diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
| commit | 55f64675b42ac8d3c557cc850f78664bee006f6f (patch) | |
| tree | 2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/core/slots | |
| parent | 0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff) | |
| download | GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2 GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip | |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gtPlusPlus/core/slots')
19 files changed, 107 insertions, 132 deletions
diff --git a/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java b/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java index 0caee5e6d0..588f17c92a 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotBuzzSaw.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.slots; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gregtech.common.items.GT_MetaGenerated_Item_02; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.items.GT_MetaGenerated_Tool; +import gregtech.common.items.GT_MetaGenerated_Item_02; + public class SlotBuzzSaw extends Slot { public SAWTOOL currentTool = SAWTOOL.NONE; @@ -24,8 +25,7 @@ public class SlotBuzzSaw extends Slot { || (itemstack.getItem() instanceof GT_MetaGenerated_Tool)) { // Buzzsaw Blade //TODO /* - * if (OrePrefixes.toolHeadBuzzSaw.contains(itemstack)){ isValid - * = false; } + * if (OrePrefixes.toolHeadBuzzSaw.contains(itemstack)){ isValid = false; } */ if (OrePrefixes.craftingTool.contains(itemstack)) { if (itemstack.getDisplayName().toLowerCase().contains("saw") diff --git a/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java b/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java index 4bfda45170..246e7f7495 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotChemicalPlantInput.java @@ -1,13 +1,14 @@ package gtPlusPlus.core.slots; -import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; -import gregtech.api.util.GT_Recipe; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidStack; +import gregtech.api.util.GTPP_Recipe.GTPP_Recipe_Map; +import gregtech.api.util.GT_Recipe; + public class SlotChemicalPlantInput extends Slot { public SlotChemicalPlantInput(final IInventory inventory, final int index, final int x, final int y) { diff --git a/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java b/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java index 8d7c0946ec..edcb3baf3b 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotCrafting.java @@ -1,6 +1,5 @@ package gtPlusPlus.core.slots; -import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -11,34 +10,28 @@ import net.minecraft.stats.AchievementList; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; +import cpw.mods.fml.common.FMLCommonHandler; + public class SlotCrafting extends Slot { + /** The craft matrix inventory linked to this result slot. */ private final IInventory craftMatrix; /** The player that is using the GUI where this slot resides. */ private final EntityPlayer thePlayer; /** - * The number of items that have been crafted so far. Gets passed to - * ItemStack.onCrafting before being reset. + * The number of items that have been crafted so far. Gets passed to ItemStack.onCrafting before being reset. */ private int amountCrafted; - private static final String __OBFID = "CL_00001761"; - - public SlotCrafting( - final EntityPlayer p_i1823_1_, - final IInventory p_i1823_2_, - final IInventory p_i1823_3_, - final int p_i1823_4_, - final int p_i1823_5_, - final int p_i1823_6_) { + public SlotCrafting(final EntityPlayer p_i1823_1_, final IInventory p_i1823_2_, final IInventory p_i1823_3_, + final int p_i1823_4_, final int p_i1823_5_, final int p_i1823_6_) { super(p_i1823_3_, p_i1823_4_, p_i1823_5_, p_i1823_6_); this.thePlayer = p_i1823_1_; this.craftMatrix = p_i1823_2_; } /** - * Check if the stack is a valid item for this slot. Always true beside for - * the armor slots. + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. */ @Override public boolean isItemValid(final ItemStack p_75214_1_) { @@ -46,8 +39,8 @@ public class SlotCrafting extends Slot { } /** - * Decrease the size of the stack in slot (first int arg) by the amount of - * the second int arg. Returns the new stack. + * Decrease the size of the stack in slot (first int arg) by the amount of the second int arg. Returns the new + * stack. */ @Override public ItemStack decrStackSize(final int p_75209_1_) { @@ -59,9 +52,8 @@ public class SlotCrafting extends Slot { } /** - * the itemStack passed in is the output - ie, iron ingots, and pickaxes, - * not ore and wood. Typically increases an internal count then calls - * onCrafting(item). + * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. Typically increases an + * internal count then calls onCrafting(item). */ @Override protected void onCrafting(final ItemStack p_75210_1_, final int p_75210_2_) { @@ -70,8 +62,7 @@ public class SlotCrafting extends Slot { } /** - * the itemStack passed in is the output - ie, iron ingots, and pickaxes, - * not ore and wood. + * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. */ @Override protected void onCrafting(final ItemStack p_75208_1_) { @@ -134,8 +125,7 @@ public class SlotCrafting extends Slot { if (itemstack1.getItem().hasContainerItem(itemstack1)) { final ItemStack itemstack2 = itemstack1.getItem().getContainerItem(itemstack1); - if ((itemstack2 != null) - && itemstack2.isItemStackDamageable() + if ((itemstack2 != null) && itemstack2.isItemStackDamageable() && (itemstack2.getItemDamage() > itemstack2.getMaxDamage())) { MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(this.thePlayer, itemstack2)); continue; diff --git a/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java b/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java index cf96dd69e2..119cd250bf 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotCraftingNoCollect.java @@ -1,6 +1,5 @@ package gtPlusPlus.core.slots; -import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; @@ -8,27 +7,28 @@ import net.minecraft.inventory.IInventory; import net.minecraft.item.*; import net.minecraft.stats.AchievementList; +import cpw.mods.fml.common.FMLCommonHandler; + public class SlotCraftingNoCollect extends SlotCrafting { + /** The craft matrix inventory linked to this result slot. */ private final IInventory craftMatrix; /** The player that is using the GUI where this slot resides. */ private EntityPlayer thePlayer; /** - * The number of items that have been crafted so far. Gets passed to - * ItemStack.onCrafting before being reset. + * The number of items that have been crafted so far. Gets passed to ItemStack.onCrafting before being reset. */ private int amountCrafted; - public SlotCraftingNoCollect( - EntityPlayer player, IInventory inventory, IInventory inventory2, int x, int y, int z) { + public SlotCraftingNoCollect(EntityPlayer player, IInventory inventory, IInventory inventory2, int x, int y, + int z) { super(player, inventory, inventory2, x, y, z); this.thePlayer = player; this.craftMatrix = inventory; } /** - * Check if the stack is a valid item for this slot. Always true beside for - * the armor slots. + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. */ @Override public boolean isItemValid(ItemStack p_75214_1_) { @@ -36,8 +36,8 @@ public class SlotCraftingNoCollect extends SlotCrafting { } /** - * Decrease the size of the stack in slot (first int arg) by the amount of - * the second int arg. Returns the new stack. + * Decrease the size of the stack in slot (first int arg) by the amount of the second int arg. Returns the new + * stack. */ @Override public ItemStack decrStackSize(int amount) { @@ -49,9 +49,8 @@ public class SlotCraftingNoCollect extends SlotCrafting { } /** - * the itemStack passed in is the output - ie, iron ingots, and pickaxes, - * not ore and wood. Typically increases an internal count then calls - * onCrafting(item). + * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. Typically increases an + * internal count then calls onCrafting(item). */ @Override protected void onCrafting(ItemStack output, int amount) { @@ -60,8 +59,7 @@ public class SlotCraftingNoCollect extends SlotCrafting { } /** - * the itemStack passed in is the output - ie, iron ingots, and pickaxes, - * not ore and wood. + * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. */ @Override protected void onCrafting(ItemStack output) { @@ -116,26 +114,16 @@ public class SlotCraftingNoCollect extends SlotCrafting { this.onCrafting(output); /* - * for (int i = 0; i < this.craftMatrix.getSizeInventory(); ++i) { - * ItemStack itemstack1 = this.craftMatrix.getStackInSlot(i); - * - * if (itemstack1 != null) { this.craftMatrix.decrStackSize(i, 1); - * - * if (itemstack1.getItem().hasContainerItem(itemstack1)) { ItemStack - * itemstack2 = itemstack1.getItem().getContainerItem(itemstack1); - * - * if (itemstack2 != null && itemstack2.isItemStackDamageable() && - * itemstack2.getItemDamage() > itemstack2.getMaxDamage()) { - * MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(thePlayer, - * itemstack2)); continue; } - * - * if - * (!itemstack1.getItem().doesContainerItemLeaveCraftingGrid(itemstack1) - * || !this.thePlayer.inventory.addItemStackToInventory(itemstack2)) { - * if (this.craftMatrix.getStackInSlot(i) == null) { - * this.craftMatrix.setInventorySlotContents(i, itemstack2); } else { - * this.thePlayer.dropPlayerItemWithRandomChoice(itemstack2, false); } } - * } } } + * for (int i = 0; i < this.craftMatrix.getSizeInventory(); ++i) { ItemStack itemstack1 = + * this.craftMatrix.getStackInSlot(i); if (itemstack1 != null) { this.craftMatrix.decrStackSize(i, 1); if + * (itemstack1.getItem().hasContainerItem(itemstack1)) { ItemStack itemstack2 = + * itemstack1.getItem().getContainerItem(itemstack1); if (itemstack2 != null && + * itemstack2.isItemStackDamageable() && itemstack2.getItemDamage() > itemstack2.getMaxDamage()) { + * MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(thePlayer, itemstack2)); continue; } if + * (!itemstack1.getItem().doesContainerItemLeaveCraftingGrid(itemstack1) || + * !this.thePlayer.inventory.addItemStackToInventory(itemstack2)) { if (this.craftMatrix.getStackInSlot(i) == + * null) { this.craftMatrix.setInventorySlotContents(i, itemstack2); } else { + * this.thePlayer.dropPlayerItemWithRandomChoice(itemstack2, false); } } } } } */ } diff --git a/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java b/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java index 69feaa3384..9de2622253 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotDataStick.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.slots; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.core.recipe.common.CI; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.core.recipe.common.CI; + public class SlotDataStick extends Slot { public SlotDataStick(final IInventory inventory, final int slot, final int x, final int y) { diff --git a/src/main/java/gtPlusPlus/core/slots/SlotFrame.java b/src/main/java/gtPlusPlus/core/slots/SlotFrame.java index 593ec747e8..9ee2a0d341 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotFrame.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotFrame.java @@ -1,10 +1,11 @@ package gtPlusPlus.core.slots; -import forestry.api.apiculture.IHiveFrame; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import forestry.api.apiculture.IHiveFrame; + public class SlotFrame extends Slot { public SlotFrame(final IInventory inventory, final int x, final int y, final int z) { diff --git a/src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java b/src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java index 18c5878e35..0dd050b5aa 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotFuelRod.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.slots; -import gregtech.api.enums.ItemList; -import ic2.core.Ic2Items; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import gregtech.api.enums.ItemList; +import ic2.core.Ic2Items; + public class SlotFuelRod extends Slot { public SlotFuelRod(final IInventory inventory, final int index, final int x, final int y) { diff --git a/src/main/java/gtPlusPlus/core/slots/SlotGtTool.java b/src/main/java/gtPlusPlus/core/slots/SlotGtTool.java index ea2d8f3a93..4047c4e62c 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotGtTool.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotGtTool.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.slots; -import gregtech.api.items.GT_MetaGenerated_Tool; -import gtPlusPlus.api.objects.Logger; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import gregtech.api.items.GT_MetaGenerated_Tool; +import gtPlusPlus.api.objects.Logger; + public class SlotGtTool extends Slot { public SlotGtTool(final IInventory inventory, final int x, final int y, final int z) { diff --git a/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java b/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java index c7013660dc..8b57926193 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotGtToolElectric.java @@ -1,24 +1,21 @@ package gtPlusPlus.core.slots; +import net.minecraft.init.Items; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; + import gregtech.api.items.GT_MetaGenerated_Tool; import gtPlusPlus.api.objects.Logger; import ic2.api.info.Info; import ic2.api.item.ElectricItem; import ic2.api.item.IElectricItem; -import net.minecraft.init.Items; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; public class SlotGtToolElectric extends SlotGtTool { + public int tier; private ItemStack content; - public SlotGtToolElectric( - final IInventory base, - final int x, - final int y, - final int z, - final int tier, + public SlotGtToolElectric(final IInventory base, final int x, final int y, final int z, final int tier, final boolean allowRedstoneDust) { super(base, x, y, z); this.tier = tier; diff --git a/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java b/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java index 702f678804..99e59380dc 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotIntegratedCircuit.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.slots; -import gtPlusPlus.core.recipe.common.CI; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import gtPlusPlus.core.recipe.common.CI; + public class SlotIntegratedCircuit extends Slot { public static Item mCircuitItem; @@ -48,8 +49,7 @@ public class SlotIntegratedCircuit extends Slot { } if (mCircuitItem != null && mCircuitItem2 != null && mCircuitItem3 != null) { if (itemstack != null) { - if (itemstack.getItem() == mCircuitItem - || itemstack.getItem() == mCircuitItem2 + if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2 || itemstack.getItem() == mCircuitItem3) { if (aLockedCircuitNumber == -1) { isValid = true; @@ -66,6 +66,7 @@ public class SlotIntegratedCircuit extends Slot { /** * Returns the circuit type. -1 is invalid, 0 is standard, 1 is GT++ bio. + * * @param itemstack - the Circuit Stack. * @return */ @@ -81,8 +82,7 @@ public class SlotIntegratedCircuit extends Slot { } if (mCircuitItem != null && mCircuitItem2 != null && mCircuitItem3 != null) { if (itemstack != null) { - if (itemstack.getItem() == mCircuitItem - || itemstack.getItem() == mCircuitItem2 + if (itemstack.getItem() == mCircuitItem || itemstack.getItem() == mCircuitItem2 || itemstack.getItem() == mCircuitItem3) { if (itemstack.getItem() == mCircuitItem) { return 0; diff --git a/src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java b/src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java index 7711858dae..cf13bab8c9 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotItemBackpackInv.java @@ -1,11 +1,13 @@ package gtPlusPlus.core.slots; -import gtPlusPlus.core.item.base.BaseItemBackpack; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import gtPlusPlus.core.item.base.BaseItemBackpack; + public class SlotItemBackpackInv extends Slot { + public SlotItemBackpackInv(final IInventory inv, final int index, final int xPos, final int yPos) { super(inv, index, xPos, yPos); } diff --git a/src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java b/src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java index 341921814f..ffd9f6dcae 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotLunchBox.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.slots; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.FoodUtils; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.util.minecraft.FoodUtils; + public class SlotLunchBox extends SlotGtTool { public SlotLunchBox(final IInventory base, final int x, final int y, final int z) { diff --git a/src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java b/src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java index 6427dccc69..7c13dd1c7a 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotMagicToolBag.java @@ -1,11 +1,12 @@ package gtPlusPlus.core.slots; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.core.util.minecraft.FoodUtils; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.core.util.minecraft.FoodUtils; + public class SlotMagicToolBag extends SlotGtTool { public SlotMagicToolBag(final IInventory base, final int x, final int y, final int z) { diff --git a/src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java b/src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java index 47a3beb393..7d91852e80 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotModularBauble.java @@ -1,10 +1,11 @@ package gtPlusPlus.core.slots; -import gtPlusPlus.core.item.bauble.ModularBauble; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import gtPlusPlus.core.item.bauble.ModularBauble; + public class SlotModularBauble extends Slot { public SlotModularBauble(final IInventory inventory, final int slot, final int x, final int y) { diff --git a/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java b/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java index f73f27b788..63a337cbb8 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotModularBaubleUpgrades.java @@ -2,16 +2,18 @@ package gtPlusPlus.core.slots; import static gtPlusPlus.core.tileentities.machines.TileEntityModularityTable.*; -import gtPlusPlus.api.objects.Logger; -import gtPlusPlus.api.objects.data.Pair; -import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT; -import gtPlusPlus.core.util.minecraft.ModularArmourUtils.Modifiers; import java.util.Iterator; import java.util.Map.Entry; + import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import gtPlusPlus.api.objects.Logger; +import gtPlusPlus.api.objects.data.Pair; +import gtPlusPlus.core.util.minecraft.ModularArmourUtils.BT; +import gtPlusPlus.core.util.minecraft.ModularArmourUtils.Modifiers; + public class SlotModularBaubleUpgrades extends Slot { public SlotModularBaubleUpgrades(final IInventory inventory, final int slot, final int x, final int y) { @@ -25,8 +27,7 @@ public class SlotModularBaubleUpgrades extends Slot { Logger.INFO("trying to insert " + itemstack.getDisplayName()); Logger.INFO("Valid Upgrade count: " + mValidUpgradeList.size()); - Iterator<Entry<ItemStack, BT>> it = - mValidUpgradeListFormChange.entrySet().iterator(); + Iterator<Entry<ItemStack, BT>> it = mValidUpgradeListFormChange.entrySet().iterator(); while (it.hasNext()) { Entry<ItemStack, BT> pair = it.next(); if (pair.getKey().getItem() == itemstack.getItem() @@ -35,8 +36,7 @@ public class SlotModularBaubleUpgrades extends Slot { } } - Iterator<Entry<ItemStack, Pair<Modifiers, Integer>>> it2 = - mValidUpgradeList.entrySet().iterator(); + Iterator<Entry<ItemStack, Pair<Modifiers, Integer>>> it2 = mValidUpgradeList.entrySet().iterator(); while (it2.hasNext()) { Entry<ItemStack, Pair<Modifiers, Integer>> pair = it2.next(); if (pair.getKey().getItem() == itemstack.getItem() diff --git a/src/main/java/gtPlusPlus/core/slots/SlotOutput.java b/src/main/java/gtPlusPlus/core/slots/SlotOutput.java index dc469b32a4..1948b9aa17 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotOutput.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotOutput.java @@ -1,6 +1,5 @@ package gtPlusPlus.core.slots; -import cpw.mods.fml.common.FMLCommonHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.InventoryCrafting; @@ -8,27 +7,23 @@ import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent; +import cpw.mods.fml.common.FMLCommonHandler; + public class SlotOutput extends SlotCrafting { private final IInventory craftMatrix; private final EntityPlayer thePlayer; private int amountCrafted; - public SlotOutput( - final EntityPlayer player, - final InventoryCrafting craftingInventory, - final IInventory p_i45790_3_, - final int slotIndex, - final int xPosition, - final int yPosition) { + public SlotOutput(final EntityPlayer player, final InventoryCrafting craftingInventory, + final IInventory p_i45790_3_, final int slotIndex, final int xPosition, final int yPosition) { super(player, craftingInventory, p_i45790_3_, slotIndex, xPosition, yPosition); this.thePlayer = player; this.craftMatrix = craftingInventory; } /** - * Check if the stack is a valid item for this slot. Always true beside for - * the armor slots. + * Check if the stack is a valid item for this slot. Always true beside for the armor slots. */ @Override public boolean isItemValid(final ItemStack par1ItemStack) { @@ -36,8 +31,8 @@ public class SlotOutput extends SlotCrafting { } /** - * Decrease the size of the stack in slot (first int arg) by the amount of - * the second int arg. Returns the new stack. + * Decrease the size of the stack in slot (first int arg) by the amount of the second int arg. Returns the new + * stack. */ @Override public ItemStack decrStackSize(final int par1) { @@ -48,9 +43,8 @@ public class SlotOutput extends SlotCrafting { } /** - * the itemStack passed in is the output - ie, iron ingots, and pickaxes, - * not ore and wood. Typically increases an internal count then calls - * onCrafting(item). + * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. Typically increases an + * internal count then calls onCrafting(item). */ @Override protected void onCrafting(final ItemStack par1ItemStack, final int par2) { @@ -59,8 +53,7 @@ public class SlotOutput extends SlotCrafting { } /** - * the itemStack passed in is the output - ie, iron ingots, and pickaxes, - * not ore and wood. + * the itemStack passed in is the output - ie, iron ingots, and pickaxes, not ore and wood. */ @Override protected void onCrafting(final ItemStack stack) { diff --git a/src/main/java/gtPlusPlus/core/slots/SlotRTG.java b/src/main/java/gtPlusPlus/core/slots/SlotRTG.java index f07fdd2894..ef226e99ca 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotRTG.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotRTG.java @@ -1,10 +1,11 @@ package gtPlusPlus.core.slots; -import ic2.core.Ic2Items; import net.minecraft.inventory.IInventory; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; +import ic2.core.Ic2Items; + public class SlotRTG extends Slot { public SlotRTG(final IInventory inventory, final int x, final int y, final int z) { diff --git a/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java b/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java index 54b8f0bd92..f4741c4800 100644 --- a/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java +++ b/src/main/java/gtPlusPlus/core/slots/SlotToolBox.java @@ -1,12 +1,13 @@ package gtPlusPlus.core.slots; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.item.ItemTool; + import gregtech.api.items.GT_MetaGenerated_Tool; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; import gtPlusPlus.core.util.reflect.ReflectionUtils; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemTool; public class SlotToolBox extends SlotGtTool { @@ -51,12 +52,9 @@ public class SlotToolBox extends SlotGtTool { } // OpenMods - String[] OpenModsContent = new String[] { - "openblocks.common.item.ItemDevNull", - "openblocks.common.item.ItemHangGlider", - "openblocks.common.item.ItemWrench", - "openblocks.common.item.ItemSleepingBag" - }; + String[] OpenModsContent = new String[] { "openblocks.common.item.ItemDevNull", + "openblocks.common.item.ItemHangGlider", "openblocks.common.item.ItemWrench", + "openblocks.common.item.ItemSleepingBag" }; for (String t : OpenModsContent) { temp = ReflectionUtils.getClass(t); if (temp != null) { @@ -73,11 +71,8 @@ public class SlotToolBox extends SlotGtTool { } // EIO< |
