From 6a4384e5fd14f997165cfe659de194ec3b708fa0 Mon Sep 17 00:00:00 2001 From: Zorbatron Date: Wed, 11 Sep 2024 16:09:56 -0400 Subject: [PATCH 1/2] Textures n' shii --- .../zbgt/common/items/ZBGTMetaItem.java | 40 ++++++++++++++++++ .../zbgt/common/items/ZBGTMetaItems.java | 16 +++++++ .../{dual_cover.ev.png => dual_cover/ev.png} | Bin .../{dual_cover.hv.png => dual_cover/hv.png} | Bin .../{dual_cover.iv.png => dual_cover/iv.png} | Bin .../luv.png} | Bin .../{dual_cover.lv.png => dual_cover/lv.png} | Bin .../{dual_cover.mv.png => dual_cover/mv.png} | Bin .../opv.png} | Bin .../uev.png} | Bin .../uhv.png} | Bin .../uiv.png} | Bin .../{dual_cover.uv.png => dual_cover/uv.png} | Bin .../uxv.png} | Bin .../zpm.png} | Bin .../items/metaitems/generic_circuit/ev.png | Bin 0 -> 398 bytes .../items/metaitems/generic_circuit/hv.png | Bin 0 -> 420 bytes .../items/metaitems/generic_circuit/iv.png | Bin 0 -> 393 bytes .../items/metaitems/generic_circuit/luv.png | Bin 0 -> 430 bytes .../items/metaitems/generic_circuit/lv.png | Bin 0 -> 387 bytes .../items/metaitems/generic_circuit/max.png | Bin 0 -> 477 bytes .../items/metaitems/generic_circuit/mv.png | Bin 0 -> 434 bytes .../items/metaitems/generic_circuit/opv.png | Bin 0 -> 445 bytes .../items/metaitems/generic_circuit/uev.png | Bin 0 -> 431 bytes .../items/metaitems/generic_circuit/uhv.png | Bin 0 -> 430 bytes .../items/metaitems/generic_circuit/uiv.png | Bin 0 -> 430 bytes .../items/metaitems/generic_circuit/ulv.png | Bin 0 -> 425 bytes .../items/metaitems/generic_circuit/uv.png | Bin 0 -> 386 bytes .../items/metaitems/generic_circuit/uxv.png | Bin 0 -> 473 bytes .../items/metaitems/generic_circuit/zpm.png | Bin 0 -> 465 bytes .../ev.png} | Bin .../hv.png} | Bin .../iv.png} | Bin .../luv.png} | Bin .../lv.png} | Bin .../mv.png} | Bin .../opv.png} | Bin .../uev.png} | Bin .../uhv.png} | Bin .../uiv.png} | Bin .../uv.png} | Bin .../uxv.png} | Bin .../zpm.png} | Bin .../resources/assets/zbgt/lang/en_us.lang | 17 ++++++++ .../item/metaitems/cover.dual_cover.ev.json | 2 +- .../item/metaitems/cover.dual_cover.hv.json | 2 +- .../item/metaitems/cover.dual_cover.iv.json | 2 +- .../item/metaitems/cover.dual_cover.luv.json | 2 +- .../item/metaitems/cover.dual_cover.lv.json | 2 +- .../item/metaitems/cover.dual_cover.mv.json | 2 +- .../item/metaitems/cover.dual_cover.opv.json | 2 +- .../item/metaitems/cover.dual_cover.uev.json | 2 +- .../item/metaitems/cover.dual_cover.uhv.json | 2 +- .../item/metaitems/cover.dual_cover.uiv.json | 2 +- .../item/metaitems/cover.dual_cover.uv.json | 2 +- .../item/metaitems/cover.dual_cover.uxv.json | 2 +- .../item/metaitems/cover.dual_cover.zpm.json | 2 +- .../cover.precise_dual_cover.ev.json | 2 +- .../cover.precise_dual_cover.hv.json | 2 +- .../cover.precise_dual_cover.iv.json | 2 +- .../cover.precise_dual_cover.luv.json | 2 +- .../cover.precise_dual_cover.lv.json | 2 +- .../cover.precise_dual_cover.mv.json | 2 +- .../cover.precise_dual_cover.opv.json | 2 +- .../cover.precise_dual_cover.uev.json | 2 +- .../cover.precise_dual_cover.uhv.json | 2 +- .../cover.precise_dual_cover.uiv.json | 2 +- .../cover.precise_dual_cover.uv.json | 2 +- .../cover.precise_dual_cover.uxv.json | 2 +- .../cover.precise_dual_cover.zpm.json | 2 +- .../item/metaitems/generic_circuit.ev.json | 6 +++ .../item/metaitems/generic_circuit.hv.json | 6 +++ .../item/metaitems/generic_circuit.iv.json | 6 +++ .../item/metaitems/generic_circuit.luv.json | 6 +++ .../item/metaitems/generic_circuit.lv.json | 6 +++ .../item/metaitems/generic_circuit.max.json | 6 +++ .../item/metaitems/generic_circuit.mv.json | 6 +++ .../item/metaitems/generic_circuit.opv.json | 6 +++ .../item/metaitems/generic_circuit.uev.json | 6 +++ .../item/metaitems/generic_circuit.uhv.json | 6 +++ .../item/metaitems/generic_circuit.uiv.json | 6 +++ .../item/metaitems/generic_circuit.ulv.json | 6 +++ .../item/metaitems/generic_circuit.uv.json | 6 +++ .../item/metaitems/generic_circuit.uxv.json | 6 +++ .../item/metaitems/generic_circuit.zpm.json | 6 +++ 85 files changed, 189 insertions(+), 26 deletions(-) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.ev.png => dual_cover/ev.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.hv.png => dual_cover/hv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.iv.png => dual_cover/iv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.luv.png => dual_cover/luv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.lv.png => dual_cover/lv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.mv.png => dual_cover/mv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.opv.png => dual_cover/opv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.uev.png => dual_cover/uev.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.uhv.png => dual_cover/uhv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.uiv.png => dual_cover/uiv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.uv.png => dual_cover/uv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.uxv.png => dual_cover/uxv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{dual_cover.zpm.png => dual_cover/zpm.png} (100%) create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/ev.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/hv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/iv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/luv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/lv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/max.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/mv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/opv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/uev.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/uhv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/uiv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/ulv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/uv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/uxv.png create mode 100644 src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/zpm.png rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.ev.png => precise_dual_cover/ev.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.hv.png => precise_dual_cover/hv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.iv.png => precise_dual_cover/iv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.luv.png => precise_dual_cover/luv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.lv.png => precise_dual_cover/lv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.mv.png => precise_dual_cover/mv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.opv.png => precise_dual_cover/opv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.uev.png => precise_dual_cover/uev.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.uhv.png => precise_dual_cover/uhv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.uiv.png => precise_dual_cover/uiv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.uv.png => precise_dual_cover/uv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.uxv.png => precise_dual_cover/uxv.png} (100%) rename src/main/resources/assets/gregtech/textures/items/metaitems/{precise_dual_cover.zpm.png => precise_dual_cover/zpm.png} (100%) create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.ev.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.hv.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.iv.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.luv.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.lv.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.max.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.mv.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.opv.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uev.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uhv.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uiv.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.ulv.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uv.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uxv.json create mode 100644 src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.zpm.json diff --git a/src/main/java/com/zorbatron/zbgt/common/items/ZBGTMetaItem.java b/src/main/java/com/zorbatron/zbgt/common/items/ZBGTMetaItem.java index cb7c4d23..cbc788ba 100644 --- a/src/main/java/com/zorbatron/zbgt/common/items/ZBGTMetaItem.java +++ b/src/main/java/com/zorbatron/zbgt/common/items/ZBGTMetaItem.java @@ -1,15 +1,18 @@ package com.zorbatron.zbgt.common.items; import static com.zorbatron.zbgt.common.items.ZBGTMetaItems.*; +import static gregtech.api.GTValues.*; import net.minecraft.client.resources.I18n; import net.minecraft.util.ResourceLocation; import com.zorbatron.zbgt.ZBGTUtility; +import com.zorbatron.zbgt.recipe.helpers.RecipeAssists; import gregtech.api.GregTechAPI; import gregtech.api.items.metaitem.MetaItem; import gregtech.api.items.metaitem.StandardMetaItem; +import gregtech.api.unification.ore.OrePrefix; import gregtech.common.items.behaviors.TooltipBehavior; public class ZBGTMetaItem extends StandardMetaItem { @@ -144,5 +147,42 @@ public void registerSubItems() { lines.add(I18n.format("metaitem.cover.dual.tooltip.transfer_rate.stacks", 16, 1280 * 64 * 64 * 4 / 20)); })).setInvisibleIf(!GregTechAPI.isHighTier()); + + // Generic Circuits: 26-40 + GENERIC_CIRCUIT_ULV = addItem(26, "generic_circuit.ulv") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(ULV)); + GENERIC_CIRCUIT_LV = addItem(27, "generic_circuit.lv") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(LV)); + GENERIC_CIRCUIT_MV = addItem(28, "generic_circuit.mv") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(MV)); + GENERIC_CIRCUIT_HV = addItem(29, "generic_circuit.hv") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(HV)); + GENERIC_CIRCUIT_EV = addItem(30, "generic_circuit.ev") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(EV)); + GENERIC_CIRCUIT_IV = addItem(31, "generic_circuit.iv") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(IV)); + GENERIC_CIRCUIT_LuV = addItem(32, "generic_circuit.luv") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(LuV)); + GENERIC_CIRCUIT_ZPM = addItem(33, "generic_circuit.zpm") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(ZPM)); + GENERIC_CIRCUIT_UV = addItem(34, "generic_circuit.uv") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(UV)); + GENERIC_CIRCUIT_UHV = addItem(35, "generic_circuit.uhv") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(UHV)); + GENERIC_CIRCUIT_UEV = addItem(36, "generic_circuit.uev") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(UEV)) + .setInvisibleIf(!GregTechAPI.isHighTier()); + GENERIC_CIRCUIT_UIV = addItem(37, "generic_circuit.uiv") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(UIV)) + .setInvisibleIf(!GregTechAPI.isHighTier()); + GENERIC_CIRCUIT_UXV = addItem(38, "generic_circuit.uxv") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(UXV)) + .setInvisibleIf(!GregTechAPI.isHighTier()); + GENERIC_CIRCUIT_OpV = addItem(39, "generic_circuit.opv") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(OpV)) + .setInvisibleIf(!GregTechAPI.isHighTier()); + GENERIC_CIRCUIT_MAX = addItem(40, "generic_circuit.max") + .setUnificationData(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(MAX)) + .setInvisibleIf(!GregTechAPI.isHighTier()); } } diff --git a/src/main/java/com/zorbatron/zbgt/common/items/ZBGTMetaItems.java b/src/main/java/com/zorbatron/zbgt/common/items/ZBGTMetaItems.java index de52593a..b8597cb6 100644 --- a/src/main/java/com/zorbatron/zbgt/common/items/ZBGTMetaItems.java +++ b/src/main/java/com/zorbatron/zbgt/common/items/ZBGTMetaItems.java @@ -32,6 +32,22 @@ public class ZBGTMetaItems { public static MetaItem.MetaValueItem PRECISE_DUAL_COVER_UXV; public static MetaItem.MetaValueItem PRECISE_DUAL_COVER_OpV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_ULV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_LV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_MV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_HV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_EV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_IV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_LuV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_ZPM; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_UV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_UHV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_UEV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_UIV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_UXV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_OpV; + public static MetaItem.MetaValueItem GENERIC_CIRCUIT_MAX; + public static void init() { ZBGTMetaItem item = new ZBGTMetaItem(); item.setRegistryName("zbgt_meta_item"); diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.ev.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/ev.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.ev.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/ev.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.hv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/hv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.hv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/hv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.iv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/iv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.iv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/iv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.luv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/luv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.luv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/luv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.lv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/lv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.lv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/lv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.mv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/mv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.mv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/mv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.opv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/opv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.opv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/opv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.uev.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/uev.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.uev.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/uev.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.uhv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/uhv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.uhv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/uhv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.uiv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/uiv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.uiv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/uiv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.uv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/uv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.uv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/uv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.uxv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/uxv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.uxv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/uxv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.zpm.png b/src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/zpm.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover.zpm.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/dual_cover/zpm.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/ev.png b/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/ev.png new file mode 100644 index 0000000000000000000000000000000000000000..4fd6cfc6c2e40783d8a06fa99dc58339c5267e67 GIT binary patch literal 398 zcmV;90df9`P)Y5$EBVZbqL71*pLzQb1z0xF7{GFmHhQ6hH+?JvbGIEnkv*%%26sDnQE$ zr%?9}h_?>6vn)l80jY|Sswnd*pvr)-%AxEf4?zL3MyNIhYxe%78==@3=`=Y!29FSY zW`vq=gpdLXG&BXrVR<>aF>e4;Kvs%=%o~6dke8#Isi#2(SPHP*EueflHlGHwNF6s-h5(b4j?wf&>5nER#}g zpQec=$uJB{#XQf`&~mB!ZAsI8l?SV(HwFSIh#@KvKtT*q@p6H(EP3`2nXc=|cEJS* z%nR_O3fBvaPh?s4uNYa3&V=1qgNl z&G@*$&qqLA*YBTioulhG_Y4J7fGUIw7{a^&VlE){(Bcr)1+K=a&Cn4|(|kM|b98Kh z3&@6|A9VsyD?~}u2ypbw;G7QyQ$Rrs3$B;luy_Aby+5ONJA7vDUwR?5?QO~4pCSFS z?|V|gs;ZXbIU}qoE4Z-KXWq=vLa+;HZaiGT1M>pldx38k-5m&^Acm+w00l7s004+Wk|Zz5cdP+?0ncmz O0000g+R literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/iv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/iv.png new file mode 100644 index 0000000000000000000000000000000000000000..4697c6b6a150db4bce4a171a77d684f577ab1a28 GIT binary patch literal 393 zcmV;40e1e0P)MXL0{zyJXnngRm^XlP1O3Jk+Qi-*R{^Bk-TDG)%t0q@Y_ zvBCI7*LAftl33T3qW^RTf(B5LV#2ZbRB!}Bi+}p+TciMGE^w%S0@NFjodS}nmI5Kh zaU|`Vrs?aoyUt&ay;lm3KxnZf1yb%T7f68w)El5a1=K$Q>J7jwz$-;Q;tcRRNor@A zix>l9jS^QQg(Dz9!;ZVl?y;}YMql0t{W`P$daS6Dvw!PG$Tx<2h`RjyfGY&ooE*^z z@k)`8dIK;H^UINqdIOLGyi(+&-TpIA%#cEM3P>&y3jj5QO1$e`x?ppbjdc4l1G!N`M9^fQU#$ge;de*m#bePl}QdL&oFB7%NE#A;dDN zRQG9`RF(|G@G6++d3yACsOxP>)6XJ5s+!&y8UUanDl`BU!Hxn{>-TzA&I>)x)tp@>4lmkz4ZWXtGKq_w!F{Q zpAl!vzVF4^zN)I%>v=yAX-{yyFW9!NSgt4vE`+w2H-NXpVWr?>-T>YXhnItmc>|aN zVWr?>-TjK;p#T5? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/lv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/lv.png new file mode 100644 index 0000000000000000000000000000000000000000..60087d65d12a2ad3ecf8bc10be0f6d99f488e49f GIT binary patch literal 387 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVD$2IaSW-L^LF+_-X;Tq)|DUi zxi>I9He`Rik%`-Y!ELe-lju6#^!ayw3nd3N?%DV4(>gb8CytFh+-Ga&rB76SY@sJ^ z=KDD4_||#bkM8`d%74)(pNE&>LV$=A!-9nxftnY#t<{m^GUjnEi1TS=c*a}N#&(_e znE9(+|E9VLUN-Uk@;*x;qd`PO_}b+DR#gEhn-{D9E3v9PXX^hcn{cn;iHL)m8f!?I z!}Zen*F(QAvGM2fRxmjsV$f2_JcH?1(FVhOhG2(qF1rG@9BaF^d>5FL9qxaRoWJ~# z5W|HH55jNeSN~tP^;dp~^uoozY-fk~y%o=IDGJM}UjOXX{*%ALespO2UTEo^uui1r zjP!xW8}`ZM0BMm6Q=9ss7M!%=e)7kNxfSS=c{afcOrP04{AWrxzbgy&pb3Kmvtr8x drI66COxg_d->7xTS^@)?!PC{xWt~$(696%XoJIfu literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/max.png b/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/max.png new file mode 100644 index 0000000000000000000000000000000000000000..28083f16c9410bbd64214b0ee78ea07477f4dd86 GIT binary patch literal 477 zcmV<30V4j1P)oU}y>V7t5`F_d|E7C6p2@v2zR*(PzK4is91=_ad$wOwQX(Ho- z3J|DIz%OMy78ow7s(Q*t7VEll{C`^mWCFNINy0IBU$6uy<4Ilp5h}px3wG4c0QCt7 zRsqR8rUHh(@BiP2VemRwD-;w$ zl<|pPAf-H_7x3VAB^Zip9aA&oxc1F)%!jP{86Z9Z_LHBg74D#Z28eElUAlkuEXZC6 zeG;Tz&ht!WuHmNreK^>- z7l1Bc8wx(|1)vMqhl9K6aWAK07*qoM6N<$g7@CFTL1t6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/opv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/opv.png new file mode 100644 index 0000000000000000000000000000000000000000..8f7523c6b85bef1e091bf3e0b1701fd516db4049 GIT binary patch literal 445 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O_~O1^9%xK7IOBOH0e#+}y>*W&8H+Kw&o*MlT@6RubeF{2v4uHt%1uA1K0E z;1OBOz`%DHgc*>Pv!5OXx=Kf;(v?ge-z@3H)fwi{l1R0uqzc~sX zX)^3?u>Q*WByy>hILD{zH=GYV57;f2k^3oZY3KLPLVLsF>&Z+V(~6u5^3QYpdC_CM zR^&sZK+m1O<@H=Mb~f0o4tc)xz_EXK#NQ~eUJyq%?!RWkJ_WI!NR~S*^%c%*UHvKS z$gJA%aha!%L@_7Nx@~K#u=>O^Gd1Guq)T$obtA6lpLuHLr?8v54j6zopr E0PTsjmH+?% literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/uev.png b/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/uev.png new file mode 100644 index 0000000000000000000000000000000000000000..eff86ba9fea045f0ce75c97d1f5007edfb98e5f7 GIT binary patch literal 431 zcmV;g0Z{&lP)u6g#5m|+;mdBFt; z)C=&WI@bq`EsCPJDn=IbJagjz*#o2iT%?Gwp1d#E0#v8tT>Td=z{v{?>Q{hz0S>!> zWG-_7L)*5WR@ZgT&rI8exd!)|XTcVrI%B&)h$rU)F5rQB0o1zyRzQlIy6iCa3(`h? zE|6peT>X??h<^vz+l6zQ^g*lud#fbWDpKzPq6M%MqmW6EA;>|EE4f^c; zTOEXKK|(tS>6ha;k_t9W^KHK?!jh`O>&kH7_vE;$s(1wv6h#%GUI3)S@xzggdI8`9 zaYK=hdI8`9@xzhLsgl^4UuH<*unS0@JY2v7^#b7k0()P&I}kuX3`v0i0%8CF0FZ<% Z%U*cIyD~{gcd!5e002ovPDHLkV1j=}zK{R_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/uhv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/uhv.png new file mode 100644 index 0000000000000000000000000000000000000000..a592671d11c2a4e57b8896379f17768f29540d45 GIT binary patch literal 430 zcmV;f0a5;mP)u1yV=sGr_1gJ)&fFjfz5F`a$y}-7(Jq4c3rNz)$%CaQS^!;Q| zAO-wNk&k!-mSy3(OvD&b^ zEzNUz_Xo(lY?_92FwgVp`>-P{X;*l@Gh9^_*)L5~-nKX$TdcB6-k2B^Oumq?^pDtkDwJYzW30%Md^#Z7O0rfLLy#Uw?_zguq z;svlP$Gu9@6|n;B6-QSUPgnv1VpzrA82Koj$){!8w&c^kD2n-dJP$O_1h>{ERsVDP zuJyP3jAw%8xnNz_^2G9I5LkfpoKyvbM0SD9zfd32Zedz5#00A)s1p)|&0RR9%5TYph Y0Ziz<$dA`sr~m)}07*qoM6N<$f_8Vk1^@s6 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/ulv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/ulv.png new file mode 100644 index 0000000000000000000000000000000000000000..5ac1abaebf613a9dd8569655edf0844771811f6f GIT binary patch literal 425 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@Y)-aSW-L^LF+_-X;Tq)`LH$ zvnH@SOHcwMmWT#M1JlMUMTY`c*zWwU>elLY&-T`yZ3kHx7)&MyZS}u=WK)Vn+tS2& z&sV2%Ragv6j;EQcV_i}C02{qO_E=29|$qO+EusT;`z2) zzv4dg+|yK;sjS(csNmonGJz>^=?V9}j2?|2ic%KeWB90JH@wdhE zx_>Du+-mr#cm8f&-Tqhar1zA!p3R%ES9y!6S?s~|+q-hl^i9~SU9vhhar+JJ_xl=4 zR=uy@#2pg4wWh4v!RLAYkmuYbMw8UJIZg^S{q4_B=pJCeJhfhzqfvnvS^aN<_ z5{C-QO_pC9E*Xctj6e1txYz%V4;%&t4h^6n5A>Myg!N~}PKSxo R(;oo&44$rjF6*2UngG4Ex^Vyi literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/uv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/uv.png new file mode 100644 index 0000000000000000000000000000000000000000..46c63d236f33d9587bb4766f0f3982d6a8ebdaa6 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEVD$8KaSW-L^LF+_-ev`nmW40l z#S2)E7xNu2W)&}Bm~D1YVyRd~?bBDg^)qKRm>g%^>3-SDiDP3=|JmBeX)4~!GNa^k zZeN?eExY!f-249iJCo9?5;GVY+E!fvS{i!Nt8v}yOOF;BJ+^RrepI9*;a)@an!@OW zJ&QAE#b^2?&3i8Lx7}F4R6$fkc-!Rjt?mlfDuTlQyK*hL!_D-pyrGi0E0|&C9Fc&V zjJ5ao$63~@ChueHcUUt~GlAnXn*r;WrwPgT7?w4x6RCN?b0fSaN;HAtSVN+O%ipCR zI2bY_I9JPTtF5>m^;dmW>x3tNypDzGx2Qa?yuWDpqd1s^#h+LT7-1|aL;b$rv*HO&|o62PlY|nTf{Aab}-DPFM;NTnz^eLMYhhk{K bIa`Jemln#Ou9adx=mY@w-fEzB+5F8bhapsoyOE%d>Br}hXhs4bQ03c;@ zD)(hsyd;^XX{%V4Wq!Aut38)I->Z%JhqY019Fd1p+9DL6jgDsO#F#9)uZ&fy@go zK#;ruzf_^U!8oEQinn6)VxDK8_;+)F6u=iPBG}1?f+;{1p6sjtg$wvR7px>d0+JWt zwhL$`#08>^fVOS_K3CVy>V?$3Y9|Ct0jiM81-h==de3~fS$otizXMz#fY$|Bd)S`C zF?&B0xB!1Rd+bpl+4}~uHNZ|-DtQB*1$aX_hFSzA5D~zh_mnG8b&q~OMeRP|YF&u6 zZoDo4wd!Au0!~!#1YKb`ER$R<$8jWA`=)8O@8&$vJ`+6aJvWh~1gPs&yYBtwOwc|T z?E9WIPx1obahN|G-6SsnT!1$e{Uk2{T!23u z-8_0jETDa{3nv;hM1dzM{_`kr_P2Ua#P!NMC5I{i;0000)$g=DM%bDa${H9nw P00000NkvXXu0mjfFmuVz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/zpm.png b/src/main/resources/assets/gregtech/textures/items/metaitems/generic_circuit/zpm.png new file mode 100644 index 0000000000000000000000000000000000000000..f80bd6ac796e42e587e10decc9e8cce3e6ecf171 GIT binary patch literal 465 zcmV;?0WSWDP)B7&WKELZ}*#*@0b3KyX43l7xJ0QCagb^*ye z<^qOs954IK^Gxb{^t1cgZJ}pR(?pKfMf?&7iAE8gLb3~lM(8X+-!-Pcd4=Bd&5jVo zUBC|TYzk9wmk(uW#88C`xFT>RZ(w%;&e69q_X;f$mlzkQst({3^dQ*=ZK$Ik`Vh;J z;1%lk0&FuNX6=_4=@9Do0xSaL`s9BC%mB`t)i(Nu!)04|U}9N8pQf+@eu zkiu;jkeobRAOiIQ;Qs8*=_!P00000NkvXX Hu0mjfCIQYk literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.ev.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/ev.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.ev.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/ev.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.hv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/hv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.hv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/hv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.iv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/iv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.iv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/iv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.luv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/luv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.luv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/luv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.lv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/lv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.lv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/lv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.mv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/mv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.mv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/mv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.opv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/opv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.opv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/opv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.uev.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/uev.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.uev.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/uev.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.uhv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/uhv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.uhv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/uhv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.uiv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/uiv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.uiv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/uiv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.uv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/uv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.uv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/uv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.uxv.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/uxv.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.uxv.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/uxv.png diff --git a/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.zpm.png b/src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/zpm.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover.zpm.png rename to src/main/resources/assets/gregtech/textures/items/metaitems/precise_dual_cover/zpm.png diff --git a/src/main/resources/assets/zbgt/lang/en_us.lang b/src/main/resources/assets/zbgt/lang/en_us.lang index 3c4db0d8..b4fa3516 100644 --- a/src/main/resources/assets/zbgt/lang/en_us.lang +++ b/src/main/resources/assets/zbgt/lang/en_us.lang @@ -97,6 +97,23 @@ metaitem.cover.dual.tooltip.transfer_rate.stacks=§bTransfer Rate: §f%,d stacks cover.dual_cover.mode_changer=Click to change between the item and fluid settings +# Items +metaitem.generic_circuit.ulv.name=Generic ULV Circuit +metaitem.generic_circuit.lv.name=Generic LV Circuit +metaitem.generic_circuit.mv.name=Generic MV Circuit +metaitem.generic_circuit.hv.name=Generic HV Circuit +metaitem.generic_circuit.ev.name=Generic EV Circuit +metaitem.generic_circuit.iv.name=Generic IV Circuit +metaitem.generic_circuit.luv.name=Generic LuV Circuit +metaitem.generic_circuit.zpm.name=Generic ZPM Circuit +metaitem.generic_circuit.uv.name=Generic UV Circuit +metaitem.generic_circuit.uhv.name=Generic UHV Circuit +metaitem.generic_circuit.uev.name=Generic UEV Circuit +metaitem.generic_circuit.uiv.name=Generic UIV Circuit +metaitem.generic_circuit.uxv.name=Generic UXV Circuit +metaitem.generic_circuit.opv.name=Generic OpV Circuit +metaitem.generic_circuit.max.name=Generic MAX Circuit + # Widgets zbgt.widget.item_slot_tiny_amount.amount_tooltip=Amount: %s diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.ev.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.ev.json index 5011c74b..7826dc06 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.ev.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.ev.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.ev" + "layer0": "gregtech:items/metaitems/dual_cover/ev" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.hv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.hv.json index 4850cba5..37015096 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.hv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.hv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.hv" + "layer0": "gregtech:items/metaitems/dual_cover/hv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.iv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.iv.json index c4026a42..4c3b7af2 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.iv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.iv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.iv" + "layer0": "gregtech:items/metaitems/dual_cover/iv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.luv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.luv.json index 7961fd6b..908535c1 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.luv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.luv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.luv" + "layer0": "gregtech:items/metaitems/dual_cover/luv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.lv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.lv.json index 2762769c..652a3509 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.lv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.lv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.lv" + "layer0": "gregtech:items/metaitems/dual_cover/lv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.mv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.mv.json index 83e64e29..7bdd9b28 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.mv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.mv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.mv" + "layer0": "gregtech:items/metaitems/dual_cover/mv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.opv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.opv.json index 50477c13..859ef8a0 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.opv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.opv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.opv" + "layer0": "gregtech:items/metaitems/dual_cover/opv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uev.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uev.json index 378ee3d3..0669d713 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uev.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uev.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.uev" + "layer0": "gregtech:items/metaitems/dual_cover/uev" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uhv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uhv.json index 955b9ef6..c8d4b101 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uhv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uhv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.uhv" + "layer0": "gregtech:items/metaitems/dual_cover/uhv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uiv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uiv.json index 601d249d..e84e9af7 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uiv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uiv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.uiv" + "layer0": "gregtech:items/metaitems/dual_cover/uiv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uv.json index 7bea5cd0..7e762207 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.uv" + "layer0": "gregtech:items/metaitems/dual_cover/uv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uxv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uxv.json index 5b9c44b5..b038c3ba 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uxv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.uxv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.uxv" + "layer0": "gregtech:items/metaitems/dual_cover/uxv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.zpm.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.zpm.json index 879c6552..ad1d8ee6 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.zpm.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.dual_cover.zpm.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/dual_cover.zpm" + "layer0": "gregtech:items/metaitems/dual_cover/zpm" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.ev.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.ev.json index 4e91257a..888370f2 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.ev.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.ev.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.ev" + "layer0": "gregtech:items/metaitems/precise_dual_cover/ev" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.hv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.hv.json index eecabb48..68e8364b 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.hv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.hv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.hv" + "layer0": "gregtech:items/metaitems/precise_dual_cover/hv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.iv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.iv.json index 72367fcb..b69d1051 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.iv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.iv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.iv" + "layer0": "gregtech:items/metaitems/precise_dual_cover/iv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.luv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.luv.json index d5678a0a..997c32a7 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.luv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.luv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.luv" + "layer0": "gregtech:items/metaitems/precise_dual_cover/luv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.lv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.lv.json index af9149c8..0fa8cfac 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.lv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.lv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.lv" + "layer0": "gregtech:items/metaitems/precise_dual_cover/lv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.mv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.mv.json index 19ea5c52..ddb901d9 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.mv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.mv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.mv" + "layer0": "gregtech:items/metaitems/precise_dual_cover/mv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.opv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.opv.json index 1a967d5a..d2f5c998 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.opv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.opv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.opv" + "layer0": "gregtech:items/metaitems/precise_dual_cover/opv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uev.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uev.json index 641a71e8..08e16442 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uev.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uev.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.uev" + "layer0": "gregtech:items/metaitems/precise_dual_cover/uev" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uhv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uhv.json index 07cf7585..60a0e41e 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uhv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uhv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.uhv" + "layer0": "gregtech:items/metaitems/precise_dual_cover/uhv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uiv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uiv.json index d19aa553..78f39395 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uiv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uiv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.uiv" + "layer0": "gregtech:items/metaitems/precise_dual_cover/uiv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uv.json index 21f55a64..54c2f3f7 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.uv" + "layer0": "gregtech:items/metaitems/precise_dual_cover/uv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uxv.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uxv.json index 059b6887..8cbe98d8 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uxv.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.uxv.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.uxv" + "layer0": "gregtech:items/metaitems/precise_dual_cover/uxv" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.zpm.json b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.zpm.json index 9f7329c2..3d0d46c2 100644 --- a/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.zpm.json +++ b/src/main/resources/assets/zbgt/models/item/metaitems/cover.precise_dual_cover.zpm.json @@ -1,7 +1,7 @@ { "parent": "item/generated", "textures": { - "layer0": "gregtech:items/metaitems/precise_dual_cover.zpm" + "layer0": "gregtech:items/metaitems/precise_dual_cover/zpm" } } diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.ev.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.ev.json new file mode 100644 index 00000000..0ac00106 --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.ev.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/ev" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.hv.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.hv.json new file mode 100644 index 00000000..31a3df88 --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.hv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/hv" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.iv.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.iv.json new file mode 100644 index 00000000..89796815 --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.iv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/iv" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.luv.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.luv.json new file mode 100644 index 00000000..186a71b9 --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.luv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/luv" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.lv.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.lv.json new file mode 100644 index 00000000..5bd333c5 --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.lv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/lv" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.max.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.max.json new file mode 100644 index 00000000..5e06ffce --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.max.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/max" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.mv.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.mv.json new file mode 100644 index 00000000..97d81387 --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.mv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/mv" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.opv.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.opv.json new file mode 100644 index 00000000..60186620 --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.opv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/opv" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uev.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uev.json new file mode 100644 index 00000000..594ef625 --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uev.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/uev" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uhv.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uhv.json new file mode 100644 index 00000000..a2f5c337 --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uhv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/uhv" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uiv.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uiv.json new file mode 100644 index 00000000..d32bf99a --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uiv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/uiv" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.ulv.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.ulv.json new file mode 100644 index 00000000..1ff801f9 --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.ulv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/ulv" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uv.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uv.json new file mode 100644 index 00000000..b86a7997 --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/uv" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uxv.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uxv.json new file mode 100644 index 00000000..76ee09b1 --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.uxv.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/uxv" + } +} diff --git a/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.zpm.json b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.zpm.json new file mode 100644 index 00000000..0714ecfd --- /dev/null +++ b/src/main/resources/assets/zbgt/models/item/metaitems/generic_circuit.zpm.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "gregtech:items/metaitems/generic_circuit/zpm" + } +} From c19b30140b46c032f5de32a8e486dc1e907650ed Mon Sep 17 00:00:00 2001 From: Zorbatron Date: Wed, 11 Sep 2024 16:30:57 -0400 Subject: [PATCH 2/2] Recipes --- .../zorbatron/zbgt/recipe/MiscRecipes.java | 18 ++++++++++++++-- .../zbgt/recipe/helpers/RecipeAssists.java | 21 +++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zorbatron/zbgt/recipe/MiscRecipes.java b/src/main/java/com/zorbatron/zbgt/recipe/MiscRecipes.java index 492962c7..964f8f8c 100644 --- a/src/main/java/com/zorbatron/zbgt/recipe/MiscRecipes.java +++ b/src/main/java/com/zorbatron/zbgt/recipe/MiscRecipes.java @@ -1,16 +1,19 @@ package com.zorbatron.zbgt.recipe; import static gregtech.api.GTValues.*; -import static gregtech.api.recipes.RecipeMaps.COMPRESSOR_RECIPES; -import static gregtech.api.recipes.RecipeMaps.POLARIZER_RECIPES; +import static gregtech.api.recipes.RecipeMaps.*; import static gregtech.api.unification.material.Materials.*; import com.zorbatron.zbgt.ZBGTConfig; +import com.zorbatron.zbgt.recipe.helpers.RecipeAssists; + +import gregtech.api.unification.ore.OrePrefix; public class MiscRecipes { protected static void init() { magneticFluids(); + genericCircuits(); if (ZBGTConfig.recipeSettings.enableSillyRecipes) { sillyRecipes(); @@ -43,6 +46,17 @@ private static void magneticFluids() { .buildAndRegister(); } + private static void genericCircuits() { + for (int tier = ULV; tier <= MAX; tier++) { + ASSEMBLER_RECIPES.recipeBuilder() + .input(OrePrefix.circuit, RecipeAssists.getMarkerMaterialByTier(tier), 16) + .circuitMeta(29) + .output(RecipeAssists.getGenericCircuitByTier(tier), 16) + .EUt(8).duration(20) + .buildAndRegister(); + } + } + private static void sillyRecipes() { COMPRESSOR_RECIPES.recipeBuilder() .fluidInputs(Water.getFluid(Integer.MAX_VALUE)) diff --git a/src/main/java/com/zorbatron/zbgt/recipe/helpers/RecipeAssists.java b/src/main/java/com/zorbatron/zbgt/recipe/helpers/RecipeAssists.java index 837e354a..5dc464b6 100644 --- a/src/main/java/com/zorbatron/zbgt/recipe/helpers/RecipeAssists.java +++ b/src/main/java/com/zorbatron/zbgt/recipe/helpers/RecipeAssists.java @@ -1,5 +1,6 @@ package com.zorbatron.zbgt.recipe.helpers; +import static com.zorbatron.zbgt.common.items.ZBGTMetaItems.*; import static gregtech.api.GTValues.*; import static gregtech.api.unification.material.Materials.*; import static gregtech.common.items.MetaItems.*; @@ -41,6 +42,26 @@ public static Material getMarkerMaterialByTier(int tier) { }; } + public static MetaItem.MetaValueItem getGenericCircuitByTier(int tier) { + return switch (tier) { + case (1) -> GENERIC_CIRCUIT_LV; + case (2) -> GENERIC_CIRCUIT_MV; + case (3) -> GENERIC_CIRCUIT_HV; + case (4) -> GENERIC_CIRCUIT_EV; + case (5) -> GENERIC_CIRCUIT_IV; + case (6) -> GENERIC_CIRCUIT_LuV; + case (7) -> GENERIC_CIRCUIT_ZPM; + case (8) -> GENERIC_CIRCUIT_UV; + case (9) -> GENERIC_CIRCUIT_UHV; + case (10) -> GENERIC_CIRCUIT_UEV; + case (11) -> GENERIC_CIRCUIT_UIV; + case (12) -> GENERIC_CIRCUIT_UXV; + case (13) -> GENERIC_CIRCUIT_OpV; + case (14) -> GENERIC_CIRCUIT_MAX; + default -> GENERIC_CIRCUIT_ULV; + }; + } + public static Material getMaterialByTier(int tier) { return switch (tier) { case (LV) -> Steel;