Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "gtmutils:block/machine/expanded_me_pattern_buffer",
"x": 90
},
"facing=east": {
"model": "gtmutils:block/machine/expanded_me_pattern_buffer",
"y": 90
},
"facing=north": {
"model": "gtmutils:block/machine/expanded_me_pattern_buffer"
},
"facing=south": {
"model": "gtmutils:block/machine/expanded_me_pattern_buffer",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "gtmutils:block/machine/expanded_me_pattern_buffer",
"x": 270
},
"facing=west": {
"model": "gtmutils:block/machine/expanded_me_pattern_buffer",
"y": 270
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"variants": {
"facing=down": {
"model": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy",
"x": 90
},
"facing=east": {
"model": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy",
"y": 90
},
"facing=north": {
"model": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy"
},
"facing=south": {
"model": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy",
"y": 180
},
"facing=up": {
"gtceu:z": 180,
"model": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy",
"x": 270
},
"facing=west": {
"model": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy",
"y": 270
}
}
}
6 changes: 6 additions & 0 deletions src/generated/resources/assets/gtmutils/lang/en_ud.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"block.gtmutils.ev_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛƎϛ§",
"block.gtmutils.ev_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ǝɯǝɹʇxƎϛ§",
"block.gtmutils.expanded_me_pattern_buffer": "ɹǝɟɟnᗺ uɹǝʇʇɐԀ ƎW pǝpuɐdxƎ",
"block.gtmutils.expanded_me_pattern_buffer_proxy": "ʎxoɹԀ ɹǝɟɟnᗺ uɹǝʇʇɐԀ ƎW pǝpuɐdxƎ",
"block.gtmutils.hv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛH9§",
"block.gtmutils.hv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ɥbıH9§",
"block.gtmutils.iv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛI6§",
Expand All @@ -14,6 +16,9 @@
"block.gtmutils.mv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ ɯnıpǝWq§",
"block.gtmutils.opv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛdOן§6§",
"block.gtmutils.opv_auto_charger_4x": "ɹǝbɹɐɥƆ oqɹn⟘ oʇnⱯ xㄣ ɹ§ǝbɐʇןoΛ pǝɹǝʍodɹǝʌOן§6§",
"block.gtmutils.pattern_buffer.desc.0": "˙sʞɔoןqıʇןnW ɥɔǝ⟘bǝɹ⅁ ɹoɟɟ§ ǝbɐɹoʇs uɹǝʇʇɐd ᄅƎⱯ9§ ʇɔǝɹıp pǝpuɐdxǝ sʍoןןⱯɟ§",
"block.gtmutils.pattern_buffer.desc.2": "¡ɹǝɥʇǝboʇ sǝuıɥɔɐɯ ʞuıן oʇɟ§ ʞɔıʇsɐʇɐpq§ ɐ ɥʇıʍɟ§ sǝıxoɹԀ ɹǝɟɟnᗺ uɹǝʇʇɐԀ pǝpuɐdxƎ9§ ʞuıꞀɟ§",
"block.gtmutils.pattern_buffer_proxy.desc.0": "˙ɟ§ɹǝɟɟnᗺ uɹǝʇʇɐԀ ƎW pǝpuɐdxƎ9§ ɹɐןnbuıs ɐ oʇ sǝuıɥɔɐɯ ʎuɐɯ buıʞuıן sʍoןןⱯɟ§",
"block.gtmutils.pterb_machine": "ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ssǝןǝɹıM",
"block.gtmutils.sterile_cleaning_maintenance_hatch": "ɥɔʇɐH ǝɔuɐuǝʇuıɐW buıuɐǝןƆ ǝןıɹǝʇS",
"block.gtmutils.uev_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛƎ∩ɐ§",
Expand All @@ -39,6 +44,7 @@
"config.gtmutils.option.customLuVToolsEnabled": "pǝןqɐuƎsןoo⟘ΛnꞀɯoʇsnɔ",
"config.gtmutils.option.customMVToolsEnabled": "pǝןqɐuƎsןoo⟘ΛWɯoʇsnɔ",
"config.gtmutils.option.customZPMToolsEnabled": "pǝןqɐuƎsןoo⟘WԀZɯoʇsnɔ",
"config.gtmutils.option.expandedBuffersEnabled": "pǝןqɐuƎsɹǝɟɟnᗺpǝpuɐdxǝ",
"config.gtmutils.option.features": "sǝɹnʇɐǝɟ",
"config.gtmutils.option.omnibreakerEnabled": "pǝןqɐuƎɹǝʞɐǝɹqıuɯo",
"config.gtmutils.option.omnibreakerEnergyCapacity": "ʎʇıɔɐdɐƆʎbɹǝuƎɹǝʞɐǝɹqıuɯo",
Expand Down
6 changes: 6 additions & 0 deletions src/generated/resources/assets/gtmutils/lang/en_us.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
{
"block.gtmutils.ev_64a_energy_converter": "§5EV§r 64§eA§r Energy Converter",
"block.gtmutils.ev_auto_charger_4x": "§5Extreme Voltage§r 4x Auto Turbo Charger",
"block.gtmutils.expanded_me_pattern_buffer": "Expanded ME Pattern Buffer",
"block.gtmutils.expanded_me_pattern_buffer_proxy": "Expanded ME Pattern Buffer Proxy",
"block.gtmutils.hv_64a_energy_converter": "§6HV§r 64§eA§r Energy Converter",
"block.gtmutils.hv_auto_charger_4x": "§6High Voltage§r 4x Auto Turbo Charger",
"block.gtmutils.iv_64a_energy_converter": "§9IV§r 64§eA§r Energy Converter",
Expand All @@ -14,6 +16,9 @@
"block.gtmutils.mv_auto_charger_4x": "§bMedium Voltage§r 4x Auto Turbo Charger",
"block.gtmutils.opv_64a_energy_converter": "§9§lOpV§r 64§eA§r Energy Converter",
"block.gtmutils.opv_auto_charger_4x": "§9§lOverpowered Voltage§r 4x Auto Turbo Charger",
"block.gtmutils.pattern_buffer.desc.0": "§fAllows expanded direct §6AE2 pattern storage §ffor GregTech Multiblocks.",
"block.gtmutils.pattern_buffer.desc.2": "§fLink §6Expanded Pattern Buffer Proxies §fwith a §bdatastick §fto link machines together!",
"block.gtmutils.pattern_buffer_proxy.desc.0": "§fAllows linking many machines to a singular §6Expanded ME Pattern Buffer§f.",
"block.gtmutils.pterb_machine": "Wireless Active Transformer",
"block.gtmutils.sterile_cleaning_maintenance_hatch": "Sterile Cleaning Maintenance Hatch",
"block.gtmutils.uev_64a_energy_converter": "§aUEV§r 64§eA§r Energy Converter",
Expand All @@ -39,6 +44,7 @@
"config.gtmutils.option.customLuVToolsEnabled": "customLuVToolsEnabled",
"config.gtmutils.option.customMVToolsEnabled": "customMVToolsEnabled",
"config.gtmutils.option.customZPMToolsEnabled": "customZPMToolsEnabled",
"config.gtmutils.option.expandedBuffersEnabled": "expandedBuffersEnabled",
"config.gtmutils.option.features": "features",
"config.gtmutils.option.omnibreakerEnabled": "omnibreakerEnabled",
"config.gtmutils.option.omnibreakerEnergyCapacity": "omnibreakerEnergyCapacity",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtmutils:expanded_me_pattern_buffer",
"replaceable_textures": [
"bottom",
"top",
"side"
],
"variants": {
"is_formed=false,is_painted=false": {
"model": {
"parent": "gtceu:block/machine/template/part/hatch_machine",
"textures": {
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch",
"side": "gtceu:block/casings/voltage/zpm/side",
"top": "gtceu:block/casings/voltage/zpm/top"
}
}
},
"is_formed=false,is_painted=true": {
"model": {
"parent": "gtceu:block/machine/template/part/hatch_machine_color_ring",
"textures": {
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch",
"side": "gtceu:block/casings/voltage/zpm/side",
"top": "gtceu:block/casings/voltage/zpm/top"
}
}
},
"is_formed=true,is_painted=false": {
"model": {
"parent": "gtceu:block/machine/template/part/hatch_machine",
"textures": {
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch",
"side": "gtceu:block/casings/voltage/zpm/side",
"top": "gtceu:block/casings/voltage/zpm/top"
}
}
},
"is_formed=true,is_painted=true": {
"model": {
"parent": "gtceu:block/machine/template/part/hatch_machine_color_ring",
"textures": {
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch",
"side": "gtceu:block/casings/voltage/zpm/side",
"top": "gtceu:block/casings/voltage/zpm/top"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"parent": "minecraft:block/block",
"loader": "gtceu:machine",
"machine": "gtmutils:expanded_me_pattern_buffer_proxy",
"replaceable_textures": [
"bottom",
"top",
"side"
],
"variants": {
"is_formed=false,is_painted=false": {
"model": {
"parent": "gtceu:block/machine/template/part/hatch_machine",
"textures": {
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch_proxy",
"side": "gtceu:block/casings/voltage/zpm/side",
"top": "gtceu:block/casings/voltage/zpm/top"
}
}
},
"is_formed=false,is_painted=true": {
"model": {
"parent": "gtceu:block/machine/template/part/hatch_machine_color_ring",
"textures": {
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch_proxy",
"side": "gtceu:block/casings/voltage/zpm/side",
"top": "gtceu:block/casings/voltage/zpm/top"
}
}
},
"is_formed=true,is_painted=false": {
"model": {
"parent": "gtceu:block/machine/template/part/hatch_machine",
"textures": {
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch_proxy",
"side": "gtceu:block/casings/voltage/zpm/side",
"top": "gtceu:block/casings/voltage/zpm/top"
}
}
},
"is_formed=true,is_painted=true": {
"model": {
"parent": "gtceu:block/machine/template/part/hatch_machine_color_ring",
"textures": {
"bottom": "gtceu:block/casings/voltage/zpm/bottom",
"overlay": "gtceu:block/overlay/appeng/me_buffer_hatch_proxy",
"side": "gtceu:block/casings/voltage/zpm/side",
"top": "gtceu:block/casings/voltage/zpm/top"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "gtmutils:block/machine/expanded_me_pattern_buffer"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"parent": "gtmutils:block/machine/expanded_me_pattern_buffer_proxy"
}
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import net.neganote.gtutilities.common.data.UtilPlaceholders;
import net.neganote.gtutilities.common.item.UtilItems;
import net.neganote.gtutilities.common.item.UtilToolItems;
import net.neganote.gtutilities.common.machine.UtilAEMachines;
import net.neganote.gtutilities.common.machine.UtilMachines;
import net.neganote.gtutilities.common.materials.UtilMaterials;
import net.neganote.gtutilities.common.tools.UtilToolConnection;
Expand Down Expand Up @@ -154,5 +155,6 @@ private void registerRecipeTypes(GTCEuAPI.RegisterEvent<ResourceLocation, GTReci

private void registerMachines(GTCEuAPI.RegisterEvent<ResourceLocation, MachineDefinition> event) {
UtilMachines.init();
UtilAEMachines.init();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
package net.neganote.gtutilities.common.machine;

import com.gregtechceu.gtceu.GTCEu;
import com.gregtechceu.gtceu.api.data.RotationState;
import com.gregtechceu.gtceu.api.machine.MachineDefinition;
import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility;

import net.minecraft.network.chat.Component;
import net.neganote.gtutilities.config.UtilConfig;
import net.neganote.gtutilities.integration.ae2.machine.ExpandedPatternBufferPartMachine;
import net.neganote.gtutilities.integration.ae2.machine.ExpandedPatternBufferProxyPartMachine;

import static com.gregtechceu.gtceu.api.GTValues.ZPM;
import static net.neganote.gtutilities.GregTechModernUtilities.REGISTRATE;

public class UtilAEMachines {

public static MachineDefinition EXPANDED_ME_PATTERN_BUFFER = null;
public static MachineDefinition EXPANDED_ME_PATTERN_BUFFER_PROXY = null;

static {
if (UtilConfig.INSTANCE.features.expandedBuffersEnabled && GTCEu.Mods.isAE2Loaded() || GTCEu.isDataGen()) {
EXPANDED_ME_PATTERN_BUFFER = REGISTRATE
.machine("expanded_me_pattern_buffer", ExpandedPatternBufferPartMachine::new)
.tier(ZPM)
.rotationState(RotationState.ALL)
.abilities(PartAbility.IMPORT_ITEMS, PartAbility.IMPORT_FLUIDS, PartAbility.EXPORT_FLUIDS,
PartAbility.EXPORT_ITEMS)
.colorOverlayTieredHullModel(GTCEu.id("block/overlay/appeng/me_buffer_hatch"))
.langValue("Expanded ME Pattern Buffer")
.tooltips(
Component.translatable("block.gtmutils.pattern_buffer.desc.0"),
Component.translatable("block.gtceu.pattern_buffer.desc.1"),
Component.translatable("block.gtmutils.pattern_buffer.desc.2"),
Component.translatable("gtceu.part_sharing.enabled"))
.register();

EXPANDED_ME_PATTERN_BUFFER_PROXY = REGISTRATE
.machine("expanded_me_pattern_buffer_proxy", ExpandedPatternBufferProxyPartMachine::new)
.tier(ZPM)
.rotationState(RotationState.ALL)
.abilities(PartAbility.IMPORT_ITEMS, PartAbility.IMPORT_FLUIDS, PartAbility.EXPORT_FLUIDS,
PartAbility.EXPORT_ITEMS)
.colorOverlayTieredHullModel(GTCEu.id("block/overlay/appeng/me_buffer_hatch_proxy"))
.langValue("Expanded ME Pattern Buffer Proxy")
.tooltips(
Component.translatable("block.gtmutils.pattern_buffer_proxy.desc.0"),
Component.translatable("block.gtceu.pattern_buffer_proxy.desc.2"),
Component.translatable("gtceu.part_sharing.enabled"))
.register();
}
}

public static void init() {}
}
5 changes: 5 additions & 0 deletions src/main/java/net/neganote/gtutilities/config/UtilConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ public static class FeatureConfigs {
@Configurable
@Configurable.Comment({ "Whether the Auto Turbo Chargers are enabled." })
public boolean autoChargersEnabled = false;

@Configurable
@Configurable.Comment({
"Whether the Expanded Pattern Buffer and Expanded Pattern Buffer Proxy are enabled. If AE2 is not loaded, this config will not load the machines regardless. " })
public boolean expandedBuffersEnabled = true;
}

public static boolean coolantEnabled() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ public static void init(RegistrateLangProvider provider) {
"Usage:",
" {watfrequency} -> Current frequency: (insert frequency here)");

provider.add("block.gtmutils.pattern_buffer.desc.0",
"§fAllows expanded direct §6AE2 pattern storage §ffor GregTech Multiblocks.");
provider.add("block.gtmutils.pattern_buffer.desc.2",
"§fLink §6Expanded Pattern Buffer Proxies §fwith a §bdatastick §fto link machines together!");
provider.add("block.gtmutils.pattern_buffer_proxy.desc.0",
"§fAllows linking many machines to a singular §6Expanded ME Pattern Buffer§f.");

dfs(provider, new HashSet<>(), UtilConfig.CONFIG_HOLDER.getValueMap());
}

Expand Down
Loading