From e7da0d15a5663a17e664f13a04ce2d4b6998ffea Mon Sep 17 00:00:00 2001 From: Alkalus Date: Thu, 24 Aug 2017 10:50:25 +1000 Subject: % Made Fission Fuel Production cost 1/8th eu/t. % Initial work on FFPP recipe handling. --- .../multi/GregtechMetaTileEntity_Refinery.java | 72 ++-------------------- 1 file changed, 4 insertions(+), 68 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java index e99a8d2b44..96cb21d84a 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java @@ -67,72 +67,8 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc @Override public boolean checkRecipe(final ItemStack aStack) { - if ((this.mInventory[1] == null) || (this.mInventory[1].isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L)) && (this.mInventory[1].stackSize < this.mInventory[1].getMaxStackSize()))) { - final ArrayList tItems = this.getStoredInputs(); - for (ItemStack tStack : tItems) { - if (tStack.isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L))) { - if (tStack.stackSize < 2) { - tStack = null; - } else { - tStack.stackSize--; - } - - } - if (this.mInventory[1] == null) { - this.mInventory[1] = GT_ModHandler.getIC2Item("miningPipe", 1L); - } else { - this.mInventory[1].stackSize++; - } - } - } - FluidStack tFluid = null;//GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), getBaseMetaTileEntity().getXCoord(), getBaseMetaTileEntity().getZCoord()); - { - return false; - } - } - - private boolean moveOneDown() { - if ((this.mInventory[1] == null) || (this.mInventory[1].stackSize < 1) - || (!GT_Utility.areStacksEqual(this.mInventory[1], GT_ModHandler.getIC2Item("miningPipe", 1L)))) { - return false; - } - final int xDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX; - final int zDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ; - final int yHead = this.getYOfPumpHead(); - if (yHead < 1) { - return false; - } - if (this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, yHead - 1, this.getBaseMetaTileEntity().getZCoord() + zDir) == Blocks.bedrock) { - return false; - } - if (!(this.getBaseMetaTileEntity().getWorld().setBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, yHead - 1, this.getBaseMetaTileEntity().getZCoord() + zDir, GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))))) { - return false; - } - if (yHead != this.getBaseMetaTileEntity().getYCoord()) { - this.getBaseMetaTileEntity().getWorld().setBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, yHead, this.getBaseMetaTileEntity().getZCoord() + zDir, GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L))); - } - this.getBaseMetaTileEntity().decrStackSize(1, 1); - return true; - } - - private int getYOfPumpHead() { - final int xDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetX; - final int zDir = ForgeDirection.getOrientation(this.getBaseMetaTileEntity().getBackFacing()).offsetZ; - int y = this.getBaseMetaTileEntity().getYCoord() - 1; - while (this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, y, this.getBaseMetaTileEntity().getZCoord() + zDir) == GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipe", 1L))) { - y--; - } - if (y == (this.getBaseMetaTileEntity().getYCoord() - 1)) { - if (this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, y, this.getBaseMetaTileEntity().getZCoord() + zDir) != GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))) { - return y + 1; - } - } else if ((this.getBaseMetaTileEntity().getBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, y, this.getBaseMetaTileEntity().getZCoord() + zDir) != GT_Utility - .getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))) && (this.mInventory[1] != null) && (this.mInventory[1].stackSize > 0) && GT_Utility.areStacksEqual(this.mInventory[1], GT_ModHandler.getIC2Item("miningPipe", 1L))) { - this.getBaseMetaTileEntity().getWorld().setBlock(this.getBaseMetaTileEntity().getXCoord() + xDir, y, this.getBaseMetaTileEntity().getZCoord() + zDir, - GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 1L))); - this.getBaseMetaTileEntity().decrStackSize(0, 1); - } - return y; + + return false; } @Override @@ -287,7 +223,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc @Override public int getPollutionPerTick(final ItemStack aStack) { - return 0; + return 200; } @Override @@ -296,7 +232,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc } public int getAmountOfOutputs() { - return 3; + return 5; } @Override -- cgit From 7dfe9ef6ce26546b06fd8b08e9ffe2cd5e24ec0f Mon Sep 17 00:00:00 2001 From: Alkalus Date: Thu, 24 Aug 2017 12:22:13 +1000 Subject: % Heavily changed the structure of the FFPP. $ Began fix for FFPP recipe handling. --- .../multi/GregtechMetaTileEntity_Refinery.java | 136 +++++++++++++++------ 1 file changed, 101 insertions(+), 35 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java index 96cb21d84a..a3a62aa7d5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java @@ -10,8 +10,11 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.objects.GT_RenderedTexture; +import gregtech.api.util.CustomRecipeMap; import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_Recipe; import gregtech.api.util.GT_Utility; +import gregtech.api.util.Recipe_GT; import gtPlusPlus.core.block.ModBlocks; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; @@ -67,7 +70,62 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc @Override public boolean checkRecipe(final ItemStack aStack) { - + + ArrayList tFluidList = getStoredFluids(); + for (int i = 0; i < tFluidList.size() - 1; i++) { + for (int j = i + 1; j < tFluidList.size(); j++) { + if (GT_Utility.areFluidsEqual((FluidStack) tFluidList.get(i), (FluidStack) tFluidList.get(j))) { + if (((FluidStack) tFluidList.get(i)).amount >= ((FluidStack) tFluidList.get(j)).amount) { + tFluidList.remove(j--); + } else { + tFluidList.remove(i--); + break; + } + } + } + } + + long tVoltage = getMaxInputVoltage(); + byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); + FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]); + if (tFluids.length > 0) { + Utils.LOG_INFO("Good Recipe. [1]"); + for(int i = 0;i 0) { + this.mEUt = (-this.mEUt); + } + this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); + this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)}; + this.mOutputFluids = tRecipe.mFluidOutputs.clone(); + updateSlots(); + return true; + } + } + else { + Utils.LOG_INFO("Could not find valid Recipe. [1]"); + } + } + } + Utils.LOG_INFO("Bad Recipe. [1]"); return false; } @@ -83,55 +141,68 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc if ((!this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(18))) && (!this.addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(18)))) { if (aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j) != ModBlocks.blockCasings2Misc) { - Utils.LOG_INFO("Wrong Block."); + Utils.LOG_INFO("1 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, Y, zDir).getLocalizedName()); return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, Y, zDir + j) != 2) { - Utils.LOG_INFO("Wrong Meta 1."); + Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, Y, zDir).getLocalizedName()+" | Expected Meta 2 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, Y, zDir)); return false; } } else { - Utils.LOG_INFO("Added Hatch. "+tTileEntity.getInventoryName()); + //Utils.LOG_INFO("Added Hatch. "+tTileEntity.getInventoryName()); } } Y = 1; - Utils.LOG_INFO("Checking at Y+1 as well."); + //Utils.LOG_INFO("Checking at Y+1 as well."); final IGregTechTileEntity tTileEntity2 = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, Y, zDir + j); if ((!this.addToMachineList(tTileEntity2, TAE.GTPP_INDEX(18))) && (!this.addEnergyInputToMachineList(tTileEntity2, TAE.GTPP_INDEX(18)))) { if (aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j) != ModBlocks.blockCasings2Misc) { - Utils.LOG_INFO("Wrong Block."); + Utils.LOG_INFO("2 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, Y, zDir).getLocalizedName()); return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, Y, zDir + j) != 2) { - Utils.LOG_INFO("Wrong Meta 1."); + Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, Y, zDir).getLocalizedName()+" | Expected Meta 2 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, Y, zDir)); return false; } } else { - Utils.LOG_INFO("Added Hatch. "+tTileEntity2.getInventoryName()); + //Utils.LOG_INFO("Added Hatch. "+tTileEntity2.getInventoryName()); } } } - for (int y = 2; y < 6; y++) { - if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir) != ModBlocks.blockCasings2Misc) { //Must Define meta for center blocks - Utils.LOG_INFO("Wrong Block."); - return false; + for (int y = 2; y < 7; y++) { + if (y<=6){ + if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir) != ModBlocks.blockCasings2Misc) { //Must Define meta for center blocks + Utils.LOG_INFO("3 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()); + return false; + } + if (aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir) != 3) { + Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 3 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); + return false; + } } - if (aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir) != 3) { - Utils.LOG_INFO("Wrong Meta. 2"); - return false; + if (y==6){ + if (aBaseMetaTileEntity.getBlockOffset(xDir, y + 1, zDir) != ModBlocks.blockCasings2Misc) { + Utils.LOG_INFO("8 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y+1, zDir).getLocalizedName()+" | "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y+1, zDir)); + return false; + } + if (aBaseMetaTileEntity.getMetaIDOffset(xDir, y + 1, zDir) != 1) { + Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y+1, zDir).getLocalizedName()+" | Expected Meta 1 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y + 1, zDir)); + return false; + } } if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) != ModBlocks.blockCasings2Misc) { - Utils.LOG_INFO("Wrong Block.1"); + //Utils.LOG_INFO("4 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()); if (y==3){ if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) { if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) { + Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); return false; } - Utils.LOG_INFO("Found Zeron-Casing."); + Utils.LOG_INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y)); } } else { @@ -141,13 +212,14 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc } if (aBaseMetaTileEntity.getBlockOffset(xDir - 1, y, zDir) != ModBlocks.blockCasings2Misc) { - Utils.LOG_INFO("Wrong Block.2"); + //Utils.LOG_INFO("5 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()); if (y==3){ if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) { if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) { + Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); return false; } - Utils.LOG_INFO("Found Zeron-Casing."); + Utils.LOG_INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y)); } } else { @@ -157,13 +229,14 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc } if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir + 1) != ModBlocks.blockCasings2Misc) { - Utils.LOG_INFO("Wrong Block.3"); + //Utils.LOG_INFO("6 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()); if (y==3){ if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) { if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) { + Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); return false; } - Utils.LOG_INFO("Found Zeron-Casing."); + Utils.LOG_INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y)); } } else { @@ -172,33 +245,26 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc } } if (aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir - 1) != ModBlocks.blockCasings2Misc) { - Utils.LOG_INFO("Wrong Block.4"); + //Utils.LOG_INFO("7 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()); if (y==3){ if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) { if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) { + Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); return false; } - Utils.LOG_INFO("Found Zeron-Casing."); + Utils.LOG_INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y)); } } else { Utils.LOG_INFO("debug.4"); return false; } - } - if (aBaseMetaTileEntity.getBlockOffset(xDir, y + 3, zDir) != ModBlocks.blockCasings2Misc) { - Utils.LOG_INFO("Wrong Block.5"); - return false; - } - if (aBaseMetaTileEntity.getMetaIDOffset(xDir, y + 3, zDir) != 3) { - Utils.LOG_INFO("Wrong Meta. 3"); - return false; - } + } } if ((this.mInputHatches.size() != 4) || (this.mOutputHatches.size() != 2) || (this.mOutputBusses.size() != 1) || (this.mMufflerHatches.size() != 1) || - (this.mMaintenanceHatches.size() != 2) || (this.mEnergyHatches.size() < 1)){ + (this.mMaintenanceHatches.size() != 2) || (this.mEnergyHatches.size() != 1)){ Utils.LOG_INFO("Wrong Hatch count."); return false; } @@ -206,8 +272,8 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc if (this.mMufflerHatches.get(0).mTier < 7){ Utils.LOG_INFO("Your Muffler must be AT LEAST ZPM tier or higher."); } - } - Utils.LOG_INFO("Multiblock Formed."); + } + Utils.LOG_INFO("Fission Fuel Production Plant Formed."); return true; } -- cgit From 2ce6f51eb26de8c3b0ba86b6480438fae44fe9f5 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Thu, 24 Aug 2017 13:33:42 +1000 Subject: % Tweaked FFPP Tooltip. - Removed the dual Maint. hatch requirement from the FFPP. --- .../machines/multi/GregtechMetaTileEntity_Refinery.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java index a3a62aa7d5..cf1cd7b439 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java @@ -42,13 +42,13 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc "Controller Block for the Fission Fuel Processing Unit", "Size(WxHxD): 3x9x3", "Controller (Front middle at bottom)", "3x2x3 Base platform of Hastelloy-X", - "1x7x1 Incoloy-DS Fluid Containment Block pillar (Center of base)", - "1x4x1 Hastelloy-N Sealant Blocks (Each Incoloy-DS Fluid Containment side and on top)", - "1x1x1 Zeron-100 Reactor Shielding (Second Sealant Tower layer, Surrounding Fluid Containment)", + "1x6x1 Incoloy-DS Fluid Containment Block pillar (Center of base, From layer 3 upwards)", + "4x Zeron-100 Reactor Shielding (Each side of Second Sealant Tower layer, Surrounding Incoloy-DS Fluid Containment)", + "Hastelloy-N Sealant Blocks (Each side of Incoloy-DS Fluid Containment casings, except layer 2 and one on top)", "4x Input Hatch (One of base platform)", "2x Output Hatch (One of base platform)", "1x Output Bus (One of base platform)", - "2x Maintenance Hatch (One of base platform)", + "1x Maintenance Hatch (One of base platform)", "1x ZPM or better Muffler (One of base platform)", "1x Energy Hatch (One of base platform)", CORE.GT_Tooltip @@ -264,7 +264,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc if ((this.mInputHatches.size() != 4) || (this.mOutputHatches.size() != 2) || (this.mOutputBusses.size() != 1) || (this.mMufflerHatches.size() != 1) || - (this.mMaintenanceHatches.size() != 2) || (this.mEnergyHatches.size() != 1)){ + (this.mMaintenanceHatches.size() != 1) || (this.mEnergyHatches.size() != 1)){ Utils.LOG_INFO("Wrong Hatch count."); return false; } -- cgit From 14728ac0d0c1a118dc638702df78e45b6c9c4277 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Thu, 24 Aug 2017 15:41:39 +1000 Subject: % Swapped FFPP checkRecipe logic to use the Fusion Reactor logic for fluid handling. $ Cleaned up some code. --- src/Java/gregtech/api/util/Recipe_GT.java | 2 +- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 6 +-- .../workbench/Workbench_CraftingHandler.java | 13 ++----- .../handler/workbench/Workbench_RecipeSorter.java | 2 +- src/Java/gtPlusPlus/core/item/ModItems.java | 3 +- src/Java/gtPlusPlus/core/util/ClassUtils.java | 5 ++- .../core/util/materials/MaterialUtils.java | 2 + .../core/util/reflect/ClientProxyFinder.java | 2 +- .../core/util/reflect/ReflectionUtils.java | 4 +- .../core/util/reflect/ServerProxyFinder.java | 2 +- .../world/darkworld/biome/Biome_DarkWorld.java | 3 +- src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java | 14 +++---- .../blocks/rainforest/SaplingRainforestTree.java | 18 ++++----- .../gregtech/api/gui/CONTAINER_AdvancedBoiler.java | 2 +- .../gregtech/api/objects/GregtechItemData.java | 2 +- .../multi/GregtechMetaTileEntityTreeFarm.java | 9 +---- .../GregtechMetaTileEntity_CatalyticReactor.java | 1 + .../multi/GregtechMetaTileEntity_Refinery.java | 45 ++++++++++++++++++++-- 18 files changed, 83 insertions(+), 52 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common') diff --git a/src/Java/gregtech/api/util/Recipe_GT.java b/src/Java/gregtech/api/util/Recipe_GT.java index fbd5d9eb4f..36a056f0c0 100644 --- a/src/Java/gregtech/api/util/Recipe_GT.java +++ b/src/Java/gregtech/api/util/Recipe_GT.java @@ -254,7 +254,7 @@ public class Recipe_GT extends GT_Recipe{ //RTG Fuel Map public static final GT_Recipe.GT_Recipe_Map_Fuel sRTGFuels = new Recipe_GT.GT_Recipe_Map_Fuel( - new HashSet(10), "gt.recipe.RTGgenerators", "RTG", null, + new HashSet(10), "gt.recipe.RTGgenerators", "RTG", null, "gregtech:textures/gui/basicmachines/Default", 1, 1, 0, 0, 1, "Fuel Value: ", 365, " Minecraft Days", true, true); //Thermal Boiler map diff --git a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java index cf1811781a..10c09390d9 100644 --- a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java +++ b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java @@ -6,8 +6,8 @@ import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils; public class Gui_ID_Registry { - private static final Map, MU_GuiId> classMap = new HashMap(); - private static final Map idMap = new HashMap(); + private static final Map, MU_GuiId> classMap = new HashMap, MU_GuiId>(); + private static final Map idMap = new HashMap(); private static int nextId = 0; static @@ -33,7 +33,7 @@ public class Gui_ID_Registry MU_GuiId guiId = classMap.get(guiHandlerClass); if (guiId == null) { for (final Map.Entry, MU_GuiId> classGuiIdEntry : classMap.entrySet()) { - if (((Class)classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass)) + if (((Class)classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass)) { guiId = classGuiIdEntry.getValue(); break; diff --git a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java index 289446eb07..951f69723c 100644 --- a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java +++ b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_CraftingHandler.java @@ -14,7 +14,7 @@ import net.minecraft.world.World; public class Workbench_CraftingHandler { private static final Workbench_CraftingHandler instance = new Workbench_CraftingHandler(); - private final List recipes = new ArrayList(); + private final List recipes = new ArrayList(); public static final Workbench_CraftingHandler getInstance() { return instance; @@ -66,7 +66,7 @@ public class Workbench_CraftingHandler { } } - final HashMap hashmap = new HashMap(); + final HashMap hashmap = new HashMap(); for (; i < par2ArrayOfObj.length; i += 2) { @@ -110,7 +110,7 @@ public class Workbench_CraftingHandler { public void addShapelessRecipe(final ItemStack par1ItemStack, final Object par2ArrayOfObj[]) { - final ArrayList arraylist = new ArrayList(); + final ArrayList arraylist = new ArrayList(); final Object aobj[] = par2ArrayOfObj; final int i = aobj.length; @@ -146,9 +146,6 @@ public class Workbench_CraftingHandler { public ItemStack findMatchingRecipe(final InventoryCrafting par1InventoryCrafting, final World par2World) { int i = 0; - ItemStack itemstack = null; - ItemStack itemstack1 = null; - for (int j = 0; j < par1InventoryCrafting.getSizeInventory(); j++) { final ItemStack itemstack2 = par1InventoryCrafting.getStackInSlot(j); @@ -160,12 +157,10 @@ public class Workbench_CraftingHandler { if (i == 0) { - itemstack = itemstack2; } if (i == 1) { - itemstack1 = itemstack2; } i++; @@ -202,7 +197,7 @@ public class Workbench_CraftingHandler { } - public List getRecipeList() + public List getRecipeList() { return this.recipes; } diff --git a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java index b68ae89e5c..92a7dd56d3 100644 --- a/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java +++ b/src/Java/gtPlusPlus/core/handler/workbench/Workbench_RecipeSorter.java @@ -4,7 +4,7 @@ import java.util.Comparator; import net.minecraft.item.crafting.*; -public class Workbench_RecipeSorter implements Comparator +public class Workbench_RecipeSorter implements Comparator { final Workbench_CraftingHandler CraftingManagerCrafter; diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 0faec7ff88..30d85628b9 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -587,6 +587,7 @@ public final class ModItems { CoalTar.run(); //Misc Items + @SuppressWarnings("unused") Item tI; tI = new BaseItemMisc("Chilly", new short[]{0,64,196}, 32, MiscTypes.POTION, new String[]{"It's Blue"}); tI = new BaseItemMisc("4000DC's", new short[]{180,100,30}, 1, MiscTypes.BIGKEY, new String[]{"It opens things."}); @@ -704,7 +705,7 @@ public final class ModItems { RfEuBattery = new RF2EU_Battery(); //Baubles Mod Test - try {final Class baublesTest = Class.forName("baubles.api.IBauble"); + try {final Class baublesTest = Class.forName("baubles.api.IBauble"); if (baublesTest != null){ COMPAT_Baubles.run(); } diff --git a/src/Java/gtPlusPlus/core/util/ClassUtils.java b/src/Java/gtPlusPlus/core/util/ClassUtils.java index 20ca894211..498362e817 100644 --- a/src/Java/gtPlusPlus/core/util/ClassUtils.java +++ b/src/Java/gtPlusPlus/core/util/ClassUtils.java @@ -20,6 +20,7 @@ public class ClassUtils { } } + @SuppressWarnings("rawtypes") public static Method getMethodViaReflection(final Class lookupClass, final String methodName, final boolean invoke) throws Exception{ final Class lookup = lookupClass.getClass(); final Method m = lookup.getDeclaredMethod(methodName); @@ -30,7 +31,7 @@ public class ClassUtils { return m; } - public static Class getNonPublicClass(final String className){ + public static Class getNonPublicClass(final String className){ Class c = null; try { c = Class.forName(className); @@ -60,7 +61,7 @@ public class ClassUtils { try { final Object o = constructor.newInstance(); - return (Class) o; + return (Class) o; } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException e) { // TODO Auto-generated catch block diff --git a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java index 863ba2b3b8..010f7b0bf0 100644 --- a/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java +++ b/src/Java/gtPlusPlus/core/util/materials/MaterialUtils.java @@ -14,6 +14,7 @@ public class MaterialUtils { public static short firstID = 791; + @SuppressWarnings({ "rawtypes", "unused" }) private static Class[][] commonTypes = {{Materials.class, int.class, TextureSet.class, float.class, int.class, int.class, int.class, int.class, int.class, int.class, int.class, @@ -32,6 +33,7 @@ public class MaterialUtils { } public static Material generateMaterialFromGtENUM(final Materials material){ + @SuppressWarnings("deprecation") String name = material.name(); final short[] rgba = material.mRGBa; final int melting = material.mMeltingPoint; diff --git a/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java b/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java index c1d0279f72..99a9bf2fa9 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java +++ b/src/Java/gtPlusPlus/core/util/reflect/ClientProxyFinder.java @@ -12,7 +12,7 @@ public class ClientProxyFinder { final SidedProxy sidedProxy = field.getAnnotation(SidedProxy.class); final Object fieldValue = field.get(modInstance); try { - final Class clientSideClass = Class.forName(sidedProxy.clientSide()); + final Class clientSideClass = Class.forName(sidedProxy.clientSide()); if(clientSideClass.isAssignableFrom(fieldValue.getClass())) { final Object clientProxy = clientSideClass.cast(fieldValue); //do what you want with client proxy instance diff --git a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java index c789871b6f..f88f8e32e0 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java +++ b/src/Java/gtPlusPlus/core/util/reflect/ReflectionUtils.java @@ -102,7 +102,7 @@ public class ReflectionUtils { /** * Allows to change the state of an immutable instance. Huh?!? */ - public static void setFieldValue(Class clazz, String fieldName, Object newValue) throws Exception { + public static void setFieldValue(Class clazz, String fieldName, Object newValue) throws Exception { Field nameField = getField(clazz, fieldName); setValue(clazz, nameField, newValue); } @@ -110,7 +110,7 @@ public class ReflectionUtils { /** * Allows to change the state of final statics. Huh?!? */ - public static void setDefault(Class clazz, String fieldName, Object newValue) throws Exception { + public static void setDefault(Class clazz, String fieldName, Object newValue) throws Exception { Field staticField = clazz.getDeclaredField(fieldName); setValue(null, staticField, newValue); } diff --git a/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java b/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java index 2fae02a9fd..38382b4a46 100644 --- a/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java +++ b/src/Java/gtPlusPlus/core/util/reflect/ServerProxyFinder.java @@ -12,7 +12,7 @@ public class ServerProxyFinder { final SidedProxy sidedProxy = field.getAnnotation(SidedProxy.class); final Object fieldValue = field.get(modInstance); try { - final Class serverSideClass = Class.forName(sidedProxy.serverSide()); + final Class serverSideClass = Class.forName(sidedProxy.serverSide()); if(serverSideClass.isAssignableFrom(fieldValue.getClass())) { final Object serverProxy = serverSideClass.cast(fieldValue); //do what you want with server proxy instance diff --git a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java index 3eadb6116e..ed8b3f38b7 100644 --- a/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java +++ b/src/Java/gtPlusPlus/core/world/darkworld/biome/Biome_DarkWorld.java @@ -113,7 +113,8 @@ public class Biome_DarkWorld { return 0xF67A14; } - private boolean addToMonsterSpawnLists(Class EntityClass, int a, int b, int c){ + @SuppressWarnings("unchecked") + private boolean addToMonsterSpawnLists(Class EntityClass, int a, int b, int c){ this.spawnableMonsterList.add(new SpawnListEntry(EntityClass, a, b, c)); this.spawnableCaveCreatureList.add(new SpawnListEntry(EntityClass, a, b, c)); return true; diff --git a/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java b/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java index 0f8dcb4649..017fe3012b 100644 --- a/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java +++ b/src/Java/gtPlusPlus/nei/GT_NEI_DefaultHandler.java @@ -71,7 +71,7 @@ extends TemplateRecipeHandler { public void loadCraftingRecipes(final ItemStack aResult) { final ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aResult); - final ArrayList tResults = new ArrayList(); + final ArrayList tResults = new ArrayList(); tResults.add(aResult); tResults.add(GT_OreDictUnificator.get(true, aResult)); if ((tPrefixMaterial != null) && (!tPrefixMaterial.mBlackListed) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { @@ -99,14 +99,13 @@ extends TemplateRecipeHandler { } } } - final CachedDefaultRecipe tNEIRecipe; } @Override public void loadUsageRecipes(final ItemStack aInput) { final ItemData tPrefixMaterial = GT_OreDictUnificator.getAssociation(aInput); - final ArrayList tInputs = new ArrayList(); + final ArrayList tInputs = new ArrayList(); tInputs.add(aInput); tInputs.add(GT_OreDictUnificator.get(false, aInput)); if ((tPrefixMaterial != null) && (!tPrefixMaterial.mPrefix.mFamiliarPrefixes.isEmpty())) { @@ -134,7 +133,6 @@ extends TemplateRecipeHandler { } } } - final CachedDefaultRecipe tNEIRecipe; } @Override @@ -322,14 +320,14 @@ extends TemplateRecipeHandler { if (this.permutated) { return; } - final ArrayList tDisplayStacks = new ArrayList(); + final ArrayList tDisplayStacks = new ArrayList(); for (final ItemStack tStack : this.items) { if (GT_Utility.isStackValid(tStack)) { if (tStack.getItemDamage() == 32767) { final List permutations = codechicken.nei.ItemList.itemMap.get(tStack.getItem()); if (!permutations.isEmpty()) { ItemStack stack; - for (final Iterator i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { + for (final Iterator i$ = permutations.iterator(); i$.hasNext(); tDisplayStacks.add(GT_Utility.copyAmount(tStack.stackSize, new Object[]{stack}))) { stack = (ItemStack) i$.next(); } } else { @@ -354,8 +352,8 @@ extends TemplateRecipeHandler { public class CachedDefaultRecipe extends TemplateRecipeHandler.CachedRecipe { public final GT_Recipe mRecipe; - public final List mOutputs = new ArrayList(); - public final List mInputs = new ArrayList(); + public final List mOutputs = new ArrayList(); + public final List mInputs = new ArrayList(); public CachedDefaultRecipe(final GT_Recipe aRecipe) { super(); diff --git a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java b/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java index e36d24e695..0cd76fa734 100644 --- a/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java +++ b/src/Java/gtPlusPlus/xmod/bop/blocks/rainforest/SaplingRainforestTree.java @@ -13,16 +13,18 @@ import net.minecraft.world.gen.feature.*; public class SaplingRainforestTree extends SaplingBase { - public SaplingRainforestTree(){ - super("Rainforest Oak Sapling", "rainforestoak", new String[]{"rainforest"}); - } + public SaplingRainforestTree(){ + super("Rainforest Oak Sapling", "rainforestoak", new String[]{"rainforest"}); + } - @Override + @Override public void func_149878_d(World world, int x, int y, int z, Random rand){ Utils.LOG_WARNING("func_149878_d - 1"); if (!net.minecraftforge.event.terraingen.TerrainGen.saplingGrowTree(world, rand, x, y, z)) return; int l = world.getBlockMetadata(x, y, z) & 7; - Object object = rand.nextInt(10) == 0 ? new WorldGenBigTree(true) : new WorldGenTrees(true); + rand.nextInt(10); + new WorldGenBigTree(true); + new WorldGenTrees(true); int i1 = 0; int j1 = 0; boolean flag = false; @@ -40,10 +42,8 @@ public class SaplingRainforestTree extends SaplingBase { { world.setBlock(x, y, z, block, 0, 4); } -//public WorldGenRainForestTree_Ex(Block wood, Block leaves, int woodMeta, int leavesMeta, boolean doBlockNotify, int minTreeHeight, int randomTreeHeight) { - Class C = BOP_Block_Registrator.class; Object o = new WorldGenRainForestTree_Ex(BOP_Block_Registrator.log_Rainforest, BOP_Block_Registrator.leaves_Rainforest, 0, 0, true, 50, 75); - + if (!((WorldGenerator)o).generate(world, rand, x + i1, y, z + j1)) { if (flag) @@ -59,5 +59,5 @@ public class SaplingRainforestTree extends SaplingBase { } } } - + } \ No newline at end of file diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java index d3ec2b024b..e480ffbfef 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/gui/CONTAINER_AdvancedBoiler.java @@ -60,7 +60,7 @@ public class CONTAINER_AdvancedBoiler this.mWaterAmount = Math.min(54, Math.max(0, this.mWaterAmount * 54 / (this.maxStorage-100))); this.mProcessingEnergy = Math.min(14, Math.max(this.mProcessingEnergy > 0 ? 1 : 0, this.mProcessingEnergy * 14 / 1000)); - Iterator var2 = this.crafters.iterator(); + Iterator var2 = this.crafters.iterator(); while (var2.hasNext()) { ICrafting var1 = (ICrafting) var2.next(); var1.sendProgressBarUpdate(this, 100, this.mTemperature); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java index 0a5351afdc..fb35c0ac21 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/api/objects/GregtechItemData.java @@ -120,7 +120,7 @@ public class GregtechItemData { } public ArrayList getAllGT_MaterialStacks() { - final ArrayList rList = new ArrayList(); + final ArrayList rList = new ArrayList(); if (this.hasValidMaterialData()) { rList.add(this.mMaterial); } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java index 191312dbfa..dd2837b021 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityTreeFarm.java @@ -65,13 +65,8 @@ public class GregtechMetaTileEntityTreeFarm extends GT_MetaTileEntity_MultiBlock private EntityPlayerMP farmerAI; - private SAWTOOL mCurrentMachineTool = SAWTOOL.NONE; private boolean canChop = false; - private final int cuttingNumber = 0; - private final int cuttingNumber2 = 0; - private final int cuttingNumber3 = 0; - public GregtechMetaTileEntityTreeFarm(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } @@ -253,10 +248,8 @@ public class GregtechMetaTileEntityTreeFarm extends GT_MetaTileEntity_MultiBlock final SAWTOOL currentInputItem = TreeFarmHelper.isCorrectMachinePart(aStack); if (currentInputItem != SAWTOOL.NONE){ if (currentInputItem == SAWTOOL.SAW){ - this.mCurrentMachineTool = SAWTOOL.SAW; } else { - this.mCurrentMachineTool = SAWTOOL.BUZZSAW; } isValid = true; } @@ -423,6 +416,7 @@ public class GregtechMetaTileEntityTreeFarm extends GT_MetaTileEntity_MultiBlock + @SuppressWarnings("unused") private boolean findLogs(final IGregTechTileEntity aBaseMetaTileEntity){ Utils.LOG_MACHINE_INFO("called findLogs()"); @@ -556,6 +550,7 @@ public class GregtechMetaTileEntityTreeFarm extends GT_MetaTileEntity_MultiBlock return true; } + @SuppressWarnings("deprecation") private boolean plantSaplings(final IGregTechTileEntity aBaseMetaTileEntity){ Utils.LOG_MACHINE_INFO("called plantSaplings()"); final World world = aBaseMetaTileEntity.getWorld(); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java index ab47262d38..e13360b7c5 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_CatalyticReactor.java @@ -58,6 +58,7 @@ public class GregtechMetaTileEntity_CatalyticReactor extends GT_MetaTileEntity_M return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "LFTR.png"); } + @SuppressWarnings("unused") @Override public boolean checkRecipe(final ItemStack aStack) { if ((this.mInventory[1] == null) || (this.mInventory[1].isItemEqual(GT_ModHandler.getIC2Item("miningPipe", 1L)) && (this.mInventory[1].stackSize < this.mInventory[1].getMaxStackSize()))) { diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java index cf1cd7b439..875990a12e 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java @@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi; import java.util.ArrayList; +import gregtech.api.enums.GT_Values; import gregtech.api.enums.TAE; import gregtech.api.enums.Textures; import gregtech.api.gui.GT_GUIContainer_MultiMachine; @@ -26,8 +27,8 @@ import net.minecraftforge.fluids.FluidStack; public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBlockBase { - private boolean completedCycle = false; - + public GT_Recipe mLastRecipe; + public GregtechMetaTileEntity_Refinery(final int aID, final String aName, final String aNameRegional) { super(aID, aName, aNameRegional); } @@ -68,7 +69,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "LFTR.png"); } - @Override + /*@Override public boolean checkRecipe(final ItemStack aStack) { ArrayList tFluidList = getStoredFluids(); @@ -127,7 +128,43 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc } Utils.LOG_INFO("Bad Recipe. [1]"); return false; - } + }*/ + + @Override + public boolean checkRecipe(ItemStack aStack) { + ArrayList tFluidList = getStoredFluids(); + int tFluidList_sS=tFluidList.size(); + for (int i = 0; i < tFluidList_sS - 1; i++) { + for (int j = i + 1; j < tFluidList_sS; j++) { + if (GT_Utility.areFluidsEqual((FluidStack) tFluidList.get(i), (FluidStack) tFluidList.get(j))) { + if (((FluidStack) tFluidList.get(i)).amount >= ((FluidStack) tFluidList.get(j)).amount) { + tFluidList.remove(j--); tFluidList_sS=tFluidList.size(); + } else { + tFluidList.remove(i--); tFluidList_sS=tFluidList.size(); + break; + } + } + } + } + if (tFluidList.size() > 1) { + FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]); + GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sFusionRecipes.findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, GT_Values.V[4], tFluids, new ItemStack[]{}); + if ((tRecipe == null && !mRunningOnLoad) || (maxEUStore() < tRecipe.mSpecialValue)) { + this.mLastRecipe = null; + return false; + } + if (mRunningOnLoad || tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[]{})) { + this.mLastRecipe = tRecipe; + this.mEUt = this.mLastRecipe.mEUt; + this.mMaxProgresstime = this.mLastRecipe.mDuration; + this.mEfficiencyIncrease = 10000; + this.mOutputFluids = this.mLastRecipe.mFluidOutputs; + mRunningOnLoad = false; + return true; + } + } + return false; + } @Override public boolean checkMachine(final IGregTechTileEntity aBaseMetaTileEntity, final ItemStack aStack) { -- cgit From 4928538ba331e835cbe640c36d1324f375282629 Mon Sep 17 00:00:00 2001 From: Alkalus Date: Thu, 24 Aug 2017 16:02:44 +1000 Subject: $ Fixed the FFPP not finding recipes. % More cleaned up code. --- src/Java/gregtech/api/util/CustomRecipeMap.java | 9 ++- .../gtPlusPlus/core/item/base/BaseItemBrain.java | 4 +- .../core/item/base/BaseItemWithCharge.java | 1 + .../gtPlusPlus/core/item/base/BasicSpawnEgg.java | 1 + .../core/item/base/dusts/BaseItemDustUnique.java | 4 +- .../item/base/dusts/decimal/BaseItemCentidust.java | 1 + .../item/base/dusts/decimal/BaseItemDecidust.java | 1 + .../core/item/base/foods/BaseItemHotFood.java | 1 + .../multi/GregtechMetaTileEntity_Refinery.java | 86 +++------------------- .../xmod/ic2/block/RTGGenerator/BlockRTG.java | 1 + 10 files changed, 29 insertions(+), 80 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common') diff --git a/src/Java/gregtech/api/util/CustomRecipeMap.java b/src/Java/gregtech/api/util/CustomRecipeMap.java index d2149bd332..3a0f1724b0 100644 --- a/src/Java/gregtech/api/util/CustomRecipeMap.java +++ b/src/Java/gregtech/api/util/CustomRecipeMap.java @@ -7,6 +7,7 @@ import java.util.*; import gregtech.api.GregTech_API; import gregtech.api.interfaces.tileentity.IHasWorldObjectAndCoords; import gregtech.api.objects.GT_ItemStack; +import gtPlusPlus.core.util.Utils; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidStack; @@ -19,7 +20,7 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ //public static final CustomRecipeMap sOreWasherRecipes = new GT_Recipe_Map_OreWasher(new HashSet(0), "ic.recipe.orewasher", "Ore Washer", "ic2.blockOreWashingPlant", RES_PATH_GUI + "basicmachines/OreWasher", 1, 3, 1, 1, 1, E, 1, E, true, false); //Fission Fuel Plant Recipes - public static final CustomRecipeMap sFissionFuelProcessing = new CustomRecipeMap(new HashSet(50), "gt.recipe.fissionfuel", "Fission Fuel Processing", null, RES_PATH_GUI + "basicmachines/FissionFuel", 0, 0, 0, 9, 1, E, 1, E, true, true); + public static final CustomRecipeMap sFissionFuelProcessing = new CustomRecipeMap(new HashSet(50), "gt.recipe.fissionfuel", "Fission Fuel Processing", null, RES_PATH_GUI + "basicmachines/FissionFuel", 0, 0, 0, 4, 1, E, 1, E, true, true); /** * HashMap of Recipes based on their Items @@ -205,6 +206,7 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ public GT_Recipe findRecipe(final IHasWorldObjectAndCoords aTileEntity, final GT_Recipe aRecipe, final boolean aNotUnificated, final long aVoltage, final FluidStack[] aFluids, final ItemStack aSpecialSlot, ItemStack... aInputs) { // No Recipes? Well, nothing to be found then. if (this.mRecipeList.isEmpty()) { + Utils.LOG_INFO("BAD RECIPE"); return null; } @@ -213,6 +215,7 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ if (GregTech_API.sPostloadFinished) { if (this.mMinimalInputFluids > 0) { if (aFluids == null) { + Utils.LOG_INFO("BAD RECIPE [1]"); return null; } int tAmount = 0; @@ -222,11 +225,13 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ } } if (tAmount < this.mMinimalInputFluids) { + Utils.LOG_INFO("BAD RECIPE [2]"); return null; } } if (this.mMinimalInputItems > 0) { if (aInputs == null) { + Utils.LOG_INFO("BAD RECIPE [3]"); return null; } int tAmount = 0; @@ -236,6 +241,7 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ } } if (tAmount < this.mMinimalInputItems) { + Utils.LOG_INFO("BAD RECIPE [4]"); return null; } } @@ -296,6 +302,7 @@ public class CustomRecipeMap/* extends GT_Recipe_Map*/{ } // And nothing has been found. + Utils.LOG_INFO("BAD RECIPE [5]"); return null; } diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBrain.java b/src/Java/gtPlusPlus/core/item/base/BaseItemBrain.java index 2521671223..815f3c49c0 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemBrain.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemBrain.java @@ -56,7 +56,7 @@ public class BaseItemBrain extends Item{ // This is a fun method which allows us to run some code when our item is // shown in a creative tab. I am going to use it to add all the brain // types. - @SuppressWarnings("unchecked") + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override @SideOnly(Side.CLIENT) public void getSubItems(final Item item, final CreativeTabs tab, final List itemList) @@ -84,7 +84,7 @@ public class BaseItemBrain extends Item{ } // This code will allow us to tell the items apart in game. You can change - @SuppressWarnings("unchecked") + @SuppressWarnings({ "rawtypes", "unchecked" }) // texture based on nbt data, but I won't be covering that. @Override @SideOnly(Side.CLIENT) diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java b/src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java index 38c0ee567f..33d7602b4e 100644 --- a/src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java +++ b/src/Java/gtPlusPlus/core/item/base/BaseItemWithCharge.java @@ -26,6 +26,7 @@ public class BaseItemWithCharge extends Item{ this.int_Max_Charge = constructor_Max_Charge; } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { int NBT_Charge = this.int_Charge; diff --git a/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java b/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java index f856185cdb..4bff33493e 100644 --- a/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java +++ b/src/Java/gtPlusPlus/core/item/base/BasicSpawnEgg.java @@ -185,6 +185,7 @@ public class BasicSpawnEgg extends ItemMonsterPlacer /** * returns a list of items with the same ID, but different meta (eg: dye returns 16 items) */ + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override @SideOnly(Side.CLIENT) public void getSubItems(final Item parItem, final CreativeTabs parTab, final List parList){ diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java index 0f287fc80d..4771e15258 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustUnique.java @@ -9,14 +9,11 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.StringUtils; import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.entity.EntityUtils; import gtPlusPlus.core.util.item.ItemUtils; import gtPlusPlus.core.util.math.MathUtils; -import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.world.World; public class BaseItemDustUnique extends Item{ @@ -98,6 +95,7 @@ public class BaseItemDustUnique extends Item{ protected final int sRadiation; + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { if (this.sRadiation > 0){ diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java b/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java index 981e78a563..aff5431e9d 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemCentidust.java @@ -35,6 +35,7 @@ public class BaseItemCentidust extends Item{ return (this.materialName+ " Centidust"); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("")){ diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java b/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java index 1db3520136..ce68c36d96 100644 --- a/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java +++ b/src/Java/gtPlusPlus/core/item/base/dusts/decimal/BaseItemDecidust.java @@ -35,6 +35,7 @@ public class BaseItemDecidust extends Item{ return (this.materialName+ " Decidust"); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("")){ diff --git a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java index 69be546843..0467d2647e 100644 --- a/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java +++ b/src/Java/gtPlusPlus/core/item/base/foods/BaseItemHotFood.java @@ -56,6 +56,7 @@ public class BaseItemHotFood extends BaseItemFood{ super.onUpdate(iStack, world, entityHolding, p_77663_4_, p_77663_5_); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void addInformation(final ItemStack stack, final EntityPlayer aPlayer, final List list, final boolean bool) { if ((this.materialName != null) && (this.materialName != "") && !this.materialName.equals("")){ diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java index 875990a12e..47f225f53c 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_Refinery.java @@ -68,67 +68,6 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc public Object getClientGUI(final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) { return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "LFTR.png"); } - - /*@Override - public boolean checkRecipe(final ItemStack aStack) { - - ArrayList tFluidList = getStoredFluids(); - for (int i = 0; i < tFluidList.size() - 1; i++) { - for (int j = i + 1; j < tFluidList.size(); j++) { - if (GT_Utility.areFluidsEqual((FluidStack) tFluidList.get(i), (FluidStack) tFluidList.get(j))) { - if (((FluidStack) tFluidList.get(i)).amount >= ((FluidStack) tFluidList.get(j)).amount) { - tFluidList.remove(j--); - } else { - tFluidList.remove(i--); - break; - } - } - } - } - - long tVoltage = getMaxInputVoltage(); - byte tTier = (byte) Math.max(1, GT_Utility.getTier(tVoltage)); - FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]); - if (tFluids.length > 0) { - Utils.LOG_INFO("Good Recipe. [1]"); - for(int i = 0;i 0) { - this.mEUt = (-this.mEUt); - } - this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); - this.mOutputItems = new ItemStack[]{tRecipe.getOutput(0)}; - this.mOutputFluids = tRecipe.mFluidOutputs.clone(); - updateSlots(); - return true; - } - } - else { - Utils.LOG_INFO("Could not find valid Recipe. [1]"); - } - } - } - Utils.LOG_INFO("Bad Recipe. [1]"); - return false; - }*/ @Override public boolean checkRecipe(ItemStack aStack) { @@ -148,18 +87,17 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc } if (tFluidList.size() > 1) { FluidStack[] tFluids = tFluidList.toArray(new FluidStack[tFluidList.size()]); - GT_Recipe tRecipe = GT_Recipe.GT_Recipe_Map.sFusionRecipes.findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, GT_Values.V[4], tFluids, new ItemStack[]{}); - if ((tRecipe == null && !mRunningOnLoad) || (maxEUStore() < tRecipe.mSpecialValue)) { + GT_Recipe tRecipe = CustomRecipeMap.sFissionFuelProcessing.findRecipe(this.getBaseMetaTileEntity(), this.mLastRecipe, false, GT_Values.V[4], tFluids, new ItemStack[]{}); + if (tRecipe == null) { this.mLastRecipe = null; return false; } - if (mRunningOnLoad || tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[]{})) { + if (tRecipe.isRecipeInputEqual(true, tFluids, new ItemStack[]{})) { this.mLastRecipe = tRecipe; this.mEUt = this.mLastRecipe.mEUt; this.mMaxProgresstime = this.mLastRecipe.mDuration; this.mEfficiencyIncrease = 10000; this.mOutputFluids = this.mLastRecipe.mFluidOutputs; - mRunningOnLoad = false; return true; } } @@ -178,11 +116,11 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc if ((!this.addToMachineList(tTileEntity, TAE.GTPP_INDEX(18))) && (!this.addEnergyInputToMachineList(tTileEntity, TAE.GTPP_INDEX(18)))) { if (aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j) != ModBlocks.blockCasings2Misc) { - Utils.LOG_INFO("1 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, Y, zDir).getLocalizedName()); + Utils.LOG_INFO("1 Wrong Block. Found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j).getLocalizedName()); return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, Y, zDir + j) != 2) { - Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, Y, zDir).getLocalizedName()+" | Expected Meta 2 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, Y, zDir)); + Utils.LOG_INFO("1 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir + i, Y, zDir + j).getLocalizedName()+" | Expected Meta 2 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir + i, Y, zDir + j)); return false; } } @@ -200,7 +138,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, Y, zDir + j) != 2) { - Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, Y, zDir).getLocalizedName()+" | Expected Meta 2 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, Y, zDir)); + Utils.LOG_INFO("2 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, Y, zDir).getLocalizedName()+" | Expected Meta 2 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, Y, zDir)); return false; } } @@ -217,7 +155,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir) != 3) { - Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 3 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); + Utils.LOG_INFO("3 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 3 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); return false; } } @@ -227,7 +165,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir, y + 1, zDir) != 1) { - Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y+1, zDir).getLocalizedName()+" | Expected Meta 1 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y + 1, zDir)); + Utils.LOG_INFO("8 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y+1, zDir).getLocalizedName()+" | Expected Meta 1 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y + 1, zDir)); return false; } } @@ -236,7 +174,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc if (y==3){ if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) { if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) { - Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); + Utils.LOG_INFO("4 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); return false; } Utils.LOG_INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y)); @@ -253,7 +191,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc if (y==3){ if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) { if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) { - Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); + Utils.LOG_INFO("5 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); return false; } Utils.LOG_INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y)); @@ -270,7 +208,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc if (y==3){ if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) { if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) { - Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); + Utils.LOG_INFO("6 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); return false; } Utils.LOG_INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y)); @@ -286,7 +224,7 @@ public class GregtechMetaTileEntity_Refinery extends GT_MetaTileEntity_MultiBloc if (y==3){ if (aBaseMetaTileEntity.getBlockOffset(xDir + 1, y, zDir) == ModBlocks.blockCasingsMisc) { if (aBaseMetaTileEntity.getMetaIDOffset(xDir + 1, y, zDir) != 13) { - Utils.LOG_INFO("Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); + Utils.LOG_INFO("7 Wrong Meta. Found "+aBaseMetaTileEntity.getBlockOffset(xDir, y, zDir).getLocalizedName()+" | Expected Meta 13 | Got Meta "+aBaseMetaTileEntity.getMetaIDOffset(xDir, y, zDir)); return false; } Utils.LOG_INFO("Found Zeron-Casing at "+(aBaseMetaTileEntity.getYCoord()+y)); diff --git a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java index 7038d98a7d..4c4984a3b6 100644 --- a/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java +++ b/src/Java/gtPlusPlus/xmod/ic2/block/RTGGenerator/BlockRTG.java @@ -42,6 +42,7 @@ extends BlockMultiID GameRegistry.registerTileEntity(TileEntityKineticWindGenerator.class, "Wind Ripper Mach II"); } + @SuppressWarnings({ "rawtypes", "unchecked" }) @Override public void getSubBlocks(final Item j, final CreativeTabs tabs, final List itemList) { final Item item = Item.getItemFromBlock(this); -- cgit