From 15a80c855b7eaeda9f9f2945da76cb7407b35af7 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Thu, 6 Jun 2024 07:24:09 -0500 Subject: [PATCH] fix: reviews part 1 --- .../multiblock/IControlRodPort.java | 6 ++- .../multiblock/IFissionReactorHatch.java | 4 -- .../api/nuclear/fission/FissionReactor.java | 2 +- .../fission/components/CoolantChannel.java | 2 + .../materials/FirstDegreeMaterials.java | 4 +- .../materials/MaterialFlagAddition.java | 2 +- .../material/properties/CoolantProperty.java | 12 +++--- .../properties/FissionFuelProperty.java | 7 +++- .../java/gregtech/common/ConfigHolder.java | 1 + .../blocks/BlockGasCentrifugeCasing.java | 3 +- .../common/blocks/BlockNuclearCasing.java | 3 +- .../multi/MetaTileEntityFissionReactor.java | 20 ++++----- .../electric/MetaTileEntityGasCentrifuge.java | 2 +- .../MetaTileEntityCoolantExportHatch.java | 6 --- .../MetaTileEntityCoolantImportHatch.java | 6 --- .../MetaTileEntityFuelRodExportHatch.java | 6 --- .../MetaTileEntityFuelRodImportHatch.java | 6 --- .../loaders/recipe/MachineRecipeLoader.java | 4 +- .../loaders/recipe/MetaTileEntityLoader.java | 9 ++-- .../recipe/chemistry/NuclearRecipes.java | 42 ++++--------------- .../resources/assets/gregtech/lang/en_us.lang | 6 +-- 21 files changed, 53 insertions(+), 100 deletions(-) diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/IControlRodPort.java b/src/main/java/gregtech/api/metatileentity/multiblock/IControlRodPort.java index f43a15533f7..b8bed76b57a 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/IControlRodPort.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/IControlRodPort.java @@ -1,5 +1,9 @@ package gregtech.api.metatileentity.multiblock; public interface IControlRodPort { - // Allows for a special multiblock ability. + + /** + * Whether it has a moderator tip, which would increase k_eff at certain control rod insertion values. + */ + boolean hasModeratorTip(); } diff --git a/src/main/java/gregtech/api/metatileentity/multiblock/IFissionReactorHatch.java b/src/main/java/gregtech/api/metatileentity/multiblock/IFissionReactorHatch.java index e0f49bbce61..693c8ee12ef 100644 --- a/src/main/java/gregtech/api/metatileentity/multiblock/IFissionReactorHatch.java +++ b/src/main/java/gregtech/api/metatileentity/multiblock/IFissionReactorHatch.java @@ -8,8 +8,4 @@ public interface IFissionReactorHatch { * @return If the channel directly below the hatch is valid or not */ boolean checkValidity(int depth); - - boolean isValid(); - - void setValid(boolean valid); } diff --git a/src/main/java/gregtech/api/nuclear/fission/FissionReactor.java b/src/main/java/gregtech/api/nuclear/fission/FissionReactor.java index b7b22854d90..601baf36d65 100644 --- a/src/main/java/gregtech/api/nuclear/fission/FissionReactor.java +++ b/src/main/java/gregtech/api/nuclear/fission/FissionReactor.java @@ -456,7 +456,7 @@ public void makeCoolantFlow(int flowRate) { double heatRemovedPerLiter = prop.getSpecificHeatCapacity() * (prop.getHotHPCoolant().getFluid().getTemperature() - coolant.getFluid().getTemperature()) / - prop.getSadgeCoefficient(); + prop.getSpecialCoolantAbsorption(); // Explained by: // https://physics.stackexchange.com/questions/153434/heat-transfer-between-the-bulk-of-the-fluid-inside-the-pipe-and-the-pipe-externa double heatFluxPerAreaAndTemp = 1 / diff --git a/src/main/java/gregtech/api/nuclear/fission/components/CoolantChannel.java b/src/main/java/gregtech/api/nuclear/fission/components/CoolantChannel.java index 538e01b57e9..af417d5d14b 100644 --- a/src/main/java/gregtech/api/nuclear/fission/components/CoolantChannel.java +++ b/src/main/java/gregtech/api/nuclear/fission/components/CoolantChannel.java @@ -18,6 +18,8 @@ public class CoolantChannel extends ReactorComponent { private ICoolantHandler inputHandler; private ICoolantHandler outputHandler; + + // Allows fission reactors to heat up less than a full liter of coolant. public double partialCoolant; public CoolantChannel(double maxTemperature, double thermalConductivity, Material coolant, double mass, diff --git a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java index 82b8a56485c..1a65b1850c2 100644 --- a/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java +++ b/src/main/java/gregtech/api/unification/material/materials/FirstDegreeMaterials.java @@ -1591,7 +1591,7 @@ public static void register() { .ingot() .color(0x566570).iconSet(METALLIC) .flags(GENERATE_RING) - .components(Zirconium, 9, Tin, 1) + .components(Zirconium, 16, Tin, 2, Chrome, 1) .blast(1700, GasTier.LOW) .build(); @@ -1646,7 +1646,7 @@ public static void register() { .blastTemp(1610, GasTier.MID, GTValues.VA[EV], 200) .fluidPipeProperties(2010, 175, true, true, true, false) .build() - .setFormula("Ni50Cr20Fe20Ni5Mo3", true); + .setFormula("Ni5Cr2Fe2NbMo", true); HighEnrichedUraniumHexafluoride = new Material.Builder(464, gregtechId("high_enriched_uranium_hexafluoride")) .gas() diff --git a/src/main/java/gregtech/api/unification/material/materials/MaterialFlagAddition.java b/src/main/java/gregtech/api/unification/material/materials/MaterialFlagAddition.java index 77f7ffcbb7a..f0a448f2b81 100644 --- a/src/main/java/gregtech/api/unification/material/materials/MaterialFlagAddition.java +++ b/src/main/java/gregtech/api/unification/material/materials/MaterialFlagAddition.java @@ -413,7 +413,7 @@ public static void register() { */ DistilledWater.setProperty(PropertyKey.COOLANT, new CoolantProperty(Steam, HighPressureSteam, 1., 1000, - 373, 10., FissionReactor.standardPressure, 2260000, 4168).setSadgeCoefficient(1000) + 373, 10., FissionReactor.standardPressure, 2260000, 4168).setSpecialCoolantAbsorption(1000) .setAccumulatesHydrogen(true)); } } diff --git a/src/main/java/gregtech/api/unification/material/properties/CoolantProperty.java b/src/main/java/gregtech/api/unification/material/properties/CoolantProperty.java index 08f8be5173f..46b012ccf6e 100644 --- a/src/main/java/gregtech/api/unification/material/properties/CoolantProperty.java +++ b/src/main/java/gregtech/api/unification/material/properties/CoolantProperty.java @@ -22,7 +22,7 @@ public class CoolantProperty implements IMaterialProperty { private double heatOfVaporization; // in J/(kg*K) private double specificHeatCapacity; - private double sadgeCoefficient = 1; + private double specialCoolantAbsorption = 1; private boolean accumulatesHydrogen = false; public CoolantProperty(Material hotCoolant, Material hotHPCoolant, double moderatorFactor, double coolingFactor, @@ -116,20 +116,20 @@ public void setSpecificHeatCapacity(double specificHeatCapacity) { this.specificHeatCapacity = specificHeatCapacity; } - public double getSadgeCoefficient() { - return sadgeCoefficient; + public double getSpecialCoolantAbsorption() { + return specialCoolantAbsorption; } /** * Used to adjust the amount of heat needed to heat the coolant from the ideal thermodynamic conditions; this is * really only for distilled water. * - * @param sadgeCoefficient A divisor to the amount of heat needed to heat the coolant from the ideal thermodynamic + * @param specialCoolantAbsorption A divisor to the amount of heat needed to heat the coolant from the ideal thermodynamic * conditions. * @return The property itself. */ - public CoolantProperty setSadgeCoefficient(double sadgeCoefficient) { - this.sadgeCoefficient = sadgeCoefficient; + public CoolantProperty setSpecialCoolantAbsorption(double specialCoolantAbsorption) { + this.specialCoolantAbsorption = specialCoolantAbsorption; return this; } diff --git a/src/main/java/gregtech/api/unification/material/properties/FissionFuelProperty.java b/src/main/java/gregtech/api/unification/material/properties/FissionFuelProperty.java index d686e0ae056..4e19a977182 100644 --- a/src/main/java/gregtech/api/unification/material/properties/FissionFuelProperty.java +++ b/src/main/java/gregtech/api/unification/material/properties/FissionFuelProperty.java @@ -1,12 +1,17 @@ package gregtech.api.unification.material.properties; public class FissionFuelProperty implements IMaterialProperty { - + // The max temperature the fuel can handle before it liquefies. private int maxTemperature; + // Scales how long the fuel rod lasts in the reactor. private int duration; + // How likely it is to absorb a neutron that had touched a moderator. private double slowNeutronCaptureCrossSection; + // How likely it is to absorb a neutron that has not yet touched a moderator. private double fastNeutronCaptureCrossSection; + // How likely it is for a moderated neutron to cause fission in this fuel. private double slowNeutronFissionCrossSection; + // How likely it is for a not-yet-moderated neutron to cause fission in this fuel. private double fastNeutronFissionCrossSection; @Override diff --git a/src/main/java/gregtech/common/ConfigHolder.java b/src/main/java/gregtech/common/ConfigHolder.java index c51b9c2f7ad..d34eb27b7c9 100644 --- a/src/main/java/gregtech/common/ConfigHolder.java +++ b/src/main/java/gregtech/common/ConfigHolder.java @@ -91,6 +91,7 @@ public static class MachineOptions { public double multiblockSteamToEU = 0.5; @Config.Comment({ "Nuclear Max Power multiplier for balancing purposes", "Default: 2.0" }) + @Config.RangeDouble(min = 0, max = 10000) public double nuclearPowerMultiplier = 2.0; @Config.Comment({ "Whether machines or boilers damage the terrain when they explode.", diff --git a/src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java b/src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java index de487915754..2fb22fd7b1c 100644 --- a/src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java +++ b/src/main/java/gregtech/common/blocks/BlockGasCentrifugeCasing.java @@ -26,7 +26,8 @@ public boolean isOpaqueCube(IBlockState state) { public enum GasCentrifugeCasingType implements IStringSerializable, IStateHarvestLevel { - GAS_CENTRIFUGE_COLUMN("gas_centrifuge_column", 2); + GAS_CENTRIFUGE_COLUMN("gas_centrifuge_column", 2), + GAS_CENTRIFUGE_HEATER("gas_centrifuge_heater", 1); private String name; private int harvestLevel; diff --git a/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java b/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java index 1ae9d470f3a..96c82c7afca 100644 --- a/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java +++ b/src/main/java/gregtech/common/blocks/BlockNuclearCasing.java @@ -23,8 +23,7 @@ public BlockNuclearCasing() { public enum NuclearCasingType implements IStringSerializable, IStateHarvestLevel { - SPENT_FUEL_CASING("spent_fuel_casing", 2), - GAS_CENTRIFUGE_HEATER("gas_centrifuge_heater", 1); + SPENT_FUEL_CASING("spent_fuel_casing", 2); NuclearCasingType(String name, int harvestLevel) { this.name = name; diff --git a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityFissionReactor.java b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityFissionReactor.java index 6d832086fbf..c894f6ee577 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityFissionReactor.java +++ b/src/main/java/gregtech/common/metatileentities/multi/MetaTileEntityFissionReactor.java @@ -2,6 +2,7 @@ import gregtech.api.GregTechAPI; import gregtech.api.capability.GregtechDataCodes; +import gregtech.api.capability.ICoolantHandler; import gregtech.api.capability.IFuelRodHandler; import gregtech.api.capability.ILockableHandler; import gregtech.api.capability.IMaintenanceHatch; @@ -15,6 +16,7 @@ import gregtech.api.metatileentity.IDataInfoProvider; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.interfaces.IGregTechTileEntity; +import gregtech.api.metatileentity.multiblock.IControlRodPort; import gregtech.api.metatileentity.multiblock.IFissionReactorHatch; import gregtech.api.metatileentity.multiblock.IMultiblockPart; import gregtech.api.metatileentity.multiblock.MultiblockAbility; @@ -45,7 +47,6 @@ import gregtech.common.blocks.BlockFissionCasing; import gregtech.common.blocks.MetaBlocks; import gregtech.common.metatileentities.MetaTileEntities; -import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityControlRodPort; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityCoolantExportHatch; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityCoolantImportHatch; import gregtech.common.metatileentities.multi.multiblockpart.MetaTileEntityFuelRodImportHatch; @@ -270,9 +271,6 @@ public void updateFormedValid() { this.updateReactorState(); this.syncReactorStats(); - if (this.fissionReactor.checkForMeltdown()) { - SoundManager.getInstance().startTileSound(GTSoundEvents.SUS_RECORD.getSoundName(), 1, this.getPos()); - } if (this.fissionReactor.checkForMeltdown()) { this.performMeltdownEffects(); } @@ -678,11 +676,11 @@ private void lockAndPrepareReactor() { ReactorComponent component = null; boolean foundPort = true; - if (mte instanceof MetaTileEntityCoolantImportHatch coolantIn) { - FluidStack containedFluid = coolantIn.getImportFluids().getTankAt(0).getFluid(); + if (mte instanceof ICoolantHandler coolantIn) { + FluidStack containedFluid = coolantIn.getFluidTank().getFluid(); if (containedFluid != null) { Material mat = GregTechAPI.materialManager.getMaterial( - coolantIn.getImportFluids().getTankAt(0).getFluid().getFluid().getName()); + containedFluid.getFluid().getName()); if (mat != null && mat.hasProperty(PropertyKey.COOLANT)) { coolantIn.setCoolant(mat); BlockPos exportHatchPos = currentPos.offset(EnumFacing.DOWN, height - 1); @@ -696,9 +694,9 @@ private void lockAndPrepareReactor() { } } } - } else if (mte instanceof MetaTileEntityFuelRodImportHatch fuelIn) { - ItemStack lockedFuel = fuelIn.getImportItems().getStackInSlot(0); - if (lockedFuel != null && !lockedFuel.isEmpty()) { + } else if (mte instanceof IFuelRodHandler fuelIn) { + ItemStack lockedFuel = fuelIn.getStackHandler().getStackInSlot(0); + if (!lockedFuel.isEmpty()) { MaterialStack mat = OreDictUnifier.getMaterial(lockedFuel); if (mat != null && OreDictUnifier.getPrefix(lockedFuel) == OrePrefix.fuelRod) { FissionFuelProperty property = mat.material.getProperty(PropertyKey.FISSION_FUEL); @@ -709,7 +707,7 @@ private void lockAndPrepareReactor() { } } } - } else if (mte instanceof MetaTileEntityControlRodPort controlIn) { + } else if (mte instanceof IControlRodPort controlIn) { component = new ControlRod(100000, controlIn.hasModeratorTip(), 1, 800); } else { foundPort = false; diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java index a9fc57d9fce..99cc4444ace 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityGasCentrifuge.java @@ -61,7 +61,7 @@ private IBlockState getPipeState() { } private IBlockState getHeaterState() { - return MetaBlocks.NUCLEAR_CASING.getState(BlockNuclearCasing.NuclearCasingType.GAS_CENTRIFUGE_HEATER); + return MetaBlocks.GAS_CENTRIFUGE_CASING.getState(BlockGasCentrifugeCasing.GasCentrifugeCasingType.GAS_CENTRIFUGE_HEATER); } private IBlockState getCentrifugeState() { diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantExportHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantExportHatch.java index d42c5861d21..be6cd2d95be 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantExportHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantExportHatch.java @@ -43,7 +43,6 @@ public class MetaTileEntityCoolantExportHatch extends MetaTileEntityMultiblockNo IControllable, IFissionReactorHatch { private boolean workingEnabled; - private boolean valid; private LockableFluidTank fluidTank; private Material coolant; @@ -150,11 +149,6 @@ public LockableFluidTank getFluidTank() { return this.fluidTank; } - @Override - public void setValid(boolean valid) { - this.valid = valid; - } - @Override public MultiblockAbility getAbility() { return MultiblockAbility.EXPORT_COOLANT; diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantImportHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantImportHatch.java index dccc5909ea7..c131ed7cf24 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantImportHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityCoolantImportHatch.java @@ -48,7 +48,6 @@ public class MetaTileEntityCoolantImportHatch extends MetaTileEntityMultiblockNo IControllable, IFissionReactorHatch { private boolean workingEnabled; - private boolean valid; private LockableFluidTank fluidTank; private Material coolant; @@ -133,11 +132,6 @@ public boolean checkValidity(int depth) { return false; } - @Override - public void setValid(boolean valid) { - this.valid = valid; - } - @Override public MultiblockAbility getAbility() { return MultiblockAbility.IMPORT_COOLANT; diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFuelRodExportHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFuelRodExportHatch.java index 472fe4eed0d..e040f847210 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFuelRodExportHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFuelRodExportHatch.java @@ -29,7 +29,6 @@ public class MetaTileEntityFuelRodExportHatch extends MetaTileEntityMultiblockNo IFissionReactorHatch { private boolean workingEnabled; - private boolean valid; public MetaTileEntityFuelRodExportHatch(ResourceLocation metaTileEntityId) { super(metaTileEntityId, 4, true); @@ -114,9 +113,4 @@ public void setFrontFacing(EnumFacing frontFacing) { public boolean checkValidity(int depth) { return true; } - - @Override - public void setValid(boolean valid) { - this.valid = valid; - } } diff --git a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFuelRodImportHatch.java b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFuelRodImportHatch.java index 56bf823169a..056c5d14cda 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFuelRodImportHatch.java +++ b/src/main/java/gregtech/common/metatileentities/multi/multiblockpart/MetaTileEntityFuelRodImportHatch.java @@ -39,7 +39,6 @@ public class MetaTileEntityFuelRodImportHatch extends MetaTileEntityMultiblockNo IControllable, IFissionReactorHatch { private boolean workingEnabled; - private boolean valid; private Material mat; public MetaTileEntityFuelRodExportHatch pairedHatch; @@ -129,11 +128,6 @@ public boolean checkValidity(int depth) { return pairedHatch != null; } - @Override - public void setValid(boolean valid) { - this.valid = valid; - } - @Override public void readFromNBT(NBTTagCompound data) { super.readFromNBT(data); diff --git a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java index 5726dc8e419..a56381e9e6c 100644 --- a/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MachineRecipeLoader.java @@ -865,8 +865,8 @@ private static void registerAssemblerRecipes() { .inputs(MetaBlocks.BOILER_CASING.getItemVariant( BlockBoilerCasing.BoilerCasingType.POLYTETRAFLUOROETHYLENE_PIPE)) .input(wireGtSingle, Nichrome, 4) - .outputs(MetaBlocks.NUCLEAR_CASING.getItemVariant( - BlockNuclearCasing.NuclearCasingType.GAS_CENTRIFUGE_HEATER)) + .outputs(MetaBlocks.GAS_CENTRIFUGE_CASING.getItemVariant( + BlockGasCentrifugeCasing.GasCentrifugeCasingType.GAS_CENTRIFUGE_HEATER)) .buildAndRegister(); ASSEMBLER_RECIPES.recipeBuilder().EUt(64).duration(200) diff --git a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java index 437c257fdcd..c503baab6ae 100644 --- a/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java +++ b/src/main/java/gregtech/loaders/recipe/MetaTileEntityLoader.java @@ -1144,12 +1144,11 @@ public static void init() { ModHandler.addShapedRecipe(true, "fission_reactor", MetaTileEntities.FISSION_REACTOR.getStackForm(), "CSC", "RHR", "CWC", - 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.EV), 'H', - MetaBlocks.FISSION_CASING.getItemVariant( - BlockFissionCasing.FissionCasingType.REACTOR_VESSEL), + 'C', new UnificationEntry(OrePrefix.circuit, MarkerMaterials.Tier.EV), + 'H', MetaBlocks.FISSION_CASING.getItemVariant(BlockFissionCasing.FissionCasingType.REACTOR_VESSEL), 'S', SENSOR.getIngredient(GTValues.EV), - 'R', new UnificationEntry(OrePrefix.rotor, Materials.Steel), 'W', - CABLE_QUAD.getIngredient(GTValues.EV)); + 'R', new UnificationEntry(OrePrefix.rotor, Materials.Steel), + 'W', CABLE_QUAD.getIngredient(GTValues.EV)); ModHandler.addShapedRecipe(true, "heat_exchanger", MetaTileEntities.HEAT_EXCHANGER.getStackForm(), "FFF", "PCP", "FFF", diff --git a/src/main/java/gregtech/loaders/recipe/chemistry/NuclearRecipes.java b/src/main/java/gregtech/loaders/recipe/chemistry/NuclearRecipes.java index b082ba98b53..2da36c0178f 100644 --- a/src/main/java/gregtech/loaders/recipe/chemistry/NuclearRecipes.java +++ b/src/main/java/gregtech/loaders/recipe/chemistry/NuclearRecipes.java @@ -10,34 +10,6 @@ public class NuclearRecipes { public static void init() { - // Thorium Fuel - /* - * CHEMICAL_RECIPES.recipeBuilder().duration(200).EUt(VA[LV]) - * .input(dust, Thorium, 1) - * .fluidInputs(Fluorine.getFluid(4000)) - * .output(dust, ThoriumTetrafluoride, 5) - * .buildAndRegister(); - * - * CHEMICAL_RECIPES.recipeBuilder().duration(100).EUt(VA[LV]) - * .input(dust, Lithium, 1) - * .fluidInputs(Fluorine.getFluid(1000)) - * .output(dust, LithiumFluoride, 2) - * .buildAndRegister(); - * - * CHEMICAL_RECIPES.recipeBuilder().duration(200).EUt(VA[LV]) - * .input(dust, Beryllium, 1) - * .fluidInputs(Fluorine.getFluid(2000)) - * .output(dust, BerylliumFluoride, 3) - * .buildAndRegister(); - * - * BLAST_RECIPES.recipeBuilder().duration(200).EUt(VA[EV]).blastFurnaceTemp(1000) - * .input(dust, ThoriumTetrafluoride, 5) - * .input(dust, LithiumFluoride, 4) - * .input(dust, BerylliumFluoride, 3) - * .fluidOutputs(ThoriumFLiBe.getFluid(4000)) - * .buildAndRegister(); - */ - // Boron carbide for spent fuel racks CHEMICAL_RECIPES.recipeBuilder().duration(200).EUt(VA[LV]) @@ -79,14 +51,14 @@ public static void init() { .input(dust, FissilePlutoniumDioxide, 1) .input(dust, Uraninite, 20) .circuitMeta(1) - .output(dust, LowGradeMOX, 1) + .output(dust, LowGradeMOX, 21) .buildAndRegister(); MIXER_RECIPES.recipeBuilder().duration(400).EUt(VA[HV]) .input(dust, FissilePlutoniumDioxide, 1) .input(dust, Uraninite, 5) .circuitMeta(2) - .output(dust, HighGradeMOX, 1) + .output(dust, HighGradeMOX, 6) .buildAndRegister(); // Zircaloy @@ -129,9 +101,9 @@ public static void init() { MIXER_RECIPES.recipeBuilder().duration(200).EUt(VA[EV]) .input(dust, Zirconium, 16) - .fluidInputs(Tin.getFluid(32)) - .fluidInputs(Chrome.getFluid(2)) - .output(dust, Zircaloy, 16) + .input(dust, Tin, 2) + .input(dust, Chrome, 1) + .output(dust, Zircaloy, 19) .buildAndRegister(); // Inconel 718 @@ -139,8 +111,8 @@ public static void init() { .input(dust, Nickel, 5) .input(dust, Chrome, 2) .input(dust, Iron, 2) - .fluidInputs(Niobium.getFluid(72)) - .fluidInputs(Molybdenum.getFluid(48)) + .input(dust, Niobium) + .input(dust, Molybdenum) .output(dust, Inconel, 10) .buildAndRegister(); diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index a374099c26c..adbb449c3bb 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -56,7 +56,7 @@ gregtech.machine.control_rod.tooltip=Requires §fControl Rod Channels§7 below i gregtech.machine.control_rod.tooltip.1=Lowers neutron multiplication as it is inserted when placed between fuel rods! gregtech.machine.control_rod_moderated.name=Graphite-Tipped Control Rod Port gregtech.machine.control_rod_moderated.tooltip=Requires §fControl Rod Channels§7 below itself to function and form. -gregtech.machine.control_rod_moderated.tooltip.1=Increases neutron multiplication when placed between fuel rods when inserted slightly! +gregtech.machine.control_rod_moderated.tooltip.1=Increases neutron multiplication when placed between fuel rods when inserted around 30%! gregtech.machine.steam_grinder.name=Steam Grinder gregtech.multiblock.steam_grinder.description=A Multiblock Macerator at the Steam Age. Requires at least 14 Bronze Casings to form. Cannot use normal Input/Output busses, nor Fluid Hatches other than the Steam Hatch. @@ -154,7 +154,7 @@ gregtech.multiblock.primitive_water_pump.extra1=Biome Coefficient:/n Ocean, Riv gregtech.multiblock.primitive_water_pump.extra2=Hatch Multipliers:/n Pump Hatch: 1x/n ULV Output Hatch: 2x/n LV Output Hatch: 4x/n/nWhile raining in the Pump's Biome, the total water production will be increased by 50%%. gregtech.multiblock.processing_array.description=The Processing Array combines up to 16 single block machine(s) in a single multiblock, effectively easing automation. gregtech.multiblock.advanced_processing_array.description=The Processing Array combines up to 64 single block machine(s) in a single multiblock, effectively easing automation. -gregtech.multiblock.fission_reactor.description=Fission Reactors use fuel rods placed together to create a sustained chain of fission reactions. These reactions generate heat that may be soaked up by coolants, which can then be used inside turbines. The reactor can take on a variety of shapes. Its cross sections can be seen in JEI, and the reactor may extend 7 blocks up and down from the controller. Reactors can import and exports fuel rods/coolants through special pairs of hatches on the top and bottom layers, respectively. Control rod hatches may also be placed on the top layer, and they give users more control over the reactor. Inserting them more decreases the neutron multiplication rate k_eff, a factor by which the power is continually multiplied by. In fact, the reactor automatically shifts this over time, attempting to reach a stable equilibrium. This may be overridden manually. Control rods, fuel hatches, and coolant hatches all require special tubing beneath them to form correctly; check their tooltips to see which blocks to use. Once a reactor's hatches are filled, the reactor can be locked to begin operation, meaning that the types of items/fluids in the hatches can not be changed while the reactor operates. +gregtech.multiblock.fission_reactor.description=Fission Reactors use fuel rods placed together to create a sustained chain of fission reactions. These reactions generate heat that may be soaked up by coolants, which can then be used inside turbines. The reactor can take on a variety of shapes. Its cross sections can be seen in JEI, and the reactor may extend 7 blocks up and down from the controller. Reactors can import and export fuel rods/coolants through special pairs of hatches on the top and bottom layers, respectively. Control rod hatches may also be placed on the top layer, and they give the user more control over the reactor. Inserting them more decreases the neutron multiplication rate "effective K", a factor by which the power is continually multiplied by. In fact, the reactor automatically shifts this over time, attempting to reach a stable equilibrium. This may be overridden manually. Control rods, fuel hatches, and coolant hatches all require special tubing beneath them to form correctly; check their tooltips to see which blocks to use. Once a reactor's hatches are filled, the reactor can be locked to begin operation, meaning that the types of items/fluids in the hatches can not be changed while the reactor operates. item.invalid.name=Invalid item @@ -2800,7 +2800,7 @@ tile.long_distance_fluid_pipeline.name=Long Distance Fluid Pipe # Nuclear Blocks tile.nuclear_casing.spent_fuel_casing.name=Spent Fuel Casing -tile.nuclear_casing.gas_centrifuge_heater.name=Gas Centrifuge Heater +tile.gas_centrifuge_casing.gas_centrifuge_heater.name=Gas Centrifuge Heater tile.gas_centrifuge_casing.gas_centrifuge_column.name=Gas Centrifuge Column # Creative tabs