From a6bb1b33da251f4a2ec7a6d6facb4864e9905341 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Fri, 20 Jan 2017 02:07:40 +1000 Subject: + Added a power cost of 32eu/action for the Tree Farmer. (Will eventually get a config option). % Moved the internal power buffer variable out of the cut method into the class. % Massive project tidy up, lots of old unused code removed or tidied up. $ Fixed lots of String comparisons that used == instead of .equals(). $ Fixed Double/Triple/Quad null checks in certain places. $ Fixed returns that set values at the same time. $ Swapped 3.14 and 1.57 to Math.PI and Math.PI/2. $ Fixed possible cases where a NPE may be thrown, by calling logging outside of null checks. + Added PI to CORE.java, since it's a double and MC uses it as a float in each instance. - Stripped 95% of the useless code out of Meta_GT_Proxy.java --- src/Java/gregtech/api/util/Recipe_GT.java | 45 +- .../core/block/base/BlockBaseModular.java | 12 +- .../core/block/machine/Machine_Charger.java | 83 -- .../gtPlusPlus/core/block/machine/Machine_NHG.java | 83 -- .../tileentity/TileEntityHeliumGenerator.java | 2 +- src/Java/gtPlusPlus/core/common/CommonProxy.java | 28 +- .../core/container/Container_Charger.java | 81 -- .../gtPlusPlus/core/container/Container_NHG.java | 102 --- .../gtPlusPlus/core/gui/machine/GUI_Charger.java | 50 -- src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java | 50 -- .../core/handler/events/LoginEventHandler.java | 2 +- .../core/handler/events/SneakManager.java | 67 +- .../core/handler/render/CapeHandler.java | 4 +- .../core/handler/render/FirepitModel.java | 15 +- .../core/item/base/cell/BaseItemCell.java | 6 +- .../core/item/base/dusts/BaseItemDust.java | 7 +- .../core/item/base/dusts/BaseItemDustAbstract.java | 3 +- .../core/item/base/dusts/BaseItemDustUnique.java | 2 +- .../core/item/general/ItemBlueprint.java | 3 +- .../core/item/general/RF2EU_Battery.java | 4 +- .../core/item/general/fuelrods/FuelRod_Base.java | 2 +- .../core/item/tool/staballoy/MultiPickaxeBase.java | 6 - .../core/item/tool/staballoy/MultiSpadeBase.java | 8 - .../core/item/tool/staballoy/StaballoyAxe.java | 8 +- src/Java/gtPlusPlus/core/lib/CORE.java | 2 + .../tileentities/machines/TileEntityCharger.java | 186 ----- .../core/tileentities/machines/TileEntityNHG.java | 502 ------------ src/Java/gtPlusPlus/core/util/Utils.java | 13 +- src/Java/gtPlusPlus/core/util/item/ItemUtils.java | 33 +- .../gtPlusPlus/core/util/player/UtilsMining.java | 17 +- .../gtPlusPlus/core/util/recipe/RecipeUtils.java | 10 +- .../gregtech/api/enums/GregtechOrePrefixes.java | 7 +- .../gregtech/api/gui/CONTAINER_DeluxeTank.java | 2 - .../gregtech/api/gui/CONTAINER_SteamCondenser.java | 160 ++-- .../gregtech/api/gui/GUI_IronBlastFurnace.java | 2 +- .../GT_MetaTileEntity_DeluxeTank.java | 1 - .../GregtechMetaPipeEntity_Cable.java | 4 +- .../GregtechMetaPipeEntity_SuperConductor.java | 6 +- .../base/machines/GregtechMetaSafeBlockBase.java | 2 +- .../creative/GregtechMetaCreativeEnergyBuffer.java | 3 - .../api/objects/GregtechRenderedTexture.java | 160 ---- .../gtPlusPlus/xmod/gregtech/api/objects/XSTR.java | 5 +- .../api/util/GregtechRecipeRegistrator.java | 8 - .../xmod/gregtech/common/Meta_GT_Proxy.java | 884 +-------------------- .../multi/GregtechMetaTileEntityAnimalFarm.java | 4 - .../multi/GregtechMetaTileEntityTreeFarm.java | 20 +- .../storage/GT_MetaTileEntity_TieredTank.java | 5 +- .../xmod/gregtech/loaders/Gregtech_Blocks.java | 27 - .../xmod/growthcraft/fishtrap/FishTrapHandler.java | 56 +- .../xmod/ic2/block/RTGGenerator/gui/GUI_RTG.java | 1 - .../xmod/thermalfoundation/fluid/TF_Fluids.java | 1 - 51 files changed, 243 insertions(+), 2551 deletions(-) delete mode 100644 src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java delete mode 100644 src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java delete mode 100644 src/Java/gtPlusPlus/core/container/Container_Charger.java delete mode 100644 src/Java/gtPlusPlus/core/container/Container_NHG.java delete mode 100644 src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java delete mode 100644 src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java delete mode 100644 src/Java/gtPlusPlus/core/tileentities/machines/TileEntityCharger.java delete mode 100644 src/Java/gtPlusPlus/core/tileentities/machines/TileEntityNHG.java delete mode 100644 src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechRenderedTexture.java (limited to 'src/Java') diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java index f0b80f084a..af421610b1 100644 --- a/src/Java/gregtech/api/util/Recipe_GT.java +++ b/src/Java/gregtech/api/util/Recipe_GT.java @@ -25,45 +25,7 @@ import net.minecraftforge.fluids.FluidStack; */ public class Recipe_GT extends GT_Recipe{ - public static volatile int VERSION = 508; - /** - * If you want to change the Output, feel free to modify or even replace the whole ItemStack Array, for Inputs, please add a new Recipe, because of the HashMaps. - */ - public ItemStack[] mInputs, mOutputs; - /** - * If you want to change the Output, feel free to modify or even replace the whole ItemStack Array, for Inputs, please add a new Recipe, because of the HashMaps. - */ - public FluidStack[] mFluidInputs, mFluidOutputs; - /** - * If you changed the amount of Array-Items inside the Output Array then the length of this Array must be larger or equal to the Output Array. A chance of 10000 equals 100% - */ - public int[] mChances; - /** - * An Item that needs to be inside the Special Slot, like for example the Copy Slot inside the Printer. This is only useful for Fake Recipes in NEI, since findRecipe() and containsInput() don't give a shit about this Field. Lists are also possible. - */ - public Object mSpecialItems; - public int mDuration, mEUt, mSpecialValue; - /** - * Use this to just disable a specific Recipe, but the Configuration enables that already for every single Recipe. - */ - public boolean mEnabled = true; - /** - * If this Recipe is hidden from NEI - */ - public boolean mHidden = false; - /** - * If this Recipe is Fake and therefore doesn't get found by the findRecipe Function (It is still in the HashMaps, so that containsInput does return T on those fake Inputs) - */ - public boolean mFakeRecipe = false; - /** - * If this Recipe can be stored inside a Machine in order to make Recipe searching more Efficient by trying the previously used Recipe first. In case you have a Recipe Map overriding things and returning one time use Recipes, you have to set this to F. - */ - public boolean mCanBeBuffered = true; - /** - * If this Recipe needs the Output Slots to be completely empty. Needed in case you have randomised Outputs - */ - public boolean mNeedsEmptyOutput = false; - + public static volatile int VERSION = 508; protected Recipe_GT(boolean aOptimize, ItemStack[] aInputs, ItemStack[] aOutputs, Object aSpecialItems, int[] aChances, FluidStack[] aFluidInputs, FluidStack[] aFluidOutputs, int aDuration, int aEUt, int aSpecialValue) { super(aOptimize, aInputs, aOutputs, aSpecialItems, aChances, aFluidInputs, aFluidOutputs, aDuration, aEUt, aSpecialValue); @@ -180,11 +142,6 @@ public class Recipe_GT extends GT_Recipe{ return mFluidOutputs[aIndex].copy(); } - @Override - public GT_Recipe copy() { - return this.copy(); - } - @Override public boolean isRecipeInputEqual(boolean aDecreaseStacksizeBySuccess, FluidStack[] aFluidInputs, ItemStack... aInputs) { return isRecipeInputEqual(aDecreaseStacksizeBySuccess, false, aFluidInputs, aInputs); diff --git a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java index 9e71370197..d694557f55 100644 --- a/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/Java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -45,15 +45,15 @@ public class BlockBaseModular extends BasicBlock{ //Utils.LOG_INFO("=========================================="); } - if (thisBlockType == BlockTypes.STANDARD.name().toUpperCase()){ + if (thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())){ LanguageRegistry.addName(this, "Block of "+blockMaterial); //Utils.LOG_INFO("Registered Block in Language Registry as: "+"Block of "+blockMaterial); } - else if (thisBlockType == BlockTypes.FRAME.name().toUpperCase()){ + else if (thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())){ LanguageRegistry.addName(this, blockMaterial+ " Frame Box"); //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box"); } - else if (thisBlockType == BlockTypes.ORE.name().toUpperCase()){ + else if (thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())){ LanguageRegistry.addName(this, blockMaterial+ " Ore"); //Utils.LOG_INFO("Registered Block in Language Registry as: "+blockMaterial+ " Frame Box"); } @@ -63,15 +63,15 @@ public class BlockBaseModular extends BasicBlock{ } //setOreDict(unlocalizedName, blockType); - if (thisBlockType == BlockTypes.STANDARD.name().toUpperCase()){ + if (thisBlockType.equals(BlockTypes.STANDARD.name().toUpperCase())){ GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); //Utils.LOG_INFO("Registered Block in Block Registry as: "+"Block of "+blockMaterial); } - else if (thisBlockType == BlockTypes.FRAME.name().toUpperCase()){ + else if (thisBlockType.equals(BlockTypes.FRAME.name().toUpperCase())){ GameRegistry.registerBlock(this, ItemBlockGtFrameBox.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box"); } - else if (thisBlockType == BlockTypes.ORE.name().toUpperCase()){ + else if (thisBlockType.equals(BlockTypes.ORE.name().toUpperCase())){ GameRegistry.registerBlock(this, ItemBlockGtBlock.class, Utils.sanitizeString(blockType.getTexture()+unlocalizedName)); //Utils.LOG_INFO("Registered Block in Block Registry as: "+blockMaterial+" Frame Box"); } diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java b/src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java deleted file mode 100644 index 4f426b99c9..0000000000 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_Charger.java +++ /dev/null @@ -1,83 +0,0 @@ -package gtPlusPlus.core.block.machine; - -import gtPlusPlus.GTplusplus; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.machines.TileEntityCharger; - -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import scala.util.Random; - -public class Machine_Charger extends BlockContainer -{ - private static final String name = "Charging Machine"; - - private final Random rand = new Random(); - - public Machine_Charger(String unlocalizedName) - { - super(Material.iron); - //GameRegistry.registerBlock(this, unlocalizedName); - this.setBlockName(unlocalizedName); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); - this.setCreativeTab(AddToCreativeTab.tabMachines); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) - { - if (world.isRemote) return true; - - TileEntity te = world.getTileEntity(x, y, z); - if (te != null && te instanceof TileEntityCharger) - { - player.openGui(GTplusplus.instance, 1, world, x, y, z); - return true; - } - return false; - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6) - { - if (world.isRemote) return; - - ArrayList drops = new ArrayList(); - - TileEntity teRaw = world.getTileEntity(x, y, z); - - if (teRaw != null && teRaw instanceof TileEntityCharger) - { - TileEntityCharger te = (TileEntityCharger) teRaw; - - for (int i = 0; i < te.getSizeInventory(); i++) - { - ItemStack stack = te.getStackInSlot(i); - - if (stack != null) drops.add(stack.copy()); - } - } - - for (int i = 0;i < drops.size();i++) - { - EntityItem item = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, (ItemStack) drops.get(i)); - item.setVelocity((rand.nextDouble() - 0.5) * 0.25, rand.nextDouble() * 0.5 * 0.25, (rand.nextDouble() - 0.5) * 0.25); - world.spawnEntityInWorld(item); - } - } - - @Override - public TileEntity createNewTileEntity(World world, int par2) - { - return new TileEntityCharger(); - } -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java b/src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java deleted file mode 100644 index 011e293000..0000000000 --- a/src/Java/gtPlusPlus/core/block/machine/Machine_NHG.java +++ /dev/null @@ -1,83 +0,0 @@ -package gtPlusPlus.core.block.machine; - -import gtPlusPlus.GTplusplus; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.machines.TileEntityNHG; - -import java.util.ArrayList; - -import net.minecraft.block.Block; -import net.minecraft.block.BlockContainer; -import net.minecraft.block.material.Material; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import scala.util.Random; - -public class Machine_NHG extends BlockContainer -{ - private static final String name = "Nuclear Fueled Helium Generator"; - - private final Random rand = new Random(); - - public Machine_NHG(String unlocalizedName) - { - super(Material.iron); - //GameRegistry.registerBlock(this, unlocalizedName); - this.setBlockName(unlocalizedName); - this.setBlockTextureName(CORE.MODID + ":" + unlocalizedName); - this.setCreativeTab(AddToCreativeTab.tabMachines); - } - - @Override - public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float lx, float ly, float lz) - { - if (world.isRemote) return true; - - TileEntity te = world.getTileEntity(x, y, z); - if (te != null && te instanceof TileEntityNHG) - { - player.openGui(GTplusplus.instance, 0, world, x, y, z); - return true; - } - return false; - } - - @Override - public void breakBlock(World world, int x, int y, int z, Block block, int par6) - { - if (world.isRemote) return; - - ArrayList drops = new ArrayList(); - - TileEntity teRaw = world.getTileEntity(x, y, z); - - if (teRaw != null && teRaw instanceof TileEntityNHG) - { - TileEntityNHG te = (TileEntityNHG) teRaw; - - for (int i = 0; i < te.getSizeInventory(); i++) - { - ItemStack stack = te.getStackInSlot(i); - - if (stack != null) drops.add(stack.copy()); - } - } - - for (int i = 0;i < drops.size();i++) - { - EntityItem item = new EntityItem(world, x + 0.5, y + 0.5, z + 0.5, (ItemStack) drops.get(i)); - item.setVelocity((rand.nextDouble() - 0.5) * 0.25, rand.nextDouble() * 0.5 * 0.25, (rand.nextDouble() - 0.5) * 0.25); - world.spawnEntityInWorld(item); - } - } - - @Override - public TileEntity createNewTileEntity(World world, int par2) - { - return new TileEntityNHG(); - } -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java b/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java index 343f37527e..ffc4745059 100644 --- a/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java +++ b/src/Java/gtPlusPlus/core/block/machine/heliumgen/tileentity/TileEntityHeliumGenerator.java @@ -249,7 +249,6 @@ public class TileEntityHeliumGenerator extends TileEntityInventory implements II private boolean redstone = false; private boolean fluidcoolreactor = false; private boolean active = true; - public boolean prevActive = false; public short getReactorSize() @@ -273,6 +272,7 @@ public class TileEntityHeliumGenerator extends TileEntityInventory implements II return cols; } + @Override protected void updateEntityServer() { Utils.LOG_WARNING("updateEntityServer"); diff --git a/src/Java/gtPlusPlus/core/common/CommonProxy.java b/src/Java/gtPlusPlus/core/common/CommonProxy.java index f16beb625f..d5a126ff39 100644 --- a/src/Java/gtPlusPlus/core/common/CommonProxy.java +++ b/src/Java/gtPlusPlus/core/common/CommonProxy.java @@ -15,18 +15,15 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.debug.DEBUG_INIT; import gtPlusPlus.core.util.player.PlayerCache; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; - -import java.util.Iterator; - import net.minecraft.entity.Entity; -import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.oredict.OreDictionary; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.*; public class CommonProxy { + public static Meta_GT_Proxy GtProxy; + public CommonProxy(){ //Should Register Gregtech Materials I've Made MinecraftForge.EVENT_BUS.register(this); @@ -38,19 +35,11 @@ public class CommonProxy { else { Utils.LOG_INFO("We're using Gregtech 5.08 or an equivalent fork."); } - handleGtIntegrationInit(); + Utils.LOG_INFO("Setting up our own GT_Proxy."); + GtProxy = new Meta_GT_Proxy(); } - } - private static void handleGtIntegrationInit(){ - Utils.LOG_INFO("Setting up our own GT_Proxy."); - Meta_GT_Proxy GtProxy = new Meta_GT_Proxy(); - for (String tOreName : OreDictionary.getOreNames()) { - ItemStack tOreStack; - Utils.LOG_INFO("Iterating list of GT materials for custom tool parts."); - for (Iterator i$ = OreDictionary.getOres(tOreName).iterator(); i$.hasNext(); GtProxy.registerOre(new OreDictionary.OreRegisterEvent(tOreName, tOreStack))) { - Utils.LOG_INFO("Iterating Material"); - tOreStack = (ItemStack) i$.next(); - } + else { + GtProxy = null; } } @@ -122,12 +111,11 @@ public class CommonProxy { } - @SuppressWarnings("static-method") public int addArmor(String armor) { return 0; } - - public void generateMysteriousParticles(Entity theEntity) { } + public void generateMysteriousParticles(Entity entity) { + } } diff --git a/src/Java/gtPlusPlus/core/container/Container_Charger.java b/src/Java/gtPlusPlus/core/container/Container_Charger.java deleted file mode 100644 index 4b6c43ada6..0000000000 --- a/src/Java/gtPlusPlus/core/container/Container_Charger.java +++ /dev/null @@ -1,81 +0,0 @@ -package gtPlusPlus.core.container; - -import gtPlusPlus.core.tileentities.machines.TileEntityCharger; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.Container; -import net.minecraft.inventory.Slot; -import net.minecraft.item.ItemStack; - -public class Container_Charger extends Container -{ - private TileEntityCharger te; - - public static final int INPUT_1 = 0; - - private int slotID = 0; - - public Container_Charger(TileEntityCharger te, EntityPlayer player) - { - this.te = te; - - //Fuel Slot A - addSlotToContainer(new Slot(te, slotID++, 80, 53)); - - - - //Inventory - for (int i = 0; i < 3; i++) - { - for (int j = 0; j < 9; j++) - { - addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - // Hotbar - for (int i = 0; i < 9; i++) - { - addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142)); - } - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotRaw) - { - ItemStack stack = null; - Slot slot = (Slot)inventorySlots.get(slotRaw); - - if (slot != null && slot.getHasStack()) - { - ItemStack stackInSlot = slot.getStack(); - stack = stackInSlot.copy(); - - if (slotRaw < 3 * 9) - { - if (!mergeItemStack(stackInSlot, 3 * 9, inventorySlots.size(), true)) - { - return null; - } - } - else if (!mergeItemStack(stackInSlot, 0, 3 * 9, false)) - { - return null; - } - - if (stackInSlot.stackSize == 0) - { - slot.putStack((ItemStack)null); - } - else - { - slot.onSlotChanged(); - } - } - return stack; - } - - @Override - public boolean canInteractWith(EntityPlayer player) - { - return te.isUseableByPlayer(player); - } -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/container/Container_NHG.java b/src/Java/gtPlusPlus/core/container/Container_NHG.java deleted file mode 100644 index 5fd19489c0..0000000000 --- a/src/Java/gtPlusPlus/core/container/Container_NHG.java +++ /dev/null @@ -1,102 +0,0 @@ -package gtPlusPlus.core.container; - -import gtPlusPlus.core.tileentities.machines.TileEntityNHG; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.*; -import net.minecraft.item.ItemStack; - -public class Container_NHG extends Container -{ - private TileEntityNHG te; - - public static final int INPUT_1 = 0, INPUT_2 = 1, INPUT_3 = 2, - INPUT_4 = 3, INPUT_5 = 4, INPUT_6 = 5, - INPUT_7 = 6, INPUT_8 = 7, INPUT_9 = 8, - INPUT_10 = 9, INPUT_11 = 10, INPUT_12 = 11, - INPUT_13 = 12, INPUT_14 = 13, INPUT_15 = 14, - INPUT_16 = 15, INPUT_17 = 16, INPUT_18 = 17, - OUTPUT = 18; - - private int slotID = 0; - - public Container_NHG(TileEntityNHG te, EntityPlayer player) - { - this.te = te; - - - //Fuel Rods A - for (int i = 0; i < 3; i++) - { - for (int j = 0; j < 3; j++) - { - addSlotToContainer(new Slot(te, slotID++, 8 + j * 18, 17 + i * 18)); - } - } - //Fuel Rods B - for (int i = 0; i < 3; i++) - { - for (int j = 0; j < 3; j++) - { - addSlotToContainer(new Slot(te, slotID++, 116 + j * 18, 17 + i * 18)); - } - } - - //Output - addSlotToContainer(new SlotFurnace(player, te, OUTPUT, 80, 53)); - - //Inventory - for (int i = 0; i < 3; i++) - { - for (int j = 0; j < 9; j++) - { - addSlotToContainer(new Slot(player.inventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); - } - } - // Hotbar - for (int i = 0; i < 9; i++) - { - addSlotToContainer(new Slot(player.inventory, i, 8 + i * 18, 142)); - } - } - - @Override - public ItemStack transferStackInSlot(EntityPlayer player, int slotRaw) - { - ItemStack stack = null; - Slot slot = (Slot)inventorySlots.get(slotRaw); - - if (slot != null && slot.getHasStack()) - { - ItemStack stackInSlot = slot.getStack(); - stack = stackInSlot.copy(); - - if (slotRaw < 3 * 9) - { - if (!mergeItemStack(stackInSlot, 3 * 9, inventorySlots.size(), true)) - { - return null; - } - } - else if (!mergeItemStack(stackInSlot, 0, 3 * 9, false)) - { - return null; - } - - if (stackInSlot.stackSize == 0) - { - slot.putStack((ItemStack)null); - } - else - { - slot.onSlotChanged(); - } - } - return stack; - } - - @Override - public boolean canInteractWith(EntityPlayer player) - { - return te.isUseableByPlayer(player); - } -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java deleted file mode 100644 index c1f687c554..0000000000 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_Charger.java +++ /dev/null @@ -1,50 +0,0 @@ -package gtPlusPlus.core.gui.machine; - -import gtPlusPlus.core.container.Container_Charger; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.machines.TileEntityCharger; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -public class GUI_Charger extends GuiContainer -{ - private ResourceLocation texture = new ResourceLocation(CORE.MODID, "textures/gui/machine_Charger.png"); - - private InventoryPlayer inventory; - private TileEntityCharger te; - - public GUI_Charger(TileEntityCharger te, EntityPlayer player) - { - super(new Container_Charger(te, player)); - inventory = player.inventory; - this.te = te; - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) - { - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - int x = (width - xSize) / 2; - int y = (height - ySize) / 2; - - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); - } - - @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) - { - fontRendererObj.drawString(I18n.format(te.getInventoryName()), (xSize / 2) - (fontRendererObj.getStringWidth(I18n.format(te.getInventoryName())) / 2), 6, 4210752, false); - //fontRendererObj.drawString(I18n.format(inventory.getInventoryName()), 8, ySize - 96 + 2, 4210752); - fontRendererObj.drawString(I18n.format("Charge:"+te.getCharge()+"~"), 8, ySize - 96 + 2, 4210752); - fontRendererObj.drawString(I18n.format("Progress:"+te.getProgress()+"ticks"), 80, ySize - 96 + 2, 4210752); - } -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java b/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java deleted file mode 100644 index 09b2ee93d8..0000000000 --- a/src/Java/gtPlusPlus/core/gui/machine/GUI_NHG.java +++ /dev/null @@ -1,50 +0,0 @@ -package gtPlusPlus.core.gui.machine; - -import gtPlusPlus.core.container.Container_NHG; -import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.tileentities.machines.TileEntityNHG; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.inventory.GuiContainer; -import net.minecraft.client.resources.I18n; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.InventoryPlayer; -import net.minecraft.util.ResourceLocation; - -import org.lwjgl.opengl.GL11; - -public class GUI_NHG extends GuiContainer -{ - private ResourceLocation texture = new ResourceLocation(CORE.MODID, "textures/gui/helium_collector_gui_12.png"); - - private InventoryPlayer inventory; - private TileEntityNHG te; - - public GUI_NHG(TileEntityNHG te, EntityPlayer player) - { - super(new Container_NHG(te, player)); - inventory = player.inventory; - this.te = te; - } - - @Override - protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) - { - Minecraft.getMinecraft().renderEngine.bindTexture(texture); - - GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); - - int x = (width - xSize) / 2; - int y = (height - ySize) / 2; - - drawTexturedModalRect(x, y, 0, 0, xSize, ySize); - } - - @Override - protected void drawGuiContainerForegroundLayer(int par1, int par2) - { - fontRendererObj.drawString(I18n.format(te.getInventoryName()), (xSize / 2) - (fontRendererObj.getStringWidth(I18n.format(te.getInventoryName())) / 2), 6, 4210752, false); - //fontRendererObj.drawString(I18n.format(inventory.getInventoryName()), 8, ySize - 96 + 2, 4210752); - fontRendererObj.drawString(I18n.format("CoreTemp:"+te.getCoreTemp()+"K"), 8, ySize - 96 + 2, 4210752); - fontRendererObj.drawString(I18n.format("Progress:"+te.getProgress()+"ticks"), 80, ySize - 96 + 2, 4210752); - } -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java index f9abae6d32..a50524122b 100644 --- a/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java +++ b/src/Java/gtPlusPlus/core/handler/events/LoginEventHandler.java @@ -28,7 +28,7 @@ public class LoginEventHandler { try { - if (localPlayerRef instanceof EntityPlayerMP && localPlayerRef != null){ + if (localPlayerRef instanceof EntityPlayerMP){ //Populates player cache if (!localPlayerRef.worldObj.isRemote){ diff --git a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java b/src/Java/gtPlusPlus/core/handler/events/SneakManager.java index 9edc962a6b..f330fea861 100644 --- a/src/Java/gtPlusPlus/core/handler/events/SneakManager.java +++ b/src/Java/gtPlusPlus/core/handler/events/SneakManager.java @@ -4,7 +4,7 @@ import gtPlusPlus.core.util.Utils; import net.minecraft.client.Minecraft; public class SneakManager { - + //We make this a singleton for clientside data storage. public static SneakManager instance = new SneakManager(); protected static final Minecraft mc = Minecraft.getMinecraft(); @@ -12,72 +12,73 @@ public class SneakManager { public static boolean isSneaking = true; public static boolean optionDoubleTap = true; public static boolean wasSprintDisabled = false; - + private static State Sprinting = State.ON; private static State Crouching = State.OFF; - + public static boolean Sneaking(){ return Crouching.getState(); } - + public static boolean Sprinting(){ return Sprinting.getState(); } - + public static State getSneakingState(){ return Crouching; } - + public static State getSprintingDisabledState(){ return Sprinting; } - + public static void toggleSneaking(){ toggleState(Crouching); } - + public static void toggleSprinting(){ toggleState(Sprinting); } - + private static State toggleState(State state){ Utils.LOG_INFO("State Toggle"); - if (state == State.ON) - return state = State.OFF; - return state = State.ON; + if (state == State.ON) { + return State.OFF; + } + return State.ON; } - + public static State setCrouchingStateON(){ return Crouching = State.ON; } - + public static State setCrouchingStateOFF(){ return Crouching = State.OFF; } - + public static State setSprintingStateON(){ return Sprinting = State.ON; } - + public static State setSprintingStateOFF(){ return Sprinting = State.OFF; } - - public static enum State { - ON(true), - OFF(false); - - private boolean STATE; - private State (final boolean State) - { - this.STATE = State; - } - - public boolean getState() { - return STATE; - } - - } - + + public static enum State { + ON(true), + OFF(false); + + private boolean STATE; + private State (final boolean State) + { + this.STATE = State; + } + + public boolean getState() { + return STATE; + } + + } + } diff --git a/src/Java/gtPlusPlus/core/handler/render/CapeHandler.java b/src/Java/gtPlusPlus/core/handler/render/CapeHandler.java index 9f449e3044..f5e87ff512 100644 --- a/src/Java/gtPlusPlus/core/handler/render/CapeHandler.java +++ b/src/Java/gtPlusPlus/core/handler/render/CapeHandler.java @@ -80,8 +80,8 @@ public class CapeHandler extends RenderPlayer { float f6 = aPlayer.prevRenderYawOffset + (aPlayer.renderYawOffset - aPlayer.prevRenderYawOffset) * aPartialTicks; - double d3 = MathHelper.sin(f6 * 3.141593F / 180.0F); - double d4 = -MathHelper.cos(f6 * 3.141593F / 180.0F); + double d3 = MathHelper.sin(f6 * CORE.PI / 180.0F); + double d4 = -MathHelper.cos(f6 * CORE.PI / 180.0F); float f7 = (float) d1 * 10.0F; float f8 = (float) (d0 * d3 + d2 * d4) * 100.0F; float f9 = (float) (d0 * d4 - (d2 * d3)) * 100.0F; diff --git a/src/Java/gtPlusPlus/core/handler/render/FirepitModel.java b/src/Java/gtPlusPlus/core/handler/render/FirepitModel.java index d07f7338df..9bad3d2f4e 100644 --- a/src/Java/gtPlusPlus/core/handler/render/FirepitModel.java +++ b/src/Java/gtPlusPlus/core/handler/render/FirepitModel.java @@ -6,6 +6,7 @@ package gtPlusPlus.core.handler.render; +import gtPlusPlus.core.lib.CORE; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; import net.minecraft.entity.Entity; @@ -40,14 +41,14 @@ public class FirepitModel extends ModelBase Side_B.setRotationPoint(-6F, 18F, 6F); Side_B.setTextureSize(16, 16); Side_B.mirror = true; - setRotation(Side_B, -0.3148822F, 1.570796F, 0F); + setRotation(Side_B, -0.3148822F, (CORE.PI/2), 0F); Side_C = new ModelRenderer(this, 0, 0); Side_C.addBox(0F, 0F, 0F, 12, 6, 1); Side_C.setRotationPoint(6F, 18F, 6F); Side_C.setTextureSize(16, 16); Side_C.mirror = true; - setRotation(Side_C, -0.3148822F, 3.141593F, 0F); + setRotation(Side_C, -0.3148822F, CORE.PI, 0F); //Side_C.mirror = false; Side_D = new ModelRenderer(this, 0, 0); @@ -62,14 +63,14 @@ public class FirepitModel extends ModelBase Log1.setRotationPoint(4F, 10F, -4F); Log1.setTextureSize(16, 16); Log1.mirror = true; - setRotation(Log1, 0F, 0F, 1.570796F); + setRotation(Log1, 0F, 0F, (CORE.PI/2)); Log2 = new ModelRenderer(this, -2, 10); Log2.addBox(0F, 0F, 0F, 14, 2, 2); Log2.setRotationPoint(-4F, 10F, -4F); Log2.setTextureSize(16, 16); Log2.mirror = true; - setRotation(Log2, 1.570796F, 0F, 1.570796F); + setRotation(Log2, (CORE.PI/2), 0F, (CORE.PI/2)); //Log2.mirror = false; Log3 = new ModelRenderer(this, 0, 10); @@ -77,14 +78,14 @@ public class FirepitModel extends ModelBase Log3.setRotationPoint(-4F, 10F, 4F); Log3.setTextureSize(16, 16); Log3.mirror = true; - setRotation(Log3, 3.141593F, 0F, 1.570796F); + setRotation(Log3, CORE.PI, 0F, (CORE.PI/2)); Log4 = new ModelRenderer(this, -2, 10); Log4.addBox(0F, 0F, 0F, 14, 2, 2); Log4.setRotationPoint(4F, 10F, 4F); Log4.setTextureSize(16, 16); Log4.mirror = true; - setRotation(Log4, 4.712389F, 0F, 1.570796F); + setRotation(Log4, 4.712389F, 0F, (CORE.PI/2)); //Log4.mirror = false; } @@ -103,7 +104,7 @@ public class FirepitModel extends ModelBase Log4.render(f5); } - private void setRotation(ModelRenderer model, float x, float y, float z) + private static void setRotation(ModelRenderer model, float x, float y, float z) { model.rotateAngleX = x; model.rotateAngleY = y; diff --git a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java index b9345f6f57..17af462a0f 100644 --- a/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java +++ b/src/Java/gtPlusPlus/core/item/base/cell/BaseItemCell.java @@ -14,13 +14,11 @@ public class BaseItemCell extends BaseItemComponent{ private IIcon base; private IIcon overlay; - private final Material cellMaterial; ComponentTypes Cell = ComponentTypes.CELL; public BaseItemCell(Material material) { super(material, BaseItemComponent.ComponentTypes.CELL); - this.cellMaterial = material; - fluidColour = (short[]) ((cellMaterial == null) ? extraData : cellMaterial.getRGBA()); + fluidColour = (short[]) ((material == null) ? extraData : material.getRGBA()); } @Override @@ -36,8 +34,6 @@ public class BaseItemCell extends BaseItemComponent{ //this.overlay = cellMaterial.getFluid(1000).getFluid().get } - private int fluidBright = 0; - private int tickValue; private short[] fluidColour; boolean upwards = true; diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java index 696f497afc..42a610641e 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDust.java @@ -28,14 +28,13 @@ public class BaseItemDust extends Item{ String name = ""; private int mTier; private Material dustInfo; - private String oredictName; public BaseItemDust(String unlocalizedName, String materialName, Material matInfo, int colour, String pileSize, int tier, int sRadioactivity) { setUnlocalizedName(unlocalizedName); this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(64); this.setTextureName(getCorrectTexture(pileSize)); - + this.setCreativeTab(tabMisc); this.colour = colour; this.mTier = tier; @@ -66,7 +65,6 @@ public class BaseItemDust extends Item{ Utils.LOG_WARNING("Generating OreDict Name: "+temp); } if (temp != null && !temp.equals("")){ - oredictName = temp; GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } addFurnaceRecipe(); @@ -111,6 +109,7 @@ public class BaseItemDust extends Item{ EntityUtils.applyRadiationDamageToEntity(sRadiation, world, entityHolding); } + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { //if (pileType != null && materialName != null && pileType != "" && materialName != "" && !pileType.equals("") && !materialName.equals("")){ @@ -222,8 +221,8 @@ public class BaseItemDust extends Item{ Utils.LOG_WARNING("Adding recipe for Hot "+materialName+" Ingots in a Blast furnace."); String tempIngot = temp.replace("ingot", "ingotHot"); ItemStack tempOutputStack = ItemUtils.getItemStackOfAmountFromOreDict(tempIngot, 1); - Utils.LOG_WARNING("This will produce "+tempOutputStack.getDisplayName() + " Debug: "+tempIngot); if (null != tempOutputStack){ + Utils.LOG_WARNING("This will produce "+tempOutputStack.getDisplayName() + " Debug: "+tempIngot); addBlastFurnaceRecipe(ItemUtils.getSimpleStack(this), null, tempOutputStack, null, 350*mTier); } return; diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java index a49dc58188..3eab83f812 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustAbstract.java @@ -18,7 +18,7 @@ public abstract class BaseItemDustAbstract extends Item{ public BaseItemDustAbstract(String unlocalizedName, String materialName, int colour, String pileSize) { this.setUnlocalizedName(unlocalizedName); this.setMaxStackSize(64); - if (pileSize == "dust" || pileSize == "Dust"){ + if (pileSize.toLowerCase().equals("dust")){ this.setTextureName(CORE.MODID + ":" + "dust"); } else{ @@ -31,6 +31,7 @@ public abstract class BaseItemDustAbstract extends Item{ GameRegistry.registerItem(this, unlocalizedName); } + @SuppressWarnings("rawtypes") @Override public abstract void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool); diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index c90499c1ca..a4e8c1cadc 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -59,7 +59,7 @@ public class BaseItemDustUnique extends Item{ temp = temp.replace("itemD", "d"); Utils.LOG_WARNING("Generating OreDict Name: "+temp); } - if (temp != null && temp != ""){ + if (temp != null && !temp.equals("")){ GT_OreDictUnificator.registerOre(temp, ItemUtils.getSimpleStack(this)); } } diff --git a/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java b/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java index 3c8e09e9e5..0458a38110 100644 --- a/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java +++ b/src/Java/gtPlusPlus/core/item/general/ItemBlueprint.java @@ -177,7 +177,8 @@ public class ItemBlueprint extends Item implements IItemBlueprint{ if (output != null){ setBlueprintName(stack, output.getDisplayName()); - return (hasBP = true); + hasBP = true; + return true; } return false; } catch (Throwable t){ diff --git a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java index 146af86302..3f51db7047 100644 --- a/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java +++ b/src/Java/gtPlusPlus/core/item/general/RF2EU_Battery.java @@ -8,7 +8,6 @@ import ic2.api.item.*; import java.util.List; -import cofh.energy.ItemEnergyContainer; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -19,6 +18,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import net.minecraft.world.World; +import cofh.energy.ItemEnergyContainer; import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; @@ -125,7 +125,7 @@ public class RF2EU_Battery extends ItemEnergyContainer implements IElectricItem, { int i = 30; - float f13 = (float)(Minecraft.getSystemTime() % 6000L) / 3000.0F * 3.141592F * 2.0F; + float f13 = ((float)(Minecraft.getSystemTime() % 6000L) / 3000.0F * CORE.PI * 2.0F); float t = 0.9F + 0.1F * MathHelper.cos(f13); diff --git a/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java b/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java index 36e6c66df8..2a94456c2a 100644 --- a/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java +++ b/src/Java/gtPlusPlus/core/item/general/fuelrods/FuelRod_Base.java @@ -147,7 +147,7 @@ public class FuelRod_Base extends Item{ int r = maximumFuel - i; return r; } - return getFuelRemaining(stack); + return 0; } public boolean setFuelRemainingExplicitly(int i){ diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java index e278c258ba..a0b884f97d 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiPickaxeBase.java @@ -27,12 +27,6 @@ public class MultiPickaxeBase extends StaballoyPickaxe{ return 0; } - protected Boolean FACING_HORIZONTAL = true; - protected String FACING = "north"; - protected EntityPlayer localPlayer; - protected String lookingDirection; - protected World localWorld; - protected ItemStack thisPickaxe = null; protected final int colour; protected final String materialName; protected final String displayName; diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java index bfe78b1866..627108f509 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/MultiSpadeBase.java @@ -6,10 +6,8 @@ import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; import gtPlusPlus.core.util.recipe.RecipeUtils; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -26,12 +24,6 @@ public class MultiSpadeBase extends StaballoySpade{ return 0; } - protected Boolean FACING_HORIZONTAL = true; - protected String FACING = "north"; - protected EntityPlayer localPlayer; - protected String lookingDirection; - protected World localWorld; - protected ItemStack thisPickaxe = null; protected final int colour; protected final String materialName; protected final String displayName; diff --git a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java index 81fc2cc05e..301671fc24 100644 --- a/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java +++ b/src/Java/gtPlusPlus/core/item/tool/staballoy/StaballoyAxe.java @@ -46,7 +46,7 @@ public class StaballoyAxe extends ItemAxe{ super.addInformation(stack, aPlayer, list, bool); } - public boolean canIgnore(Block bit){ + public static boolean canIgnore(Block bit){ if (bit instanceof BlockAir)return true; if (bit instanceof BlockGrass)return true; if (bit instanceof BlockSand)return true; @@ -105,7 +105,7 @@ public class StaballoyAxe extends ItemAxe{ for(int x=19;x>=0;x--){ int r=check(par1World,x,y,z,xo,yo,zo); if (r==2) return 3; - if (r==2) return 2; + //if (r==2) return 2; if (r==1) f=true; } } @@ -154,7 +154,7 @@ public class StaballoyAxe extends ItemAxe{ for(int x=19;x>=0;x--){ int r=check2(par1World,x,y,z,xo,yo,zo); if (r==2) return 3; - if (r==2) return 2; + //if (r==2) return 2; if (r==1) f=true; } } @@ -178,7 +178,7 @@ public class StaballoyAxe extends ItemAxe{ } } - private void breakMushroom(World wld, Block bit, EntityPlayer plr, boolean silk, int x, int y, int z, int met) { + private static void breakMushroom(World wld, Block bit, EntityPlayer plr, boolean silk, int x, int y, int z, int met) { if (silk){ ItemStack stk = null; //TODO /*if (bit==Blocks.brown_mushroom_block) stk = new ItemStack(LoonToolItems.brown_mushroom_block,1,met); diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index 8fa2b99b79..e81c5bc4a9 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -20,6 +20,8 @@ public class CORE { protected CORE(){ } + + public final static float PI = (float) Math.PI; public static final String name = "GT++"; public static final String MODID = "miscutils"; diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityCharger.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityCharger.java deleted file mode 100644 index 9ec6aa3b24..0000000000 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityCharger.java +++ /dev/null @@ -1,186 +0,0 @@ -package gtPlusPlus.core.tileentities.machines; - -import gtPlusPlus.core.item.base.BaseItemWithCharge; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.Constants; - -public class TileEntityCharger extends TileEntity implements IInventory -{ - private ItemStack[] items = new ItemStack[1]; //18 - private int progress_Current = 1; - private int progress_Max = 1000; - public float charge_Current; - public float charge_Max = 10000; - private float tempItemChargeValue; - - public float getCharge(){ - return charge_Current; - } - - public int getProgress(){ - return progress_Current; - } - - @Override - public int getSizeInventory() - { - return items.length; - } - - @Override - public ItemStack getStackInSlot(int slot) - { - return items[slot]; - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - if (items[slot] != null) - { - ItemStack itemstack; - - if (items[slot].stackSize == amount) - { - itemstack = items[slot]; - items[slot] = null; - markDirty(); - return itemstack; - } - itemstack = items[slot].splitStack(amount); - if (items[slot].stackSize == 0) items[slot] = null; - markDirty(); - return itemstack; - } - return null; - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) - { - if (items[slot] != null) - { - ItemStack itemstack = items[slot]; - items[slot] = null; - return itemstack; - } - return null; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - if (stack != null){ - items[slot] = stack; - if (stack != null && stack.stackSize > getInventoryStackLimit()) - { - stack.stackSize = getInventoryStackLimit(); - } - - - markDirty(); - } - } - - @Override - public String getInventoryName() - { - return "container.Charger"; - } - - @Override - public boolean hasCustomInventoryName() - { - return false; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - NBTTagList list = nbt.getTagList("Items", Constants.NBT.TAG_COMPOUND); - items = new ItemStack[getSizeInventory()]; - - for (int i = 0; i < list.tagCount(); ++i) { NBTTagCompound comp = list.getCompoundTagAt(i); int j = comp.getByte("Slot") & 255; if (j >= 0 && j < items.length) - { - items[j] = ItemStack.loadItemStackFromNBT(comp); - } - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); - NBTTagList list = new NBTTagList(); - - for (int i = 0; i < items.length; ++i) - { - if (items[i] != null) - { - NBTTagCompound comp = new NBTTagCompound(); - comp.setByte("Slot", (byte)i); - items[i].writeToNBT(comp); - list.appendTag(comp); - } - } - - nbt.setTag("Items", list); - } - - @Override - public int getInventoryStackLimit() - { - return 64; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return worldObj.getTileEntity(xCoord, yCoord, zCoord) != this ? false : player.getDistanceSq((double)xCoord + 0.5D, (double)yCoord + 0.5D, (double)zCoord + 0.5D) <= 64.0D; - } - - @Override - public void openInventory() {} - - @Override - public void closeInventory() {} - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return true; - } - - @Override - public void updateEntity() { - if(!this.worldObj.isRemote){ - if (progress_Current < progress_Max){ - progress_Current++; - } - else if (progress_Current >= progress_Max){ - if (charge_Current < charge_Max){ - charge_Current = charge_Current+500; - } - if (getStackInSlot(0).getItem() instanceof BaseItemWithCharge){ - float tempCharge; - ItemStack output = getStackInSlot(0).copy(); - if (output.stackTagCompound != null){ - tempCharge = output.stackTagCompound.getFloat("charge_Current"); - output.stackTagCompound = new NBTTagCompound(); - output.stackTagCompound.setFloat("charge_Current", tempCharge+40); - this.charge_Current = charge_Current-40; - tempCharge = 0; - } - } - progress_Current = 0; - } - } - } - -} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityNHG.java b/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityNHG.java deleted file mode 100644 index 3a9dbbd4c7..0000000000 --- a/src/Java/gtPlusPlus/core/tileentities/machines/TileEntityNHG.java +++ /dev/null @@ -1,502 +0,0 @@ -package gtPlusPlus.core.tileentities.machines; - -import gtPlusPlus.core.item.ModItems; -import gtPlusPlus.core.item.general.fuelrods.FuelRod_Base; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.math.MathUtils; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.inventory.IInventory; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.nbt.NBTTagList; -import net.minecraft.tileentity.TileEntity; -import net.minecraftforge.common.util.Constants; - -public class TileEntityNHG extends TileEntity implements IInventory -{ - private ItemStack[] items = new ItemStack[19]; //18 - private int progress = 1; - private int maxProgress = 180; - private int heatCycleProgress = 12; - public float coreTemp; - public float maxTemp = 10000; - private boolean fuelrod_1 = false; - private boolean fuelrod_2 = false; - private boolean fuelrod_3 = false; - private boolean fuelrod_4 = false; - private boolean fuelrod_5 = false; - private boolean fuelrod_6 = false; - private boolean fuelrod_7 = false; - private boolean fuelrod_8 = false; - private boolean fuelrod_9 = false; - private boolean fuelrod_10 = false; - private boolean fuelrod_11 = false; - private boolean fuelrod_12 = false; - private boolean fuelrod_13 = false; - private boolean fuelrod_14 = false; - private boolean fuelrod_15 = false; - private boolean fuelrod_16 = false; - private boolean fuelrod_17 = false; - private boolean fuelrod_18 = false; - - public float getCoreTemp(){ - return coreTemp; - } - - public int getProgress(){ - return progress; - } - - public boolean isValidFuelRod(ItemStack input){ - if(!this.worldObj.isRemote){ - if (input != null){ - if (input.getItem() instanceof FuelRod_Base){ - int fuelRodFuelLevel = getRodFuelValue(input); - float fuelRodHeatLevel = getRodHeatValue(input); - Utils.LOG_WARNING("Fuel Left: "+fuelRodFuelLevel+" Current Temp: "+fuelRodHeatLevel); - return true; - //return input.stackTagCompound.getInteger("code"); - } - } - - } - return false; - } - - public ItemStack doFuelRodHeatDamage(ItemStack input){ - if(!this.worldObj.isRemote){ - if (input != null){ - if (isValidFuelRod(input)){ - int fuelRodFuelLevel = getRodFuelValue(input); - float fuelRodHeatLevel = getRodHeatValue(input); - if(fuelRodFuelLevel <= 0 || fuelRodFuelLevel == 0){ - return null; - } - if(fuelRodHeatLevel == 0 && fuelRodFuelLevel > 0){ - if(fuelRodFuelLevel >= 5){ - int tempInt=fuelRodFuelLevel; - float tempFloat=fuelRodHeatLevel; - ItemStack output = input.copy(); - if (input.stackTagCompound != null){ - output.stackTagCompound = new NBTTagCompound(); - output.stackTagCompound.setInteger("fuelRemaining", tempInt-40); - output.stackTagCompound.setFloat("heat", tempFloat+20); - } - return output; - } - return null; - } - else if(fuelRodHeatLevel >= 5 && fuelRodFuelLevel > 0){ - int tempInt=fuelRodFuelLevel; - float tempFloat=fuelRodHeatLevel; - ItemStack output = input.copy(); - if (input.stackTagCompound != null){ - output.stackTagCompound = new NBTTagCompound(); - output.stackTagCompound.setInteger("fuelRemaining", tempInt-5); - output.stackTagCompound.setFloat("heat", tempFloat+5); - } - return output; - } - - else if(fuelRodHeatLevel >= 5 && fuelRodFuelLevel == 0){ - ItemStack output = input.copy(); - if (input.stackTagCompound != null){ - output.stackTagCompound = new NBTTagCompound(); - output.stackTagCompound.setInteger("heat", -5); - } - return output; - } - else { - return null; - } - } - } - } - return null; - } - - public float getRodHeatValue(ItemStack value){ - if (value != null){ - if (value.stackTagCompound != null){ - return value.stackTagCompound.getFloat("heat"); - } - } - return 0f; - } - - public int getRodFuelValue(ItemStack value){ - if (value != null){ - if (value.stackTagCompound != null){ - int tempInt = value.stackTagCompound.getInteger("fuelRemaining"); - return tempInt; - } - } - return 0; - } - - public void checkFuelRods(){ - - if(!this.worldObj.isRemote){ - for (int i = 0; i < getSizeInventory(); i++){ - if (items[i] != null){ - if (items[i].getItem() instanceof FuelRod_Base){ - ItemStack fuelRodStack = getStackInSlot(i).copy(); - //setInventorySlotContents(i, doFuelRodHeatDamage(fuelRodStack)); - if (i == 0){ - fuelrod_1 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 1){ - fuelrod_2 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 2){ - fuelrod_3 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 3){ - fuelrod_4 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 4){ - fuelrod_5 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 5){ - fuelrod_6 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 6){ - fuelrod_7 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 7){ - fuelrod_8 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 8){ - fuelrod_9 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 9){ - fuelrod_10 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 10){ - fuelrod_11 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 11){ - fuelrod_12 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 12){ - fuelrod_13 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 13){ - fuelrod_14 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 14){ - fuelrod_15 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 15){ - fuelrod_16 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 16){ - fuelrod_17 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - else if (i == 17){ - fuelrod_18 = true; - ItemStack r = doFuelRodHeatDamage(fuelRodStack); - setInventorySlotContents(i, r); - } - - - } - } - } - Utils.LOG_WARNING("|"+fuelrod_1+"|"+fuelrod_2+"|"+fuelrod_3+"| "+"|"+fuelrod_10+"|"+fuelrod_11+"|"+fuelrod_12+"|"); - Utils.LOG_WARNING("|"+fuelrod_4+"|"+fuelrod_5+"|"+fuelrod_6+"| "+"|"+fuelrod_13+"|"+fuelrod_14+"|"+fuelrod_15+"|"); - Utils.LOG_WARNING("|"+fuelrod_7+"|"+fuelrod_8+"|"+fuelrod_9+"| "+"|"+fuelrod_16+"|"+fuelrod_17+"|"+fuelrod_18+"|"); - } - - } - - public boolean calculateHeat(){ - /*if (!fuelrod_1 || !fuelrod_2 || !fuelrod_3 || !fuelrod_4 || !fuelrod_5 || !fuelrod_6 || !fuelrod_7 || !fuelrod_8 || !fuelrod_9 || !fuelrod_10 || !fuelrod_11 || !fuelrod_12 || !fuelrod_13 || !fuelrod_14 || !fuelrod_15 || !fuelrod_16 || !fuelrod_17 || !fuelrod_18){ - coreTemp = 0; - } - else {*/ - if(!this.worldObj.isRemote){ - for (int i = 0; i < getSizeInventory(); i++){ - if (items[i] != null){ - if (items[i].getItem() instanceof FuelRod_Base){ - ItemStack fuelRodStack = getStackInSlot(i).copy(); - //if (fuelRodStack.stackTagCompound.getFloat("heat") != 0){ - doFuelRodHeatDamage(fuelRodStack); - coreTemp = coreTemp+fuelRodStack.stackTagCompound.getFloat("heat"); - return true; - //} - } - } - } - } - //} - - - - return false; - } - - @Override - public int getSizeInventory() - { - return items.length; - } - - @Override - public ItemStack getStackInSlot(int slot) - { - - return items[slot]; - - } - - @Override - public ItemStack decrStackSize(int slot, int amount) - { - if (items[slot] != null) - { - ItemStack itemstack; - - if (items[slot].stackSize == amount) - { - itemstack = items[slot]; - items[slot] = null; - markDirty(); - return itemstack; - } - itemstack = items[slot].splitStack(amount); - if (items[slot].stackSize == 0) items[slot] = null; - markDirty(); - return itemstack; - } - return null; - } - - @Override - public ItemStack getStackInSlotOnClosing(int slot) - { - if (items[slot] != null) - { - ItemStack itemstack = items[slot]; - items[slot] = null; - return itemstack; - } - return null; - } - - @Override - public void setInventorySlotContents(int slot, ItemStack stack) - { - if (stack != null){ - items[slot] = stack; - if (stack != null && stack.stackSize > getInventoryStackLimit()) - { - stack.stackSize = getInventoryStackLimit(); - } - - - markDirty(); - } - } - - @Override - public String getInventoryName() - { - return "container.NHG"; - } - - @Override - public boolean hasCustomInventoryName() - { - return false; - } - - @Override - public void readFromNBT(NBTTagCompound nbt) - { - super.readFromNBT(nbt); - NBTTagList list = nbt.getTagList("Items", Constants.NBT.TAG_COMPOUND); - items = new ItemStack[getSizeInventory()]; - - for (int i = 0; i < list.tagCount(); ++i) { NBTTagCompound comp = list.getCompoundTagAt(i); int j = comp.getByte("Slot") & 255; if (j >= 0 && j < items.length) - { - items[j] = ItemStack.loadItemStackFromNBT(comp); - } - } - } - - @Override - public void writeToNBT(NBTTagCompound nbt) - { - super.writeToNBT(nbt); - NBTTagList list = new NBTTagList(); - - for (int i = 0; i < items.length; ++i) - { - if (items[i] != null) - { - NBTTagCompound comp = new NBTTagCompound(); - comp.setByte("Slot", (byte)i); - items[i].writeToNBT(comp); - list.appendTag(comp); - } - } - - nbt.setTag("Items", list); - } - - @Override - public int getInventoryStackLimit() - { - return 64; - } - - @Override - public boolean isUseableByPlayer(EntityPlayer player) - { - return worldObj.getTileEntity(xCoord, yCoord, zCoord) != this ? false : player.getDistanceSq((double)xCoord + 0.5D, (double)yCoord + 0.5D, (double)zCoord + 0.5D) <= 64.0D; - } - - @Override - public void openInventory() {} - - @Override - public void closeInventory() {} - - @Override - public boolean isItemValidForSlot(int slot, ItemStack stack) - { - return true; - } - - //Machine Code - TODO - private ItemStack neutrons; - - @Override - public void updateEntity() { - - if(!this.worldObj.isRemote){ - - if(progress >= heatCycleProgress){ - //Utils.LOG_SPECIFIC_WARNING("NFHG", "Updating Entity "+this.getBlockType().getUnlocalizedName(), 376); - if (MathUtils.divideXintoY(heatCycleProgress, maxProgress)){ - Utils.LOG_SPECIFIC_WARNING("NFHG", "Updating Entity "+this.getBlockType().getUnlocalizedName(), 378); - calculateHeat(); - heatCycleProgress=0; - } - } - - if(++progress >= maxProgress){ - - - Utils.LOG_SPECIFIC_WARNING("NFHG", "Updating Entity "+this.getBlockType().getUnlocalizedName(), 338); - if (items[18] != null){ - ItemStack checkOutput = getStackInSlot(18); - if(neutrons == null){ - neutrons = new ItemStack(ModItems.itemHeliumBlob, 1); - if (checkOutput == null){ - Utils.LOG_WARNING("ItemStack in Output slot is definitely null, making a new ItemStack."); - setInventorySlotContents(18, neutrons); - progress = 0; - markDirty(); - } - else { - checkOutput.stackSize++; - Utils.LOG_WARNING("Found an ItemStack to increase the size of. Current size is "+neutrons.stackSize); - - progress = 0; - markDirty(); - } - } - else if(checkOutput.getItem() == ModItems.itemHeliumBlob && checkOutput.stackSize < 64){ - checkOutput.stackSize++; - Utils.LOG_WARNING("Found an ItemStack to increase size of. Current size is "+checkOutput.stackSize); - progress = 0; - markDirty(); - } - else if(checkOutput.getItem() == ModItems.itemHeliumBlob && checkOutput.stackSize == 64){ - Utils.LOG_WARNING("Output stack is full."); - progress = 0; - markDirty(); - } - } - else if (items[18] == null){ - Utils.LOG_WARNING("ItemStack in Output slot is null"); - neutrons = new ItemStack(ModItems.itemHeliumBlob, 1); - ItemStack checkOutput = getStackInSlot(18); - if (checkOutput == null){ - Utils.LOG_WARNING("ItemStack in Output slot is definitely null, making a new ItemStack."); - se