diff options
Diffstat (limited to 'src/main')
3 files changed, 20 insertions, 10 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java index 1ee64e26c4..504f149dc4 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/GTMetaTileEntity/NeutronAccelerator.java @@ -10,8 +10,6 @@ import static gregtech.api.enums.GT_Values.V; public class NeutronAccelerator extends GT_MetaTileEntity_Hatch_Energy { - public boolean isRunning; - public NeutronAccelerator(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); } @@ -27,13 +25,11 @@ public class NeutronAccelerator extends GT_MetaTileEntity_Hatch_Energy { @Override public void loadNBTData(NBTTagCompound aNBT) { super.loadNBTData(aNBT); - this.isRunning = aNBT.getBoolean("isRunning"); } @Override public void saveNBTData(NBTTagCompound aNBT) { super.saveNBTData(aNBT); - aNBT.setBoolean("isRunning", this.isRunning); } @Override @@ -53,12 +49,12 @@ public class NeutronAccelerator extends GT_MetaTileEntity_Hatch_Energy { @Override public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { - if (this.getBaseMetaTileEntity().isServerSide()) { + if (aBaseMetaTileEntity.isServerSide()) { if (aBaseMetaTileEntity.getStoredEU() >= getMaxEUConsume() && aBaseMetaTileEntity.isAllowedToWork()) { setEUVar(aBaseMetaTileEntity.getStoredEU() - getMaxEUConsume()); - isRunning = true; + aBaseMetaTileEntity.setActive(true); } else { - isRunning = false; + aBaseMetaTileEntity.setActive(false); } } super.onPostTick(aBaseMetaTileEntity, aTick); diff --git a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java index 22d3d38904..40cd1ef6dd 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/NeutronActivator.java @@ -330,7 +330,7 @@ public class NeutronActivator extends GT_MetaTileEntity_MultiblockBase_EM implem public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { super.onPostTick(aBaseMetaTileEntity, aTick); boolean anyWorking = false; - if (this.getBaseMetaTileEntity().isServerSide()) { + if (aBaseMetaTileEntity.isServerSide()) { for (ItemStack input : getStoredInputs()) { if (input.isItemEqual(Materials.Graphite.getDust(1)) || input.isItemEqual(Materials.Beryllium.getDust(1))) { @@ -341,7 +341,7 @@ public class NeutronActivator extends GT_MetaTileEntity_MultiblockBase_EM implem } for (NeutronAccelerator tHatch : mNeutronAccelerator) { - if (tHatch.isRunning && this.getRepairStatus() == this.getIdealStatus()) { + if (tHatch.getBaseMetaTileEntity().isActive() && this.getRepairStatus() == this.getIdealStatus()) { anyWorking = true; this.eV += Math.max(nextInt(tHatch.getMaxEUConsume(), tHatch.getMaxEUConsume() * 2 + 1) * 10 * Math.pow(0.95, height - 4), 10); } @@ -413,7 +413,7 @@ public class NeutronActivator extends GT_MetaTileEntity_MultiblockBase_EM implem int currentNKEInput = 0; boolean anyWorking = false; for (NeutronAccelerator tHatch : mNeutronAccelerator) { - if (tHatch.isRunning) { + if (tHatch.getBaseMetaTileEntity().isActive()) { currentNKEInput += nextInt(tHatch.getMaxEUConsume(), tHatch.getMaxEUConsume() * 2 + 1) * 10 * Math.pow(0.95, height - 4); anyWorking = true; } diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index f4be8c4695..77ece93202 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -23,6 +23,20 @@ public class RecipeLoader_02 { public static void RecipeLoad(){ + GT_Values.RA.addAssemblerRecipe( + new ItemStack[]{ + GT_OreDictUnificator.get(OrePrefixes.pipeLarge, Materials.StainlessSteel,1), + GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlueAlloy,1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorHV,32), + GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Beryllium,32), + GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Elite,1) + }, + null, + ItemRefer.Speeding_Pipe.get(1), + 300, + 1920 + ); + // Compact MK1 Fusion Disassembly Recipe GT_Values.RA.addAssemblerRecipe( new ItemStack[]{ |