Skip to content

Commit 9d375a3

Browse files
Phoenixvine32908Phoenixvine32908
committed
Merge remote-tracking branch 'origin/main'
2 parents e01b793 + 727fbf3 commit 9d375a3

17 files changed

Lines changed: 194 additions & 0 deletions

‎run/config/gtmutils.yaml‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
features:
2+
# Whether the Sterile Cleaning Maintenance Hatch is enabled.
3+
sterileHatchEnabled: true
4+
5+
# Whether the 64A energy converters are enabled.
6+
converters64aEnabled: true
7+
8+
# Whether the Omni-breaker is enabled.
9+
omnibreakerEnabled: true
10+
11+
# What tier the Omni-breaker is, if enabled. (ULV = 0, LV = 1, MV = 2, ...)
12+
# (Unless the default recipe is overridden, can only support LV to IV!)
13+
omnibreakerTier: 5
14+
15+
# The energy capacity of the Omni-breaker.
16+
omnibreakerEnergyCapacity: 40960000
17+
18+
# Whether the Wireless Active Transformer is enabled.
19+
pterbEnabled: true
20+
21+
# Base amount of WAT coolant to drain every second.
22+
# (Setting both this amount and the IO multiplier to 0 disables the coolant mechanic.)
23+
pterbCoolantBaseDrain: 10
24+
25+
# Multiplier over IO amount for additional coolant drain.
26+
# (Setting both this and the base drain amount to 0 disables the coolant mechanic.)
27+
pterbCoolantIOMultiplier: 3.0E-5
28+
29+
# Whether the coins/credits are enabled.
30+
coinsEnabled: true
31+
32+
# Whether the custom MV tools are enabled.
33+
customMVToolsEnabled: false
34+
35+
# Whether the custom HV tools are enabled.
36+
customHVToolsEnabled: false
37+
38+
# Whether the custom EV tools are enabled.
39+
customEVToolsEnabled: false
40+
41+
# Whether the custom IV tools are enabled.
42+
customIVToolsEnabled: false
43+
44+
# Whether the custom LuV tools are enabled.
45+
customLuVToolsEnabled: true
46+
47+
# Whether the custom ZPM tools are enabled.
48+
customZPMToolsEnabled: true
49+

‎src/generated/resources/assets/gtmutils/blockstates/sterile_cleaning_maintenance_hatch.json‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"variants": {
3+
"facing=down": {
4+
"model": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch",
25+
"y": 270
26+
}
27+
}
28+
}

‎src/generated/resources/assets/gtmutils/lang/en_ud.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"block.gtmutils.mv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛWq§",
99
"block.gtmutils.opv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛdOן§6§",
1010
"block.gtmutils.pterb_machine": "ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ssǝןǝɹıM",
11+
"block.gtmutils.sterile_cleaning_maintenance_hatch": "ɥɔʇɐH ǝɔuɐuǝʇuıɐW buıuɐǝןƆ ǝןıɹǝʇS",
1112
"block.gtmutils.uev_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛƎ∩ɐ§",
1213
"block.gtmutils.uhv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛH∩ㄣ§",
1314
"block.gtmutils.uiv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛI∩ᄅ§",
@@ -68,10 +69,22 @@
6869
"item.gtceu.tool.zpm_screwdriver": ")WԀZ( ɹǝʌıɹpʍǝɹɔS ɔıɹʇɔǝןƎ %s",
6970
"item.gtceu.tool.zpm_wirecutter": ")WԀZ( ɹǝʇʇnƆ ǝɹıM %s",
7071
"item.gtceu.tool.zpm_wrench": ")WԀZ( ɥɔuǝɹM %s",
72+
"item.gtmutils.ancient_gold_coin": "uıoƆ pןo⅁ ʇuǝıɔuⱯ",
73+
"item.gtmutils.chocolate_coin": "uıoƆ ǝʇɐןoɔoɥƆ",
74+
"item.gtmutils.copper_credit": "ʇıpǝɹƆ ɹǝddoƆ",
75+
"item.gtmutils.cupronickel_credit": "ʇıpǝɹƆ ןǝʞɔıuoɹdnƆ",
76+
"item.gtmutils.doge_coin": "uıoƆ ǝboᗡ",
77+
"item.gtmutils.gold_credit": "ʇıpǝɹƆ pןo⅁",
7178
"item.gtmutils.luv_power_unit": "ʇıu∩ ɹǝʍoԀ ΛnꞀ",
79+
"item.gtmutils.naquadah_credit": "ʇıpǝɹƆ ɥɐpɐnbɐN",
80+
"item.gtmutils.neutronium_credit": "ʇıpǝɹƆ ɯnıuoɹʇnǝN",
7281
"item.gtmutils.omnibreaker": "ɹǝʞɐǝɹq-ıuɯO",
82+
"item.gtmutils.osmium_credit": "ʇıpǝɹƆ ɯnıɯsO",
83+
"item.gtmutils.platinum_credit": "ʇıpǝɹƆ ɯnuıʇɐןԀ",
84+
"item.gtmutils.silver_credit": "ʇıpǝɹƆ ɹǝʌןıS",
7385
"item.gtmutils.zpm_power_unit": "ʇıu∩ ɹǝʍoԀ WԀZ",
7486
"itemGroup.gtmutils.creative_tab": "sǝıʇıןıʇ∩ uɹǝpoW ɥɔǝ⟘bǝɹ⅁",
87+
"material.gtmutils.quantum_coolant": "ʇuɐןooƆ ɯnʇuɐnὉ",
7588
"tooltip.omnibreaker.can_break_anything": "¡⅁NIH⟘ʎNⱯ ǝuıɯ-ɐʇsuı uɐɔ ɹǝʞɐǝɹq-ıuɯO ǝɥ⟘",
7689
"tooltip.omnibreaker.charge_status": "∩Ǝ %s / ∩Ǝ %s :ʎbɹǝuƎ",
7790
"tooltip.omnibreaker.modern_vajra": "ɐɹظɐΛ uɹǝpoW Ɐ",

