Port to 7.0.0

.github/workflows/release.yml

@@ -56,6 +56,9 @@ jobs:
           curseforge-id: ${{ vars.CURSE_ID }}
           curseforge-token: ${{ secrets.CURSE_TOKEN }}
 
+          modrinth-id: ${{ vars.MODRINTH_ID }}
+          modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+
           github-token: ${{ secrets.GITHUB_TOKEN }}
           github-generate-changelog: true
           github-tag: "1.20.1-${{ steps.gradle_properties.outputs.mod_version }}"

README.md

@@ -4,16 +4,16 @@ A GregTech Modern addon, adding some nice quality-of-life features.
 Current features:
 
 * A Sterile Cleaning Maintenance Hatch
-* An omni-breaker, that can break anything instantly
+* An omni-breaker, a tool that can break anything instantly like a modern Vajra
 * 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)
+* The Wireless Active Transformer (WAT)
+  * Has an opt-in coolant system, where the WAT 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.
+All features (except for the sterile cleaning hatch and optional coolant for the WAT) have default recipes.
 Feel free to change recipes in your own pack!
 
 ## License

build.gradle

@@ -29,6 +29,7 @@ repositories {
         url "https://maven.firstdarkdev.xyz/snapshots/"
     }
     maven {
+
         // latvian.dev Maven (KubeJS and Rhino)
         url = "https://maven.latvian.dev/releases"
     }
@@ -102,6 +103,7 @@ minecraft {
 
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
             args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+            args '--existing-mod', 'gtceu'
         }
     }
 }

changelog.md

@@ -1,3 +1,4 @@
-# GregTech Modern Utilities version 1.1.12
+# GregTech Modern Utilities version 2.0.0
 
-* HOTFIX: 64A converters were not properly respecting the high tier content config
+* Port to GTM 7.0.0
+* Make omni-breaker teleport drops to player on right-click

gradle.properties

@@ -11,7 +11,7 @@ org.gradle.jvmargs=-Xmx1G
     mapping_version=2023.09.03-1.20.1
 
 # Mod Properties
-    mod_version=1.1.12
+    mod_version=2.0.0
     maven_group=net.neganote.gtmutils
     archives_base_name=gtmutils
     mod_id=gtmutils
@@ -23,11 +23,11 @@ org.gradle.jvmargs=-Xmx1G
 # Dependencies
     appeng_version=15.0.18
     architectury_version=9.2.14
-    gtceu_version=1.6.4
-    ldlib_version=1.0.34
+    gtceu_version=7.0.0
+    ldlib_version=1.0.40.b
     registrate_version=MC1.20-1.3.11
     rhino_version=2001.2.3-build.6
     kubejs_version=2001.6.5-build.14
     configuration_version=2.2.0
-    jei_version=15.20.0.105
-    emi_version = 1.1.13
+    jei_version=15.20.0.106
+    emi_version = 1.1.22

