diff options
3 files changed, 52 insertions, 10 deletions
diff --git a/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java b/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java index e7ba056ad7..a4eff70edd 100644 --- a/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java +++ b/src/main/java/goodgenerator/blocks/tileEntity/MTEFuelRefineFactory.java @@ -7,6 +7,7 @@ import static com.gtnewhorizon.structurelib.structure.StructureUtility.transpose import static gregtech.api.util.GTStructureUtility.buildHatchAdder; import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.StatCollector; @@ -45,6 +46,7 @@ import gregtech.api.recipe.check.CheckRecipeResult; import gregtech.api.recipe.check.CheckRecipeResultRegistry; import gregtech.api.render.TextureFactory; import gregtech.api.util.GTRecipe; +import gregtech.api.util.GTUtility; import gregtech.api.util.MultiblockTooltipBuilder; import gregtech.api.util.OverclockCalculator; import tectech.thing.metaTileEntity.hatch.MTEHatchEnergyMulti; @@ -254,7 +256,7 @@ public class MTEFuelRefineFactory extends MTETooltipMultiBlockBaseEM implements int overclockAmount = Tier - recipe.mSpecialValue; return super.createOverclockCalculator(recipe).limitOverclockCount(overclockAmount); } - }.setOverclock(4.0, 4.0); // Set Overclock to be 2/2 + }.setOverclock(4.0, 4.0); // Set Overclock to be 4/4 } @Override @@ -330,6 +332,21 @@ public class MTEFuelRefineFactory extends MTETooltipMultiBlockBaseEM implements } @Override + public boolean onWireCutterRightClick(ForgeDirection side, ForgeDirection wrenchingSide, EntityPlayer aPlayer, + float aX, float aY, float aZ, ItemStack aTool) { + if (aPlayer.isSneaking()) { + batchMode = !batchMode; + if (batchMode) { + GTUtility.sendChatToPlayer(aPlayer, "Batch recipes."); + } else { + GTUtility.sendChatToPlayer(aPlayer, "Don't batch recipes."); + } + } + + return true; + } + + @Override public boolean supportsBatchMode() { return true; } diff --git a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java index 0b063106d0..6e11e1a85d 100644 --- a/src/main/java/goodgenerator/loader/FuelRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/FuelRecipeLoader.java @@ -132,7 +132,7 @@ public class FuelRecipeLoader { new FluidStack(FluidRegistry.getFluid("molten.hypogen"), 120), new FluidStack(FluidRegistry.getFluid("molten.chromaticglass"), 6480)) .fluidOutputs(GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(250)) - .duration(10 * TICKS) + .duration(2 * TICKS) .eut(350_000_000) .metadata(NFR_COIL_TIER, 4) .noOptimize() @@ -156,14 +156,15 @@ public class FuelRecipeLoader { // Alternate higher tier recipe GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.SpaceTime, 4), GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.TranscendentMetal, 16), GGMaterial.atomicSeparationCatalyst.get(OrePrefixes.dust, 48)) .fluidInputs( GGMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000), - FluidRegistry.getFluidStack("heavyradox", 250)) + FluidRegistry.getFluidStack("heavyradox", 250), + MaterialsUEVplus.Mellion.getMolten(288L), + MaterialsUEVplus.Creon.getMolten(288L)) .fluidOutputs(GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(750)) - .duration(5 * SECONDS) + .duration(2 * SECONDS + 10 * TICKS) .eut(300_000_000) .metadata(NFR_COIL_TIER, 3) .noOptimize() @@ -177,7 +178,7 @@ public class FuelRecipeLoader { .fluidInputs( GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000), FluidRegistry.getFluidStack("molten.shirabon", 360)) - .fluidOutputs(GGMaterial.naquadahBasedFuelMkVI.getFluidOrGas(500)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkVI.getFluidOrGas(750)) .duration(12 * SECONDS) .eut(320_000_000) .metadata(NFR_COIL_TIER, 3) @@ -187,14 +188,14 @@ public class FuelRecipeLoader { // Alternate higher tier recipe GTValues.RA.stdBuilder() .itemInputs( - GTOreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.WhiteDwarfMatter, 4), MaterialsElements.STANDALONE.CELESTIAL_TUNGSTEN.getDust(64), GTOreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 48)) .fluidInputs( GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000), - FluidRegistry.getFluidStack("molten.shirabon", 360)) - .fluidOutputs(GGMaterial.naquadahBasedFuelMkVI.getFluidOrGas(750)) - .duration(4 * SECONDS) + FluidRegistry.getFluidStack("molten.shirabon", 360), + MaterialsUEVplus.RawStarMatter.getFluid(60L)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkVI.getFluidOrGas(1250)) + .duration(3 * SECONDS) .eut(TierEU.RECIPE_UXV) .metadata(NFR_COIL_TIER, 4) .noOptimize() diff --git a/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java index aaba3ac759..cd9e53c616 100644 --- a/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java +++ b/src/main/java/goodgenerator/loader/NeutronActivatorLoader.java @@ -12,7 +12,9 @@ import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; import static gregtech.api.util.GTRecipeConstants.NKE_RANGE; +import goodgenerator.items.GGMaterial; import gregtech.api.enums.GTValues; +import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GTOreDictUnificator; @@ -48,5 +50,27 @@ public class NeutronActivatorLoader { .noOptimize() .addTo(neutronActivatorRecipes); + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Tesseract.get(1)) + .fluidInputs(GGMaterial.naquadahBasedFuelMkV.getFluidOrGas(64)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(64)) + .itemOutputs(ItemList.EnergisedTesseract.get(1)) + .duration(16400 * SECONDS) + .eut(0) + .metadata(NKE_RANGE, computeRangeNKE(1100, 1050)) + .noOptimize() + .addTo(neutronActivatorRecipes); + + GTValues.RA.stdBuilder() + .itemInputs(ItemList.Tesseract.get(1)) + .fluidInputs(GGMaterial.naquadahBasedFuelMkVI.getFluidOrGas(64)) + .fluidOutputs(GGMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(64)) + .itemOutputs(ItemList.EnergisedTesseract.get(1)) + .duration(24600 * SECONDS) + .eut(0) + .metadata(NKE_RANGE, computeRangeNKE(1100, 1075)) + .noOptimize() + .addTo(neutronActivatorRecipes); + } } |