Skip to content

[ref:idra/early-game-smelting-rework] Early game smelting rework #931

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LordIdra merged 15 commits into from
May 18, 2026
Merged

[ref:idra/early-game-smelting-rework] Early game smelting rework #931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
57bffb5
start alloy furnace
LordIdra Mar 22, 2026
b164ac3
crude alloy furnace finished
LordIdra Apr 7, 2026
dbd0e33
finish early game smelting changes
LordIdra Apr 10, 2026
243479e
add obsidian fluid item recipes
LordIdra Apr 10, 2026
d942be5
Merge branch 'master' into idra/early-game-smelting-rework
LordIdra May 10, 2026
778dd48
fix insane recipes + no waila when unformed + update lit property
LordIdra May 10, 2026
34fcfb3
Merge branch 'master' into idra/early-game-smelting-rework
LordIdra May 10, 2026
9b62e9e
THOU SHALT COMPILE
LordIdra May 10, 2026
d39d8a7
Merge branch 'master' into idra/early-game-smelting-rework
LordIdra May 10, 2026
a313058
ADDRESS THY PR COMMENTS
LordIdra May 17, 2026
5a37c21
oops
LordIdra May 17, 2026
330f2d8
Merge branch 'master' into idra/early-game-smelting-rework
JustAHuman-xD May 18, 2026
68208db
yet-to-be-made pr comments
LordIdra May 18, 2026
68563dd
pr comments
LordIdra May 18, 2026
97f228d
Merge branch 'master' into idra/early-game-smelting-rework
LordIdra May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/main/java/io/github/pylonmc/pylon/PylonBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ public static void initialize() {
RebarBlock.register(PylonKeys.PORTABLE_FLUID_TANK_TIN, Material.GREEN_STAINED_GLASS, PortableFluidTank.class);
RebarBlock.register(PylonKeys.PORTABLE_FLUID_TANK_IRON, Material.LIGHT_GRAY_STAINED_GLASS, PortableFluidTank.class);
RebarBlock.register(PylonKeys.PORTABLE_FLUID_TANK_BRONZE, Material.ORANGE_STAINED_GLASS, PortableFluidTank.class);
RebarBlock.register(PylonKeys.PORTABLE_FLUID_TANK_OBSIDIAN, Material.BLACK_STAINED_GLASS, PortableFluidTank.class);
RebarBlock.register(PylonKeys.PORTABLE_FLUID_TANK_IGNEOUS_COMPOSITE, Material.BLACK_STAINED_GLASS, PortableFluidTank.class);
RebarBlock.register(PylonKeys.PORTABLE_FLUID_TANK_STEEL, Material.GRAY_STAINED_GLASS, PortableFluidTank.class);
RebarBlock.register(PylonKeys.PORTABLE_FLUID_TANK_PALLADIUM, Material.BLUE_STAINED_GLASS, PortableFluidTank.class);
Expand All @@ -58,6 +59,7 @@ public static void initialize() {
RebarBlock.register(PylonKeys.FLUID_TANK_CASING_TIN, Material.GREEN_STAINED_GLASS, FluidTankCasing.class);
RebarBlock.register(PylonKeys.FLUID_TANK_CASING_IRON, Material.LIGHT_GRAY_STAINED_GLASS, FluidTankCasing.class);
RebarBlock.register(PylonKeys.FLUID_TANK_CASING_BRONZE, Material.ORANGE_STAINED_GLASS, FluidTankCasing.class);
RebarBlock.register(PylonKeys.FLUID_TANK_CASING_OBSIDIAN, Material.BLACK_STAINED_GLASS, FluidTankCasing.class);
RebarBlock.register(PylonKeys.FLUID_TANK_CASING_IGNEOUS_COMPOSITE, Material.BLACK_STAINED_GLASS, FluidTankCasing.class);
RebarBlock.register(PylonKeys.FLUID_TANK_CASING_STEEL, Material.GRAY_STAINED_GLASS, FluidTankCasing.class);
RebarBlock.register(PylonKeys.FLUID_TANK_CASING_PALLADIUM, Material.BLUE_STAINED_GLASS, FluidTankCasing.class);
Expand Down Expand Up @@ -91,7 +93,6 @@ public static void initialize() {
RebarBlock.register(PylonKeys.DIESEL_SMELTERY_HEATER, Material.FURNACE, DieselSmelteryHeater.class);
RebarBlock.register(PylonKeys.CASTING_UNIT, Material.BRICKS, CastingUnit.class);
RebarBlock.register(PylonKeys.FORMING_TABLE, Material.CRAFTING_TABLE, FormingTable.class);
RebarBlock.register(PylonKeys.PIT_KILN, Material.DECORATED_POT, PitKiln.class);
RebarBlock.register(PylonKeys.FLUID_STRAINER, Material.COPPER_GRATE, FluidStrainer.class);
RebarBlock.register(PylonKeys.EXPLOSIVE_TARGET, Material.TARGET, ExplosiveTarget.class);
RebarBlock.register(PylonKeys.EXPLOSIVE_TARGET_FIERY, Material.TARGET, ExplosiveTarget.class);
Expand Down Expand Up @@ -178,6 +179,8 @@ public static void initialize() {
RebarBlock.register(PylonKeys.POTION_ALTAR, Material.STONE_BRICK_SLAB, PotionAltar.class);
RebarBlock.register(PylonKeys.COLLIMATOR, Material.OBSIDIAN, Collimator.class);
RebarBlock.register(PylonKeys.COLLIMATOR_PILLAR, Material.DEEPSLATE_TILE_WALL, CollimatorPillar.class);
RebarBlock.register(PylonKeys.CRUDE_ALLOY_FURNACE, Material.BLAST_FURNACE, CrudeAlloyFurnace.class);
RebarBlock.register(PylonKeys.KILN, Material.BLAST_FURNACE, Kiln.class);
RebarBlock.register(PylonKeys.WOODEN_SILO, Material.BROWN_TERRACOTTA, Silo.class);
RebarBlock.register(PylonKeys.COPPER_SILO, Material.TERRACOTTA, Silo.class);
RebarBlock.register(PylonKeys.TIN_SILO, Material.GREEN_TERRACOTTA, Silo.class);
Expand Down
7 changes: 0 additions & 7 deletions src/main/java/io/github/pylonmc/pylon/PylonHelpPages.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ public class PylonHelpPages {
public static final SimpleStaticGuidePage HELP = new SimpleStaticGuidePage(pylonKey("help"));

public static final SimpleStaticGuidePage PROGRESSION = new SimpleStaticGuidePage(pylonKey("help_progression"));
public static final SimpleStaticGuidePage PIT_KILN = new SimpleStaticGuidePage(pylonKey("help_pit_kiln"));
public static final SimpleStaticGuidePage FLUID_HANDLING = new SimpleStaticGuidePage(pylonKey("help_fluid_handling"));
public static final SimpleStaticGuidePage HYDRAULICS = new SimpleStaticGuidePage(pylonKey("help_hydraulics"));
public static final SimpleStaticGuidePage BLOOMERY = new SimpleStaticGuidePage(pylonKey("help_bloomery"));
Expand All @@ -29,7 +28,6 @@ public static void initialise() {

PROGRESSION.addButton(Item.simple(ItemStackBuilder.guide(Material.IRON_PICKAXE, Pylon.getInstance(), "help.progression.manual_core")));
PROGRESSION.addButton(Item.simple(ItemStackBuilder.guide(Material.CLOCK, Pylon.getInstance(), "help.loupe"))); // recycle loupe desc
PROGRESSION.addButton(Item.simple(ItemStackBuilder.guide(Material.BRICKS, Pylon.getInstance(), "help.progression.pit_kiln")));
PROGRESSION.addButton(Item.simple(ItemStackBuilder.guide(Material.BRICK, Pylon.getInstance(), "help.progression.bronze_age")));
PROGRESSION.addButton(Item.simple(ItemStackBuilder.guide(Material.WATER_BUCKET, Pylon.getInstance(), "help.progression.hydraulic_machines")));
PROGRESSION.addButton(Item.simple(ItemStackBuilder.guide(Material.MINECART, Pylon.getInstance(), "help.progression.cargo_machines")));
Expand All @@ -40,11 +38,6 @@ public static void initialise() {
PROGRESSION.addButton(Item.simple(ItemStackBuilder.guide(Material.ELYTRA, Pylon.getInstance(), "help.progression.flight_ring")));
HELP.addPage(Material.BOOKSHELF, PROGRESSION);

PIT_KILN.addButton(Item.simple(ItemStackBuilder.guide(Material.DECORATED_POT, Pylon.getInstance(), "help.pit_kiln.kiln")));
PIT_KILN.addButton(Item.simple(ItemStackBuilder.guide(Material.DECORATED_POT, Pylon.getInstance(), "help.pit_kiln.construction")));
PIT_KILN.addButton(Item.simple(ItemStackBuilder.guide(Material.DECORATED_POT, Pylon.getInstance(), "help.pit_kiln.crafting")));
HELP.addButton(new PageButton(ItemStackBuilder.of(Material.DECORATED_POT).addCustomModelDataString(PylonKeys.PIT_KILN.asString()), PIT_KILN));

HELP.addButton(new PageButton(ItemStackBuilder.of(Material.BROWN_TERRACOTTA).addCustomModelDataString(PylonKeys.FLUID_PIPE_WOOD.asString()), FLUID_HANDLING));

HELP.addButton(new PageButton(ItemStackBuilder.of(Material.WAXED_COPPER_BULB).addCustomModelDataString(PylonKeys.HYDRAULIC_CORE_DRILL.asString()), HYDRAULICS));
Expand Down
61 changes: 55 additions & 6 deletions src/main/java/io/github/pylonmc/pylon/PylonItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import io.github.pylonmc.pylon.content.machines.hydraulics.*;
import io.github.pylonmc.pylon.content.machines.simple.*;
import io.github.pylonmc.pylon.content.machines.smelting.DieselSmelteryHeater;
import io.github.pylonmc.pylon.content.machines.smelting.PitKiln;
import io.github.pylonmc.pylon.content.machines.storage.Silo;
import io.github.pylonmc.pylon.content.resources.CharcoalBlock;
import io.github.pylonmc.pylon.content.resources.IronBloom;
Expand Down Expand Up @@ -483,6 +482,13 @@ private PylonItems() {
PylonPages.MISCELLANEOUS.addItem(FINE_SEDIMENT);
}

public static final ItemStack SLAG = ItemStackBuilder.rebar(Material.FLINT, PylonKeys.SLAG)
.build();
static {
RebarItem.register(RebarItem.class, SLAG);
PylonPages.MISCELLANEOUS.addItem(SLAG);
}

public static final ItemStack QUARTZ_DUST = ItemStackBuilder.rebar(Material.CLAY_BALL, PylonKeys.QUARTZ_DUST)
.set(DataComponentTypes.ITEM_MODEL, Material.SUGAR.getKey())
.build();
Expand Down Expand Up @@ -1979,6 +1985,15 @@ private PylonItems() {
PylonPages.SIMPLE_MACHINES.addItem(GRINDSTONE_HANDLE);
}

public static final ItemStack CRUDE_ALLOY_FURNACE = ItemStackBuilder.rebar(Material.BLAST_FURNACE, PylonKeys.CRUDE_ALLOY_FURNACE)
.build();
static {
RebarItem.register(RebarItem.class, CRUDE_ALLOY_FURNACE, PylonKeys.CRUDE_ALLOY_FURNACE);
PylonPages.SIMPLE_MACHINES.addItem(CRUDE_ALLOY_FURNACE);
RebarGuide.getOrCreateInfoPage(PylonKeys.CRUDE_ALLOY_FURNACE)
.addButton(new MachineRecipesButton(CRUDE_ALLOY_FURNACE, CrudeAlloyFurnaceRecipe.RECIPE_TYPE));
}

public static final ItemStack MIXING_POT = ItemStackBuilder.rebar(Material.CAULDRON, PylonKeys.MIXING_POT)
.build();
static {
Expand Down Expand Up @@ -2164,13 +2179,14 @@ private PylonItems() {
//</editor-fold>

//<editor-fold desc="Machines - Smelting" defaultstate=collapsed>
public static final ItemStack PIT_KILN = ItemStackBuilder.rebar(Material.DECORATED_POT, PylonKeys.PIT_KILN)

public static final ItemStack KILN = ItemStackBuilder.rebar(Material.BLAST_FURNACE, PylonKeys.KILN)
.build();
static {
RebarItem.register(PitKiln.Item.class, PIT_KILN, PylonKeys.PIT_KILN);
PylonPages.SMELTING.addItem(PIT_KILN);
RebarGuide.getOrCreateInfoPage(PylonKeys.PIT_KILN)
.addButton(new MachineRecipesButton(PIT_KILN, PitKilnRecipe.RECIPE_TYPE));
RebarItem.register(RebarItem.class, KILN, PylonKeys.KILN);
PylonPages.SMELTING.addItem(KILN);
RebarGuide.getOrCreateInfoPage(PylonKeys.KILN)
.addButton(new MachineRecipesButton(KILN, KilnRecipe.RECIPE_TYPE));
}

public static final ItemStack BLOOMERY = ItemStackBuilder.rebar(Material.MAGMA_BLOCK, PylonKeys.BLOOMERY)
Expand Down Expand Up @@ -2340,6 +2356,17 @@ private PylonItems() {
PylonPages.FLUID_PIPES_AND_TANKS.addItem(FLUID_PIPE_BRONZE);
}

public static final ItemStack FLUID_PIPE_OBSIDIAN = ItemStackBuilder.rebar(Material.CLAY_BALL, PylonKeys.FLUID_PIPE_OBSIDIAN)
.set(
DataComponentTypes.ITEM_MODEL,
Settings.get(PylonKeys.FLUID_PIPE_OBSIDIAN).getOrThrow("material", ConfigAdapter.MATERIAL).key()
)
.build();
static {
RebarItem.register(FluidPipe.class, FLUID_PIPE_OBSIDIAN);
PylonPages.FLUID_PIPES_AND_TANKS.addItem(FLUID_PIPE_OBSIDIAN);
}

public static final ItemStack FLUID_PIPE_IGNEOUS_COMPOSITE = ItemStackBuilder.rebar(Material.CLAY_BALL, PylonKeys.FLUID_PIPE_IGNEOUS_COMPOSITE)
.set(
DataComponentTypes.ITEM_MODEL,
Expand Down Expand Up @@ -2440,6 +2467,20 @@ private PylonItems() {
PylonPages.FLUID_PIPES_AND_TANKS.addItem(PORTABLE_FLUID_TANK_BRONZE);
}

public static final ItemStack PORTABLE_FLUID_TANK_OBSIDIAN
= ItemStackBuilder.rebar(Material.BLACK_STAINED_GLASS, PylonKeys.PORTABLE_FLUID_TANK_OBSIDIAN)
.editPdc(pdc -> pdc.set(PortableFluidTank.Item.FLUID_AMOUNT_KEY, RebarSerializers.DOUBLE, 0.0))
.addCustomModelDataString("pylon:fluid:empty")
.build();
static {
RebarItem.register(
PortableFluidTank.Item.class,
PORTABLE_FLUID_TANK_OBSIDIAN,
PylonKeys.PORTABLE_FLUID_TANK_OBSIDIAN
);
PylonPages.FLUID_PIPES_AND_TANKS.addItem(PORTABLE_FLUID_TANK_OBSIDIAN);
}

public static final ItemStack PORTABLE_FLUID_TANK_IGNEOUS_COMPOSITE
= ItemStackBuilder.rebar(Material.BLACK_STAINED_GLASS, PylonKeys.PORTABLE_FLUID_TANK_IGNEOUS_COMPOSITE)
.editPdc(pdc -> pdc.set(PortableFluidTank.Item.FLUID_AMOUNT_KEY, RebarSerializers.DOUBLE, 0.0))
Expand Down Expand Up @@ -2525,6 +2566,14 @@ private PylonItems() {
PylonPages.FLUID_PIPES_AND_TANKS.addItem(FLUID_TANK_CASING_BRONZE);
}

public static final ItemStack FLUID_TANK_CASING_OBSIDIAN
= ItemStackBuilder.rebar(Material.BLACK_STAINED_GLASS, PylonKeys.FLUID_TANK_CASING_OBSIDIAN)
.build();
static {
RebarItem.register(FluidTankCasing.Item.class, FLUID_TANK_CASING_OBSIDIAN, PylonKeys.FLUID_TANK_CASING_OBSIDIAN);
PylonPages.FLUID_PIPES_AND_TANKS.addItem(FLUID_TANK_CASING_OBSIDIAN);
}

public static final ItemStack FLUID_TANK_CASING_IGNEOUS_COMPOSITE
= ItemStackBuilder.rebar(Material.BLACK_STAINED_GLASS, PylonKeys.FLUID_TANK_CASING_IGNEOUS_COMPOSITE)
.build();
Expand Down
9 changes: 6 additions & 3 deletions src/main/java/io/github/pylonmc/pylon/PylonKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ public class PylonKeys {
public static final NamespacedKey STONE_HAMMER = pylonKey("stone_hammer");
public static final NamespacedKey IRON_HAMMER = pylonKey("iron_hammer");
public static final NamespacedKey DIAMOND_HAMMER = pylonKey("diamond_hammer");
public static final NamespacedKey NETHERITE_HAMMER = pylonKey("netherite_hammer");

public static final NamespacedKey WATERING_CAN = pylonKey("watering_can");
public static final NamespacedKey SPRINKLER = pylonKey("sprinkler");
Expand Down Expand Up @@ -155,6 +154,8 @@ public class PylonKeys {

public static final NamespacedKey GRINDSTONE = pylonKey("grindstone");
public static final NamespacedKey GRINDSTONE_HANDLE = pylonKey("grindstone_handle");
public static final NamespacedKey CRUDE_ALLOY_FURNACE = pylonKey("crude_alloy_furnace");
public static final NamespacedKey KILN = pylonKey("kiln");

public static final NamespacedKey MIXING_POT = pylonKey("mixing_pot");
public static final NamespacedKey CRUCIBLE = pylonKey("crucible");
Expand All @@ -166,6 +167,7 @@ public class PylonKeys {
public static final NamespacedKey FLUID_PIPE_TIN = pylonKey("fluid_pipe_tin");
public static final NamespacedKey FLUID_PIPE_BRONZE = pylonKey("fluid_pipe_bronze");
public static final NamespacedKey FLUID_PIPE_IRON = pylonKey("fluid_pipe_iron");
public static final NamespacedKey FLUID_PIPE_OBSIDIAN = pylonKey("fluid_pipe_obsidian");
public static final NamespacedKey FLUID_PIPE_IGNEOUS_COMPOSITE = pylonKey("fluid_pipe_igneous_composite");
public static final NamespacedKey FLUID_PIPE_STEEL = pylonKey("fluid_pipe_steel");
public static final NamespacedKey FLUID_PIPE_CREATIVE = pylonKey("fluid_pipe_creative");
Expand All @@ -175,6 +177,7 @@ public class PylonKeys {
public static final NamespacedKey PORTABLE_FLUID_TANK_TIN = pylonKey("portable_fluid_tank_tin");
public static final NamespacedKey PORTABLE_FLUID_TANK_IRON = pylonKey("portable_fluid_tank_iron");
public static final NamespacedKey PORTABLE_FLUID_TANK_BRONZE = pylonKey("portable_fluid_tank_bronze");
public static final NamespacedKey PORTABLE_FLUID_TANK_OBSIDIAN = pylonKey("portable_fluid_tank_obsidian");
public static final NamespacedKey PORTABLE_FLUID_TANK_IGNEOUS_COMPOSITE = pylonKey("portable_fluid_tank_igneous_composite");
public static final NamespacedKey PORTABLE_FLUID_TANK_STEEL = pylonKey("portable_fluid_tank_steel");

Expand All @@ -184,6 +187,7 @@ public class PylonKeys {
public static final NamespacedKey FLUID_TANK_CASING_TIN = pylonKey("fluid_tank_casing_tin");
public static final NamespacedKey FLUID_TANK_CASING_IRON = pylonKey("fluid_tank_casing_iron");
public static final NamespacedKey FLUID_TANK_CASING_BRONZE = pylonKey("fluid_tank_casing_bronze");
public static final NamespacedKey FLUID_TANK_CASING_OBSIDIAN = pylonKey("fluid_tank_casing_obsidian");
public static final NamespacedKey FLUID_TANK_CASING_IGNEOUS_COMPOSITE = pylonKey("fluid_tank_casing_igneous_composite");
public static final NamespacedKey FLUID_TANK_CASING_STEEL = pylonKey("fluid_tank_casing_steel");

Expand Down Expand Up @@ -249,8 +253,6 @@ public class PylonKeys {
public static final NamespacedKey SHEET_MOLD = pylonKey("mold_sheet");
public static final NamespacedKey PIPE_MOLD = pylonKey("mold_pipe");

public static final NamespacedKey PIT_KILN = pylonKey("pit_kiln");

public static final NamespacedKey EXPLOSIVE_TARGET = pylonKey("explosive_target");
public static final NamespacedKey EXPLOSIVE_TARGET_FIERY = pylonKey("explosive_target_fiery");
public static final NamespacedKey EXPLOSIVE_TARGET_SUPER = pylonKey("explosive_target_super");
Expand Down Expand Up @@ -472,4 +474,5 @@ public class PylonKeys {
public static final NamespacedKey PALLADIUM_SILO = pylonKey("palladium_silo");

public static final NamespacedKey FINE_SEDIMENT = pylonKey("fine_sediment");
public static final NamespacedKey SLAG = pylonKey("slag");
}
19 changes: 10 additions & 9 deletions src/main/java/io/github/pylonmc/pylon/PylonRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,12 @@ public static void initialize() {
PipeBendingRecipe.RECIPE_TYPE.register();
PressRecipe.RECIPE_TYPE.register();
SmelteryRecipe.RECIPE_TYPE.register();
PitKilnRecipe.RECIPE_TYPE.register();
KilnRecipe.RECIPE_TYPE.register();
StrainingRecipe.RECIPE_TYPE.register();
TableSawRecipe.RECIPE_TYPE.register();
SiloConverterRecipe.RECIPE_TYPE.register();
HydraulicPurifier.RECIPE_TYPE.register();
CrudeAlloyFurnaceRecipe.RECIPE_TYPE.register();
FormingRecipe.RECIPE_TYPE.register();

//hardcoded
Expand Down Expand Up @@ -71,8 +72,8 @@ private static void initCollimator() {
)
.addIngredient('#', GuiItems.backgroundBlack())
.addIngredient('i', new FluidButton(input.amountMillibuckets(), PylonFluids.OBSCYRA))
.addIngredient('x', ItemButton.from(PylonItems.COLLIMATOR))
.addIngredient('o', ItemButton.from(PylonItems.COHESIVE_UNIT))
.addIngredient('x', ItemButton.of(PylonItems.COLLIMATOR))
.addIngredient('o', ItemButton.of(PylonItems.COHESIVE_UNIT))
.build()
).register();
}
Expand Down Expand Up @@ -110,11 +111,11 @@ private static void initPalladiumCondenser() {
"# # # # # # # # #"
)
.addIngredient('#', GuiItems.backgroundBlack())
.addIngredient('x', ItemButton.from(PylonItems.PALLADIUM_CONDENSER))
.addIngredient('x', ItemButton.of(PylonItems.PALLADIUM_CONDENSER))
.addIngredient('H', new FluidButton((double) dieselUse, PylonFluids.BIODIESEL))
.addIngredient('d', new FluidButton((double) hydraulicUse, PylonFluids.HYDRAULIC_FLUID))
.addIngredient('s', ItemButton.from(dusts))
.addIngredient('p', ItemButton.from(PylonItems.PALLADIUM_DUST))
.addIngredient('s', ItemButton.of(dusts))
.addIngredient('p', ItemButton.of(PylonItems.PALLADIUM_DUST))
.addIngredient('D', new FluidButton((double) hydraulicUse, PylonFluids.DIRTY_HYDRAULIC_FLUID))
.build()
).register();
Expand Down Expand Up @@ -146,7 +147,7 @@ private static void initBiorefinery() {
"# # # # # # # # #"
)
.addIngredient('#', GuiItems.backgroundBlack())
.addIngredient('x', ItemButton.from(PylonItems.BIOREFINERY))
.addIngredient('x', ItemButton.of(PylonItems.BIOREFINERY))
.addIngredient('o', new FluidButton(1.0, PylonFluids.BIODIESEL))
.addIngredient('p', new FluidButton(plantOilPerMbOfBiodiesel, PylonFluids.PLANT_OIL))
.addIngredient('e', new FluidButton(ethanolPerMbOfBiodiesel, PylonFluids.ETHANOL))
Expand Down Expand Up @@ -176,8 +177,8 @@ private static void initFermenter() {
"# # # # # # # # #"
)
.addIngredient('#', GuiItems.backgroundBlack())
.addIngredient('i', ItemButton.from(ItemStack.of(Material.SUGAR_CANE)))
.addIngredient('x', ItemButton.from(PylonItems.FERMENTER))
.addIngredient('i', ItemButton.of(ItemStack.of(Material.SUGAR_CANE)))
.addIngredient('x', ItemButton.of(PylonItems.FERMENTER))
.addIngredient('o', new FluidButton(ethanolPerSugarcane, PylonFluids.ETHANOL))
.build()
).register();
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/io/github/pylonmc/pylon/content/components/FluidHatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,13 +138,19 @@ public boolean setFluid(@NotNull RebarFluid fluid, double amount) {
return result;
}

public double fluidAmount() {
return fluid == null
? 0.0
: fluidAmount(fluid);
}

@Override
public @Nullable WailaDisplay getWaila(@NotNull Player player) {
Component info;
if (!isFormedAndFullyLoaded()) {
info = Component.translatable("pylon.message.fluid_hatch.no_casing");
} else if (fluid == null) {
info = Component.translatable("pylon.message.fluid_hatch.no_multiblock");
info = Component.translatable("pylon.message.fluid_hatch.no_fluid");
} else {
info = Component.translatable("pylon.message.fluid_hatch.working")
.arguments(
Expand Down
Loading
Loading