src/generated/resources/assets/gtmutils/blockstates/ev_64a_energy_converter.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "gtmutils:block/machine/ev_64a_energy_converter",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "gtmutils:block/machine/ev_64a_energy_converter",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "gtmutils:block/machine/ev_64a_energy_converter"
+    },
+    "facing=south": {
+      "model": "gtmutils:block/machine/ev_64a_energy_converter",
+      "y": 180
+    },
+    "facing=up": {
+      "gtceu:z": 180,
+      "model": "gtmutils:block/machine/ev_64a_energy_converter",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "gtmutils:block/machine/ev_64a_energy_converter",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/gtmutils/blockstates/hv_64a_energy_converter.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "gtmutils:block/machine/hv_64a_energy_converter",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "gtmutils:block/machine/hv_64a_energy_converter",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "gtmutils:block/machine/hv_64a_energy_converter"
+    },
+    "facing=south": {
+      "model": "gtmutils:block/machine/hv_64a_energy_converter",
+      "y": 180
+    },
+    "facing=up": {
+      "gtceu:z": 180,
+      "model": "gtmutils:block/machine/hv_64a_energy_converter",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "gtmutils:block/machine/hv_64a_energy_converter",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/gtmutils/blockstates/iv_64a_energy_converter.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "gtmutils:block/machine/iv_64a_energy_converter",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "gtmutils:block/machine/iv_64a_energy_converter",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "gtmutils:block/machine/iv_64a_energy_converter"
+    },
+    "facing=south": {
+      "model": "gtmutils:block/machine/iv_64a_energy_converter",
+      "y": 180
+    },
+    "facing=up": {
+      "gtceu:z": 180,
+      "model": "gtmutils:block/machine/iv_64a_energy_converter",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "gtmutils:block/machine/iv_64a_energy_converter",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/gtmutils/blockstates/luv_64a_energy_converter.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "gtmutils:block/machine/luv_64a_energy_converter",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "gtmutils:block/machine/luv_64a_energy_converter",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "gtmutils:block/machine/luv_64a_energy_converter"
+    },
+    "facing=south": {
+      "model": "gtmutils:block/machine/luv_64a_energy_converter",
+      "y": 180
+    },
+    "facing=up": {
+      "gtceu:z": 180,
+      "model": "gtmutils:block/machine/luv_64a_energy_converter",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "gtmutils:block/machine/luv_64a_energy_converter",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/gtmutils/blockstates/lv_64a_energy_converter.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "gtmutils:block/machine/lv_64a_energy_converter",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "gtmutils:block/machine/lv_64a_energy_converter",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "gtmutils:block/machine/lv_64a_energy_converter"
+    },
+    "facing=south": {
+      "model": "gtmutils:block/machine/lv_64a_energy_converter",
+      "y": 180
+    },
+    "facing=up": {
+      "gtceu:z": 180,
+      "model": "gtmutils:block/machine/lv_64a_energy_converter",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "gtmutils:block/machine/lv_64a_energy_converter",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/gtmutils/blockstates/max_64a_energy_converter.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "gtmutils:block/machine/max_64a_energy_converter",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "gtmutils:block/machine/max_64a_energy_converter",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "gtmutils:block/machine/max_64a_energy_converter"
+    },
+    "facing=south": {
+      "model": "gtmutils:block/machine/max_64a_energy_converter",
+      "y": 180
+    },
+    "facing=up": {
+      "gtceu:z": 180,
+      "model": "gtmutils:block/machine/max_64a_energy_converter",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "gtmutils:block/machine/max_64a_energy_converter",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/gtmutils/blockstates/mv_64a_energy_converter.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "gtmutils:block/machine/mv_64a_energy_converter",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "gtmutils:block/machine/mv_64a_energy_converter",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "gtmutils:block/machine/mv_64a_energy_converter"
+    },
+    "facing=south": {
+      "model": "gtmutils:block/machine/mv_64a_energy_converter",
+      "y": 180
+    },
+    "facing=up": {
+      "gtceu:z": 180,
+      "model": "gtmutils:block/machine/mv_64a_energy_converter",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "gtmutils:block/machine/mv_64a_energy_converter",
+      "y": 270
+    }
+  }
+}

src/generated/resources/assets/gtmutils/blockstates/opv_64a_energy_converter.json

@@ -0,0 +1,28 @@
+{
+  "variants": {
+    "facing=down": {
+      "model": "gtmutils:block/machine/opv_64a_energy_converter",
+      "x": 90
+    },
+    "facing=east": {
+      "model": "gtmutils:block/machine/opv_64a_energy_converter",
+      "y": 90
+    },
+    "facing=north": {
+      "model": "gtmutils:block/machine/opv_64a_energy_converter"
+    },
+    "facing=south": {
+      "model": "gtmutils:block/machine/opv_64a_energy_converter",
+      "y": 180
+    },
+    "facing=up": {
+      "gtceu:z": 180,
+      "model": "gtmutils:block/machine/opv_64a_energy_converter",
+      "x": 270
+    },
+    "facing=west": {
+      "model": "gtmutils:block/machine/opv_64a_energy_converter",
+      "y": 270
+    }
+  }
+}