Merge pull request #7

Add the Power Transfer Einstein-Rosen Bridge (PTERB)

Author: NegaNote

README.md

@@ -6,11 +6,16 @@ Current features:
 * A Sterile Cleaning Maintenance Hatch
 * An omni-breaker, that can break anything instantly
 * 64A Energy Converters
+* The Power Transfer Einstein-Rosen Bridge (PTERB), a wireless version of the Active Transformer
+  * Has an opt-in coolant system, where the PTERB requires coolant to be used, or it'll explode (or just stop if GTm is set to have harmless active transformers)
 
 All features can be enabled or disabled in the config.
 
 While this mod was originally created for Monifactory, feel free to use it in any GregTech modpack you like!
 
+All features (except for the sterile cleaning hatch and optional coolant for the PTERB) have default recipes.
+Feel free to change recipes in your own pack!
+
 ## License
 
 All code is under LGPL3. Some parts were directly lifted from GregTech Modern.

build.gradle

@@ -113,6 +113,7 @@ dependencies {
     runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}-forge:${jei_version}")
     runtimeOnly fg.deobf("dev.emi:emi-forge:${emi_version}+${minecraft_version}")
     runtimeOnly fg.deobf("curse.maven:jade-324717:5390389")
+    compileOnly fg.deobf("curse.maven:jade-324717:5390389")
 
     // GregTech and dependencies
     implementation fg.deobf("com.gregtechceu.gtceu:gtceu-${minecraft_version}:${gtceu_version}:slim") { transitive = false }

changelog.md

@@ -1,3 +1,3 @@
-# GregTech Modern Utilities version 1.0.3
+# GregTech Modern Utilities version 1.1.0
 
-HOTFIX - prevent server from trying to load client code
+Add the Power Transfer Einstein-Rosen Bridge, a wireless version of the Active Transformer.

gradle.properties

@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G
     mapping_version=2023.09.03-1.20.1
 
 # Mod Properties
-    mod_version=1.0.3
+    mod_version=1.1.0
     maven_group=net.neganote.gtmutils
     archives_base_name=gtmutils
     mod_id=gtmutils

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

@@ -7,6 +7,7 @@
   "block.gtmutils.max_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§XⱯWן§ɔ§",
   "block.gtmutils.mv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛWq§",
   "block.gtmutils.opv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛdOן§6§",
+  "block.gtmutils.pterb_machine": "ǝbpıɹᗺ uǝsoᴚ-uıǝʇsuıƎ ɹǝɟsuɐɹ⟘ ɹǝʍoԀ",
   "block.gtmutils.sterile_cleaning_maintenance_hatch": "ɥɔʇɐH ǝɔuɐuǝʇuıɐW buıuɐǝןƆ ǝןıɹǝʇS",
   "block.gtmutils.uev_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛƎ∩ɐ§",
   "block.gtmutils.uhv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛH∩ㄣ§",
@@ -15,9 +16,27 @@
   "block.gtmutils.uv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§Λ∩Ɛ§",
   "block.gtmutils.uxv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛX∩ǝ§",
   "block.gtmutils.zpm_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§WԀZɔ§",
+  "config.gtmutils.option.converters64aEnabled": "pǝןqɐuƎɐㄣ9sɹǝʇɹǝʌuoɔ",
+  "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",
+  "config.gtmutils.option.omnibreakerTier": "ɹǝı⟘ɹǝʞɐǝɹqıuɯo",
+  "config.gtmutils.option.pterbCoolantBaseDrain": "uıɐɹᗡǝsɐᗺʇuɐןooƆqɹǝʇd",
+  "config.gtmutils.option.pterbCoolantIOMultiplier": "ɹǝıןdıʇןnWOIʇuɐןooƆqɹǝʇd",
+  "config.gtmutils.option.pterbEnabled": "pǝןqɐuƎqɹǝʇd",
+  "config.gtmutils.option.sterileHatchEnabled": "pǝןqɐuƎɥɔʇɐHǝןıɹǝʇs",
+  "config.jade.plugin_gtmutils.frequency_info": "oɟuI ʎɔuǝnbǝɹℲ ᗺᴚƎ⟘Ԁ",
+  "gtmutils.gui.pterb.wireless_configurator.title": "ʎɔuǝnbǝɹɟ ssǝןǝɹıM",
+  "gtmutils.multiblock.pterb_machine.coolant_usage": "puoɔǝs ɹǝd %s ɟo Ꞁ%s suıɐɹᗡɔ§",
+  "gtmutils.pterb.current_frequency": "%s :ʎɔuǝnbǝɹɟ ʇuǝɹɹnƆ",
+  "gtmutils.pterb_machine.invalid_frequency": "¡0 ʎɔuǝnbǝɹɟ uo ʞɹoʍ ʇou ןןıʍ sᗺᴚƎ⟘Ԁ",
   "item.gtmutils.omnibreaker": "ɹǝʞɐǝɹq-ıuɯO",
   "itemGroup.gtmutils.creative_tab": "sǝıʇıןıʇ∩ uɹǝpoW ɥɔǝ⟘bǝɹ⅁",
