Skip to content

[ref:more-cargo-blocks] Breakers and miners #502

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
Jan 9, 2026
Merged

[ref:more-cargo-blocks] Breakers and miners #502

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
dbddeb6
nerf hydraulic hammer head and add diesel hammer head
LordIdra Dec 22, 2025
2e97a0f
why smoke wrong
LordIdra Dec 22, 2025
b6fc702
fix diesel consumption when empty
LordIdra Dec 22, 2025
c4ddcc0
add diesel mixing attachment, smeltery heater, cobblestone/concrete/o…
LordIdra Dec 23, 2025
37fe8c7
Add diesel excavator + chopper
LordIdra Dec 24, 2025
aee261a
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
LordIdra Dec 24, 2025
e16c5b4
Add breakers and miners
LordIdra Dec 25, 2025
d8631cb
Merge branch 'idras-little-fixes' into breakers-and-miners
LordIdra Dec 25, 2025
ce74e40
oops
LordIdra Dec 26, 2025
9ae294c
run ci
LordIdra Dec 28, 2025
295b3b9
you will run ci and you will be happy
LordIdra Dec 28, 2025
fb8762b
fix all the bugs
LordIdra Jan 3, 2026
40a66ca
Fix issues that ohm found
LordIdra Jan 5, 2026
4cf7487
Update src/main/resources/settings/diesel_smeltery_heater.yml
LordIdra Jan 9, 2026
9803cc6
Merge branch 'master' into breakers-and-miners
LordIdra Jan 9, 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
9 changes: 8 additions & 1 deletion src/main/java/io/github/pylonmc/pylon/base/BaseBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ public static void initialize() {
PylonBlock.register(BaseKeys.SMELTERY_HOPPER, Material.HOPPER, SmelteryHopper.class);
PylonBlock.register(BaseKeys.SMELTERY_CASTER, Material.BRICKS, SmelteryCaster.class);
PylonBlock.register(BaseKeys.SMELTERY_BURNER, Material.FURNACE, SmelteryBurner.class);
PylonBlock.register(BaseKeys.DIESEL_SMELTERY_HEATER, Material.FURNACE, DieselSmelteryHeater.class);
PylonBlock.register(BaseKeys.PIT_KILN, Material.DECORATED_POT, PitKiln.class);
PylonBlock.register(BaseKeys.FLUID_STRAINER, Material.COPPER_GRATE, FluidStrainer.class);
PylonBlock.register(BaseKeys.EXPLOSIVE_TARGET, Material.TARGET, ExplosiveTarget.class);
Expand Down Expand Up @@ -118,12 +119,18 @@ public static void initialize() {
PylonBlock.register(BaseKeys.VACUUM_HOPPER_4, Material.HOPPER, VacuumHopper.class);
PylonBlock.register(BaseKeys.HYDRAULIC_REFUELING_STATION, Material.WAXED_CUT_COPPER_SLAB, HydraulicRefuelingStation.class);
PylonBlock.register(BaseKeys.HYDRAULIC_FARMER, Material.WAXED_EXPOSED_COPPER_BULB, HydraulicFarmer.class);
PylonBlock.register(BaseKeys.HYDRAULIC_EXCAVATOR, Material.WAXED_EXPOSED_CHISELED_COPPER, HydraulicExcavator.class);
PylonBlock.register(BaseKeys.HYDRAULIC_MINER, Material.WAXED_EXPOSED_CHISELED_COPPER, HydraulicMiner.class);
PylonBlock.register(BaseKeys.HYDRAULIC_BREAKER, Material.WAXED_EXPOSED_CUT_COPPER, HydraulicBreaker.class);
PylonBlock.register(BaseKeys.DIESEL_PIPE_BENDER, Material.IRON_BLOCK, DieselPipeBender.class);
PylonBlock.register(BaseKeys.DIESEL_TABLE_SAW, Material.IRON_BLOCK, DieselTableSaw.class);
PylonBlock.register(BaseKeys.DIESEL_PRESS, Material.IRON_BLOCK, DieselPress.class);
PylonBlock.register(BaseKeys.DIESEL_GRINDSTONE, Material.IRON_BLOCK, DieselGrindstone.class);
PylonBlock.register(BaseKeys.DIESEL_BRICK_MOLDER, Material.IRON_BLOCK, DieselBrickMolder.class);
PylonBlock.register(BaseKeys.DIESEL_HAMMER_HEAD, Material.IRON_BLOCK, DieselHammerHead.class);
PylonBlock.register(BaseKeys.DIESEL_MIXING_ATTACHMENT, Material.IRON_BLOCK, DieselMixingAttachment.class);
PylonBlock.register(BaseKeys.DIESEL_FURNACE, Material.FURNACE, DieselFurnace.class);
PylonBlock.register(BaseKeys.DIESEL_BREAKER, Material.DROPPER, DieselBreaker.class);
PylonBlock.register(BaseKeys.DIESEL_MINER, Material.IRON_BLOCK, DieselMiner.class);
PylonBlock.register(BaseKeys.CARGO_DUCT, Material.STRUCTURE_VOID, CargoDuct.class);
PylonBlock.register(BaseKeys.CARGO_BUFFER, Material.STRUCTURE_VOID, CargoBuffer.class);
PylonBlock.register(BaseKeys.CARGO_EXTRACTOR, Material.STRUCTURE_VOID, CargoExtractor.class);
Expand Down
59 changes: 56 additions & 3 deletions src/main/java/io/github/pylonmc/pylon/base/BaseItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
import io.github.pylonmc.pylon.base.content.machines.fluid.*;
import io.github.pylonmc.pylon.base.content.machines.hydraulics.*;
import io.github.pylonmc.pylon.base.content.machines.simple.*;
import io.github.pylonmc.pylon.base.content.machines.smelting.DieselSmelteryHeater;
import io.github.pylonmc.pylon.base.content.machines.smelting.PitKiln;
import io.github.pylonmc.pylon.base.content.resources.IronBloom;
import io.github.pylonmc.pylon.base.content.science.Loupe;
Expand Down Expand Up @@ -1794,11 +1795,11 @@ private BaseItems() {
BasePages.HYDRAULICS.addItem(HYDRAULIC_REFUELING_STATION);
}

public static final ItemStack HYDRAULIC_EXCAVATOR = ItemStackBuilder.pylon(Material.WAXED_EXPOSED_CHISELED_COPPER, BaseKeys.HYDRAULIC_EXCAVATOR)
public static final ItemStack HYDRAULIC_MINER = ItemStackBuilder.pylon(Material.WAXED_EXPOSED_CHISELED_COPPER, BaseKeys.HYDRAULIC_MINER)
.build();
static {
PylonItem.register(HydraulicExcavator.Item.class, HYDRAULIC_EXCAVATOR, BaseKeys.HYDRAULIC_EXCAVATOR);
BasePages.HYDRAULICS.addItem(HYDRAULIC_EXCAVATOR);
PylonItem.register(HydraulicMiner.Item.class, HYDRAULIC_MINER, BaseKeys.HYDRAULIC_MINER);
BasePages.HYDRAULICS.addItem(HYDRAULIC_MINER);
}

public static final ItemStack HYDRAULIC_FARMER = ItemStackBuilder.pylon(Material.WAXED_EXPOSED_COPPER_BULB, BaseKeys.HYDRAULIC_FARMER)
Expand All @@ -1808,6 +1809,13 @@ private BaseItems() {
BasePages.HYDRAULICS.addItem(HYDRAULIC_FARMER);
}

public static final ItemStack HYDRAULIC_BREAKER = ItemStackBuilder.pylon(Material.WAXED_EXPOSED_CUT_COPPER, BaseKeys.HYDRAULIC_BREAKER)
.build();
static {
PylonItem.register(HydraulicBreaker.Item.class, HYDRAULIC_BREAKER, BaseKeys.HYDRAULIC_BREAKER);
BasePages.HYDRAULICS.addItem(HYDRAULIC_BREAKER);
}

public static final ItemStack SOULBOUND_RUNE = ItemStackBuilder.pylon(Material.FIREWORK_STAR, BaseKeys.SOULBOUND_RUNE)
.set(DataComponentTypes.FIREWORK_EXPLOSION, FireworkEffect.builder()
.withColor(Color.PURPLE)
Expand Down Expand Up @@ -1857,6 +1865,51 @@ private BaseItems() {
BasePages.DIESEL_MACHINES.addItem(DIESEL_BRICK_MOLDER);
}

public static final ItemStack DIESEL_HAMMER_HEAD = ItemStackBuilder.pylon(Material.IRON_BLOCK, BaseKeys.DIESEL_HAMMER_HEAD)
.set(DataComponentTypes.ITEM_MODEL, Material.GRAY_CONCRETE.getKey())
.build();
static {
PylonItem.register(DieselHammerHead.Item.class, DIESEL_HAMMER_HEAD, BaseKeys.DIESEL_HAMMER_HEAD);
BasePages.DIESEL_MACHINES.addItem(DIESEL_HAMMER_HEAD);
}

public static final ItemStack DIESEL_MIXING_ATTACHMENT = ItemStackBuilder.pylon(Material.IRON_BLOCK, BaseKeys.DIESEL_MIXING_ATTACHMENT)
.set(DataComponentTypes.ITEM_MODEL, Material.LIGHT_GRAY_CONCRETE.getKey())
.build();
static {
PylonItem.register(DieselMixingAttachment.Item.class, DIESEL_MIXING_ATTACHMENT, BaseKeys.DIESEL_MIXING_ATTACHMENT);
BasePages.DIESEL_MACHINES.addItem(DIESEL_MIXING_ATTACHMENT);
}

public static final ItemStack DIESEL_FURNACE = ItemStackBuilder.pylon(Material.FURNACE, BaseKeys.DIESEL_FURNACE)
.build();
static {
PylonItem.register(DieselFurnace.Item.class, DIESEL_FURNACE, BaseKeys.DIESEL_FURNACE);
BasePages.DIESEL_MACHINES.addItem(DIESEL_FURNACE);
}

public static final ItemStack DIESEL_SMELTERY_HEATER = ItemStackBuilder.pylon(Material.FURNACE, BaseKeys.DIESEL_SMELTERY_HEATER)
.build();
static {
PylonItem.register(DieselSmelteryHeater.Item.class, DIESEL_SMELTERY_HEATER, BaseKeys.DIESEL_SMELTERY_HEATER);
BasePages.SMELTING.addItem(DIESEL_SMELTERY_HEATER);
}

public static final ItemStack DIESEL_BREAKER = ItemStackBuilder.pylon(Material.DROPPER, BaseKeys.DIESEL_BREAKER)
.build();
static {
PylonItem.register(DieselBreaker.Item.class, DIESEL_BREAKER, BaseKeys.DIESEL_BREAKER);
BasePages.DIESEL_MACHINES.addItem(DIESEL_BREAKER);
}

public static final ItemStack DIESEL_MINER = ItemStackBuilder.pylon(Material.IRON_BLOCK, BaseKeys.DIESEL_MINER)
.set(DataComponentTypes.ITEM_MODEL, Material.YELLOW_TERRACOTTA.getKey())
.build();
static {
PylonItem.register(DieselMiner.Item.class, DIESEL_MINER, BaseKeys.DIESEL_MINER);
BasePages.DIESEL_MACHINES.addItem(DIESEL_MINER);
}

public static final ItemStack CARGO_DUCT = ItemStackBuilder.pylon(Material.STRUCTURE_VOID, BaseKeys.CARGO_DUCT)
.set(DataComponentTypes.ITEM_MODEL, Material.GRAY_CONCRETE.getKey())
.build();
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/io/github/pylonmc/pylon/base/BaseKeys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

public class BaseKeys {
public static final NamespacedKey ROCK_DUST = baseKey("rock_dust");
public static final NamespacedKey UNFIRED_BRICK = baseKey("unfired_brick");

public static final NamespacedKey OBSIDIAN_CHIP = baseKey("obsidian_chip");

Expand Down Expand Up @@ -285,7 +284,8 @@ public class BaseKeys {
public static final NamespacedKey HYDRAULIC_REFUELING_STATION = baseKey("hydraulic_refueling_station");

public static final NamespacedKey HYDRAULIC_FARMER = baseKey("hydraulic_farmer");
public static final NamespacedKey HYDRAULIC_EXCAVATOR = baseKey("hydraulic_excavator");
public static final NamespacedKey HYDRAULIC_MINER = baseKey("hydraulic_miner");
public static final NamespacedKey HYDRAULIC_BREAKER = baseKey("hydraulic_breaker");

public static final NamespacedKey REACTIVATED_WITHER_SKULL = baseKey("reactivated_wither_skull");
public static final NamespacedKey HYPER_ACTIVATED_WITHER_SKULL = baseKey("hyper_activated_wither_skull");
Expand All @@ -297,6 +297,12 @@ public class BaseKeys {
public static final NamespacedKey DIESEL_PRESS = baseKey("diesel_press");
public static final NamespacedKey DIESEL_GRINDSTONE = baseKey("diesel_grindstone");
public static final NamespacedKey DIESEL_BRICK_MOLDER = baseKey("diesel_brick_molder");
public static final NamespacedKey DIESEL_HAMMER_HEAD = baseKey("diesel_hammer_head");
public static final NamespacedKey DIESEL_MIXING_ATTACHMENT = baseKey("diesel_mixing_attachment");
public static final NamespacedKey DIESEL_SMELTERY_HEATER = baseKey("diesel_smeltery_heater");
public static final NamespacedKey DIESEL_FURNACE = baseKey("diesel_furnace");
public static final NamespacedKey DIESEL_BREAKER = baseKey("diesel_breaker");
public static final NamespacedKey DIESEL_MINER = baseKey("diesel_miner");

public static final NamespacedKey CARGO_BUFFER = baseKey("cargo_buffer");
public static final NamespacedKey CARGO_DUCT = baseKey("cargo_duct");
Expand Down
Loading
Loading