‎src/generated/resources/assets/gtmutils/lang/en_us.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
"block.gtmutils.mv_64a_energy_converter": "§bMV§r 64§eA§r Energy Converter",
99
"block.gtmutils.opv_64a_energy_converter": "§9§lOpV§r 64§eA§r Energy Converter",
1010
"block.gtmutils.pterb_machine": "Wireless Active Transformer",
11+
"block.gtmutils.sterile_cleaning_maintenance_hatch": "Sterile Cleaning Maintenance Hatch",
1112
"block.gtmutils.uev_64a_energy_converter": "§aUEV§r 64§eA§r Energy Converter",
1213
"block.gtmutils.uhv_64a_energy_converter": "§4UHV§r 64§eA§r Energy Converter",
1314
"block.gtmutils.uiv_64a_energy_converter": "§2UIV§r 64§eA§r Energy Converter",
@@ -68,10 +69,22 @@
6869
"item.gtceu.tool.zpm_screwdriver": "%s Electric Screwdriver (ZPM)",
6970
"item.gtceu.tool.zpm_wirecutter": "%s Wire Cutter (ZPM)",
7071
"item.gtceu.tool.zpm_wrench": "%s Wrench (ZPM)",
72+
"item.gtmutils.ancient_gold_coin": "Ancient Gold Coin",
73+
"item.gtmutils.chocolate_coin": "Chocolate Coin",
74+
"item.gtmutils.copper_credit": "Copper Credit",
75+
"item.gtmutils.cupronickel_credit": "Cupronickel Credit",
76+
"item.gtmutils.doge_coin": "Doge Coin",
77+
"item.gtmutils.gold_credit": "Gold Credit",
7178
"item.gtmutils.luv_power_unit": "LuV Power Unit",
79+
"item.gtmutils.naquadah_credit": "Naquadah Credit",
80+
"item.gtmutils.neutronium_credit": "Neutronium Credit",
7281
"item.gtmutils.omnibreaker": "Omni-breaker",
82+
"item.gtmutils.osmium_credit": "Osmium Credit",
83+
"item.gtmutils.platinum_credit": "Platinum Credit",
84+
"item.gtmutils.silver_credit": "Silver Credit",
7385
"item.gtmutils.zpm_power_unit": "ZPM Power Unit",
7486
"itemGroup.gtmutils.creative_tab": "GregTech Modern Utilities",
87+
"material.gtmutils.quantum_coolant": "Quantum Coolant",
7588
"tooltip.omnibreaker.can_break_anything": "The Omni-breaker can insta-mine ANYTHING!",
7689
"tooltip.omnibreaker.charge_status": "Energy: %s EU / %s EU",
7790
"tooltip.omnibreaker.modern_vajra": "A Modern Vajra",

‎src/generated/resources/assets/gtmutils/models/block/machine/sterile_cleaning_maintenance_hatch.json‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"parent": "minecraft:block/block",
3+
"loader": "gtceu:machine",
4+
"machine": "gtmutils:sterile_cleaning_maintenance_hatch",
5+
"replaceable_textures": [
6+
"bottom",
7+
"top",
8+
"side"
9+
],
10+
"variants": {
11+
"": {
12+
"model": {
13+
"parent": "gtmutils:block/machine/part/sterile_cleaning_maintenance_hatch",
14+
"textures": {
15+
"bottom": "gtceu:block/casings/voltage/uhv/bottom",
16+
"side": "gtceu:block/casings/voltage/uhv/side",
17+
"top": "gtceu:block/casings/voltage/uhv/top"
18+
}
19+
}
20+
}
21+
}
22+
}

‎src/generated/resources/assets/gtmutils/models/item/ancient_gold_coin.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "gtmutils:item/ancient_gold_coin"
5+
}
6+
}

‎src/generated/resources/assets/gtmutils/models/item/chocolate_coin.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "gtmutils:item/chocolate_coin"
5+
}
6+
}

‎src/generated/resources/assets/gtmutils/models/item/copper_credit.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "gtmutils:item/copper_credit"
5+
}
6+
}

‎src/generated/resources/assets/gtmutils/models/item/cupronickel_credit.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "gtmutils:item/cupronickel_credit"
5+
}
6+
}

‎src/generated/resources/assets/gtmutils/models/item/doge_coin.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "gtmutils:item/doge_coin"
5+
}
6+
}

0 commit comments

Comments
 (0)