Skip to content

Commit

Permalink
made heat exchangers use recipe tags instead of special value
Browse files Browse the repository at this point in the history
  • Loading branch information
@Trinsdar
Trinsdar committed Jan 28, 2025
1 parent 29d8e66 commit 9322360
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .../src/main/java/org/gtreimagined/gt5r/blockentity/multi/BlockEntityLargeHeatExchanger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
import org.gtreimagined.gt5r.data.GT5RRecipeTags;
import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler;
import org.gtreimagined.gtcore.item.ItemSelectorTag;
import tesseract.TesseractGraphWrappers;
Expand Down Expand Up @@ -62,7 +63,7 @@ protected int compareInputHatches(MachineFluidHandler<?> a, MachineFluidHandler<

@Override
protected boolean validateRecipe(IRecipe r) {
return super.validateRecipe(r) && r.getSpecialValue() >= 0;
return super.validateRecipe(r) && !r.getTags().contains(GT5RRecipeTags.SMALL_HEAT_EXCHANGED_ONLY);
}

@Override
Expand Down
3 changes: 2 additions & 1 deletion ...src/main/java/org/gtreimagined/gt5r/blockentity/single/BlockEntitySmallHeatExchanger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import net.minecraft.world.level.Explosion;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.state.BlockState;
import org.gtreimagined.gt5r.data.GT5RRecipeTags;
import org.gtreimagined.gt5r.machine.HeatExchangerMachine;
import org.gtreimagined.gt5r.machine.caps.ParallelRecipeHandler;
import org.gtreimagined.gtcore.data.GTCoreTags;
Expand All @@ -39,7 +40,7 @@ public BlockEntitySmallHeatExchanger(HeatExchangerMachine type, BlockPos pos, Bl

@Override
protected boolean validateRecipe(IRecipe r) {
return super.validateRecipe(r) && r.getSpecialValue() != 0;
return super.validateRecipe(r) && !r.getTags().contains(GT5RRecipeTags.LARGE_HEAT_EXCHANGED_ONLY);
}

@Override
Expand Down
2 changes: 2 additions & 0 deletions common/src/main/java/org/gtreimagined/gt5r/data/GT5RRecipeTags.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ public class GT5RRecipeTags {
public static final String RECYCLING = "recycling";
public static final String MACERATOR_ORE_PROCESING = "macerator_ore_processing";
public static final String ALLOY_SMELTER_MOLDING = "alloy_smelter_molding";
public static final String LARGE_HEAT_EXCHANGED_ONLY = "large_heat_exchanged_only";
public static final String SMALL_HEAT_EXCHANGED_ONLY = "small_heat_exchanged_only";
}
2 changes: 1 addition & 1 deletion common/src/main/java/org/gtreimagined/gt5r/data/RecipeMaps.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ public void render(PoseStack stack, IRecipe recipe, Font fontRenderer, int guiOf
String duration = "Duration: " + recipe.getDuration() + " ticks" + additional;
String extraBurntime = "HU/t: " + recipe.getPower();
String heatIncreaseMultiplier = "Total HU: " + (recipe.getPower() * recipe.getDuration());
String heatExchanger = recipe.getSpecialValue() == 1 ? "" : (recipe.getSpecialValue() == -1 ? "Small" : "Large") + " Heat Exchanger only";
String heatExchanger = recipe.getTags().contains(GT5RRecipeTags.LARGE_HEAT_EXCHANGED_ONLY) ? "Large Heat Exchanger only" : recipe.getTags().contains(GT5RRecipeTags.SMALL_HEAT_EXCHANGED_ONLY) ? "Small Heat Exchanger only" : "";
renderString(stack, duration, fontRenderer, 5, 0, guiOffsetX, guiOffsetY);
renderString(stack, extraBurntime, fontRenderer, 5, 10, guiOffsetX, guiOffsetY);
renderString(stack, heatIncreaseMultiplier, fontRenderer, 5, 20, guiOffsetX, guiOffsetY);
Expand Down
23 changes: 12 additions & 11 deletions common/src/main/java/org/gtreimagined/gt5r/loader/multi/HeatExchangerLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import earth.terrarium.botarium.common.fluid.utils.FluidHooks;
import net.minecraft.world.item.Items;
import org.gtreimagined.gt5r.data.GT5RRecipeTags;
import org.gtreimagined.gtcore.data.GTCoreFluids;
import tesseract.TesseractGraphWrappers;

Expand All @@ -13,18 +14,18 @@ public class HeatExchangerLoader {
public static void init() {
HEAT_EXCHANGER.RB().fi(HotCoolant.getLiquid(1))
.fo(Coolant.getLiquid(1))
.add("hot_coolant",1, 20, 1);
.add("hot_coolant",1, 20);
HEAT_EXCHANGER.RB().fi(Lava.getLiquid(1))
.fo(FluidHooks.newFluidHolder(GTCoreFluids.PAHOEHOE_LAVA.getFluid(), TesseractGraphWrappers.dropletMultiplier, null))
.add("lava", 1, 80, 1);
HEAT_EXCHANGER.RB().ii(Items.MAGMA_BLOCK).io(Items.COBBLESTONE).add("magma_block", 1000, 40, -1);
HEAT_EXCHANGER.RB().fi(HotCarbonDioxide.getGas(1)).fo(CarbonDioxide.getGas(1)).add("hot_carbon_dioxide", 1, 20);
HEAT_EXCHANGER.RB().fi(HotMoltenSodium.getLiquid(1)).fo(Sodium.getLiquid(1)).add("hot_molten_sodium", 1, 30);
HEAT_EXCHANGER.RB().fi(HotMoltenTin.getLiquid(1)).fo(Tin.getLiquid(1)).add("hot_molten_tin", 1, 40);
HEAT_EXCHANGER.RB().fi(HotMoltenLithiumChloride.getLiquid(1)).fo(LithiumChloride.getLiquid(1)).add("hot_molten_lithium_chloride", 1, 15);
HEAT_EXCHANGER.RB().fi(HotHeavyWater.getLiquid(1)).fo(HeavyWater.getLiquid(1)).add("hot_heavy_water", 1, 50);
HEAT_EXCHANGER.RB().fi(HotSemiheavyWater.getLiquid(1)).fo(SemiheavyWater.getLiquid(1)).add("hot_semiheavy_water", 1, 40);
HEAT_EXCHANGER.RB().fi(HotTritiatedWater.getLiquid(1)).fo(TritiatedWater.getLiquid(1)).add("hot_tritiated_water", 1, 60);
HEAT_EXCHANGER.RB().fi(HotHelium.getGas(1)).fo(Helium.getGas(1)).add("hot_helium", 30, 1);
.add("lava", 1, 80);
HEAT_EXCHANGER.RB().ii(Items.MAGMA_BLOCK).io(Items.COBBLESTONE).tags(GT5RRecipeTags.SMALL_HEAT_EXCHANGED_ONLY).add("magma_block", 1000, 40);
HEAT_EXCHANGER.RB().fi(HotCarbonDioxide.getGas(1)).fo(CarbonDioxide.getGas(1)).tags(GT5RRecipeTags.LARGE_HEAT_EXCHANGED_ONLY).add("hot_carbon_dioxide", 1, 20);
HEAT_EXCHANGER.RB().fi(HotMoltenSodium.getLiquid(1)).fo(Sodium.getLiquid(1)).tags(GT5RRecipeTags.LARGE_HEAT_EXCHANGED_ONLY).add("hot_molten_sodium", 1, 30);
HEAT_EXCHANGER.RB().fi(HotMoltenTin.getLiquid(1)).fo(Tin.getLiquid(1)).tags(GT5RRecipeTags.LARGE_HEAT_EXCHANGED_ONLY).add("hot_molten_tin", 1, 40);
HEAT_EXCHANGER.RB().fi(HotMoltenLithiumChloride.getLiquid(1)).fo(LithiumChloride.getLiquid(1)).tags(GT5RRecipeTags.LARGE_HEAT_EXCHANGED_ONLY).add("hot_molten_lithium_chloride", 1, 15);
HEAT_EXCHANGER.RB().fi(HotHeavyWater.getLiquid(1)).fo(HeavyWater.getLiquid(1)).tags(GT5RRecipeTags.LARGE_HEAT_EXCHANGED_ONLY).add("hot_heavy_water", 1, 50);
HEAT_EXCHANGER.RB().fi(HotSemiheavyWater.getLiquid(1)).fo(SemiheavyWater.getLiquid(1)).tags(GT5RRecipeTags.LARGE_HEAT_EXCHANGED_ONLY).add("hot_semiheavy_water", 1, 40);
HEAT_EXCHANGER.RB().fi(HotTritiatedWater.getLiquid(1)).fo(TritiatedWater.getLiquid(1)).tags(GT5RRecipeTags.LARGE_HEAT_EXCHANGED_ONLY).add("hot_tritiated_water", 1, 60);
HEAT_EXCHANGER.RB().fi(HotHelium.getGas(1)).fo(Helium.getGas(1)).tags(GT5RRecipeTags.LARGE_HEAT_EXCHANGED_ONLY).add("hot_helium", 30, 1);
}
}

0 comments on commit 9322360

Please sign in to comment.