Skip to content
This repository was archived by the owner on Jan 19, 2026. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
2fe8251
Merge pull request #41 from EpimorphicPioneers/gate_guardian_develop
gateguardian523 Aug 1, 2024
31f470d
Merge remote-tracking branch 'origin/main'
3453890470 Aug 3, 2024
bc4825c
Merge remote-tracking branch 'origin/main'
3453890470 Aug 3, 2024
ca4a785
Merge remote-tracking branch 'origin/main'
3453890470 Aug 3, 2024
2b125ce
Merge remote-tracking branch 'origin/main'
3453890470 Aug 5, 2024
dda2efc
glass
gateguardian523 Aug 6, 2024
5c8e7b0
fix shift tooltips
DancingSnow0517 Aug 6, 2024
652b8de
fix shift tooltips (#86)
DancingSnow0517 Aug 6, 2024
e358eff
Merge remote-tracking branch 'origin/main'
3453890470 Aug 6, 2024
1f8cf9a
fix & datagen
gateguardian523 Aug 6, 2024
1e0d60a
Merge remote-tracking branch 'origin/glass' into glass
gateguardian523 Aug 6, 2024
5c4fb8c
update glass textures
DancingSnow0517 Aug 6, 2024
40caeff
Merge branch 'refs/heads/glass' into update-glass
DancingSnow0517 Aug 6, 2024
0688361
spotless
DancingSnow0517 Aug 6, 2024
1faf55b
Merge remote-tracking branch 'refs/remotes/origin/fix-tooltips'
3453890470 Aug 6, 2024
1021d44
Merge remote-tracking branch 'origin/main'
3453890470 Aug 6, 2024
4301d3e
Merge remote-tracking branch 'origin/main'
3453890470 Aug 8, 2024
c5075bb
Merge remote-tracking branch 'origin/main'
3453890470 Aug 8, 2024
fbdf4ef
Merge remote-tracking branch 'origin/main'
3453890470 Aug 9, 2024
d08d0bc
Merge remote-tracking branch 'origin/main'
3453890470 Aug 9, 2024
14dd67c
Merge remote-tracking branch 'origin/main'
3453890470 Aug 9, 2024
de69508
Merge remote-tracking branch 'origin/main'
3453890470 Aug 10, 2024
f20d856
Merge remote-tracking branch 'origin/main'
3453890470 Aug 10, 2024
4c863a5
Merge remote-tracking branch 'origin/main'
3453890470 Aug 12, 2024
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
135 changes: 105 additions & 30 deletions src/generated/resources/assets/epimorphism/lang/en_ud.json

Large diffs are not rendered by default.

135 changes: 105 additions & 30 deletions src/generated/resources/assets/epimorphism/lang/en_us.json

Large diffs are not rendered by default.

220 changes: 175 additions & 45 deletions src/generated/resources/assets/epimorphism/lang/zh_cn.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@
import static com.epimorphismmc.epimorphism.common.block.BorosilicateGlassBlock.Type.TRANSCENDENT_METAL_BOROSILICATE;
import static com.epimorphismmc.epimorphism.common.block.BorosilicateGlassBlock.Type.TUNGSTEN_BOROSILICATE;
import static com.epimorphismmc.epimorphism.common.block.BorosilicateGlassBlock.Type.WHITE_DWARF_MATTER_BOROSILICATE;
import static com.epimorphismmc.epimorphism.common.block.BlockMaps.*;
import static com.epimorphismmc.epimorphism.common.block.BorosilicateGlassBlock.Type.*;
import static com.gregtechceu.gtceu.common.data.GTBlocks.*;
import static com.gregtechceu.gtceu.common.data.GTModels.createModelBlockState;
import static com.gregtechceu.gtceu.common.registry.GTRegistration.REGISTRATE;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ public class EPMachines {
.rotationState(RotationState.ALL)
.abilities(EPPartAbility.CATALYST)
.overlayTieredHullRenderer("catalyst_hatch")
.tooltips()
.tooltips(Component.translatable("block.epimorphism.catalyst_hatch.desc.0"))
.register();

public static final MachineDefinition NEUTRON_SENSOR = registrate()
Expand All @@ -315,7 +315,7 @@ public class EPMachines {
.rotationState(RotationState.ALL)
.abilities(EPPartAbility.NEUTRON_SENSOR)
.overlayTieredHullRenderer("neutron_sensor")
.tooltips(Component.translatable("block.epimorphism.neutron_sensor.desc"))
.tooltips(Component.translatable("block.epimorphism.neutron_sensor.desc.0"))
.register();

public static final MachineDefinition[] NEUTRON_ACCELERATOR = registerTieredEPMachines(
Expand Down Expand Up @@ -362,8 +362,8 @@ public class EPMachines {
.abilities(EPPartAbility.REINFORCED_ROTOR_HOLDER)
.renderer(() -> new RotorHolderMachineRenderer(tier))
.tooltips(
LangHandler.getFromMultiLang("gtceu.machine.muffler_hatch.tooltip", 0),
LangHandler.getFromMultiLang("gtceu.machine.muffler_hatch.tooltip", 1),
LangHandler.getFromMultiLang("gtceu.machine.rotor_holder.tooltip", 0),
LangHandler.getFromMultiLang("gtceu.machine.rotor_holder.tooltip", 1),
Component.translatable("gtceu.universal.disabled"))
.register(),
tiersBetween(IV, UEV));
Expand Down Expand Up @@ -1521,7 +1521,13 @@ public class EPMachines {
public static final MultiblockMachineDefinition CHEMICAL_PLANT = registrate()
.multiblock("chemical_plant", ChemicalPlantMachine::new)
.langValue("Chemical Plant")
.tooltips(Component.translatable("block.epimorphism.chemical_plant.desc.0"))
.tooltips(
Component.translatable("block.epimorphism.chemical_plant.desc.0"),
Component.translatable("block.epimorphism.chemical_plant.desc.1"),
Component.translatable("block.epimorphism.chemical_plant.desc.2"),
Component.translatable("block.epimorphism.chemical_plant.desc.3"),
Component.translatable("block.epimorphism.chemical_plant.desc.4"),
Component.translatable("block.epimorphism.chemical_plant.desc.5"))
.rotationState(RotationState.ALL)
.recipeTypes(EPRecipeTypes.CHEMICAL_PLANT_RECIPES)
.recipeModifiers(
Expand Down Expand Up @@ -2226,7 +2232,6 @@ public class EPMachines {
.tooltips(
Component.translatable("block.epimorphism.concrete_backfiller.desc.0"),
Component.translatable("block.epimorphism.concrete_backfiller.desc.1"),
Component.translatable("block.epimorphism.concrete_backfiller.desc.2"),
Component.translatable(
"gtceu.universal.tooltip.working_area_max",
((int) Math.pow(2, tier - 1)) * 16 + 1,
Expand Down Expand Up @@ -2265,7 +2270,8 @@ public class EPMachines {
.langValue("Yotta Fluid Tank")
.tooltips(
Component.translatable("block.epimorphism.yotta_fluid_tank.desc.0"),
Component.translatable("block.epimorphism.yotta_fluid_tank.desc.1"))
Component.translatable("block.epimorphism.yotta_fluid_tank.desc.1"),
Component.translatable("block.epimorphism.yotta_fluid_tank.desc.2"))
.rotationState(RotationState.NON_Y_AXIS)
.recipeType(DUMMY_RECIPES)
.appearanceBlock(EPBlocks.YOTTA_FLUID_TANK_CASING)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -151,80 +151,71 @@ public class EPPhysicsItems {
registerParticleCapsule("kerr_black_hole").lang("Kerr Black Hole Capsule").register();

// Nuclear Physics items
public static ItemEntry<Item> NEUTRON_SOURCE =
registrate().item("neutron_source", Item::new).lang("Neutron Source").register();
public static ItemEntry<ComponentItem> ELECTRON_SOURCE =
registerItemWithTooltip("electron_source", 1).register();
public static ItemEntry<Item> PLATE_RADIATION_PROTECTION = registrate()
.item("plate_radiation_protection", Item::new)
.lang("Radiation Protection Plate")
.register();
public static ItemEntry<Item> ADV_PLATE_RADIATION_PROTECTION = registrate()
.item("advanced_plate_radiation_protection", Item::new)
.lang("Advanced Radiation Protection Plate")
.register();
public static ItemEntry<Item> ENCAPSULATED_URANIUM = registrate()
.item("encapsulated_uranium", Item::new)
.lang("Encapsulated Uranium")
.register();
public static ItemEntry<Item> ENRICHED_URANIUM_NUGGET = registrate()
.item("enriched_uranium_nugget", Item::new)
.lang("Enriched Uranium Nugget")
.register();
public static ItemEntry<Item> ENRICHED_URANIUM =
registrate().item("enriched_uranium", Item::new).lang("Enriched Uranium").register();
public static ItemEntry<Item> ENCAPSULATED_THORIUM = registrate()
.item("encapsulated_thorium", Item::new)
.lang("Encapsulated Thorium")
.register();
public static ItemEntry<Item> ENRICHED_THORIUM_NUGGET = registrate()
.item("enriched_thorium_nugget", Item::new)
.lang("Enriched Thorium Nugget")
.register();
public static ItemEntry<Item> ENRICHED_THORIUM =
registrate().item("enriched_thorium", Item::new).lang("Enriched Thorium").register();
public static ItemEntry<Item> ENCAPSULATED_PLUTONIUM = registrate()
.item("encapsulated_plutonium", Item::new)
.lang("Encapsulated Plutonium")
.register();
public static ItemEntry<Item> ENRICHED_PLUTONIUM_NUGGET = registrate()
.item("enriched_plutonium_nugget", Item::new)
.lang("Enriched Plutonium Nugget")
.register();
public static ItemEntry<Item> ENRICHED_PLUTONIUM = registrate()
.item("enriched_plutonium", Item::new)
.lang("Enriched Plutonium")
public static ItemEntry<ComponentItem> NEUTRON_SOURCE = registerItemWithTooltip
("neutron_source", 1)
.register();

public static ItemEntry<ComponentItem> NEUTRON_REFLECTOR = registerReactorComponent(
"neutron_reflector")
.lang("Neutron Reflector")
public static ItemEntry<ComponentItem> ELECTRON_SOURCE = registerItemWithTooltip
("electron_source", 1)
.register();
public static ItemEntry<ComponentItem> PLATE_RADIATION_PROTECTION = registerItemWithTooltip
("plate_radiation_protection",1)
.register();
public static ItemEntry<ComponentItem> ADV_PLATE_RADIATION_PROTECTION = registerItemWithTooltip
("advanced_plate_radiation_protection",1)
.register();
public static ItemEntry<ComponentItem> ENCAPSULATED_URANIUM = registerItemWithTooltip
("encapsulated_uranium",1)
.register();
public static ItemEntry<ComponentItem> ENRICHED_URANIUM_NUGGET = registerItemWithTooltip
("enriched_uranium_nugget",1)
.register();
public static ItemEntry<ComponentItem> ENRICHED_URANIUM = registerItemWithTooltip
("enriched_uranium",1)
.register();
public static ItemEntry<ComponentItem> ENCAPSULATED_THORIUM = registerItemWithTooltip
("encapsulated_thorium",1)
.register();
public static ItemEntry<ComponentItem> ENRICHED_THORIUM_NUGGET = registerItemWithTooltip
("enriched_thorium_nugget",1)
.register();
public static ItemEntry<ComponentItem> ENRICHED_THORIUM = registerItemWithTooltip
("enriched_thorium",1)
.register();
public static ItemEntry<ComponentItem> ENCAPSULATED_PLUTONIUM = registerItemWithTooltip
("encapsulated_plutonium",1)
.register();
public static ItemEntry<ComponentItem> ENRICHED_PLUTONIUM_NUGGET = registerItemWithTooltip
("enriched_plutonium_nugget",1)
.register();
public static ItemEntry<ComponentItem> ENRICHED_PLUTONIUM = registerItemWithTooltip
("enriched_plutonium",1)
.register();
public static ItemEntry<ComponentItem> NEUTRON_REFLECTOR = registerReactorComponent
("neutron_reflector")
.onRegister(attach(new ReflectorBehavior(3000)))
.register();
public static ItemEntry<ComponentItem> THICK_NEUTRON_REFLECTOR = registerReactorComponent(
"thick_neutron_reflector")
.lang("Thick Neutron Reflector")
public static ItemEntry<ComponentItem> THICK_NEUTRON_REFLECTOR = registerReactorComponent
("thick_neutron_reflector")
.onRegister(attach(new ReflectorBehavior(12000)))
.register();
public static ItemEntry<ComponentItem> IRIDIUM_REFLECTOR = registerReactorComponent(
"iridium_reflector")
.lang("Iridium Reflector")
public static ItemEntry<ComponentItem> IRIDIUM_REFLECTOR = registerReactorComponent
("iridium_reflector")
.onRegister(attach(new ReflectorBehavior(-1)))
.register();
public static ItemEntry<ComponentItem> PLATING = registerReactorComponent("plating")
.lang("Plating")
public static ItemEntry<ComponentItem> PLATING = registerReactorComponent
("plating")
.onRegister(attach(new PlatingBehavior(1000, 0.95F)))
.register();
public static ItemEntry<ComponentItem> CONTAINMENT_PLATING = registerReactorComponent(
"containment_plating")
.lang("Containment Plating")
public static ItemEntry<ComponentItem> CONTAINMENT_PLATING = registerReactorComponent
("containment_plating")
.onRegister(attach(new PlatingBehavior(500, 0.9F)))
.register();
public static ItemEntry<ComponentItem> HEAT_PLATING = registerReactorComponent("heat_plating")
.lang("Heat Plating")
public static ItemEntry<ComponentItem> HEAT_PLATING = registerReactorComponent
("heat_plating")
.onRegister(attach(new PlatingBehavior(1700, 0.99F)))
.register();
public static ItemEntry<ComponentItem> HEAT_EXCHANGER = registerReactorComponent("heat_exchanger")
public static ItemEntry<ComponentItem> HEAT_EXCHANGER = registerReactorComponent
("heat_exchanger")
.lang("Heat Exchanger")
.onRegister(attach(new ExchangerBehavior(2500, 12, 4)))
.register();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,8 @@ public class AdvancedMachines {
Component.translatable("block.epimorphism.precise_assembler.desc.1"),
Component.translatable("block.epimorphism.precise_assembler.desc.2"),
Component.translatable("block.epimorphism.precise_assembler.desc.3"),
Component.translatable("block.epimorphism.precise_assembler.desc.4"))
Component.translatable("block.epimorphism.precise_assembler.desc.4"),
Component.translatable("block.epimorphism.precise_assembler.desc.5"))
.rotationState(RotationState.NON_Y_AXIS)
.recipeTypes(ASSEMBLER_RECIPES, EPRecipeTypes.PRECISE_ASSEMBLER_RECIPES)
.recipeModifiers(
Expand Down Expand Up @@ -613,9 +614,11 @@ public class AdvancedMachines {
components.add(
Component.translatable("block.epimorphism.general_processing_plant.desc.1"));
components.add(
Component.translatable("block.epimorphism.general_processing_plant.desc.2"));
Component.translatable("epimorphism.universal.desc.duration", "0.4×"));
components.add(
Component.translatable("epimorphism.universal.desc.energ_usage", "0.8×"));
components.add(
Component.translatable("block.epimorphism.general_processing_plant.desc.3"));
Component.translatable("block.epimorphism.general_processing_plant.desc.2"));
components.add(Component.translatable("monomorphism.shift_info"));
}
})
Expand Down Expand Up @@ -1102,8 +1105,14 @@ public class AdvancedMachines {
.multiblock("advanced_electric_blast_furnace", AdvancedEBFMachine::new)
.langValue("Advanced Electric Blast Furnace")
.tooltips(
Component.translatable("block.epimorphism.advanced_electric_blast_furnace.desc.0"),
Component.translatable("gtceu.machine.electric_blast_furnace.tooltip.1"),
Component.translatable("gtceu.machine.electric_blast_furnace.tooltip.2"))
Component.translatable("gtceu.machine.electric_blast_furnace.tooltip.2"),
Component.translatable("block.epimorphism.advanced_electric_blast_furnace.desc.1"),
Component.translatable("epimorphism.universal.desc.duration","0.5x"),
Component.translatable("block.epimorphism.advanced_electric_blast_furnace.desc.2"),
Component.translatable("block.epimorphism.advanced_electric_blast_furnace.desc.3"),
Component.translatable("block.epimorphism.advanced_electric_blast_furnace.desc.4"))
.rotationState(RotationState.NON_Y_AXIS)
.recipeType(BLAST_RECIPES)
.recipeModifiers(EPRecipeModifiers.EP_PARALLEL, AdvancedEBFMachine::advEBFOverclock)
Expand Down Expand Up @@ -1152,7 +1161,13 @@ public class AdvancedMachines {
public static final MultiblockMachineDefinition INDUSTRIAL_VACUUM_FREEZER = registrate()
.multiblock("industrial_vacuum_freezer", IndustrialFreezerMachine::new)
.langValue("Industrial Vacuum Freezer")
.tooltips(Component.translatable("block.epimorphism.industrial_vacuum_freezer.desc.0"))
.tooltips(
Component.translatable("block.epimorphism.industrial_vacuum_freezer.desc.0"),
Component.translatable("block.epimorphism.industrial_vacuum_freezer.desc.1"),
Component.translatable("epimorphism.universal.desc.duration","0.5x"),
Component.translatable("epimorphism.universal.desc.parallel","4"),
Component.translatable("block.epimorphism.industrial_vacuum_freezer.desc.2"),
Component.translatable("block.epimorphism.industrial_vacuum_freezer.desc.3"))
.rotationState(RotationState.NON_Y_AXIS)
.recipeType(VACUUM_RECIPES)
.recipeModifiers(
Expand Down Expand Up @@ -1183,7 +1198,13 @@ public class AdvancedMachines {
blockEntity -> new ParallelCoilCasingMultiblockMachine(
blockEntity, "Firebox", machine -> machine.getCoilTier() * 4))
.langValue("Coking Tower")
.tooltips(Component.translatable("block.epimorphism.industrial_coke_oven.desc.0"))
.tooltips(
Component.translatable("block.epimorphism.industrial_coke_oven.desc.0"),
Component.translatable("block.epimorphism.industrial_coke_oven.desc.1"),
Component.translatable("epimorphism.universal.desc.duration","0.5x"),
Component.translatable("epimorphism.universal.desc.parallel","4"),
Component.translatable("block.epimorphism.industrial_coke_oven.desc.2"),
Component.translatable("block.epimorphism.industrial_coke_oven.desc.3"))
.rotationState(RotationState.NON_Y_AXIS)
.recipeType(PYROLYSE_RECIPES)
.appearanceBlock(CASING_STEEL_SOLID)
Expand Down Expand Up @@ -1605,7 +1626,12 @@ public class AdvancedMachines {
public static final MultiblockMachineDefinition INFINITE_FLUID_DRILLING_RIG = registrate()
.multiblock("infinite_fluid_drilling_rig", InfiniteFluidDrillingRigMachine::new)
.langValue("Infinite Fluid Drilling Rig")
.tooltips(Component.translatable("block.epimorphism.industrial_drill.desc.0"))
.tooltips(
Component.translatable("block.epimorphism.infinite_fluid_drilling_rig.desc.0"),
Component.translatable("gtceu.machine.fluid_drilling_rig.description"),
Component.translatable("gtceu.machine.fluid_drilling_rig.depletion","0"),
Component.translatable("block.epimorphism.infinite_fluid_drilling_rig.desc.1"),
Component.translatable("block.epimorphism.infinite_fluid_drilling_rig.desc.2"))
.rotationState(RotationState.NON_Y_AXIS)
.recipeType(DUMMY_RECIPES)
.appearanceBlock(EPBlocks.NEUTRONIUM_MINING_CASING)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class EPAEMachines {
.rotationState(RotationState.ALL)
.abilities(EPPartAbility.TANK_ACCESS)
.overlayTieredHullRenderer("tank_access_hatch")
.tooltips(Component.translatable("block.epimorphism.tank_hatch.desc.0"))
.tooltips(Component.translatable("block.epimorphism.tank_access_hatch.desc.0"))
.register();

public static void init() {}
Expand Down
Loading