Skip to content

Commit d13bbfa

Browse files
Phoenixvine32908Phoenixvine32908
committed
Expanded Pattern Buffers and the proxies for them.
1 parent 5c20336 commit d13bbfa

15 files changed

+1317
-2
lines changed

‎src/generated/resources/assets/gtmutils/blockstates/expanded_me_pattern_buffer.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/expanded_me_pattern_buffer",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/expanded_me_pattern_buffer",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/expanded_me_pattern_buffer"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/expanded_me_pattern_buffer",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/expanded_me_pattern_buffer",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/expanded_me_pattern_buffer",
25+
"y": 270
26+
}
27+
}
28+
}

‎src/generated/resources/assets/gtmutils/blockstates/expanded_me_pattern_buffer_proxy.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/expanded_me_pattern_buffer_proxy",
5+
"x": 90
6+
},
7+
"facing=east": {
8+
"model": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy",
9+
"y": 90
10+
},
11+
"facing=north": {
12+
"model": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy"
13+
},
14+
"facing=south": {
15+
"model": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy",
16+
"y": 180
17+
},
18+
"facing=up": {
19+
"gtceu:z": 180,
20+
"model": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy",
21+
"x": 270
22+
},
23+
"facing=west": {
24+
"model": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy",
25+
"y": 270
26+
}
27+
}
28+
}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"block.gtmutils.ev_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛƎϛ§",
33
"block.gtmutils.ev_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ǝɯǝɹʇxƎϛ§",
4+
"block.gtmutils.expanded_me_pattern_buffer": ")sʇoןS ᄅㄥ( ɹǝɟɟnᗺ uɹǝʇʇɐԀ ƎW pǝpuɐdxƎ",
5+
"block.gtmutils.expanded_me_pattern_buffer_proxy": "ʎxoɹԀ ɹǝɟɟnᗺ uɹǝʇʇɐԀ ƎW pǝpuɐdxƎ",
46
"block.gtmutils.hv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛH9§",
57
"block.gtmutils.hv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ɥbıH9§",
68
"block.gtmutils.iv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛI6§",
@@ -25,6 +27,7 @@
2527
"block.gtmutils.uxv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛX∩ǝ§",
2628
"block.gtmutils.zpm_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§WԀZɔ§",
2729
"block.gtmutils.zpm_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ WԀZɔ§",
30+
"config.gtmutils.option.aeMachinesEnabled": "pǝןqɐuƎsǝuıɥɔɐWǝɐ",
2831
"config.gtmutils.option.autoChargersEnabled": "pǝןqɐuƎsɹǝbɹɐɥƆoʇnɐ",
2932
"config.gtmutils.option.coinsEnabled": "pǝןqɐuƎsuıoɔ",
3033
"config.gtmutils.option.converters64aEnabled": "pǝןqɐuƎɐㄣ9sɹǝʇɹǝʌuoɔ",
@@ -38,7 +41,6 @@
3841
"config.gtmutils.option.omnibreakerEnabled": "pǝןqɐuƎɹǝʞɐǝɹqıuɯo",
3942
"config.gtmutils.option.omnibreakerEnergyCapacity": "ʎʇıɔɐdɐƆʎbɹǝuƎɹǝʞɐǝɹqıuɯo",
4043
"config.gtmutils.option.omnibreakerTier": "ɹǝı⟘ɹǝʞɐǝɹqıuɯo",
41-
"config.gtmutils.option.parallelHatchAutoConfigure": "ǝɹnbıɟuoƆoʇnⱯɥɔʇɐHןǝןןɐɹɐd",
4244
"config.gtmutils.option.pterbCoolantBaseDrain": "uıɐɹᗡǝsɐᗺʇuɐןooƆqɹǝʇd",
4345
"config.gtmutils.option.pterbCoolantIOMultiplier": "ɹǝıןdıʇןnWOIʇuɐןooƆqɹǝʇd",
4446
"config.gtmutils.option.pterbEnabled": "pǝןqɐuƎqɹǝʇd",

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"block.gtmutils.ev_64a_energy_converter": "§5EV§r 64§eA§r Energy Converter",
33
"block.gtmutils.ev_auto_charger_4x": "§5Extreme Voltage§r 4x Auto Turbo Charger",
4+
"block.gtmutils.expanded_me_pattern_buffer": "Expanded ME Pattern Buffer (72 Slots)",
5+
"block.gtmutils.expanded_me_pattern_buffer_proxy": "Expanded ME Pattern Buffer Proxy",
46
"block.gtmutils.hv_64a_energy_converter": "§6HV§r 64§eA§r Energy Converter",
57
"block.gtmutils.hv_auto_charger_4x": "§6High Voltage§r 4x Auto Turbo Charger",
68
"block.gtmutils.iv_64a_energy_converter": "§9IV§r 64§eA§r Energy Converter",
@@ -25,6 +27,7 @@
2527
"block.gtmutils.uxv_64a_energy_converter": "§eUXV§r 64§eA§r Energy Converter",
2628
"block.gtmutils.zpm_64a_energy_converter": "§cZPM§r 64§eA§r Energy Converter",
2729
"block.gtmutils.zpm_auto_charger_4x": "§cZPM Voltage§r 4x Auto Turbo Charger",
30+
"config.gtmutils.option.aeMachinesEnabled": "aeMachinesEnabled",
2831
"config.gtmutils.option.autoChargersEnabled": "autoChargersEnabled",
2932
"config.gtmutils.option.coinsEnabled": "coinsEnabled",
3033
"config.gtmutils.option.converters64aEnabled": "converters64aEnabled",
@@ -38,7 +41,6 @@
3841
"config.gtmutils.option.omnibreakerEnabled": "omnibreakerEnabled",
3942
"config.gtmutils.option.omnibreakerEnergyCapacity": "omnibreakerEnergyCapacity",
4043
"config.gtmutils.option.omnibreakerTier": "omnibreakerTier",
41-
"config.gtmutils.option.parallelHatchAutoConfigure": "parallelHatchAutoConfigure",
4244
"config.gtmutils.option.pterbCoolantBaseDrain": "pterbCoolantBaseDrain",
4345
"config.gtmutils.option.pterbCoolantIOMultiplier": "pterbCoolantIOMultiplier",
4446
"config.gtmutils.option.pterbEnabled": "pterbEnabled",

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"parent": "minecraft:block/block",
3+
"loader": "gtceu:machine",
4+
"machine": "gtmutils:expanded_me_pattern_buffer",
5+
"replaceable_textures": [
6+
"bottom",
7+
"top",
8+
"side"
9+
],
10+
"variants": {
11+
"is_formed=false,is_painted=false": {
12+
"model": {
13+
"parent": "gtceu:block/machine/template/part/hatch_machine",
14+
"textures": {
15+
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
16+
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch",
17+
"side": "gtceu:block/casings/voltage/zpm/side",
18+
"top": "gtceu:block/casings/voltage/zpm/top"
19+
}
20+
}
21+
},
22+
"is_formed=false,is_painted=true": {
23+
"model": {
24+
"parent": "gtceu:block/machine/template/part/hatch_machine_color_ring",
25+
"textures": {
26+
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
27+
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch",
28+
"side": "gtceu:block/casings/voltage/zpm/side",
29+
"top": "gtceu:block/casings/voltage/zpm/top"
30+
}
31+
}
32+
},
33+
"is_formed=true,is_painted=false": {
34+
"model": {
35+
"parent": "gtceu:block/machine/template/part/hatch_machine",
36+
"textures": {
37+
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
38+
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch",
39+
"side": "gtceu:block/casings/voltage/zpm/side",
40+
"top": "gtceu:block/casings/voltage/zpm/top"
41+
}
42+
}
43+
},
44+
"is_formed=true,is_painted=true": {
45+
"model": {
46+
"parent": "gtceu:block/machine/template/part/hatch_machine_color_ring",
47+
"textures": {
48+
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
49+
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch",
50+
"side": "gtceu:block/casings/voltage/zpm/side",
51+
"top": "gtceu:block/casings/voltage/zpm/top"
52+
}
53+
}
54+
}
55+
}
56+
}

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

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"parent": "minecraft:block/block",
3+
"loader": "gtceu:machine",
4+
"machine": "gtmutils:expanded_me_pattern_buffer_proxy",
5+
"replaceable_textures": [
6+
"bottom",
7+
"top",
8+
"side"
9+
],
10+
"variants": {
11+
"is_formed=false,is_painted=false": {
12+
"model": {
13+
"parent": "gtceu:block/machine/template/part/hatch_machine",
14+
"textures": {
15+
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
16+
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch_proxy",
17+
"side": "gtceu:block/casings/voltage/zpm/side",
18+
"top": "gtceu:block/casings/voltage/zpm/top"
19+
}
20+
}
21+
},
22+
"is_formed=false,is_painted=true": {
23+
"model": {
24+
"parent": "gtceu:block/machine/template/part/hatch_machine_color_ring",
25+
"textures": {
26+
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
27+
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch_proxy",
28+
"side": "gtceu:block/casings/voltage/zpm/side",
29+
"top": "gtceu:block/casings/voltage/zpm/top"
30+
}
31+
}
32+
},
33+
"is_formed=true,is_painted=false": {
34+
"model": {
35+
"parent": "gtceu:block/machine/template/part/hatch_machine",
36+
"textures": {
37+
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
38+
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch_proxy",
39+
"side": "gtceu:block/casings/voltage/zpm/side",
40+
"top": "gtceu:block/casings/voltage/zpm/top"
41+
}
42+
}
43+
},
44+
"is_formed=true,is_painted=true": {
45+
"model": {
46+
"parent": "gtceu:block/machine/template/part/hatch_machine_color_ring",
47+
"textures": {
48+
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
49+
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch_proxy",
50+
"side": "gtceu:block/casings/voltage/zpm/side",
51+
"top": "gtceu:block/casings/voltage/zpm/top"
52+
}
53+
}
54+
}
55+
}
56+
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "gtmutils:block/machine/expanded_me_pattern_buffer"
3+
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"parent": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy"
3+
}

