Skip to content

feat: 设计新的 PartAbility 通用仓 #20

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

Open
MuuuShin wants to merge 1 commit into
base: 26.8
Choose a base branch
from
Open

feat: 设计新的 PartAbility 通用仓 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/generated/resources/assets/gtocore/lang/en_us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5865,6 +5865,7 @@
"gtocore.part_ability.input_mana": "Input Mana",
"gtocore.part_ability.items_input": "Items Input",
"gtocore.part_ability.items_output": "Items Output",
"gtocore.part_ability.machine_control": "Machine Control Hatch",
"gtocore.part_ability.maintenance": "Maintenance Hatch",
"gtocore.part_ability.mana_amplifier_hatch": "Mana Amplifier Hatch",
"gtocore.part_ability.muffler": "Muffler",
Expand All @@ -5890,6 +5891,7 @@
"gtocore.part_ability.substation_output_energy": "Substation Energy Output",
"gtocore.part_ability.tank_valve": "Tank Valve",
"gtocore.part_ability.thread_hatch": "Thread Hatch",
"gtocore.part_ability.utility": "Utility Hatch",
"gtocore.pattern.blocking_mode": "Block insertion when the container has any content",
"gtocore.pattern.blocking_parallel": "Prevent insertion after parallel allocation if container has synthetic materials",
"gtocore.pattern.blocking_reverse": "Prevent insertion when not using the same pattern",
Expand Down Expand Up @@ -9096,4 +9098,4 @@
"venus.ad_astra.name": "Venus",
"venus_orbit.ad_astra.name": "Venus Orbit",
"void.gtocore.name": "Void"
}
}
4 changes: 3 additions & 1 deletion src/generated/resources/assets/gtocore/lang/zh_cn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5993,6 +5993,7 @@
"gtocore.part_ability.input_mana": "魔力输入仓",
"gtocore.part_ability.items_input": "物品输入仓",
"gtocore.part_ability.items_output": "物品输出仓",
"gtocore.part_ability.machine_control": "机器控制仓",
"gtocore.part_ability.maintenance": "维护仓",
"gtocore.part_ability.mana_amplifier_hatch": "魔力增幅仓",
"gtocore.part_ability.muffler": "消声仓",
Expand All @@ -6018,6 +6019,7 @@
"gtocore.part_ability.substation_output_energy": "变电站能量输出仓",
"gtocore.part_ability.tank_valve": "储罐阀门",
"gtocore.part_ability.thread_hatch": "线程仓",
"gtocore.part_ability.utility": "通用仓",
"gtocore.pattern.blocking_mode": "容器有任何内容时阻止插入",
"gtocore.pattern.blocking_parallel": "并行发配后容器内存在合成材料时暂停发送",
"gtocore.pattern.blocking_reverse": "非同一样板时阻止插入",
Expand Down Expand Up @@ -9225,4 +9227,4 @@
"venus.ad_astra.name": "金星",
"venus_orbit.ad_astra.name": "金星轨道",
"void.gtocore.name": "虚空"
}
}
4 changes: 3 additions & 1 deletion src/generated/resources/assets/gtocore/lang/zh_tw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5993,6 +5993,7 @@
"gtocore.part_ability.input_mana": "魔力輸入倉",
"gtocore.part_ability.items_input": "物品輸入倉",
"gtocore.part_ability.items_output": "物品輸出倉",
"gtocore.part_ability.machine_control": "機器控制倉",
"gtocore.part_ability.maintenance": "維護倉",
"gtocore.part_ability.mana_amplifier_hatch": "魔力增幅倉",
"gtocore.part_ability.muffler": "消聲倉",
Expand All @@ -6018,6 +6019,7 @@
"gtocore.part_ability.substation_output_energy": "變電站能量輸出倉",
"gtocore.part_ability.tank_valve": "儲罐閥門",
"gtocore.part_ability.thread_hatch": "線程倉",
"gtocore.part_ability.utility": "通用倉",
"gtocore.pattern.blocking_mode": "容器有任何內容時阻止插入",
"gtocore.pattern.blocking_parallel": "並行發配後容器內存在合成材料時暫停發送",
"gtocore.pattern.blocking_reverse": "非同一樣板時阻止插入",
Expand Down Expand Up @@ -9225,4 +9227,4 @@
"venus.ad_astra.name": "金星",
"venus_orbit.ad_astra.name": "金星軌道",
"void.gtocore.name": "虛空"
}
}
2 changes: 2 additions & 0 deletions src/main/java/com/gtocore/api/machine/part/GTOPartAbility.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ public GTOPartAbility(String name, String cn, String en) {
LANG.put("gtocore.part_ability.optical_data_transmission", new CNEN("光学数据源仓", "Optical Data Transmission"));
LANG.put("gtocore.part_ability.data_access", new CNEN("数据访问仓", "Data Access"));
LANG.put("gtocore.part_ability.hpca_component", new CNEN("高性能计算组件", "HPCA Component"));
LANG.put("gtocore.part_ability.utility", new CNEN("通用仓", "Utility Hatch"));
LANG.put("gtocore.part_ability.machine_control", new CNEN("机器控制仓", "Machine Control Hatch"));

}
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/gtocore/common/data/GTOMachines.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ public static void init() {

public static final MachineDefinition HEAT_HATCH = machine("heat_hatch", "导热仓", h -> new HeatHatchPartMachine(h, 850, 1, 1))
.allRotation()
.abilities(PartAbility.IMPORT_ITEMS, PartAbility.IMPORT_FLUIDS, HEAT_CONDUCTION)
.abilities(PartAbility.UTILITY, HEAT_CONDUCTION)
.tooltips(GTOMachineTooltips.TempInterfaceTooltips)
.tooltips(Component.translatable(HeatInterfaceCover.MAX_TEMPERATURE, 850))
.tooltips(Component.translatable(HeatInterfaceCover.HEAT_CAPACITY, 1))
Expand All @@ -702,7 +702,7 @@ public static void init() {

public static final MachineDefinition ADVANCED_HEAT_HATCH = machine("advanced_heat_hatch", "高级导热仓", h -> new HeatHatchPartMachine(h, 3600, 2, 4))
.allRotation()
.abilities(PartAbility.IMPORT_ITEMS, PartAbility.IMPORT_FLUIDS, HEAT_CONDUCTION)
.abilities(PartAbility.UTILITY, HEAT_CONDUCTION)
.tooltips(GTOMachineTooltips.TempInterfaceTooltips)
.tooltips(Component.translatable(HeatInterfaceCover.MAX_TEMPERATURE, 3600))
.tooltips(Component.translatable(HeatInterfaceCover.HEAT_CAPACITY, 2))
Expand All @@ -714,15 +714,15 @@ public static void init() {

public static final MachineDefinition VACUUM_INTERFACE = machine("vacuum_interface", "真空接口", VacuumInterfacePartMachine::new)
.allRotation()
.abilities(PartAbility.IMPORT_ITEMS, PartAbility.IMPORT_FLUIDS)
.abilities(PartAbility.UTILITY)
.tooltips(GTOMachineTooltips.VacuumInterfaceTooltips)
.tier(LV)
.overlayTieredHullRenderer("neutron_sensor")
.register();

public static final MachineDefinition SPACE_SHIELD_HATCH = machine("space_shield_hatch", "太空屏障仓", SpaceShieldHatch::new)
.allRotation()
.abilities(PartAbility.IMPORT_ITEMS, PartAbility.IMPORT_FLUIDS)
.abilities(PartAbility.UTILITY)
.notAllowSharedTooltips()
.tooltips(GTOMachineTooltips.spaceShieldHatchTooltips)
.renderer(() -> new OverlayTieredMachineRenderer(UEV, GTCEu.id("block/machine/part/optical_data_hatch")))
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/com/gtocore/common/data/machines/ExResearchMachines.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public static void init() {}
.where('O', blocks(GTBlocks.HIGH_POWER_CASING.get()))
.where('P', blocks(GTOBlocks.COBALT_OXIDE_CERAMIC_STRONG_THERMALLY_CONDUCTIVE_MECHANICAL_BLOCK.get()))
.where('Q', blocks(GTOBlocks.MC_NYLON_TENSILE_MECHANICAL_SHELL.get()))
.where('R', blocks(GTOBlocks.OXIDATION_RESISTANT_HASTELLOY_N_MECHANICAL_CASING.get())
.wherePart('R', blocks(GTOBlocks.OXIDATION_RESISTANT_HASTELLOY_N_MECHANICAL_CASING.get())
.or(blocks(GTOMachines.THERMAL_CONDUCTOR_HATCH.get()).setMaxGlobalLimited(1))
.or(abilities(IMPORT_ITEMS))
.or(abilities(IMPORT_FLUIDS))
Expand Down Expand Up @@ -304,7 +304,7 @@ private static GTOMachineBuilder registerHPCAPart(String name, String cn,
.or(abilities(IMPORT_FLUIDS))
.or(abilities(COMPUTATION_DATA_RECEPTION))
.or(abilities(PartAbility.OPTICAL_DATA_RECEPTION)))
.where('D', blocks(GTBlocks.HIGH_POWER_CASING.get())
.wherePart('D', blocks(GTBlocks.HIGH_POWER_CASING.get())
.or(abilities(PartAbility.OPTICAL_DATA_TRANSMISSION).setMaxGlobalLimited(4, 1))
.or(abilities(PartAbility.OPTICAL_DATA_RECEPTION).setMaxGlobalLimited(4, 1))
.or(abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(8, 2))
Expand Down Expand Up @@ -434,7 +434,7 @@ private static GTOMachineBuilder registerHPCAPart(String name, String cn,
.where('-', any())
.where('V', blocks(COMPUTER_HEAT_VENT.get()))
.where('A', blocks(ADVANCED_COMPUTER_CASING.get()))
.where('P', blocks(COMPUTER_CASING.get())
.wherePart('P', blocks(COMPUTER_CASING.get())
.or(abilities(PartAbility.INPUT_ENERGY).setMinGlobalLimited(1).setMaxGlobalLimited(2, 1))
.or(abilities(PartAbility.COMPUTATION_DATA_RECEPTION).setExactLimit(1))
.or(autoAbilities(true, false, false)))
Expand Down Expand Up @@ -484,7 +484,7 @@ private static GTOMachineBuilder registerHPCAPart(String name, String cn,
.where('B', blocks(GTBlocks.COMPUTER_HEAT_VENT.get()))
.where('C', blocks(GTBlocks.ADVANCED_COMPUTER_CASING.get()))
.where('D', blocks(GTBlocks.HIGH_POWER_CASING.get()))
.where('E', blocks(GTBlocks.HIGH_POWER_CASING.get())
.wherePart('E', blocks(GTBlocks.HIGH_POWER_CASING.get())
.or(abilities(PartAbility.INPUT_ENERGY).setMaxGlobalLimited(2))
.or(abilities(PartAbility.EXPORT_ITEMS).setExactLimit(1))
.or(abilities(PartAbility.COMPUTATION_DATA_RECEPTION).setExactLimit(1))
Expand Down Expand Up @@ -556,7 +556,7 @@ private static GTOMachineBuilder registerHPCAPart(String name, String cn,
.where('B', blocks(GTBlocks.ADVANCED_COMPUTER_CASING.get()))
.where('C', blocks(GTOBlocks.HIGH_PRESSURE_RESISTANT_CASING.get()))
.where('D', blocks(GTBlocks.HIGH_POWER_CASING.get()))
.where('E', blocks(GTBlocks.HIGH_POWER_CASING.get())
.wherePart('E', blocks(GTBlocks.HIGH_POWER_CASING.get())
.or(abilities(PartAbility.INPUT_ENERGY).setMaxGlobalLimited(2))
.or(abilities(IMPORT_ITEMS))
.or(blocks(STORAGE_DATA_HOLDER.get()).setExactLimit(1))
Expand All @@ -577,11 +577,11 @@ private static GTOMachineBuilder registerHPCAPart(String name, String cn,
.nonYAxisRotation()
.pattern(definition -> MultiBlockFileReader.start(definition)
.where('A', blocks(GTBlocks.COMPUTER_CASING.get()))
.where('B', blocks(GTOBlocks.STABLE_BASE_CASING.get())
.wherePart('B', blocks(GTOBlocks.STABLE_BASE_CASING.get())
.or(abilities(PartAbility.INPUT_ENERGY).setMaxGlobalLimited(2).setPreviewCount(1))
.or(blocks(THERMODYNAMIC_DATA_HOLDER.get()).setExactLimit(1))
.or(abilities(PartAbility.MAINTENANCE).setExactLimit(1))
.or(blocks(GTMachines.CONTROL_HATCH.get())))
.or(abilities(PartAbility.MAINTENANCE).setExactLimit(1)),
abilities(HEAT_CONDUCTION))
.where('C', controller(definition))
.where('D', blocks(GTOBlocks.STABLE_BASE_CASING.get()))
.where('E', GTOPredicates.recordPosition(LOW_TEMP_INTERFACE,
Expand Down Expand Up @@ -623,7 +623,7 @@ private static GTOMachineBuilder registerHPCAPart(String name, String cn,
.where('J', blocks(GTOBlocks.OPTICAL_DYNAMIC_COATING_INSTRUMENT_PROTECTIVE_SHIELD_GLASS.get()))
.where('K', blocks(GTOBlocks.PRESSURE_RESISTANT_HOUSING_MECHANICAL_BLOCK.get()))
.where('L', blocks(GTOBlocks.HIGH_ENERGY_LASER_EMITTER.get()))
.where('M', blocks(GCYMBlocks.CASING_LASER_SAFE_ENGRAVING.get())
.wherePart('M', blocks(GCYMBlocks.CASING_LASER_SAFE_ENGRAVING.get())
.or(autoAbilities(definition.getRecipeTypes()))
.or(abilities(MAINTENANCE).setExactLimit(1))
.or(blocks(OPTICAL_DATA_HOLDER.get()).setExactLimit(1)))
Expand Down Expand Up @@ -659,7 +659,7 @@ private static GTOMachineBuilder registerHPCAPart(String name, String cn,
.where('N', blocks(GTOBlocks.MOLECULAR_CASING.get()))
.where('O', blocks(GTOBlocks.VACUUM_CHAMBER_PROTECTION_CASING.get()))
.where('P', blocks(GTOBlocks.STRONTIUM_CARBONATE_CERAMIC_RAY_ABSORBING_MECHANICAL_CUBE.get()))
.where('Q', blocks(GTOBlocks.NEUTRONIUM_STABLE_CASING.get())
.wherePart('Q', blocks(GTOBlocks.NEUTRONIUM_STABLE_CASING.get())
.or(autoAbilities(definition.getRecipeTypes()))
.or(blocks(INTELLIGENT_SCANNING_ME_PROXY.get()).setExactLimit(1))
.or(abilities(MAINTENANCE).setExactLimit(1)))
Expand Down
Loading
Loading