Skip to content

Commit 3ce79d6

Browse files
Phoenixvine32908NegaNote
Phoenixvine32908
and
NegaNote
authored
Expanded pattern buffers. 72 slots goes brr. (#22)
* Change from L to mb. * datagen * Auto Charger. * Expanded Pattern Buffers and the proxies for them. * Something happened with the datagen (aka skill issue on my end). Here's it back. * Fixed improper use of machine registration. Added temp recipes for the expanded buffer and proxy. * Spotless * Requested changes. * && * More spotless * auto chargers off by default. * Lang stuff and more spotless. --------- Co-authored-by: NegaNote <neganote43@gmail.com>
1 parent 4bf52c4 commit 3ce79d6

17 files changed

Lines changed: 1382 additions & 0 deletions

‎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: 6 additions & 0 deletions
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": "ɹǝɟɟ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§",
@@ -14,6 +16,9 @@
1416
"block.gtmutils.mv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ɯnıpǝWq§",
1517
"block.gtmutils.opv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛdOן§6§",
1618
"block.gtmutils.opv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ pǝɹǝʍodɹǝʌOן§6§",
19+
"block.gtmutils.pattern_buffer.desc.0": "˙sʞɔoןqıʇןnW ɥɔǝ⟘bǝɹ⅁ ɹoɟɟ§ ǝbɐɹoʇs uɹǝʇʇɐd ᄅƎⱯ9§ ʇɔǝɹıp pǝpuɐdxǝ sʍoןןⱯɟ§",
20+
"block.gtmutils.pattern_buffer.desc.2": "¡ɹǝɥʇǝboʇ sǝuıɥɔɐɯ ʞuıן oʇɟ§ ʞɔıʇsɐʇɐpq§ ɐ ɥʇıʍɟ§ sǝıxoɹԀ ɹǝɟɟnᗺ uɹǝʇʇɐԀ pǝpuɐdxƎ9§ ʞuıꞀɟ§",
21+
"block.gtmutils.pattern_buffer_proxy.desc.0": "˙ɟ§ɹǝɟɟnᗺ uɹǝʇʇɐԀ ƎW pǝpuɐdxƎ9§ ɹɐןnbuıs ɐ oʇ sǝuıɥɔɐɯ ʎuɐɯ buıʞuıן sʍoןןⱯɟ§",
1722
"block.gtmutils.pterb_machine": "ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ssǝןǝɹıM",
1823
"block.gtmutils.sterile_cleaning_maintenance_hatch": "ɥɔʇɐH ǝɔuɐuǝʇuıɐW buıuɐǝןƆ ǝןıɹǝʇS",
1924
"block.gtmutils.uev_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛƎ∩ɐ§",
@@ -39,6 +44,7 @@
3944
"config.gtmutils.option.customLuVToolsEnabled": "pǝןqɐuƎsןoo⟘ΛnꞀɯoʇsnɔ",
4045
"config.gtmutils.option.customMVToolsEnabled": "pǝןqɐuƎsןoo⟘ΛWɯoʇsnɔ",
4146
"config.gtmutils.option.customZPMToolsEnabled": "pǝןqɐuƎsןoo⟘WԀZɯoʇsnɔ",
47+
"config.gtmutils.option.expandedBuffersEnabled": "pǝןqɐuƎsɹǝɟɟnᗺpǝpuɐdxǝ",
4248
"config.gtmutils.option.features": "sǝɹnʇɐǝɟ",
4349
"config.gtmutils.option.omnibreakerEnabled": "pǝןqɐuƎɹǝʞɐǝɹqıuɯo",
4450
"config.gtmutils.option.omnibreakerEnergyCapacity": "ʎʇıɔɐdɐƆʎbɹǝuƎɹǝʞɐǝɹqıuɯo",

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

Lines changed: 6 additions & 0 deletions
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",
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",
@@ -14,6 +16,9 @@
1416
"block.gtmutils.mv_auto_charger_4x": "§bMedium Voltage§r 4x Auto Turbo Charger",
1517
"block.gtmutils.opv_64a_energy_converter": "§9§lOpV§r 64§eA§r Energy Converter",
1618
"block.gtmutils.opv_auto_charger_4x": "§9§lOverpowered Voltage§r 4x Auto Turbo Charger",
19+
"block.gtmutils.pattern_buffer.desc.0": "§fAllows expanded direct §6AE2 pattern storage §ffor GregTech Multiblocks.",
20+
"block.gtmutils.pattern_buffer.desc.2": "§fLink §6Expanded Pattern Buffer Proxies §fwith a §bdatastick §fto link machines together!",
21+
"block.gtmutils.pattern_buffer_proxy.desc.0": "§fAllows linking many machines to a singular §6Expanded ME Pattern Buffer§f.",
1722
"block.gtmutils.pterb_machine": "Wireless Active Transformer",
1823
"block.gtmutils.sterile_cleaning_maintenance_hatch": "Sterile Cleaning Maintenance Hatch",
1924
"block.gtmutils.uev_64a_energy_converter": "§aUEV§r 64§eA§r Energy Converter",
@@ -39,6 +44,7 @@
3944
"config.gtmutils.option.customLuVToolsEnabled": "customLuVToolsEnabled",
4045
"config.gtmutils.option.customMVToolsEnabled": "customMVToolsEnabled",
4146
"config.gtmutils.option.customZPMToolsEnabled": "customZPMToolsEnabled",
47+
"config.gtmutils.option.expandedBuffersEnabled": "expandedBuffersEnabled",
4248
"config.gtmutils.option.features": "features",
4349
"config.gtmutils.option.omnibreakerEnabled": "omnibreakerEnabled",
4450
"config.gtmutils.option.omnibreakerEnergyCapacity": "omnibreakerEnergyCapacity",

‎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: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
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+
public static MachineDefinition EXPANDED_ME_PATTERN_BUFFER = null;
19+
public static MachineDefinition EXPANDED_ME_PATTERN_BUFFER_PROXY = null;
20+
21+
static {
22+
if (UtilConfig.INSTANCE.features.expandedBuffersEnabled && GTCEu.Mods.isAE2Loaded() || GTCEu.isDataGen()) {
23+
EXPANDED_ME_PATTERN_BUFFER = REGISTRATE
24+
.machine("expanded_me_pattern_buffer", ExpandedPatternBufferPartMachine::new)
25+
.tier(ZPM)
26+
.rotationState(RotationState.ALL)
27+
.abilities(PartAbility.IMPORT_ITEMS, PartAbility.IMPORT_FLUIDS, PartAbility.EXPORT_FLUIDS,
28+
PartAbility.EXPORT_ITEMS)
29+
.colorOverlayTieredHullModel(GTCEu.id("block/overlay/appeng/me_buffer_hatch"))
30+
.langValue("Expanded ME Pattern Buffer")
31+
.tooltips(
32+
Component.translatable("block.gtmutils.pattern_buffer.desc.0"),
33+
Component.translatable("block.gtceu.pattern_buffer.desc.1"),
34+
Component.translatable("block.gtmutils.pattern_buffer.desc.2"),
35+
Component.translatable("gtceu.part_sharing.enabled"))
36+
.register();
37+
38+
EXPANDED_ME_PATTERN_BUFFER_PROXY = REGISTRATE
39+
.machine("expanded_me_pattern_buffer_proxy", ExpandedPatternBufferProxyPartMachine::new)
40+
.tier(ZPM)
41+
.rotationState(RotationState.ALL)
42+
.abilities(PartAbility.IMPORT_ITEMS, PartAbility.IMPORT_FLUIDS, PartAbility.EXPORT_FLUIDS,
43+
PartAbility.EXPORT_ITEMS)
44+
.colorOverlayTieredHullModel(GTCEu.id("block/overlay/appeng/me_buffer_hatch_proxy"))
45+
.langValue("Expanded ME Pattern Buffer Proxy")
46+
.tooltips(
47+
Component.translatable("block.gtmutils.pattern_buffer_proxy.desc.0"),
48+
Component.translatable("block.gtceu.pattern_buffer_proxy.desc.2"),
49+
Component.translatable("gtceu.part_sharing.enabled"))
50+
.register();
51+
}
52+
}
53+
54+
public static void init() {}
55+
}

0 commit comments

Comments
 (0)