‎src/main/java/net/neganote/gtutilities/GregTechModernUtilities.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import net.neganote.gtutilities.common.data.UtilPlaceholders;
2929
import net.neganote.gtutilities.common.item.UtilItems;
3030
import net.neganote.gtutilities.common.item.UtilToolItems;
31+
import net.neganote.gtutilities.common.machine.UtilAEMachines;
3132
import net.neganote.gtutilities.common.machine.UtilMachines;
3233
import net.neganote.gtutilities.common.materials.UtilMaterials;
3334
import net.neganote.gtutilities.common.tools.UtilToolConnection;
@@ -154,5 +155,6 @@ private void registerRecipeTypes(GTCEuAPI.RegisterEvent<ResourceLocation, GTReci
154155

155156
private void registerMachines(GTCEuAPI.RegisterEvent<ResourceLocation, MachineDefinition> event) {
156157
UtilMachines.init();
158+
UtilAEMachines.init();
157159
}
158160
}

‎src/main/java/net/neganote/gtutilities/common/machine/UtilAEMachines.java‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package net.neganote.gtutilities.common.machine;
2+
3+
import com.gregtechceu.gtceu.GTCEu;
4+
import com.gregtechceu.gtceu.api.data.RotationState;
5+
import com.gregtechceu.gtceu.api.machine.MachineDefinition;
6+
import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility;
7+
8+
import net.minecraft.network.chat.Component;
9+
import net.neganote.gtutilities.config.UtilConfig;
10+
import net.neganote.gtutilities.integration.ae2.machine.ExpandedPatternBufferPartMachine;
11+
import net.neganote.gtutilities.integration.ae2.machine.ExpandedPatternBufferProxyPartMachine;
12+
13+
import static com.gregtechceu.gtceu.api.GTValues.ZPM;
14+
import static net.neganote.gtutilities.GregTechModernUtilities.REGISTRATE;
15+
16+
public class UtilAEMachines {
17+
18+
static {
19+
if (UtilConfig.INSTANCE.features.aeMachinesEnabled) {
20+
final MachineDefinition EXPANDED_ME_PATTERN_BUFFER = REGISTRATE
21+
.machine("expanded_me_pattern_buffer", ExpandedPatternBufferPartMachine::new)
22+
.tier(ZPM)
23+
.rotationState(RotationState.ALL)
24+
.abilities(PartAbility.IMPORT_ITEMS, PartAbility.IMPORT_FLUIDS, PartAbility.EXPORT_FLUIDS,
25+
PartAbility.EXPORT_ITEMS)
26+
.colorOverlayTieredHullModel(GTCEu.id("block/overlay/appeng/me_buffer_hatch"))
27+
.langValue("Expanded ME Pattern Buffer (72 Slots)")
28+
.tooltips(
29+
Component.translatable("block.gtceu.pattern_buffer.desc.0"),
30+
Component.literal("§6Expanded to 72 Slots"),
31+
Component.translatable("block.gtceu.pattern_buffer.desc.2"),
32+
Component.translatable("gtceu.part_sharing.enabled"))
33+
.register();
34+
35+
final MachineDefinition EXPANDED_ME_PATTERN_BUFFER_PROXY = REGISTRATE
36+
.machine("expanded_me_pattern_buffer_proxy", ExpandedPatternBufferProxyPartMachine::new)
37+
.tier(ZPM)
38+
.rotationState(RotationState.ALL)
39+
.abilities(PartAbility.IMPORT_ITEMS, PartAbility.IMPORT_FLUIDS, PartAbility.EXPORT_FLUIDS,
40+
PartAbility.EXPORT_ITEMS)
41+
.colorOverlayTieredHullModel(GTCEu.id("block/overlay/appeng/me_buffer_hatch_proxy"))
42+
.langValue("Expanded ME Pattern Buffer Proxy")
43+
.tooltips(
44+
Component.translatable("block.gtceu.pattern_buffer_proxy.desc.0"),
45+
Component.literal("§6Compatible with 72 Slot Buffer"),
46+
Component.translatable("block.gtceu.pattern_buffer_proxy.desc.2"),
47+
Component.translatable("gtceu.part_sharing.enabled"))
48+
.register();
49+
}
50+
}
51+
52+
public static void init() {}
53+
}

0 commit comments

Comments
 (0)