diff options
| author | Draknyte1 <Draknyte1@hotmail.com> | 2016-11-14 02:59:55 +1000 |
|---|---|---|
| committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-11-14 02:59:55 +1000 |
| commit | 4140196b5fbf9d562aac74c03a39987e1801e99e (patch) | |
| tree | 4007d89b7c8c3178dcbcc24dc3b2c78dd04237e9 /src/Java/gtPlusPlus | |
| parent | 5209e2b9ea0741902be58e354d4bd54b5ad15af4 (diff) | |
| download | GT5-Unofficial-4140196b5fbf9d562aac74c03a39987e1801e99e.tar.gz GT5-Unofficial-4140196b5fbf9d562aac74c03a39987e1801e99e.tar.bz2 GT5-Unofficial-4140196b5fbf9d562aac74c03a39987e1801e99e.zip | |
% Changed the way Forestry blocks are handled, should stop overrides of the default Alveary components.
$ Changed recipe checking of the Alloy Smelter, instead of only checking the first two slots, it now will check a dynamic size. Should fix #36.
Diffstat (limited to 'src/Java/gtPlusPlus')
3 files changed, 5 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java index f087ad75f4..bf632ef039 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/alveary/FR_BlockAlveary.java @@ -18,12 +18,12 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import forestry.apiculture.MaterialBeehive; import forestry.apiculture.multiblock.TileAlvearyPlain; -import forestry.core.blocks.BlockStructure; +import forestry.core.blocks.BlockForestry; import forestry.core.render.TextureManager; import gtPlusPlus.GTplusplus; import gtPlusPlus.core.creative.AddToCreativeTab; -public class FR_BlockAlveary extends BlockStructure +public class FR_BlockAlveary extends BlockForestry { public static enum Type diff --git a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java index 51d0dea31b..f3d751690e 100644 --- a/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java +++ b/src/Java/gtPlusPlus/xmod/forestry/bees/items/FR_ItemRegistry.java @@ -41,8 +41,6 @@ public class FR_ItemRegistry { public static MB_ItemFrame hiveFrameClay; public static MB_ItemFrame hiveFrameNova; - //Alveary Stuff - public static FR_BlockAlveary alveary; public static void Register() { @@ -68,7 +66,8 @@ public class FR_ItemRegistry { hiveFrameSoul = new MB_ItemFrame(MB_FrameType.SOUL, EnumRarity.common, ""); hiveFrameClay = new MB_ItemFrame(MB_FrameType.CLAY, EnumRarity.common, ""); hiveFrameNova = new MB_ItemFrame(MB_FrameType.NOVA, EnumRarity.epic, "A Creative Only Frame."); - if (CORE.configSwitches.enableCustomAlvearyBlocks){ + if (CORE.configSwitches.enableCustomAlvearyBlocks){//Alveary Stuff + FR_BlockAlveary alveary; alveary = registerBlock(new FR_BlockAlveary(), ItemBlockForestry.class, "alveary"); } } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java index 3fbc961fa9..4de7048ffd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_AlloyBlastSmelter.java @@ -94,7 +94,7 @@ public class GregtechMetaTileEntity_AlloyBlastSmelter } } } - ItemStack[] tInputs = (ItemStack[]) Arrays.copyOfRange(tInputList.toArray(new ItemStack[tInputList.size()]), 0, 2); + ItemStack[] tInputs = (ItemStack[]) Arrays.copyOfRange(tInputList.toArray(new ItemStack[tInputList.size()]), 0, tInputList.size()); ArrayList<FluidStack> tFluidList = getStoredFluids(); for (int i = 0; i < tFluidList.size() - 1; i++) { |