From b2d50e5cfb98b1204aa8f0bc1b2ae0a9fd74eafb Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 17 May 2025 22:55:17 -0400 Subject: [PATCH 1/5] Add tooltip to LCR about being able to process normal CR recipes --- .../multi/electric/MetaTileEntityLargeChemicalReactor.java | 6 ++++-- src/main/resources/assets/gregtech/lang/en_us.lang | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java index a15161260ee..6ee97c2b065 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java @@ -52,7 +52,7 @@ public MetaTileEntity createMetaTileEntity(IGregTechTileEntity tileEntity) { } @Override - protected BlockPattern createStructurePattern() { + protected @NotNull BlockPattern createStructurePattern() { TraceabilityPredicate casing = states(getCasingState()).setMinGlobalLimited(10); TraceabilityPredicate abilities = autoAbilities(); return FactoryBlockPattern.start() @@ -134,10 +134,12 @@ public SoundEvent getBreakdownSound() { return GTSoundEvents.BREAKDOWN_ELECTRICAL; } + @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack stack, @Nullable World player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(TooltipHelper.RAINBOW_SLOW + I18n.format("gregtech.machine.perfect_oc")); + tooltip.add(TooltipHelper.RAINBOW_SLOW + I18n.format("gregtech.multiblock.large_chemical_reactor.description.0")); } @SideOnly(Side.CLIENT) diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 82dbe17614d..d881691abf8 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -161,6 +161,7 @@ gregtech.multiblock.fusion_reactor.zpm.description=The Fusion Reactor Mark 2 is gregtech.multiblock.fusion_reactor.uv.description=The Fusion Reactor Mark 3 is a large multiblock structure used for fusing elements into heavier ones. It can only use UV Energy Hatches. For every Hatch it has, its buffer increases by 40M EU, and has a maximum of 640M. gregtech.multiblock.fusion_reactor.heat=Heat: %s gregtech.multiblock.large_chemical_reactor.description=The Large Chemical Reactor performs chemical reactions at 100%% energy efficiency. Overclocks multiply both speed and energy by 4. The multiblock requires exactly 1 Cupronickel Coil Block, which must be placed adjacent to the PTFE Pipe casing located in the center. +gregtech.multiblock.large_chemical_reactor.description.0=Is able to process normal chemical reactor recipes gregtech.multiblock.primitive_water_pump.description=The Primitive Water Pump is a pre-Steam Era multiblock that collects water once per second, depending on the Biome it is in. It can use a Pump, ULV, or LV Output Hatch, increasing the amount of water per tier. Follows the formula: Biome Coefficient * Hatch Multiplier. gregtech.multiblock.primitive_water_pump.extra1=Biome Coefficient:/n Ocean, River: 1000 L/s/n Swamp: 800 L/s/n Jungle: 350 L/s/n Snowy: 300 L/s/n Plains, Forest: 250 L/s/n Taiga: 175 L/s/n Beach: 170 L/s/n Other: 100 L/s 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%%. From ed035334056136808734fafa6d96f062bfd5b7fb Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 17 May 2025 22:56:11 -0400 Subject: [PATCH 2/5] oops --- .../multi/electric/MetaTileEntityLargeChemicalReactor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java index 6ee97c2b065..f896bdda028 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java @@ -139,7 +139,7 @@ public SoundEvent getBreakdownSound() { public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(TooltipHelper.RAINBOW_SLOW + I18n.format("gregtech.machine.perfect_oc")); - tooltip.add(TooltipHelper.RAINBOW_SLOW + I18n.format("gregtech.multiblock.large_chemical_reactor.description.0")); + tooltip.add(I18n.format("gregtech.multiblock.large_chemical_reactor.description.0")); } @SideOnly(Side.CLIENT) From 9050f5c8e9c51d8fb43ee7650aa47476a47d8eba Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 17 May 2025 23:21:00 -0400 Subject: [PATCH 3/5] Better tooltip --- src/main/resources/assets/gregtech/lang/en_us.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index d881691abf8..fd564782f2e 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -161,7 +161,7 @@ gregtech.multiblock.fusion_reactor.zpm.description=The Fusion Reactor Mark 2 is gregtech.multiblock.fusion_reactor.uv.description=The Fusion Reactor Mark 3 is a large multiblock structure used for fusing elements into heavier ones. It can only use UV Energy Hatches. For every Hatch it has, its buffer increases by 40M EU, and has a maximum of 640M. gregtech.multiblock.fusion_reactor.heat=Heat: %s gregtech.multiblock.large_chemical_reactor.description=The Large Chemical Reactor performs chemical reactions at 100%% energy efficiency. Overclocks multiply both speed and energy by 4. The multiblock requires exactly 1 Cupronickel Coil Block, which must be placed adjacent to the PTFE Pipe casing located in the center. -gregtech.multiblock.large_chemical_reactor.description.0=Is able to process normal chemical reactor recipes +gregtech.multiblock.large_chemical_reactor.description.0=Performs all §eChemical Reactor§7 recipes and §eLarge Chemical Reactor§7 recipes gregtech.multiblock.primitive_water_pump.description=The Primitive Water Pump is a pre-Steam Era multiblock that collects water once per second, depending on the Biome it is in. It can use a Pump, ULV, or LV Output Hatch, increasing the amount of water per tier. Follows the formula: Biome Coefficient * Hatch Multiplier. gregtech.multiblock.primitive_water_pump.extra1=Biome Coefficient:/n Ocean, River: 1000 L/s/n Swamp: 800 L/s/n Jungle: 350 L/s/n Snowy: 300 L/s/n Plains, Forest: 250 L/s/n Taiga: 175 L/s/n Beach: 170 L/s/n Other: 100 L/s 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%%. From 105de19e2d29e2a3344cc041daadc6eb699ffdab Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 17 May 2025 23:21:24 -0400 Subject: [PATCH 4/5] whoops --- src/main/resources/assets/gregtech/lang/en_us.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index fd564782f2e..b511c5a1972 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -161,7 +161,7 @@ gregtech.multiblock.fusion_reactor.zpm.description=The Fusion Reactor Mark 2 is gregtech.multiblock.fusion_reactor.uv.description=The Fusion Reactor Mark 3 is a large multiblock structure used for fusing elements into heavier ones. It can only use UV Energy Hatches. For every Hatch it has, its buffer increases by 40M EU, and has a maximum of 640M. gregtech.multiblock.fusion_reactor.heat=Heat: %s gregtech.multiblock.large_chemical_reactor.description=The Large Chemical Reactor performs chemical reactions at 100%% energy efficiency. Overclocks multiply both speed and energy by 4. The multiblock requires exactly 1 Cupronickel Coil Block, which must be placed adjacent to the PTFE Pipe casing located in the center. -gregtech.multiblock.large_chemical_reactor.description.0=Performs all §eChemical Reactor§7 recipes and §eLarge Chemical Reactor§7 recipes +gregtech.multiblock.large_chemical_reactor.description.0=Performs all §eChemical Reactor§7 and §eLarge Chemical Reactor§7 recipes gregtech.multiblock.primitive_water_pump.description=The Primitive Water Pump is a pre-Steam Era multiblock that collects water once per second, depending on the Biome it is in. It can use a Pump, ULV, or LV Output Hatch, increasing the amount of water per tier. Follows the formula: Biome Coefficient * Hatch Multiplier. gregtech.multiblock.primitive_water_pump.extra1=Biome Coefficient:/n Ocean, River: 1000 L/s/n Swamp: 800 L/s/n Jungle: 350 L/s/n Snowy: 300 L/s/n Plains, Forest: 250 L/s/n Taiga: 175 L/s/n Beach: 170 L/s/n Other: 100 L/s 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%%. From 029e19990926c95f27aaabf0d3d16142e50871ab Mon Sep 17 00:00:00 2001 From: Zorbatron <46525467+Zorbatron@users.noreply.github.com> Date: Sat, 17 May 2025 23:32:27 -0400 Subject: [PATCH 5/5] spobble --- .../multi/electric/MetaTileEntityLargeChemicalReactor.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java index f896bdda028..a7411ef25d9 100644 --- a/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java +++ b/src/main/java/gregtech/common/metatileentities/multi/electric/MetaTileEntityLargeChemicalReactor.java @@ -136,7 +136,8 @@ public SoundEvent getBreakdownSound() { @SideOnly(Side.CLIENT) @Override - public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World player, @NotNull List tooltip, + boolean advanced) { super.addInformation(stack, player, tooltip, advanced); tooltip.add(TooltipHelper.RAINBOW_SLOW + I18n.format("gregtech.machine.perfect_oc")); tooltip.add(I18n.format("gregtech.multiblock.large_chemical_reactor.description.0"));