diff options
| author | Technus <daniel112092@gmail.com> | 2017-07-22 15:09:46 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-07-22 15:09:46 +0200 |
| commit | 3f026875a31de2094a3af282a72ba87adc9a787d (patch) | |
| tree | 1b6154dcdb08dc127cb40c67d7ca97b5872603d2 /src/main/java/gregtech/common/tileentities | |
| parent | 534126e4806d56852116924dcc24e96886ea6056 (diff) | |
| parent | 677192c35309ef7ecc093dccf3b529e3f2ebb1ba (diff) | |
| download | GT5-Unofficial-3f026875a31de2094a3af282a72ba87adc9a787d.tar.gz GT5-Unofficial-3f026875a31de2094a3af282a72ba87adc9a787d.tar.bz2 GT5-Unofficial-3f026875a31de2094a3af282a72ba87adc9a787d.zip | |
Merge branch 'experimental' of https://github.com/GTNewHorizons/GT5-Unofficial into experimental
Diffstat (limited to 'src/main/java/gregtech/common/tileentities')
2 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java index eae624ae49..f8148d5974 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java @@ -28,9 +28,9 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine { int drillX, drillY, drillZ; boolean isPickingPipes; boolean waitMiningPipe; - final static int[] RADIUS = new int[]{8, 8, 16, 24}; //Miner radius per tier - final static int[] SPEED = new int[]{160, 160, 80, 40}; //Miner cycle time per tier - final static int[] ENERGY = new int[]{8, 8, 32, 128}; //Miner energy consumption per tier + final static int[] RADIUS = new int[]{8, 8, 16, 24, 32}; //Miner radius per tier + final static int[] SPEED = new int[]{160, 160, 80, 40, 20}; //Miner cycle time per tier + final static int[] ENERGY = new int[]{8, 8, 32, 128, 512}; //Miner energy consumption per tier public GT_MetaTileEntity_Miner(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, 1, "Digging ore instead of you", 2, 2, "Miner.png", "", new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_SIDE_ACTIVE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_SIDE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_FRONT_ACTIVE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_FRONT")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_TOP_ACTIVE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_TOP")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_BOTTOM_ACTIVE")), new GT_RenderedTexture(new Textures.BlockIcons.CustomIcon("basicmachines/miner/OVERLAY_BOTTOM"))); diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java index 18cd5bd74a..c8f5a4aa8a 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeChemicalReactor.java @@ -86,6 +86,7 @@ public class GT_MetaTileEntity_LargeChemicalReactor extends GT_MetaTileEntity_Mu } } } + tInputList.add(mInventory[1]); ItemStack[] inputs = tInputList.toArray(new ItemStack[tInputList.size()]); ArrayList<FluidStack> tFluidList = getStoredFluids(); |