+  "material.gtmutils.quantum_coolant": "ʇuɐןooƆ ɯnʇuɐnὉ",
   "tooltip.omnibreaker.can_break_anything": "¡⅁NIH⟘ʎNⱯ ǝuıɯ-ɐʇsuı uɐɔ ɹǝʞɐǝɹq-ıuɯO ǝɥ⟘",
   "tooltip.omnibreaker.charge_status": "∩Ǝ %s / ∩Ǝ %s :ʎbɹǝuƎ",
-  "tooltip.omnibreaker.right_click_function": "¡ʞɔıןɔ-ʇɥbıɹ ɥʇıʍ sʞɔoןq ןɐnpıʌıpuı ʞɐǝɹᗺ"
+  "tooltip.omnibreaker.right_click_function": "¡ʞɔıןɔ-ʇɥbıɹ ɥʇıʍ sʞɔoןq ןɐnpıʌıpuı ʞɐǝɹᗺ",
+  "tooltip.pterb_machine.frequencies": "˙ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ǝןbuıs ɐ ǝʞıן ʇɔɐ ʎɔuǝnbǝɹɟ ǝɯɐs ǝɥʇ ɥʇıʍ sᗺᴚƎ⟘Ԁ ןןⱯ",
+  "tooltip.pterb_machine.purpose": ")ᗺᴚƎ⟘Ԁ( ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ssǝןǝɹıM",
+  "tooltip.pterb_machine.uses_coolant": "¡uoıʇɔunɟ oʇ %s suıɐɹᗡ"
 }

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

@@ -7,6 +7,7 @@
   "block.gtmutils.max_64a_energy_converter": "§c§lMAX§r 64§eA§r Energy Converter",
   "block.gtmutils.mv_64a_energy_converter": "§bMV§r 64§eA§r Energy Converter",
   "block.gtmutils.opv_64a_energy_converter": "§9§lOpV§r 64§eA§r Energy Converter",
+  "block.gtmutils.pterb_machine": "Power Transfer Einstein-Rosen Bridge",
   "block.gtmutils.sterile_cleaning_maintenance_hatch": "Sterile Cleaning Maintenance Hatch",
   "block.gtmutils.uev_64a_energy_converter": "§aUEV§r 64§eA§r Energy Converter",
   "block.gtmutils.uhv_64a_energy_converter": "§4UHV§r 64§eA§r Energy Converter",
@@ -15,9 +16,27 @@
   "block.gtmutils.uv_64a_energy_converter": "§3UV§r 64§eA§r Energy Converter",
   "block.gtmutils.uxv_64a_energy_converter": "§eUXV§r 64§eA§r Energy Converter",
   "block.gtmutils.zpm_64a_energy_converter": "§cZPM§r 64§eA§r Energy Converter",
+  "config.gtmutils.option.converters64aEnabled": "converters64aEnabled",
+  "config.gtmutils.option.features": "features",
+  "config.gtmutils.option.omnibreakerEnabled": "omnibreakerEnabled",
+  "config.gtmutils.option.omnibreakerEnergyCapacity": "omnibreakerEnergyCapacity",
+  "config.gtmutils.option.omnibreakerTier": "omnibreakerTier",
+  "config.gtmutils.option.pterbCoolantBaseDrain": "pterbCoolantBaseDrain",
+  "config.gtmutils.option.pterbCoolantIOMultiplier": "pterbCoolantIOMultiplier",
+  "config.gtmutils.option.pterbEnabled": "pterbEnabled",
+  "config.gtmutils.option.sterileHatchEnabled": "sterileHatchEnabled",
+  "config.jade.plugin_gtmutils.frequency_info": "PTERB Frequency Info",
+  "gtmutils.gui.pterb.wireless_configurator.title": "Wireless frequency",
+  "gtmutils.multiblock.pterb_machine.coolant_usage": "§cDrains %sL of %s per second",
+  "gtmutils.pterb.current_frequency": "Current frequency: %s",
+  "gtmutils.pterb_machine.invalid_frequency": "PTERBs will not work on frequency 0!",
   "item.gtmutils.omnibreaker": "Omni-breaker",
   "itemGroup.gtmutils.creative_tab": "GregTech Modern Utilities",
