Skip to content
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.

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

Add High Pressure Variation of The Steam Miner Singleblock. #2637

Merged
merged 5 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/lang/en_ud.json
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@
"block.gtceu.high_performance_computation_array": ")ⱯƆԀH( ʎɐɹɹⱯ uoıʇɐʇndɯoƆ ǝɔuɐɯɹoɟɹǝԀ ɥbıH",
"block.gtceu.high_power_casing": "buısɐƆ ɹǝʍoԀ ɥbıH",
"block.gtceu.high_pressure_hazard_sign_block": "ʞɔoןᗺ ubıS pɹɐzɐH ǝɹnssǝɹԀ ɥbıH",
"block.gtceu.high_pressure_steam_miner": "ɹǝuıW ɯɐǝʇS ǝɹnssǝɹԀ ɥbıH",
"block.gtceu.high_temperature_hazard_sign_block": "ʞɔoןᗺ ubıS pɹɐzɐH ǝɹnʇɐɹǝdɯǝ⟘ ɥbıH",
"block.gtceu.high_temperature_smelting_casing": "buısɐƆ buıʇןǝɯS ǝɹnʇɐɹǝdɯǝ⟘ ɥbıH",
"block.gtceu.high_voltage_hazard_sign_block": "ʞɔoןᗺ ubıS pɹɐzɐH ǝbɐʇןoΛ ɥbıH",
Expand Down Expand Up @@ -1742,7 +1743,6 @@
"config.gtceu.option.enableCleanroom": "ɯooɹuɐǝןƆǝןqɐuǝ",
"config.gtceu.option.enableFEConverters": "sɹǝʇɹǝʌuoƆƎℲǝןqɐuǝ",
"config.gtceu.option.enableMaintenance": "ǝɔuɐuǝʇuıɐWǝןqɐuǝ",
"config.gtceu.option.enableMoreDualHatchAbility": "ʎʇıןıqⱯɥɔʇɐHןɐnᗡǝɹoWǝןqɐuǝ",
"config.gtceu.option.enableResearch": "ɥɔɹɐǝsǝᴚǝןqɐuǝ",
"config.gtceu.option.enableTieredCasings": "sbuısɐƆpǝɹǝı⟘ǝןqɐuǝ",
"config.gtceu.option.enableWorldAccelerators": "sɹoʇɐɹǝןǝɔɔⱯpןɹoMǝןqɐuǝ",
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@
"block.gtceu.high_performance_computation_array": "High Performance Computation Array (HPCA)",
"block.gtceu.high_power_casing": "High Power Casing",
"block.gtceu.high_pressure_hazard_sign_block": "High Pressure Hazard Sign Block",
"block.gtceu.high_pressure_steam_miner": "High Pressure Steam Miner",
"block.gtceu.high_temperature_hazard_sign_block": "High Temperature Hazard Sign Block",
"block.gtceu.high_temperature_smelting_casing": "High Temperature Smelting Casing",
"block.gtceu.high_voltage_hazard_sign_block": "High Voltage Hazard Sign Block",
Expand Down Expand Up @@ -1742,7 +1743,6 @@
"config.gtceu.option.enableCleanroom": "enableCleanroom",
"config.gtceu.option.enableFEConverters": "enableFEConverters",
"config.gtceu.option.enableMaintenance": "enableMaintenance",
"config.gtceu.option.enableMoreDualHatchAbility": "enableMoreDualHatchAbility",
"config.gtceu.option.enableResearch": "enableResearch",
"config.gtceu.option.enableTieredCasings": "enableTieredCasings",
"config.gtceu.option.enableWorldAccelerators": "enableWorldAccelerators",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public class GTMachines {
public static final Pair<MachineDefinition, MachineDefinition> STEAM_ROCK_CRUSHER = registerSimpleSteamMachines(
"rock_crusher", GTRecipeTypes.ROCK_BREAKER_RECIPES);
public static final MachineDefinition STEAM_MINER = REGISTRATE
.machine("steam_miner", holder -> new SteamMinerMachine(holder, 320, 4, 0))
.machine("steam_miner", holder -> new SteamMinerMachine(holder, 320, 4, 0, 16))
.rotationState(RotationState.NON_Y_AXIS)
.langValue("Steam Miner")
.recipeType(DUMMY_RECIPES)
Expand All @@ -146,6 +146,21 @@ public class GTMachines {
})
.renderer(() -> new SteamMinerRenderer(false, GTCEu.id("block/machines/steam_miner")))
.register();
public static final MachineDefinition HIGH_PRESSURE_STEAM_MINER = REGISTRATE
.machine("high_pressure_steam_miner", holder -> new SteamMinerMachine(holder, 240, 6, 0, 32))
.rotationState(RotationState.NON_Y_AXIS)
.langValue("High Pressure Steam Miner")
.recipeType(DUMMY_RECIPES)
.tier(0)
.tooltips(Component.translatable("gtceu.universal.tooltip.uses_per_tick_steam", 32)
.append(ChatFormatting.GRAY + ", ")
.append(Component.translatable("gtceu.machine.miner.per_block", 280 / 20)))
.tooltipBuilder((item, tooltip) -> {
int maxArea = IMiner.getWorkingArea(6);
tooltip.add(Component.translatable("gtceu.universal.tooltip.working_area", maxArea, maxArea));
})
.renderer(() -> new SteamMinerRenderer(true, GTCEu.id("block/machines/high_pressure_steam_miner")))
.register();

//////////////////////////////////////
// *** SimpleTieredMachine ***//
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ public class SteamMinerMachine extends SteamWorkableMachine implements IMiner, I
@Nullable
protected ISubscription exportItemSubs;

public SteamMinerMachine(IMachineBlockEntity holder, int speed, int maximumRadius, int fortune) {
public SteamMinerMachine(IMachineBlockEntity holder, int speed, int maximumRadius, int fortune, int energyPerTick) {
super(holder, false, fortune, speed, maximumRadius);
this.inventorySize = 4;
this.energyPerTick = 16;
this.energyPerTick = energyPerTick;
this.importItems = createImportItemHandler();
this.exportItems = createExportItemHandler();
}
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation": {
"frametime": 8
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"animation":{
"frametime":2
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading