Skip to content

Commit bba3cad

Browse files
authored
Merge pull request #12 from TBoshoven/formatting
Formatting and import ordering
2 parents 2b7c7e2 + 164020b commit bba3cad

23 files changed

+39
-45
lines changed

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/Blocks.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import net.minecraft.block.material.MaterialColor;
88
import net.minecraft.block.material.PushReaction;
99
import net.minecraftforge.event.RegistryEvent.Register;
10-
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
1110
import net.minecraftforge.eventbus.api.SubscribeEvent;
11+
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
1212

1313
import javax.annotation.ParametersAreNonnullByDefault;
1414

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/MagicDoorBlock.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
import com.tomboshoven.minecraft.magicdoorknob.items.MagicDoorknobItem;
55
import mcp.MethodsReturnNonnullByDefault;
66
import net.minecraft.block.Block;
7-
import net.minecraft.block.SoundType;
8-
import net.minecraft.state.EnumProperty;
97
import net.minecraft.block.BlockState;
8+
import net.minecraft.block.SoundType;
109
import net.minecraft.entity.Entity;
1110
import net.minecraft.entity.player.PlayerEntity;
12-
import net.minecraft.state.StateContainer;
13-
import net.minecraft.util.SoundEvents;
1411
import net.minecraft.inventory.InventoryHelper;
1512
import net.minecraft.item.Item;
1613
import net.minecraft.item.ItemStack;
14+
import net.minecraft.state.EnumProperty;
15+
import net.minecraft.state.StateContainer;
1716
import net.minecraft.state.properties.BlockStateProperties;
1817
import net.minecraft.tileentity.TileEntity;
1918
import net.minecraft.util.Direction;
2019
import net.minecraft.util.Hand;
20+
import net.minecraft.util.SoundEvents;
2121
import net.minecraft.util.math.BlockPos;
2222
import net.minecraft.util.math.BlockRayTraceResult;
2323
import net.minecraft.util.math.shapes.ISelectionContext;
@@ -106,8 +106,7 @@ public void onReplaced(BlockState state, World worldIn, BlockPos pos, BlockState
106106

107107
// Break the bottom part
108108
worldIn.destroyBlock(pos.down(), false);
109-
}
110-
else {
109+
} else {
111110
// Break the top part
112111
worldIn.destroyBlock(pos.up(), false);
113112
}

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/MagicDoorwayBlock.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
import com.tomboshoven.minecraft.magicdoorknob.blocks.tileentities.MagicDoorwayTileEntity;
44
import mcp.MethodsReturnNonnullByDefault;
55
import net.minecraft.block.Block;
6+
import net.minecraft.block.BlockState;
67
import net.minecraft.state.BooleanProperty;
78
import net.minecraft.state.EnumProperty;
8-
import net.minecraft.block.BlockState;
99
import net.minecraft.state.StateContainer;
1010
import net.minecraft.tileentity.TileEntity;
1111
import net.minecraft.util.math.BlockPos;
@@ -50,6 +50,7 @@ public class MagicDoorwayBlock extends MagicDoorwayPartBaseBlock {
5050
private static final VoxelShape BOUNDING_BOX_WALL_W = makeCuboidShape(15, 0, 0, 16, 16, 16);
5151

5252
private static final VoxelShape BOUNDING_BOX_TOP = makeCuboidShape(0, 15, 0, 16, 16, 16);
53+
5354
/**
5455
* Create a new Magic Doorway block.
5556
*/

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/MagicDoorwayPartBaseBlock.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.tomboshoven.minecraft.magicdoorknob.blocks.tileentities.MagicDoorwayPartBaseTileEntity;
44
import mcp.MethodsReturnNonnullByDefault;
55
import net.minecraft.block.Block;
6-
import net.minecraft.block.SoundType;
76
import net.minecraft.block.BlockState;
7+
import net.minecraft.block.SoundType;
88
import net.minecraft.client.particle.ParticleManager;
99
import net.minecraft.entity.Entity;
1010
import net.minecraft.tileentity.TileEntity;
@@ -115,7 +115,7 @@ public enum EnumPartType implements IStringSerializable {
115115
private final String name;
116116

117117
/**
118-
* @param name The name of the part.
118+
* @param name The name of the part.
119119
*/
120120
EnumPartType(String name) {
121121
this.name = name;

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/blocks/tileentities/MagicDoorwayPartBaseTileEntity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.tomboshoven.minecraft.magicdoorknob.blocks.tileentities;
22

33
import com.mojang.datafixers.Dynamic;
4-
import com.tomboshoven.minecraft.magicdoorknob.items.MagicDoorknobItem;
54
import com.tomboshoven.minecraft.magicdoorknob.items.Items;
5+
import com.tomboshoven.minecraft.magicdoorknob.items.MagicDoorknobItem;
66
import com.tomboshoven.minecraft.magicdoorknob.modelloaders.textured.ModelTextureProperty;
77
import mcp.MethodsReturnNonnullByDefault;
88
import net.minecraft.block.BlockState;

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/items/Items.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import net.minecraft.item.ItemTier;
1010
import net.minecraft.util.ResourceLocation;
1111
import net.minecraftforge.event.RegistryEvent.Register;
12-
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
1312
import net.minecraftforge.eventbus.api.SubscribeEvent;
13+
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
1414
import net.minecraftforge.registries.IForgeRegistry;
1515

1616
import javax.annotation.ParametersAreNonnullByDefault;

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/items/MagicDoorknobItem.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.tomboshoven.minecraft.magicdoorknob.items;
22

3+
import com.tomboshoven.minecraft.magicdoorknob.blocks.Blocks;
34
import com.tomboshoven.minecraft.magicdoorknob.blocks.MagicDoorBlock;
45
import com.tomboshoven.minecraft.magicdoorknob.blocks.MagicDoorwayBlock;
5-
import com.tomboshoven.minecraft.magicdoorknob.blocks.Blocks;
66
import com.tomboshoven.minecraft.magicdoorknob.blocks.tileentities.MagicDoorTileEntity;
77
import com.tomboshoven.minecraft.magicdoorknob.blocks.tileentities.MagicDoorwayTileEntity;
88
import mcp.MethodsReturnNonnullByDefault;

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/ModelLoaders.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import com.tomboshoven.minecraft.magicdoorknob.modelloaders.textured.TexturedModelLoader;
44
import net.minecraft.util.ResourceLocation;
5+
import net.minecraftforge.api.distmarker.Dist;
6+
import net.minecraftforge.api.distmarker.OnlyIn;
57
import net.minecraftforge.client.event.ModelRegistryEvent;
68
import net.minecraftforge.client.model.ModelLoaderRegistry2;
79
import net.minecraftforge.eventbus.api.SubscribeEvent;
8-
import net.minecraftforge.api.distmarker.Dist;
9-
import net.minecraftforge.api.distmarker.OnlyIn;
1010

1111
import static com.tomboshoven.minecraft.magicdoorknob.MagicDoorknobMod.MOD_ID;
1212

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ITextureMapper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface ITextureMapper {
2020
/**
2121
* @param spriteToMap The property to get the texture location for
2222
* @param blockState The block state as provided to getQuads; this is null for items
23-
* @param extraData Extra model data if available
23+
* @param extraData Extra model data if available
2424
* @return The location of the appropriate texture
2525
*/
2626
ResourceLocation mapSprite(PropertySprite spriteToMap, @Nullable BlockState blockState, @Nullable IModelData extraData);

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ModelDataTextureMapper.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import mcp.MethodsReturnNonnullByDefault;
44
import net.minecraft.block.BlockState;
55
import net.minecraft.util.ResourceLocation;
6-
import net.minecraftforge.client.model.data.IModelData;
7-
import net.minecraftforge.client.model.data.ModelProperty;
86
import net.minecraftforge.api.distmarker.Dist;
97
import net.minecraftforge.api.distmarker.OnlyIn;
8+
import net.minecraftforge.client.model.data.IModelData;
9+
import net.minecraftforge.client.model.data.ModelProperty;
1010

1111
import javax.annotation.Nullable;
1212
import javax.annotation.ParametersAreNonnullByDefault;

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/ModelTextureProperty.java

-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ private ModelTextureProperty(ResourceLocation name) {
3333
* It will be created if it hasn't been requested before.
3434
*
3535
* @param name The name of the property to get.
36-
*
3736
* @return The requested property.
3837
*/
3938
public static ModelTextureProperty get(ResourceLocation name) {

MagicDoorknob/src/main/java/com/tomboshoven/minecraft/magicdoorknob/modelloaders/textured/TexturedBakedModel.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
import net.minecraft.util.Direction;
1616
import net.minecraft.util.ResourceLocation;
1717
import net.minecraft.world.World;
18+
import net.minecraftforge.api.distmarker.Dist;
19+
import net.minecraftforge.api.distmarker.OnlyIn;
1820
import net.minecraftforge.client.model.BakedModelWrapper;
1921
import net.minecraftforge.client.model.data.EmptyModelData;
2022
import net.minecraftforge.client.model.data.IModelData;
21-
import net.minecraftforge.api.distmarker.Dist;
22-
import net.minecraftforge.api.distmarker.OnlyIn;
2323

2424
import javax.annotation.Nullable;
2525
import javax.annotation.ParametersAreNonnullByDefault;

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/MagicMirrorMod.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.tomboshoven.minecraft.magicmirror;
22

33
import com.tomboshoven.minecraft.magicmirror.blocks.Blocks;
4-
import com.tomboshoven.minecraft.magicmirror.blocks.modifiers.MagicMirrorModifier;
54
import com.tomboshoven.minecraft.magicmirror.blocks.modifiers.ArmorMagicMirrorModifier;
65
import com.tomboshoven.minecraft.magicmirror.blocks.modifiers.CreatureMagicMirrorModifier;
6+
import com.tomboshoven.minecraft.magicmirror.blocks.modifiers.MagicMirrorModifier;
77
import com.tomboshoven.minecraft.magicmirror.blocks.tileentities.TileEntities;
88
import com.tomboshoven.minecraft.magicmirror.commands.Commands;
99
import com.tomboshoven.minecraft.magicmirror.items.Items;

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/blocks/MagicMirrorBlock.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public enum EnumPartType implements IStringSerializable {
237237
private final String name;
238238

239239
/**
240-
* @param name The name of the part.
240+
* @param name The name of the part.
241241
*/
242242
EnumPartType(String name) {
243243
this.name = name;
@@ -285,7 +285,6 @@ public MessageAttachModifier() {
285285
* Decode a packet into an instance of the message.
286286
*
287287
* @param buf The buffer to read from.
288-
*
289288
* @return The created message instance.
290289
*/
291290
public static MessageAttachModifier decode(PacketBuffer buf) {

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/blocks/modifiers/ArmorMagicMirrorModifier.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.tomboshoven.minecraft.magicmirror.blocks.modifiers;
22

3-
import com.tomboshoven.minecraft.magicmirror.blocks.tileentities.modifiers.MagicMirrorTileEntityModifier;
43
import com.tomboshoven.minecraft.magicmirror.blocks.tileentities.modifiers.ArmorMagicMirrorTileEntityModifier;
4+
import com.tomboshoven.minecraft.magicmirror.blocks.tileentities.modifiers.MagicMirrorTileEntityModifier;
55
import mcp.MethodsReturnNonnullByDefault;
6-
import net.minecraft.item.Items;
76
import net.minecraft.item.ItemStack;
7+
import net.minecraft.item.Items;
88
import net.minecraft.util.math.BlockPos;
99
import net.minecraft.world.World;
1010

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/blocks/modifiers/CreatureMagicMirrorModifier.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package com.tomboshoven.minecraft.magicmirror.blocks.modifiers;
22

3-
import com.tomboshoven.minecraft.magicmirror.blocks.tileentities.modifiers.MagicMirrorTileEntityModifier;
43
import com.tomboshoven.minecraft.magicmirror.blocks.tileentities.modifiers.CreatureMagicMirrorTileEntityModifier;
4+
import com.tomboshoven.minecraft.magicmirror.blocks.tileentities.modifiers.MagicMirrorTileEntityModifier;
55
import mcp.MethodsReturnNonnullByDefault;
6-
import net.minecraft.item.Items;
76
import net.minecraft.item.ItemStack;
7+
import net.minecraft.item.Items;
88
import net.minecraft.util.math.BlockPos;
99
import net.minecraft.world.World;
1010

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/blocks/tileentities/MagicMirrorCoreTileEntity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
import mcp.MethodsReturnNonnullByDefault;
99
import net.minecraft.entity.player.PlayerEntity;
1010
import net.minecraft.nbt.CompoundNBT;
11-
import net.minecraft.nbt.ListNBT;
1211
import net.minecraft.nbt.INBT;
12+
import net.minecraft.nbt.ListNBT;
1313
import net.minecraft.network.NetworkManager;
1414
import net.minecraft.network.play.server.SUpdateTileEntityPacket;
1515
import net.minecraft.tileentity.ITickableTileEntity;
1616
import net.minecraft.util.Hand;
1717
import net.minecraft.util.math.AxisAlignedBB;
1818
import net.minecraft.util.math.BlockPos;
1919
import net.minecraft.world.World;
20-
import net.minecraftforge.common.util.FakePlayer;
2120
import net.minecraftforge.api.distmarker.Dist;
2221
import net.minecraftforge.api.distmarker.OnlyIn;
22+
import net.minecraftforge.common.util.FakePlayer;
2323
import net.minecraftforge.fml.DistExecutor;
2424

2525
import javax.annotation.Nullable;

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/blocks/tileentities/modifiers/ArmorMagicMirrorTileEntityModifier.java

-2
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ public MessageSwapMirror() {
284284
* Decode a packet into an instance of the message.
285285
*
286286
* @param buf The buffer to read from.
287-
*
288287
* @return The created message instance.
289288
*/
290289
public static MessageSwapMirror decode(PacketBuffer buf) {
@@ -326,7 +325,6 @@ public MessageSwapPlayer() {
326325
* Decode a packet into an instance of the message.
327326
*
328327
* @param buf The buffer to read from.
329-
*
330328
* @return The created message instance.
331329
*/
332330
public static MessageSwapPlayer decode(PacketBuffer buf) {

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/blocks/tileentities/modifiers/CreatureMagicMirrorTileEntityModifier.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import com.tomboshoven.minecraft.magicmirror.reflection.modifiers.CreatureReflectionModifierClient;
88
import mcp.MethodsReturnNonnullByDefault;
99
import net.minecraft.entity.player.PlayerEntity;
10-
import net.minecraft.item.Items;
1110
import net.minecraft.inventory.InventoryHelper;
1211
import net.minecraft.item.ItemStack;
12+
import net.minecraft.item.Items;
1313
import net.minecraft.util.Hand;
1414
import net.minecraft.util.math.BlockPos;
1515
import net.minecraft.world.World;

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/commands/MagicMirrorCommand.java

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ public class MagicMirrorCommand {
2020
* Reply with some debugging information.
2121
*
2222
* @param context The command context.
23-
*
2423
* @return Currently, the number of active reflections.
2524
*/
2625
private static int debug(CommandContext<CommandSource> context) {

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/items/Items.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
import com.tomboshoven.minecraft.magicmirror.MagicMirrorMod;
44
import com.tomboshoven.minecraft.magicmirror.blocks.Blocks;
55
import mcp.MethodsReturnNonnullByDefault;
6-
import net.minecraft.item.Item;
76
import net.minecraft.item.BlockItem;
7+
import net.minecraft.item.Item;
88
import net.minecraft.item.ItemGroup;
99
import net.minecraftforge.event.RegistryEvent.Register;
10-
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
1110
import net.minecraftforge.eventbus.api.SubscribeEvent;
11+
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
1212

1313
import javax.annotation.ParametersAreNonnullByDefault;
1414

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/reflection/ReflectionClient.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ public void render(Direction facing, float partialTicks) {
9595
// Create or destroy the framebuffer if needed
9696
if (reflectedEntity != null && frameBuffer == null) {
9797
buildFrameBuffer();
98-
}
99-
else if (reflectedEntity == null && frameBuffer != null) {
98+
} else if (reflectedEntity == null && frameBuffer != null) {
10099
cleanUpFrameBuffer();
101100
}
102101

MagicMirror/src/main/java/com/tomboshoven/minecraft/magicmirror/reflection/renderers/modifiers/CreatureReflectionRendererModifier.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,24 @@
33
import com.tomboshoven.minecraft.magicmirror.reflection.renderers.ReflectionRendererBase;
44
import mcp.MethodsReturnNonnullByDefault;
55
import net.minecraft.client.Minecraft;
6+
import net.minecraft.client.renderer.entity.EntityRenderer;
7+
import net.minecraft.client.renderer.entity.EntityRendererManager;
8+
import net.minecraft.client.renderer.entity.LivingRenderer;
69
import net.minecraft.client.renderer.entity.layers.ArrowLayer;
710
import net.minecraft.client.renderer.entity.layers.BipedArmorLayer;
11+
import net.minecraft.client.renderer.entity.layers.ElytraLayer;
12+
import net.minecraft.client.renderer.entity.layers.HeadLayer;
813
import net.minecraft.client.renderer.entity.layers.HeldItemLayer;
914
import net.minecraft.client.renderer.entity.model.BipedModel;
1015
import net.minecraft.client.renderer.entity.model.BipedModel.ArmPose;
1116
import net.minecraft.client.renderer.entity.model.EntityModel;
1217
import net.minecraft.client.renderer.entity.model.IHasArm;
1318
import net.minecraft.client.renderer.entity.model.IHasHead;
1419
import net.minecraft.client.renderer.entity.model.RendererModel;
15-
import net.minecraft.client.renderer.entity.EntityRenderer;
16-
import net.minecraft.client.renderer.entity.LivingRenderer;
17-
import net.minecraft.client.renderer.entity.EntityRendererManager;
18-
import net.minecraft.client.renderer.entity.layers.HeadLayer;
19-
import net.minecraft.client.renderer.entity.layers.ElytraLayer;
2020
import net.minecraft.entity.Entity;
2121
import net.minecraft.entity.LivingEntity;
22-
import net.minecraft.item.UseAction;
2322
import net.minecraft.item.ItemStack;
23+
import net.minecraft.item.UseAction;
2424
import net.minecraft.util.HandSide;
2525
import net.minecraft.util.ResourceLocation;
2626

@@ -83,7 +83,7 @@ private static class RenderOffModelPlayer<T extends LivingEntity, M extends Enti
8383
//noinspection unchecked,rawtypes
8484
addLayer(new HeldItemLayer(this));
8585
}
86-
if(model instanceof BipedModel) {
86+
if (model instanceof BipedModel) {
8787
//noinspection unchecked,rawtypes
8888
addLayer(new BipedArmorLayer(this, new BipedModel<>(0.5F), new BipedModel<>(1.0F)));
8989
}

0 commit comments

Comments
 (0)