+  "material.gtmutils.quantum_coolant": "Quantum Coolant",
   "tooltip.omnibreaker.can_break_anything": "The Omni-breaker can insta-mine ANYTHING!",
   "tooltip.omnibreaker.charge_status": "Energy: %s EU / %s EU",
-  "tooltip.omnibreaker.right_click_function": "Break individual blocks with right-click!"
+  "tooltip.omnibreaker.right_click_function": "Break individual blocks with right-click!",
+  "tooltip.pterb_machine.frequencies": "All PTERBs with the same frequency act like a single Active Transformer.",
+  "tooltip.pterb_machine.purpose": "Wireless Active Transformer (PTERB)",
+  "tooltip.pterb_machine.uses_coolant": "Drains %s to function!"
 }

src/generated/resources/data/ae2/tags/items/p2p_attunements/fluid_p2p_tunnel.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "gtmutils:quantum_coolant_bucket"
+  ]
+}

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

@@ -24,10 +24,12 @@
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.neganote.gtutilities.client.renderer.UtilShaders;
 import net.neganote.gtutilities.common.item.UtilItems;
 import net.neganote.gtutilities.common.machine.UtilMachines;
+import net.neganote.gtutilities.common.materials.UtilMaterials;
 import net.neganote.gtutilities.config.UtilConfig;
-import net.neganote.gtutilities.data.UtilDatagen;
+import net.neganote.gtutilities.datagen.UtilDatagen;
 
 import com.tterrag.registrate.util.entry.RegistryEntry;
 import org.apache.logging.log4j.LogManager;
@@ -49,6 +51,7 @@ public GregTechModernUtilities() {
         modEventBus.addListener(this::commonSetup);
         if (GTCEu.isClientSide()) {
             modEventBus.addListener(this::clientSetup);
+            modEventBus.register(UtilShaders.class);
         }
         modEventBus.addListener(this::addMaterialRegistries);
         modEventBus.addListener(this::addMaterials);
@@ -127,7 +130,7 @@ private void addMaterialRegistries(MaterialRegistryEvent event) {
 
     // As well as this.
     private void addMaterials(MaterialEvent event) {
-        // CustomMaterials.init();
+        UtilMaterials.register();
     }
 
     // This is optional, though.

src/main/java/net/neganote/gtutilities/client/renderer/UtilRenderTypes.java

@@ -0,0 +1,34 @@
+package net.neganote.gtutilities.client.renderer;
+
+import net.minecraft.client.renderer.RenderStateShard;
+import net.minecraft.client.renderer.RenderStateShard.ShaderStateShard;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.VertexFormat;
+
+@OnlyIn(Dist.CLIENT)
+public class UtilRenderTypes {
+
+    public static final ShaderStateShard WORMHOLE_SHADER_SHARD = new ShaderStateShard(
+            () -> UtilShaders.WORMHOLE_SHADER);
+
+    public static RenderType WORMHOLE = RenderType.create("wormhole", DefaultVertexFormat.POSITION,
+            VertexFormat.Mode.QUADS, 131072, false, false,
+            RenderType.CompositeState.builder()
+                    .setShaderState(WORMHOLE_SHADER_SHARD)
+                    // I would just use RenderStateShard.ADDITIVE_TRANSPARENCY, but that's protected for some reason
+                    // So instead I'm just copying it directly
+                    .setTransparencyState(new RenderStateShard.TransparencyStateShard("additive_transparency", () -> {
+                        RenderSystem.enableBlend();
+                        RenderSystem.blendFunc(GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ONE);
+                    }, () -> {
+                        RenderSystem.disableBlend();
+                        RenderSystem.defaultBlendFunc();
+                    }))
+                    .createCompositeState(false));
+}

src/main/java/net/neganote/gtutilities/client/renderer/UtilShaders.java

@@ -0,0 +1,26 @@
+package net.neganote.gtutilities.client.renderer;
+
+import net.minecraft.client.renderer.ShaderInstance;
+import net.minecraftforge.client.event.RegisterShadersEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.neganote.gtutilities.GregTechModernUtilities;
+
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+
+import java.io.IOException;
+
+public class UtilShaders {
+
+    public static ShaderInstance WORMHOLE_SHADER;
+
+    @SubscribeEvent
+    public static void shaderRegistry(RegisterShadersEvent event) {
+        try {
+            event.registerShader(new ShaderInstance(event.getResourceProvider(),
+                    GregTechModernUtilities.id("rendertype_wormhole"), DefaultVertexFormat.POSITION),
+                    (shaderInstance -> WORMHOLE_SHADER = shaderInstance));
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}