diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/api/objects/minecraft')
20 files changed, 168 insertions, 156 deletions
diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java b/src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java index cefc4fce37..e516f12ddd 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/AABB.java @@ -1,12 +1,14 @@ package gtPlusPlus.api.objects.minecraft; -import gtPlusPlus.core.util.minecraft.EntityUtils; import net.minecraft.entity.Entity; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; +import gtPlusPlus.core.util.minecraft.EntityUtils; + /** * Generates an AABB around an entity. + * * @author Alkalus * */ @@ -17,10 +19,11 @@ public class AABB { /** * Creates a AxisAlignedBB based around an Entity. + * * @param aEntity - The Entity to work with. - * @param x - Maximum X from origin. - * @param y - Maximum Y from origin. - * @param z - Maximum Z from origin. + * @param x - Maximum X from origin. + * @param y - Maximum Y from origin. + * @param z - Maximum Z from origin. */ public AABB(Entity aEntity, int x, int y, int z) { if (aEntity == null) { @@ -42,6 +45,7 @@ public class AABB { /** * Used to get the AxisAlignedBB from this class. + * * @return */ public AxisAlignedBB get() { @@ -50,6 +54,7 @@ public class AABB { /** * Used to determine if this object is valid or not. + * * @return */ public boolean valid() { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java index f7d29e1200..56a134716b 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_FluidTank.java @@ -15,6 +15,7 @@ public class BTF_FluidTank extends FluidTank { /** * Let's replace the Default handling with GT's own handling code, because it's probably better, right? + * * @author Alkalus/GregoriusT */ public FluidStack getFluid() { @@ -38,13 +39,10 @@ public class BTF_FluidTank extends FluidTank { return this; } - /* public abstract boolean isLiquidInput(byte arg0); - - public abstract boolean isLiquidOutput(byte arg0); - - public abstract boolean doesFillContainers(); - - public abstract boolean doesEmptyContainers();*/ + /* + * public abstract boolean isLiquidInput(byte arg0); public abstract boolean isLiquidOutput(byte arg0); public + * abstract boolean doesFillContainers(); public abstract boolean doesEmptyContainers(); + */ public boolean canTankBeFilled() { return true; @@ -85,13 +83,11 @@ public class BTF_FluidTank extends FluidTank { } public int fill(FluidStack aFluid, boolean doFill) { - if (aFluid != null - && aFluid.getFluid().getID() > 0 + if (aFluid != null && aFluid.getFluid().getID() > 0 && aFluid.amount > 0 && this.canTankBeFilled() && this.isFluidInputAllowed(aFluid)) { - if (this.getFillableStack() != null - && this.getFillableStack().getFluid().getID() > 0) { + if (this.getFillableStack() != null && this.getFillableStack().getFluid().getID() > 0) { if (!this.getFillableStack().isFluidEqual(aFluid)) { return 0; } else { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java index d23ea97072..6dac3a7acd 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BTF_Inventory.java @@ -1,13 +1,15 @@ package gtPlusPlus.api.objects.minecraft; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.tileentities.base.TileEntityBase; -import gtPlusPlus.core.util.data.ArrayUtils; import java.util.ArrayList; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.tileentities.base.TileEntityBase; +import gtPlusPlus.core.util.data.ArrayUtils; + public class BTF_Inventory implements ISidedInventory { public final ItemStack[] mInventory; @@ -59,7 +61,7 @@ public class BTF_Inventory implements ISidedInventory { public ItemStack decrStackSize(int aIndex, int aAmount) { ItemStack tStack = this.getStackInSlot(aIndex); - ItemStack rStack = GT_Utility.copy(new Object[] {tStack}); + ItemStack rStack = GT_Utility.copy(new Object[] { tStack }); if (tStack != null) { if (tStack.stackSize <= aAmount) { if (this.setStackToZeroInsteadOfNull(aIndex)) { @@ -81,42 +83,33 @@ public class BTF_Inventory implements ISidedInventory { public int[] getAccessibleSlotsFromSide(int aSide) { ArrayList<Integer> tList = new ArrayList<Integer>(); TileEntityBase tTileEntity = this.mTile; - boolean tSkip = tTileEntity - .getCoverBehaviorAtSide((byte) aSide) - .letsItemsIn( - (byte) aSide, - tTileEntity.getCoverIDAtSide((byte) aSide), - tTileEntity.getCoverDataAtSide((byte) aSide), - -2, - tTileEntity) - || tTileEntity - .getCoverBehaviorAtSide((byte) aSide) - .letsItemsOut( - (byte) aSide, - tTileEntity.getCoverIDAtSide((byte) aSide), - tTileEntity.getCoverDataAtSide((byte) aSide), - -2, - tTileEntity); + boolean tSkip = tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsIn( + (byte) aSide, + tTileEntity.getCoverIDAtSide((byte) aSide), + tTileEntity.getCoverDataAtSide((byte) aSide), + -2, + tTileEntity) + || tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsOut( + (byte) aSide, + tTileEntity.getCoverIDAtSide((byte) aSide), + tTileEntity.getCoverDataAtSide((byte) aSide), + -2, + tTileEntity); for (int rArray = 0; rArray < this.getSizeInventory(); ++rArray) { - if (this.isValidSlot(rArray) - && (tSkip - || tTileEntity - .getCoverBehaviorAtSide((byte) aSide) - .letsItemsOut( - (byte) aSide, - tTileEntity.getCoverIDAtSide((byte) aSide), - tTileEntity.getCoverDataAtSide((byte) aSide), - rArray, - tTileEntity) - || tTileEntity - .getCoverBehaviorAtSide((byte) aSide) - .letsItemsIn( - (byte) aSide, - tTileEntity.getCoverIDAtSide((byte) aSide), - tTileEntity.getCoverDataAtSide((byte) aSide), - rArray, - tTileEntity))) { + if (this.isValidSlot(rArray) && (tSkip + || tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsOut( + (byte) aSide, + tTileEntity.getCoverIDAtSide((byte) aSide), + tTileEntity.getCoverDataAtSide((byte) aSide), + rArray, + tTileEntity) + || tTileEntity.getCoverBehaviorAtSide((byte) aSide).letsItemsIn( + (byte) aSide, + tTileEntity.getCoverIDAtSide((byte) aSide), + tTileEntity.getCoverDataAtSide((byte) aSide), + rArray, + tTileEntity))) { tList.add(Integer.valueOf(rArray)); } } @@ -131,16 +124,14 @@ public class BTF_Inventory implements ISidedInventory { } public boolean canInsertItem(int aIndex, ItemStack aStack, int aSide) { - return this.isValidSlot(aIndex) - && aStack != null + return this.isValidSlot(aIndex) && aStack != null && aIndex < this.mInventory.length && (this.mInventory[aIndex] == null || GT_Utility.areStacksEqual(aStack, this.mInventory[aIndex])) && this.allowPutStack(this.mTile, aIndex, (byte) aSide, aStack); } public boolean canExtractItem(int aIndex, ItemStack aStack, int aSide) { - return this.isValidSlot(aIndex) - && aStack != null + return this.isValidSlot(aIndex) && aStack != null && aIndex < this.mInventory.length && this.allowPullStack(this.mTile, aIndex, (byte) aSide, aStack); } @@ -209,10 +200,8 @@ public class BTF_Inventory implements ISidedInventory { for (int s = 0; s < this.getSizeInventory(); s++) { if (mInventory != null && mInventory[s] != null) { ItemStack slot = mInventory[s]; - if (slot == null - || (slot != null - && GT_Utility.areStacksEqual(aInput, slot) - && slot.stackSize != slot.getItem().getItemStackLimit(slot))) { + if (slot == null || (slot != null && GT_Utility.areStacksEqual(aInput, slot) + && slot.stackSize != slot.getItem().getItemStackLimit(slot))) { if (slot == null) { slot = aInput.copy(); } else { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java index 451d1aca77..cd6edf5411 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/BlockPos.java @@ -1,15 +1,17 @@ package gtPlusPlus.api.objects.minecraft; -import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gtPlusPlus.api.objects.data.AutoMap; import java.io.Serializable; import java.util.HashSet; import java.util.Set; + import net.minecraft.block.Block; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import gregtech.api.interfaces.tileentity.IGregTechTileEntity; +import gtPlusPlus.api.objects.data.AutoMap; + public class BlockPos implements Serializable { private static final long serialVersionUID = -7271947491316682006L; @@ -89,8 +91,7 @@ public class BlockPos implements Serializable { return false; } BlockPos otherPoint = (BlockPos) other; - return this.xPos == otherPoint.xPos - && this.yPos == otherPoint.yPos + return this.xPos == otherPoint.xPos && this.yPos == otherPoint.yPos && this.zPos == otherPoint.zPos && this.dim == otherPoint.dim; } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java b/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java index 04b1f2b59b..5799a12822 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/CubicObject.java @@ -1,8 +1,9 @@ package gtPlusPlus.api.objects.minecraft; -import gtPlusPlus.api.objects.data.AutoMap; import net.minecraftforge.common.util.ForgeDirection; +import gtPlusPlus.api.objects.data.AutoMap; + public class CubicObject<T> { public final T NORTH; diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java index 492d0b3aeb..6748b58537 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/DimChunkPos.java @@ -30,9 +30,7 @@ public class DimChunkPos { this.dimension = dim; this.xPos = x; this.zPos = z; - Chunk h = Minecraft.getMinecraft() - .getIntegratedServer() - .worldServerForDimension(dim) + Chunk h = Minecraft.getMinecraft().getIntegratedServer().worldServerForDimension(dim) .getChunkFromChunkCoords(xPos, zPos); if (h == null) { this.mainChunk = null; @@ -45,9 +43,7 @@ public class DimChunkPos { if (this.mainChunk != null) { return this.mainChunk; } - Chunk h = Minecraft.getMinecraft() - .getIntegratedServer() - .worldServerForDimension(this.dimension) + Chunk h = Minecraft.getMinecraft().getIntegratedServer().worldServerForDimension(this.dimension) .getChunkFromChunkCoords(xPos, zPos); return h; } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java index 40f78763d0..d627d47349 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeBlockPos.java @@ -1,13 +1,15 @@ package gtPlusPlus.api.objects.minecraft; -import gtPlusPlus.api.objects.data.AutoMap; import java.util.HashSet; import java.util.Set; + import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import gtPlusPlus.api.objects.data.AutoMap; + public class FakeBlockPos extends BlockPos { private static final long serialVersionUID = -6442245826092414593L; @@ -43,7 +45,13 @@ public class FakeBlockPos extends BlockPos { } public String getUniqueIdentifier() { - String S = "" + this.xPos + "@" + this.yPos + "@" + this.zPos + this.aBlockAtPos.getLocalizedName() + "@" + String S = "" + this.xPos + + "@" + + this.yPos + + "@" + + this.zPos + + this.aBlockAtPos.getLocalizedName() + + "@" + this.aBlockMetaAtPos; return S; } @@ -222,18 +230,17 @@ public class FakeBlockPos extends BlockPos { } /** - * Called when a plant grows on this block, only implemented for saplings using the WorldGen*Trees classes right now. - * Modder may implement this for custom plants. - * This does not use ForgeDirection, because large/huge trees can be located in non-representable direction, - * so the source location is specified. - * Currently this just changes the block to dirt if it was grass. + * Called when a plant grows on this block, only implemented for saplings using the WorldGen*Trees classes right + * now. Modder may implement this for custom plants. This does not use ForgeDirection, because large/huge trees can + * be located in non-representable direction, so the source location is specified. Currently this just changes the + * block to dirt if it was grass. * * Note: This happens DURING the generation, the generation may not be complete when this is called. * - * @param world Current world - * @param x Soil X - * @param y Soil Y - * @param z Soil Z + * @param world Current world + * @param x Soil X + * @param y Soil Y + * @param z Soil Z * @param sourceX Plant growth location X * @param sourceY Plant growth location Y * @param sourceZ Plant growth location Z diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java index 2a55282623..d294326ff3 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FakeWorld.java @@ -1,10 +1,7 @@ package gtPlusPlus.api.objects.minecraft; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.util.math.MathUtils; -import gtPlusPlus.core.util.minecraft.ItemUtils; import java.util.HashMap; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.init.Blocks; @@ -14,6 +11,11 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.biome.BiomeGenBase; import net.minecraftforge.common.util.ForgeDirection; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.AutoMap; +import gtPlusPlus.core.util.math.MathUtils; +import gtPlusPlus.core.util.minecraft.ItemUtils; + public class FakeWorld implements IBlockAccess { public static HashMap<String, FakeBlockPos> mStaticFakeWorldData; @@ -48,18 +50,13 @@ public class FakeWorld implements IBlockAccess { public void init() { - /*if (mStaticFakeWorldData == null) { - Logger.WARNING("Setting all Blocks in Fake World to Air."); - mStaticFakeWorldData = new HashMap<String, FakeBlockPos>(); - for (int y=0;y<=aWorldHeight;y++) { - for (int x=-aDistanceFromOrigin;x<=aDistanceFromOrigin;x++) { - for (int z=-aDistanceFromOrigin;z<=aDistanceFromOrigin;z++) { - FakeBlockPos aTempPos = new FakeBlockPos(x, y, z, Blocks.air, 0); - mStaticFakeWorldData.put(aTempPos.getLocationString(), aTempPos); - } - } - } - }*/ + /* + * if (mStaticFakeWorldData == null) { Logger.WARNING("Setting all Blocks in Fake World to Air."); + * mStaticFakeWorldData = new HashMap<String, FakeBlockPos>(); for (int y=0;y<=aWorldHeight;y++) { for (int + * x=-aDistanceFromOrigin;x<=aDistanceFromOrigin;x++) { for (int + * z=-aDistanceFromOrigin;z<=aDistanceFromOrigin;z++) { FakeBlockPos aTempPos = new FakeBlockPos(x, y, z, + * Blocks.air, 0); mStaticFakeWorldData.put(aTempPos.getLocationString(), aTempPos); } } } } + */ // if (mStaticFakeWorldData != null) { // Logger.WARNING(" Instancing static air world."); mFakeWorldData = new HashMap<String, FakeBlockPos>(); diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java index 1cc3c2c0aa..a90d72864c 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/FluidGT6.java @@ -1,10 +1,12 @@ package gtPlusPlus.api.objects.minecraft; +import net.minecraftforge.fluids.Fluid; + import gregtech.api.GregTech_API; import gtPlusPlus.core.lib.CORE; -import net.minecraftforge.fluids.Fluid; public class FluidGT6 extends Fluid implements Runnable { + private final short[] mRGBa; public final String mTextureName; @@ -19,8 +21,7 @@ public class FluidGT6 extends Fluid implements Runnable { @Override public int getColor() { - return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16) - | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8) + return (Math.max(0, Math.min(255, this.mRGBa[0])) << 16) | (Math.max(0, Math.min(255, this.mRGBa[1])) << 8) | Math.max(0, Math.min(255, this.mRGBa[2])); } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java index 9500d862fa..6fe2f9ddb5 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemPackage.java @@ -47,11 +47,11 @@ public abstract class ItemPackage implements RunnableWithInfo<String> { /** * Override this to handle GT Recipe map manipulation after they're Baked. + * * @param event - the {@link FMLLoadCompleteEvent}. * @return - Did we do anything? */ public boolean onLoadComplete(FMLLoadCompleteEvent event) { return false; - } - ; + }; } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java index 7e0e0bb9ea..f5e483b91c 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ItemStackData.java @@ -1,10 +1,11 @@ package gtPlusPlus.api.objects.minecraft; -import gtPlusPlus.core.util.minecraft.ItemUtils; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import gtPlusPlus.core.util.minecraft.ItemUtils; + public class ItemStackData { protected final Item mItem; diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java b/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java index a8768f7604..e8b4a19031 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/NoConflictGTRecipeMap.java @@ -1,10 +1,11 @@ package gtPlusPlus.api.objects.minecraft; +import java.util.Collection; +import java.util.Iterator; + import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.util.GT_Recipe; import gtPlusPlus.api.objects.data.AutoMap; -import java.util.Collection; -import java.util.Iterator; public class NoConflictGTRecipeMap implements Collection<GT_Recipe> { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java index 0ec01e3825..84f5fe5fba 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/SafeTexture.java @@ -1,14 +1,17 @@ package gtPlusPlus.api.objects.minecraft; +import java.util.HashMap; + +import net.minecraft.util.IIcon; + import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gregtech.api.GregTech_API; import gtPlusPlus.core.util.Utils; -import java.util.HashMap; -import net.minecraft.util.IIcon; /** * A Server Side safe object that can hold {@link IIcon}s. + * * @author Alkalus * */ diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java index 98232fb4c4..12916af64b 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ShapedRecipe.java @@ -1,12 +1,13 @@ package gtPlusPlus.api.objects.minecraft; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.ShapedOreRecipe; + import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.api.objects.data.Pair; import gtPlusPlus.core.util.minecraft.ItemUtils; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.ShapedOreRecipe; public class ShapedRecipe { @@ -15,19 +16,10 @@ public class ShapedRecipe { ItemStack[] mBlackList = null; - public ShapedRecipe( - Object aInput1, - Object aInput2, - Object aInput3, - Object aInput4, - Object aInput5, - Object aInput6, - Object aInput7, - Object aInput8, - Object aInput9, - ItemStack aOutput) { - - this(new Object[] {aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9}, aOutput); + public ShapedRecipe(Object aInput1, Object aInput2, Object aInput3, Object aInput4, Object aInput5, Object aInput6, + Object aInput7, Object aInput8, Object aInput9, ItemStack aOutput) { + + this(new Object[] { aInput1, aInput2, aInput3, aInput4, aInput5, aInput6, aInput7, aInput8, aInput9 }, aOutput); } public ShapedRecipe(Object[] aInputs, ItemStack aOutput) { @@ -75,8 +67,11 @@ public class ShapedRecipe { Logger.RECIPE("Generating Shaped Crafting Recipe for " + aOutput.getDisplayName()); if (aInputs.length < 9 || aInputs.length > 9) { - Logger.RECIPE("[Fix] Recipe for " + aOutput.getDisplayName() - + " has incorrect number of inputs. Size: " + aInputs.length + "."); + Logger.RECIPE( + "[Fix] Recipe for " + aOutput.getDisplayName() + + " has incorrect number of inputs. Size: " + + aInputs.length + + "."); // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(1)); // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(2)); // Logger.RECIPE("[1234abcd] Reciped exists at location: "+ReflectionUtils.getMethodName(3)); @@ -101,8 +96,12 @@ public class ShapedRecipe { mInfo = ((ItemStack) stack).getDisplayName(); } aRecipePairs.put(new Pair<Character, Object>(CHARS.charAt(aCharSlot), stack)); - Logger.RECIPE("Storing '" + CHARS.charAt(aCharSlot) + "' with an object of type " - + stack.getClass().getSimpleName() + " and a value of " + mInfo); + Logger.RECIPE( + "Storing '" + CHARS.charAt(aCharSlot) + + "' with an object of type " + + stack.getClass().getSimpleName() + + " and a value of " + + mInfo); aChar[aMemSlot++] = CHARS.charAt(aCharSlot); aCharSlot++; aLoggingInfo[aInfoSlot++] = mInfo; @@ -160,23 +159,30 @@ public class ShapedRecipe { mInfo = ((ItemStack) stack).getDisplayName(); } aRecipePairs.put(new Pair<Character, Object>(CHARS.charAt(aCharSlot), stack)); - Logger.RECIPE("Registering Pair of '" + CHARS.charAt(aCharSlot) + "' and a " - + stack.getClass().getSimpleName() + " object. Object has a value of " + mInfo); + Logger.RECIPE( + "Registering Pair of '" + CHARS.charAt(aCharSlot) + + "' and a " + + stack.getClass().getSimpleName() + + " object. Object has a value of " + + mInfo); aCharSlot++; counter++; } } - Logger.RECIPE("Counter started at " + KEY_COUNTER + ", counter is now at " + counter - + ". Trying to create Varag array with a size of " - + (KEY_COUNTER + (counter - KEY_COUNTER) * 2)); + Logger.RECIPE( + "Counter started at " + KEY_COUNTER + + ", counter is now at " + + counter + + ". Trying to create Varag array with a size of " + + (KEY_COUNTER + (counter - KEY_COUNTER) * 2)); // Counter started at 3, counter is now at 4. Trying to create Varag array with a size of 2 // Register the shaped grid straight to the varags mVarags2 = new Object[(KEY_COUNTER + (counter - KEY_COUNTER) * 2)]; - /*mVarags2[0] = aGrid[0]; - mVarags2[1] = aGrid[1]; - mVarags2[2] = aGrid[2];*/ + /* + * mVarags2[0] = aGrid[0]; mVarags2[1] = aGrid[1]; mVarags2[2] = aGrid[2]; + */ mVarags2[0] = aGrid; // Add Each Char, then Item to the varags, sequentially. diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java b/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java index c5703d12fb..4e4e0e9780 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/TexturePackage.java @@ -1,10 +1,12 @@ package gtPlusPlus.api.objects.minecraft; -import gtPlusPlus.api.objects.data.AutoMap; import java.util.LinkedHashMap; import java.util.Set; + import net.minecraft.util.IIcon; +import gtPlusPlus.api.objects.data.AutoMap; + public class TexturePackage { private AutoMap<IIcon> mAnimationArray = new AutoMap<IIcon>(); diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java b/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java index b40696747b..f38a960044 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/ThreadPooCollector.java @@ -1,18 +1,20 @@ package gtPlusPlus.api.objects.minecraft; -import gtPlusPlus.GTplusplus; -import gtPlusPlus.GTplusplus.INIT_PHASE; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector; -import gtPlusPlus.core.util.Utils; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; + import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.util.AxisAlignedBB; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; +import gtPlusPlus.GTplusplus; +import gtPlusPlus.GTplusplus.INIT_PHASE; +import gtPlusPlus.api.objects.data.Pair; +import gtPlusPlus.core.tileentities.machines.TileEntityPooCollector; +import gtPlusPlus.core.util.Utils; + public class ThreadPooCollector extends Thread { public boolean canRun = true; @@ -22,8 +24,7 @@ public class ThreadPooCollector extends Thread { private static long internalTickCounter = 0; private static final ThreadPooCollector mThread; - private static final HashMap<String, Pair<BlockPos, TileEntityPooCollector>> mPooCollectors = - new LinkedHashMap<String, Pair<BlockPos, TileEntityPooCollector>>(); + private static final HashMap<String, Pair<BlockPos, TileEntityPooCollector>> mPooCollectors = new LinkedHashMap<String, Pair<BlockPos, TileEntityPooCollector>>(); static { mThread = new ThreadPooCollector(); @@ -82,12 +83,12 @@ public class ThreadPooCollector extends Thread { int endX = p.xPos + 3; int endY = p.yPos + 5; int endZ = p.zPos + 3; - AxisAlignedBB box = AxisAlignedBB.getBoundingBox( - startX, startY, startZ, endX, endY, endZ); + AxisAlignedBB box = AxisAlignedBB + .getBoundingBox(startX, startY, startZ, endX, endY, endZ); if (box != null) { @SuppressWarnings("unchecked") - List<EntityAnimal> animals = - w.getEntitiesWithinAABB(EntityAnimal.class, box); + List<EntityAnimal> animals = w + .getEntitiesWithinAABB(EntityAnimal.class, box); if (animals != null && !animals.isEmpty()) { pair.getValue().onPostTick(animals); } diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java index 4dea1c22d6..b4ab2c9315 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoEUBonusMultiBehaviour.java @@ -1,8 +1,9 @@ package gtPlusPlus.api.objects.minecraft.multi; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.item.ItemStack; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; + public class NoEUBonusMultiBehaviour extends SpecialMultiBehaviour { public NoEUBonusMultiBehaviour() { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java index d8ddbea5e7..cea7e40a51 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoOutputBonusMultiBehaviour.java @@ -1,8 +1,9 @@ package gtPlusPlus.api.objects.minecraft.multi; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.item.ItemStack; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; + public class NoOutputBonusMultiBehaviour extends SpecialMultiBehaviour { public NoOutputBonusMultiBehaviour() { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java index 834c93890d..cfe6afee66 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/NoSpeedBonusMultiBehaviour.java @@ -1,8 +1,9 @@ package gtPlusPlus.api.objects.minecraft.multi; -import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; import net.minecraft.item.ItemStack; +import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList; + public class NoSpeedBonusMultiBehaviour extends SpecialMultiBehaviour { public NoSpeedBonusMultiBehaviour() { diff --git a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java index 03f000fcc2..94c87ab71b 100644 --- a/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java +++ b/src/main/java/gtPlusPlus/api/objects/minecraft/multi/SpecialMultiBehaviour.java @@ -1,12 +1,14 @@ package gtPlusPlus.api.objects.minecraft.multi; -import gregtech.api.util.GT_Utility; import net.minecraft.item.ItemStack; +import gregtech.api.util.GT_Utility; + /** - * Extend this class to implement custom behaviour for multiblocks. - * The Trigger item when in a special slot or input bus, will cause the multiblock to behave as specified. - * Not overriding a method here will cause the default values to be used. + * Extend this class to implement custom behaviour for multiblocks. The Trigger item when in a special slot or input + * bus, will cause the multiblock to behave as specified. Not overriding a method here will cause the default values to + * be used. + * * @author Alkalus * */ |