diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a8b813d..aa6a5be 100644 --- a/.github/workflows/release.yml +++ b/.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 }}" diff --git a/README.md b/README.md index e1141c4..188e537 100644 --- a/README.md +++ b/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 diff --git a/build.gradle b/build.gradle index 42a7712..001c22f 100644 --- a/build.gradle +++ b/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' } } } diff --git a/changelog.md b/changelog.md index 3266510..b36fdd2 100644 --- a/changelog.md +++ b/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 \ No newline at end of file +* Port to GTM 7.0.0 +* Make omni-breaker teleport drops to player on right-click diff --git a/gradle.properties b/gradle.properties index 4e634b6..c66c609 100644 --- a/gradle.properties +++ b/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 diff --git a/src/generated/resources/assets/gtmutils/blockstates/ev_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/ev_64a_energy_converter.json new file mode 100644 index 0000000..a8c965c --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/hv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/hv_64a_energy_converter.json new file mode 100644 index 0000000..c00799d --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/iv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/iv_64a_energy_converter.json new file mode 100644 index 0000000..5e6485d --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/luv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/luv_64a_energy_converter.json new file mode 100644 index 0000000..16ab1ec --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/lv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/lv_64a_energy_converter.json new file mode 100644 index 0000000..1760b2e --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/max_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/max_64a_energy_converter.json new file mode 100644 index 0000000..4c4a1f4 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/mv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/mv_64a_energy_converter.json new file mode 100644 index 0000000..a1c3930 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/opv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/opv_64a_energy_converter.json new file mode 100644 index 0000000..b92cfa0 --- /dev/null +++ b/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 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/pterb_machine.json b/src/generated/resources/assets/gtmutils/blockstates/pterb_machine.json new file mode 100644 index 0000000..ea4c089 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/blockstates/pterb_machine.json @@ -0,0 +1,114 @@ +{ + "variants": { + "facing=down,upwards_facing=east": { + "gtceu:z": 90, + "model": "gtmutils:block/machine/pterb_machine", + "x": 90 + }, + "facing=down,upwards_facing=north": { + "model": "gtmutils:block/machine/pterb_machine", + "x": 90 + }, + "facing=down,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/pterb_machine", + "x": 90 + }, + "facing=down,upwards_facing=west": { + "gtceu:z": 270, + "model": "gtmutils:block/machine/pterb_machine", + "x": 90 + }, + "facing=east,upwards_facing=east": { + "gtceu:z": 90, + "model": "gtmutils:block/machine/pterb_machine", + "y": 90 + }, + "facing=east,upwards_facing=north": { + "model": "gtmutils:block/machine/pterb_machine", + "y": 90 + }, + "facing=east,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/pterb_machine", + "y": 90 + }, + "facing=east,upwards_facing=west": { + "gtceu:z": 270, + "model": "gtmutils:block/machine/pterb_machine", + "y": 90 + }, + "facing=north,upwards_facing=east": { + "gtceu:z": 90, + "model": "gtmutils:block/machine/pterb_machine" + }, + "facing=north,upwards_facing=north": { + "model": "gtmutils:block/machine/pterb_machine" + }, + "facing=north,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/pterb_machine" + }, + "facing=north,upwards_facing=west": { + "gtceu:z": 270, + "model": "gtmutils:block/machine/pterb_machine" + }, + "facing=south,upwards_facing=east": { + "gtceu:z": 90, + "model": "gtmutils:block/machine/pterb_machine", + "y": 180 + }, + "facing=south,upwards_facing=north": { + "model": "gtmutils:block/machine/pterb_machine", + "y": 180 + }, + "facing=south,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/pterb_machine", + "y": 180 + }, + "facing=south,upwards_facing=west": { + "gtceu:z": 270, + "model": "gtmutils:block/machine/pterb_machine", + "y": 180 + }, + "facing=up,upwards_facing=east": { + "gtceu:z": 270, + "model": "gtmutils:block/machine/pterb_machine", + "x": 270 + }, + "facing=up,upwards_facing=north": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/pterb_machine", + "x": 270 + }, + "facing=up,upwards_facing=south": { + "model": "gtmutils:block/machine/pterb_machine", + "x": 270 + }, + "facing=up,upwards_facing=west": { + "gtceu:z": 90, + "model": "gtmutils:block/machine/pterb_machine", + "x": 270 + }, + "facing=west,upwards_facing=east": { + "gtceu:z": 90, + "model": "gtmutils:block/machine/pterb_machine", + "y": 270 + }, + "facing=west,upwards_facing=north": { + "model": "gtmutils:block/machine/pterb_machine", + "y": 270 + }, + "facing=west,upwards_facing=south": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/pterb_machine", + "y": 270 + }, + "facing=west,upwards_facing=west": { + "gtceu:z": 270, + "model": "gtmutils:block/machine/pterb_machine", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/sterile_cleaning_maintenance_hatch.json b/src/generated/resources/assets/gtmutils/blockstates/sterile_cleaning_maintenance_hatch.json new file mode 100644 index 0000000..88dbbb1 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/blockstates/sterile_cleaning_maintenance_hatch.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch", + "x": 90 + }, + "facing=east": { + "model": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch", + "y": 90 + }, + "facing=north": { + "model": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch" + }, + "facing=south": { + "model": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch", + "x": 270 + }, + "facing=west": { + "model": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/uev_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/uev_64a_energy_converter.json new file mode 100644 index 0000000..1cf28ca --- /dev/null +++ b/src/generated/resources/assets/gtmutils/blockstates/uev_64a_energy_converter.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtmutils:block/machine/uev_64a_energy_converter", + "x": 90 + }, + "facing=east": { + "model": "gtmutils:block/machine/uev_64a_energy_converter", + "y": 90 + }, + "facing=north": { + "model": "gtmutils:block/machine/uev_64a_energy_converter" + }, + "facing=south": { + "model": "gtmutils:block/machine/uev_64a_energy_converter", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/uev_64a_energy_converter", + "x": 270 + }, + "facing=west": { + "model": "gtmutils:block/machine/uev_64a_energy_converter", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/uhv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/uhv_64a_energy_converter.json new file mode 100644 index 0000000..7558bc6 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/blockstates/uhv_64a_energy_converter.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtmutils:block/machine/uhv_64a_energy_converter", + "x": 90 + }, + "facing=east": { + "model": "gtmutils:block/machine/uhv_64a_energy_converter", + "y": 90 + }, + "facing=north": { + "model": "gtmutils:block/machine/uhv_64a_energy_converter" + }, + "facing=south": { + "model": "gtmutils:block/machine/uhv_64a_energy_converter", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/uhv_64a_energy_converter", + "x": 270 + }, + "facing=west": { + "model": "gtmutils:block/machine/uhv_64a_energy_converter", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/uiv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/uiv_64a_energy_converter.json new file mode 100644 index 0000000..8f67899 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/blockstates/uiv_64a_energy_converter.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtmutils:block/machine/uiv_64a_energy_converter", + "x": 90 + }, + "facing=east": { + "model": "gtmutils:block/machine/uiv_64a_energy_converter", + "y": 90 + }, + "facing=north": { + "model": "gtmutils:block/machine/uiv_64a_energy_converter" + }, + "facing=south": { + "model": "gtmutils:block/machine/uiv_64a_energy_converter", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/uiv_64a_energy_converter", + "x": 270 + }, + "facing=west": { + "model": "gtmutils:block/machine/uiv_64a_energy_converter", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/ulv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/ulv_64a_energy_converter.json new file mode 100644 index 0000000..1819867 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/blockstates/ulv_64a_energy_converter.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtmutils:block/machine/ulv_64a_energy_converter", + "x": 90 + }, + "facing=east": { + "model": "gtmutils:block/machine/ulv_64a_energy_converter", + "y": 90 + }, + "facing=north": { + "model": "gtmutils:block/machine/ulv_64a_energy_converter" + }, + "facing=south": { + "model": "gtmutils:block/machine/ulv_64a_energy_converter", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/ulv_64a_energy_converter", + "x": 270 + }, + "facing=west": { + "model": "gtmutils:block/machine/ulv_64a_energy_converter", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/uv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/uv_64a_energy_converter.json new file mode 100644 index 0000000..ab119f1 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/blockstates/uv_64a_energy_converter.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtmutils:block/machine/uv_64a_energy_converter", + "x": 90 + }, + "facing=east": { + "model": "gtmutils:block/machine/uv_64a_energy_converter", + "y": 90 + }, + "facing=north": { + "model": "gtmutils:block/machine/uv_64a_energy_converter" + }, + "facing=south": { + "model": "gtmutils:block/machine/uv_64a_energy_converter", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/uv_64a_energy_converter", + "x": 270 + }, + "facing=west": { + "model": "gtmutils:block/machine/uv_64a_energy_converter", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/uxv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/uxv_64a_energy_converter.json new file mode 100644 index 0000000..4b1dbda --- /dev/null +++ b/src/generated/resources/assets/gtmutils/blockstates/uxv_64a_energy_converter.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtmutils:block/machine/uxv_64a_energy_converter", + "x": 90 + }, + "facing=east": { + "model": "gtmutils:block/machine/uxv_64a_energy_converter", + "y": 90 + }, + "facing=north": { + "model": "gtmutils:block/machine/uxv_64a_energy_converter" + }, + "facing=south": { + "model": "gtmutils:block/machine/uxv_64a_energy_converter", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/uxv_64a_energy_converter", + "x": 270 + }, + "facing=west": { + "model": "gtmutils:block/machine/uxv_64a_energy_converter", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/blockstates/zpm_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/blockstates/zpm_64a_energy_converter.json new file mode 100644 index 0000000..0bef8cf --- /dev/null +++ b/src/generated/resources/assets/gtmutils/blockstates/zpm_64a_energy_converter.json @@ -0,0 +1,28 @@ +{ + "variants": { + "facing=down": { + "model": "gtmutils:block/machine/zpm_64a_energy_converter", + "x": 90 + }, + "facing=east": { + "model": "gtmutils:block/machine/zpm_64a_energy_converter", + "y": 90 + }, + "facing=north": { + "model": "gtmutils:block/machine/zpm_64a_energy_converter" + }, + "facing=south": { + "model": "gtmutils:block/machine/zpm_64a_energy_converter", + "y": 180 + }, + "facing=up": { + "gtceu:z": 180, + "model": "gtmutils:block/machine/zpm_64a_energy_converter", + "x": 270 + }, + "facing=west": { + "model": "gtmutils:block/machine/zpm_64a_energy_converter", + "y": 270 + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/lang/en_ud.json b/src/generated/resources/assets/gtmutils/lang/en_ud.json index 207be1a..e8da045 100644 --- a/src/generated/resources/assets/gtmutils/lang/en_ud.json +++ b/src/generated/resources/assets/gtmutils/lang/en_ud.json @@ -7,7 +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.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 ɹ§ΛƎ∩ɐ§", "block.gtmutils.uhv_64a_energy_converter": "ɹǝʇɹǝʌuoƆ ʎbɹǝuƎ ɹ§Ɐǝ§ㄣ9 ɹ§ΛH∩ㄣ§", @@ -25,12 +25,12 @@ "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.pterb_info": "oɟuI ᗺᴚƎ⟘Ԁ", + "config.jade.plugin_gtmutils.pterb_info": "oɟuI ⟘ⱯM", "gtmutils.gui.pterb.wireless_configurator.title": "ʎɔuǝnbǝɹɟ ssǝןǝɹıM", "gtmutils.machine.64a_energy_converter.tooltip_tool_usage": "ǝbuɐɥɔ oʇ ʇǝןןɐW ʇɟoS ǝsn 'ㄥ§ɹǝʇɹǝʌuoƆ ∩Ǝɟ§ sɐ sʇɹɐʇS", "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ᗺᴚƎ⟘Ԁ", + "gtmutils.pterb_machine.invalid_frequency": "¡0 ʎɔuǝnbǝɹɟ uo ʞɹoʍ ʇou ןןıʍ s⟘ⱯM", "item.gtmutils.omnibreaker": "ɹǝʞɐǝɹq-ıuɯO", "itemGroup.gtmutils.creative_tab": "sǝıʇıןıʇ∩ uɹǝpoW ɥɔǝ⟘bǝɹ⅁", "material.gtmutils.quantum_coolant": "ʇuɐןooƆ ɯnʇuɐnὉ", @@ -38,8 +38,15 @@ "tooltip.omnibreaker.charge_status": "∩Ǝ %s / ∩Ǝ %s :ʎbɹǝuƎ", "tooltip.omnibreaker.modern_vajra": "ɐɹظɐΛ uɹǝpoW Ɐ", "tooltip.omnibreaker.right_click_function": "¡ʞɔıןɔ-ʇɥbıɹ ɥʇıʍ sʞɔoןq ןɐnpıʌıpuı ʞɐǝɹᗺ", - "tooltip.pterb_machine.frequencies": "˙ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ǝןbuıs ɐ ǝʞıן ʇɔɐ ʎɔuǝnbǝɹɟ ǝɯɐs ǝɥʇ ɥʇıʍ sᗺᴚƎ⟘Ԁ ןןⱯ", + "tooltip.omnibreaker.swappable_tools": "¡ǝuo uı sןooʇ ǝןdıʇןnɯ suıɐʇuoɔ osןⱯ", + "tooltip.omnibreaker.tool_mode": "%s :ǝpoɯ ʇuǝɹɹnƆ", + "tooltip.omnibreaker.tool_mode_0": "ɹǝʞɐǝɹqıuɯO", + "tooltip.omnibreaker.tool_mode_1": "ɥɔuǝɹM", + "tooltip.omnibreaker.tool_mode_2": "ɹǝʌıɹpʍǝɹɔS", + "tooltip.omnibreaker.tool_mode_3": "ɹǝʇʇnɔ-ǝɹıM", + "tooltip.omnibreaker.tool_mode_4": "ɹɐqʍoɹƆ", + "tooltip.pterb_machine.frequencies": "˙ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ǝןbuıs ɐ ǝʞıן ʇɔɐ ʎɔuǝnbǝɹɟ ǝɯɐs ǝɥʇ ɥʇıʍ s⟘ⱯM ןןⱯ", "tooltip.pterb_machine.input_coolant_before_use": "¡uo ʇı buıuɹnʇ ǝɹoɟǝq ʇuɐןooɔ ʇnduı sʎɐʍןⱯ", - "tooltip.pterb_machine.purpose": ")ᗺᴚƎ⟘Ԁ( ɹǝɯɹoɟsuɐɹ⟘ ǝʌıʇɔⱯ ssǝןǝɹıM", + "tooltip.pterb_machine.purpose": ")ᗺᴚƎ⟘Ԁ( ǝbpıɹᗺ uǝsoᴚ-uıǝʇsuıƎ ɹǝɟsuɐɹ⟘ ɹǝʍoԀ", "tooltip.pterb_machine.uses_coolant": "¡uoıʇɔunɟ oʇ %s suıɐɹᗡ" } \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/lang/en_us.json b/src/generated/resources/assets/gtmutils/lang/en_us.json index 1f54f26..6a15326 100644 --- a/src/generated/resources/assets/gtmutils/lang/en_us.json +++ b/src/generated/resources/assets/gtmutils/lang/en_us.json @@ -7,7 +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.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", "block.gtmutils.uhv_64a_energy_converter": "§4UHV§r 64§eA§r Energy Converter", @@ -25,12 +25,12 @@ "config.gtmutils.option.pterbCoolantIOMultiplier": "pterbCoolantIOMultiplier", "config.gtmutils.option.pterbEnabled": "pterbEnabled", "config.gtmutils.option.sterileHatchEnabled": "sterileHatchEnabled", - "config.jade.plugin_gtmutils.pterb_info": "PTERB Info", + "config.jade.plugin_gtmutils.pterb_info": "WAT Info", "gtmutils.gui.pterb.wireless_configurator.title": "Wireless frequency", "gtmutils.machine.64a_energy_converter.tooltip_tool_usage": "Starts as §fEU Converter§7, use Soft Mallet to change", "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!", + "gtmutils.pterb_machine.invalid_frequency": "WATs will not work on frequency 0!", "item.gtmutils.omnibreaker": "Omni-breaker", "itemGroup.gtmutils.creative_tab": "GregTech Modern Utilities", "material.gtmutils.quantum_coolant": "Quantum Coolant", @@ -38,8 +38,15 @@ "tooltip.omnibreaker.charge_status": "Energy: %s EU / %s EU", "tooltip.omnibreaker.modern_vajra": "A Modern Vajra", "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.omnibreaker.swappable_tools": "Also contains multiple tools in one!", + "tooltip.omnibreaker.tool_mode": "Current mode: %s", + "tooltip.omnibreaker.tool_mode_0": "Omnibreaker", + "tooltip.omnibreaker.tool_mode_1": "Wrench", + "tooltip.omnibreaker.tool_mode_2": "Screwdriver", + "tooltip.omnibreaker.tool_mode_3": "Wire-cutter", + "tooltip.omnibreaker.tool_mode_4": "Crowbar", + "tooltip.pterb_machine.frequencies": "All WATs with the same frequency act like a single Active Transformer.", "tooltip.pterb_machine.input_coolant_before_use": "Always input coolant before turning it on!", - "tooltip.pterb_machine.purpose": "Wireless Active Transformer (PTERB)", + "tooltip.pterb_machine.purpose": "Power Transfer Einstein-Rosen Bridge (PTERB)", "tooltip.pterb_machine.uses_coolant": "Drains %s to function!" } \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/ev_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/ev_64a_energy_converter.json new file mode 100644 index 0000000..e0e489b --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/ev_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:ev_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/ev/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/ev/side", + "top": "gtceu:block/casings/voltage/ev/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/hv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/hv_64a_energy_converter.json new file mode 100644 index 0000000..4f58620 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/hv_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:hv_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/hv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/hv/side", + "top": "gtceu:block/casings/voltage/hv/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/hv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/hv/side", + "top": "gtceu:block/casings/voltage/hv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/iv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/iv_64a_energy_converter.json new file mode 100644 index 0000000..9bf0e37 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/iv_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:iv_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/iv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/iv/side", + "top": "gtceu:block/casings/voltage/iv/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/iv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/iv/side", + "top": "gtceu:block/casings/voltage/iv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/luv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/luv_64a_energy_converter.json new file mode 100644 index 0000000..d933886 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/luv_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:luv_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/luv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/luv/side", + "top": "gtceu:block/casings/voltage/luv/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/luv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/luv/side", + "top": "gtceu:block/casings/voltage/luv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/lv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/lv_64a_energy_converter.json new file mode 100644 index 0000000..6023d9c --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/lv_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:lv_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/lv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/lv/side", + "top": "gtceu:block/casings/voltage/lv/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/lv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/lv/side", + "top": "gtceu:block/casings/voltage/lv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/max_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/max_64a_energy_converter.json new file mode 100644 index 0000000..d621e32 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/max_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:max_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/max/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/max/side", + "top": "gtceu:block/casings/voltage/max/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/max/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/max/side", + "top": "gtceu:block/casings/voltage/max/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/mv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/mv_64a_energy_converter.json new file mode 100644 index 0000000..f852177 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/mv_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:mv_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/mv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/mv/side", + "top": "gtceu:block/casings/voltage/mv/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/mv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/mv/side", + "top": "gtceu:block/casings/voltage/mv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/opv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/opv_64a_energy_converter.json new file mode 100644 index 0000000..2aa99e4 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/opv_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:opv_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/opv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/opv/side", + "top": "gtceu:block/casings/voltage/opv/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/opv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/opv/side", + "top": "gtceu:block/casings/voltage/opv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/pterb_machine.json b/src/generated/resources/assets/gtmutils/models/block/machine/pterb_machine.json new file mode 100644 index 0000000..31c7fd5 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/pterb_machine.json @@ -0,0 +1,90 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:pterb_machine", + "texture_overrides": { + "all": "gtceu:block/casings/solid/machine_casing_palladium_substation" + }, + "variants": { + "is_formed=false,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_palladium_substation", + "overlay_front": "gtceu:block/multiblock/data_bank/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/data_bank/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_palladium_substation", + "overlay_front": "gtceu:block/multiblock/data_bank/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/data_bank/overlay_front_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_palladium_substation", + "overlay_front": "gtceu:block/multiblock/data_bank/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/data_bank/overlay_front_active_emissive" + } + } + }, + "is_formed=false,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_palladium_substation", + "overlay_front": "gtceu:block/multiblock/data_bank/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/data_bank/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=idle": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_palladium_substation", + "overlay_front": "gtceu:block/multiblock/data_bank/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/data_bank/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=suspend": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_palladium_substation", + "overlay_front": "gtceu:block/multiblock/data_bank/overlay_front", + "overlay_front_emissive": "gtceu:block/multiblock/data_bank/overlay_front_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=waiting": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_palladium_substation", + "overlay_front": "gtceu:block/multiblock/data_bank/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/data_bank/overlay_front_active_emissive" + } + } + }, + "is_formed=true,recipe_logic_status=working": { + "model": { + "parent": "gtceu:block/machine/template/cube_all/sided", + "textures": { + "all": "gtceu:block/casings/solid/machine_casing_palladium_substation", + "overlay_front": "gtceu:block/multiblock/data_bank/overlay_front_active", + "overlay_front_emissive": "gtceu:block/multiblock/data_bank/overlay_front_active_emissive" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/sterile_cleaning_maintenance_hatch.json b/src/generated/resources/assets/gtmutils/models/block/machine/sterile_cleaning_maintenance_hatch.json new file mode 100644 index 0000000..b0b864c --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/sterile_cleaning_maintenance_hatch.json @@ -0,0 +1,22 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:sterile_cleaning_maintenance_hatch", + "replaceable_textures": [ + "bottom", + "top", + "side" + ], + "variants": { + "": { + "model": { + "parent": "gtmutils:block/machine/part/sterile_cleaning_maintenance_hatch", + "textures": { + "bottom": "gtceu:block/casings/voltage/uhv/bottom", + "side": "gtceu:block/casings/voltage/uhv/side", + "top": "gtceu:block/casings/voltage/uhv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/uev_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/uev_64a_energy_converter.json new file mode 100644 index 0000000..2513c6a --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/uev_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:uev_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/uev/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/uev/side", + "top": "gtceu:block/casings/voltage/uev/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/uev/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/uev/side", + "top": "gtceu:block/casings/voltage/uev/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/uhv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/uhv_64a_energy_converter.json new file mode 100644 index 0000000..9141a74 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/uhv_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:uhv_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/uhv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/uhv/side", + "top": "gtceu:block/casings/voltage/uhv/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/uhv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/uhv/side", + "top": "gtceu:block/casings/voltage/uhv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/uiv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/uiv_64a_energy_converter.json new file mode 100644 index 0000000..ebb8f36 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/uiv_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:uiv_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/uiv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/uiv/side", + "top": "gtceu:block/casings/voltage/uiv/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/uiv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/uiv/side", + "top": "gtceu:block/casings/voltage/uiv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/ulv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/ulv_64a_energy_converter.json new file mode 100644 index 0000000..e6e05ab --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/ulv_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:ulv_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/ulv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/ulv/side", + "top": "gtceu:block/casings/voltage/ulv/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/ulv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/ulv/side", + "top": "gtceu:block/casings/voltage/ulv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/uv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/uv_64a_energy_converter.json new file mode 100644 index 0000000..4e50ff2 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/uv_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:uv_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/uv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/uv/side", + "top": "gtceu:block/casings/voltage/uv/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/uv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/uv/side", + "top": "gtceu:block/casings/voltage/uv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/uxv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/uxv_64a_energy_converter.json new file mode 100644 index 0000000..fc90780 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/uxv_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:uxv_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/uxv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/uxv/side", + "top": "gtceu:block/casings/voltage/uxv/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/uxv/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/uxv/side", + "top": "gtceu:block/casings/voltage/uxv/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/block/machine/zpm_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/block/machine/zpm_64a_energy_converter.json new file mode 100644 index 0000000..21e35bb --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/block/machine/zpm_64a_energy_converter.json @@ -0,0 +1,37 @@ +{ + "parent": "minecraft:block/block", + "loader": "gtceu:machine", + "machine": "gtmutils:zpm_64a_energy_converter", + "variants": { + "fe_to_eu=false": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/zpm/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_in", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_in_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_out", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_out_emissive", + "side": "gtceu:block/casings/voltage/zpm/side", + "top": "gtceu:block/casings/voltage/zpm/top" + } + } + }, + "fe_to_eu=true": { + "model": { + "parent": "gtceu:block/machine/template/transformer_like_machine", + "textures": { + "bottom": "gtceu:block/casings/voltage/zpm/bottom", + "overlay_in_io": "gtceu:block/overlay/machine/overlay_energy_64a_out", + "overlay_in_io_emissive": "gtceu:block/overlay/machine/overlay_energy_64a_out_emissive", + "overlay_in_tinted": "gtceu:block/overlay/machine/overlay_energy_64a_tinted", + "overlay_out_io": "gtceu:block/overlay/converter/converter_native_in", + "overlay_out_io_emissive": "gtceu:block/overlay/converter/converter_native_in_emissive", + "side": "gtceu:block/casings/voltage/zpm/side", + "top": "gtceu:block/casings/voltage/zpm/top" + } + } + } + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/ev_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/ev_64a_energy_converter.json new file mode 100644 index 0000000..113b88d --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/ev_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/ev_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/hv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/hv_64a_energy_converter.json new file mode 100644 index 0000000..ace6f59 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/hv_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/hv_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/iv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/iv_64a_energy_converter.json new file mode 100644 index 0000000..ea8ab40 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/iv_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/iv_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/luv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/luv_64a_energy_converter.json new file mode 100644 index 0000000..a23fade --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/luv_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/luv_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/lv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/lv_64a_energy_converter.json new file mode 100644 index 0000000..f9c8ea1 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/lv_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/lv_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/max_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/max_64a_energy_converter.json new file mode 100644 index 0000000..f8da5bd --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/max_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/max_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/mv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/mv_64a_energy_converter.json new file mode 100644 index 0000000..4ec6507 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/mv_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/mv_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/opv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/opv_64a_energy_converter.json new file mode 100644 index 0000000..9e064d3 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/opv_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/opv_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/pterb_machine.json b/src/generated/resources/assets/gtmutils/models/item/pterb_machine.json new file mode 100644 index 0000000..dd82246 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/pterb_machine.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/pterb_machine" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/sterile_cleaning_maintenance_hatch.json b/src/generated/resources/assets/gtmutils/models/item/sterile_cleaning_maintenance_hatch.json new file mode 100644 index 0000000..98c10e6 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/sterile_cleaning_maintenance_hatch.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/sterile_cleaning_maintenance_hatch" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/uev_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/uev_64a_energy_converter.json new file mode 100644 index 0000000..9874156 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/uev_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/uev_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/uhv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/uhv_64a_energy_converter.json new file mode 100644 index 0000000..f42aa54 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/uhv_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/uhv_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/uiv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/uiv_64a_energy_converter.json new file mode 100644 index 0000000..5f197e8 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/uiv_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/uiv_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/ulv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/ulv_64a_energy_converter.json new file mode 100644 index 0000000..47c1935 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/ulv_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/ulv_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/uv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/uv_64a_energy_converter.json new file mode 100644 index 0000000..d93f92c --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/uv_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/uv_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/uxv_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/uxv_64a_energy_converter.json new file mode 100644 index 0000000..544c713 --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/uxv_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/uxv_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/assets/gtmutils/models/item/zpm_64a_energy_converter.json b/src/generated/resources/assets/gtmutils/models/item/zpm_64a_energy_converter.json new file mode 100644 index 0000000..63dbbbf --- /dev/null +++ b/src/generated/resources/assets/gtmutils/models/item/zpm_64a_energy_converter.json @@ -0,0 +1,3 @@ +{ + "parent": "gtmutils:block/machine/zpm_64a_energy_converter" +} \ No newline at end of file diff --git a/src/generated/resources/data/ae2/tags/items/p2p_attunements/fluid_p2p_tunnel.json b/src/generated/resources/data/ae2/tags/items/p2p_attunements/fluid_p2p_tunnel.json deleted file mode 100644 index 4e47f36..0000000 --- a/src/generated/resources/data/ae2/tags/items/p2p_attunements/fluid_p2p_tunnel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "gtmutils:quantum_coolant_bucket" - ] -} \ No newline at end of file diff --git a/src/main/java/net/neganote/gtutilities/client/renderer/machine/PTERBRenderer.java b/src/main/java/net/neganote/gtutilities/client/renderer/machine/PTERBRenderer.java deleted file mode 100644 index 3ffc06d..0000000 --- a/src/main/java/net/neganote/gtutilities/client/renderer/machine/PTERBRenderer.java +++ /dev/null @@ -1,92 +0,0 @@ -package net.neganote.gtutilities.client.renderer.machine; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.GTValues; -import com.gregtechceu.gtceu.api.blockentity.MetaMachineBlockEntity; -import com.gregtechceu.gtceu.api.pattern.util.RelativeDirection; -import com.gregtechceu.gtceu.client.renderer.machine.WorkableCasingMachineRenderer; - -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.MultiBufferSource; -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.resources.model.BakedModel; -import net.minecraft.core.Direction; -import net.minecraft.core.Vec3i; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.entity.BlockEntity; -import net.neganote.gtutilities.GregTechModernUtilities; -import net.neganote.gtutilities.client.renderer.UtilRenderTypes; -import net.neganote.gtutilities.common.machine.multiblock.PTERBMachine; - -import com.mojang.blaze3d.vertex.PoseStack; -import com.mojang.blaze3d.vertex.VertexConsumer; - -import java.util.List; -import java.util.function.Consumer; - -public class PTERBRenderer extends WorkableCasingMachineRenderer { - - public static final ResourceLocation TEXTURE = GTCEu.id("block/casings/solid/machine_casing_palladium_substation"); - // TODO: replace this texture with custom casing - public static final ResourceLocation OVERLAY_MODEL_TEXTURES = GTCEu.id("block/multiblock/data_bank"); - - public static final ResourceLocation SPHERE = GregTechModernUtilities.id("render/sphere"); - - public PTERBRenderer() { - super(TEXTURE, OVERLAY_MODEL_TEXTURES); - } - - @Override - public void render(BlockEntity blockEntity, float partialTicks, PoseStack stack, MultiBufferSource buffer, - int combinedLight, int combinedOverlay) { - if (blockEntity instanceof MetaMachineBlockEntity mmbe && mmbe.getMetaMachine() instanceof PTERBMachine pterb && - pterb.isFormed() && pterb.isActive()) { - var frontFacing = pterb.getFrontFacing(); - var upwardsFacing = pterb.getUpwardsFacing(); - - Direction upwards = RelativeDirection.UP.getRelativeFacing(frontFacing, upwardsFacing, false); - - // Disable the rendering for now. Might finish it later if I ever become smart enough/able to understand - // Minecraft's rendering system better. - // renderWormhole(stack, buffer, upwards, combinedLight, combinedOverlay); - } - } - - @SuppressWarnings("deprecation") - private void renderWormhole(PoseStack stack, MultiBufferSource bufferSource, Direction upwards, - int combinedLight, int combinedOverlay) { - stack.pushPose(); - var modelManager = Minecraft.getInstance().getModelManager(); - BakedModel sphere = modelManager.getModel(SPHERE); - Vec3i movement = upwards.getNormal(); - stack.translate(movement.getX() * 8 + 0.5f, movement.getY() * 8 + 0.5f, movement.getZ() * 8 + 0.5f); - PoseStack.Pose pose = stack.last(); - VertexConsumer consumer = bufferSource.getBuffer(UtilRenderTypes.WORMHOLE); - List quads = sphere.getQuads(null, null, GTValues.RNG); - for (BakedQuad quad : quads) { - consumer.putBulkData(pose, quad, 1.0f, 1.0f, 1.0f, combinedLight, combinedOverlay); - } - stack.popPose(); - } - - @Override - public boolean hasTESR(BlockEntity blockEntity) { - return true; - } - - @Override - public int getViewDistance() { - return 256; - } - - @Override - public boolean isGlobalRenderer(BlockEntity blockEntity) { - return true; - } - - @Override - public void onAdditionalModel(Consumer registry) { - super.onAdditionalModel(registry); - registry.accept(SPHERE); - } -} diff --git a/src/main/java/net/neganote/gtutilities/client/renderer/machine/UtilConverterRenderer.java b/src/main/java/net/neganote/gtutilities/client/renderer/machine/UtilConverterRenderer.java deleted file mode 100644 index 6002c8a..0000000 --- a/src/main/java/net/neganote/gtutilities/client/renderer/machine/UtilConverterRenderer.java +++ /dev/null @@ -1,100 +0,0 @@ -package net.neganote.gtutilities.client.renderer.machine; - -import com.gregtechceu.gtceu.GTCEu; -import com.gregtechceu.gtceu.api.machine.MachineDefinition; -import com.gregtechceu.gtceu.api.machine.MetaMachine; -import com.gregtechceu.gtceu.client.renderer.machine.OverlayEnergyIORenderer; -import com.gregtechceu.gtceu.client.renderer.machine.TieredHullMachineRenderer; -import com.gregtechceu.gtceu.client.util.StaticFaceBakery; -import com.gregtechceu.gtceu.common.machine.electric.ConverterMachine; - -import com.lowdragmc.lowdraglib.client.model.ModelFactory; - -import net.minecraft.client.renderer.block.model.BakedQuad; -import net.minecraft.client.renderer.texture.TextureAtlas; -import net.minecraft.client.resources.model.ModelState; -import net.minecraft.core.Direction; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.util.RandomSource; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.api.distmarker.OnlyIn; - -import org.jetbrains.annotations.Nullable; - -import java.util.List; -import java.util.function.Consumer; - -import static com.gregtechceu.gtceu.client.renderer.machine.OverlayEnergyIORenderer.*; -import static com.gregtechceu.gtceu.client.renderer.machine.OverlayEnergyIORenderer.ENERGY_OUT_1A; - -// Copied wholesale and slightly modified from GTm -public class UtilConverterRenderer extends TieredHullMachineRenderer { - - private static final ResourceLocation CONVERTER_FE_IN = GTCEu.id("block/overlay/converter/converter_native_in"); - private static final ResourceLocation CONVERTER_FE_OUT = GTCEu.id("block/overlay/converter/converter_native_out"); - private final OverlayEnergyIORenderer ENERGY_IN; - private final OverlayEnergyIORenderer ENERGY_OUT; - - public UtilConverterRenderer(int tier, int baseAmp) { - super(tier, GTCEu.id("block/machine/hull_machine")); - switch (baseAmp) { - case 4: - ENERGY_IN = ENERGY_IN_4A; - ENERGY_OUT = ENERGY_OUT_4A; - break; - case 8: - ENERGY_IN = ENERGY_IN_8A; - ENERGY_OUT = ENERGY_OUT_8A; - break; - case 16: - ENERGY_IN = ENERGY_IN_16A; - ENERGY_OUT = ENERGY_OUT_16A; - break; - case 64: - ENERGY_IN = ENERGY_IN_64A; - ENERGY_OUT = ENERGY_OUT_64A; - break; - default: - ENERGY_IN = ENERGY_IN_1A; - ENERGY_OUT = ENERGY_OUT_1A; - break; - } - } - - @Override - @OnlyIn(Dist.CLIENT) - public void renderMachine(List quads, MachineDefinition definition, @Nullable MetaMachine machine, - Direction frontFacing, @Nullable Direction side, RandomSource rand, Direction modelFacing, - ModelState modelState) { - super.renderMachine(quads, definition, machine, frontFacing, side, rand, modelFacing, modelState); - var isFeToEu = false; - if (machine instanceof ConverterMachine converter) { - isFeToEu = converter.isFeToEu(); - } - if (side == frontFacing && modelFacing != null) { - if (isFeToEu) { - ENERGY_OUT.renderOverlay(quads, modelFacing, modelState, 2); - } else { - quads.add(StaticFaceBakery.bakeFace(modelFacing, ModelFactory.getBlockSprite(CONVERTER_FE_OUT), - modelState, -1)); - } - } else if (side != null && modelFacing != null) { - if (isFeToEu) { - quads.add(StaticFaceBakery.bakeFace(modelFacing, ModelFactory.getBlockSprite(CONVERTER_FE_IN), - modelState, -1)); - } else { - ENERGY_IN.renderOverlay(quads, modelFacing, modelState, 2); - } - } - } - - @Override - @SuppressWarnings("all") - public void onPrepareTextureAtlas(ResourceLocation atlasName, Consumer register) { - super.onPrepareTextureAtlas(atlasName, register); - if (atlasName.equals(TextureAtlas.LOCATION_BLOCKS)) { - register.accept(CONVERTER_FE_IN); - register.accept(CONVERTER_FE_OUT); - } - } -} diff --git a/src/main/java/net/neganote/gtutilities/common/item/OmniBreakerItem.java b/src/main/java/net/neganote/gtutilities/common/item/OmniBreakerItem.java index c1c9c87..400d0dd 100644 --- a/src/main/java/net/neganote/gtutilities/common/item/OmniBreakerItem.java +++ b/src/main/java/net/neganote/gtutilities/common/item/OmniBreakerItem.java @@ -3,7 +3,6 @@ import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.GTCapabilityHelper; import com.gregtechceu.gtceu.api.item.ComponentItem; -import com.gregtechceu.gtceu.utils.FormattingUtil; import net.minecraft.ChatFormatting; import net.minecraft.core.BlockPos; @@ -107,17 +106,12 @@ public boolean isBookEnchantable(ItemStack stack, ItemStack book) { @Override public void appendHoverText(@NotNull ItemStack stack, @Nullable Level level, @NotNull List tooltipComponents, @NotNull TooltipFlag isAdvanced) { - var electricItem = Objects.requireNonNull(GTCapabilityHelper.getElectricItem(stack)); - long charge = electricItem.getCharge(); - long maxCharge = electricItem.getMaxCharge(); - tooltipComponents.add(Component.translatable("tooltip.omnibreaker.charge_status", - Component.translatable(FormattingUtil.formatNumbers(charge)).withStyle(ChatFormatting.GREEN), - Component.translatable(FormattingUtil.formatNumbers(maxCharge)).withStyle(ChatFormatting.YELLOW))); tooltipComponents.add(Component.translatable("tooltip.omnibreaker.modern_vajra")); tooltipComponents .add(Component.translatable("tooltip.omnibreaker.can_break_anything").withStyle(ChatFormatting.GRAY)); tooltipComponents .add(Component.translatable("tooltip.omnibreaker.right_click_function").withStyle(ChatFormatting.GRAY)); + super.appendHoverText(stack, level, tooltipComponents, isAdvanced); } } diff --git a/src/main/java/net/neganote/gtutilities/common/item/PrecisionBreakBehavior.java b/src/main/java/net/neganote/gtutilities/common/item/PrecisionBreakBehavior.java index 2743faf..7519e56 100644 --- a/src/main/java/net/neganote/gtutilities/common/item/PrecisionBreakBehavior.java +++ b/src/main/java/net/neganote/gtutilities/common/item/PrecisionBreakBehavior.java @@ -5,12 +5,15 @@ import com.gregtechceu.gtceu.api.item.component.IInteractionItem; import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.context.UseOnContext; import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; +import static net.minecraft.world.level.block.Block.getDrops; + public class PrecisionBreakBehavior implements IInteractionItem { public int tier; @@ -22,33 +25,41 @@ public PrecisionBreakBehavior(int tier) { @Override public InteractionResult useOn(UseOnContext context) { Level level = context.getLevel(); - if (!level.isClientSide()) { - BlockPos pos = context.getClickedPos(); - BlockState blockState = level.getBlockState(pos); - float hardness = blockState.getBlock().defaultDestroyTime(); - if (!blockState.canHarvestBlock(level, pos, context.getPlayer()) || hardness < 0.0f) { - return InteractionResult.PASS; - } - int unbreaking = context.getItemInHand().getItem().getAllEnchantments(context.getItemInHand()) - .getOrDefault(Enchantments.UNBREAKING, 0); - double chance = 1.0f / (unbreaking + 1); - double rand = Math.random(); - - var electricItem = GTCapabilityHelper.getElectricItem(context.getItemInHand()); - - if (electricItem != null) { - if (electricItem.getCharge() >= GTValues.VEX[tier]) { - if (rand >= chance) { - electricItem.discharge(GTValues.VEX[tier], tier, true, false, false); - } - } else { - return InteractionResult.PASS; - } - } + BlockPos pos = context.getClickedPos(); + BlockState blockState = level.getBlockState(pos); - level.destroyBlock(pos, true); + var itemStack = context.getItemInHand(); + + float hardness = blockState.getBlock().defaultDestroyTime(); + if (!blockState.canHarvestBlock(level, pos, context.getPlayer()) || hardness < 0.0f) { + return InteractionResult.PASS; } + + int unbreaking = context.getItemInHand().getItem().getAllEnchantments(itemStack) + .getOrDefault(Enchantments.UNBREAKING, 0); + double chance = 1.0 / (unbreaking + 1); + double rand = Math.random(); + + var electricItem = GTCapabilityHelper.getElectricItem(context.getItemInHand()); + + assert electricItem != null; + + if (electricItem.getCharge() < GTValues.VEX[tier]) { + return InteractionResult.PASS; + } + + if (!level.isClientSide()) { + var drops = getDrops(blockState, (ServerLevel) level, pos, level.getBlockEntity(pos)); + var player = context.getPlayer(); + assert player != null; + drops.forEach(player::addItem); + level.destroyBlock(pos, false); + if (rand <= chance) { + electricItem.discharge(GTValues.V[tier], tier, true, false, false); + } + } + return InteractionResult.SUCCESS; } } diff --git a/src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java b/src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java index 5f55cae..6b45785 100644 --- a/src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java +++ b/src/main/java/net/neganote/gtutilities/common/machine/UtilMachines.java @@ -1,5 +1,6 @@ package net.neganote.gtutilities.common.machine; +import com.gregtechceu.gtceu.GTCEu; import com.gregtechceu.gtceu.api.GTValues; import com.gregtechceu.gtceu.api.capability.compat.FeCompat; import com.gregtechceu.gtceu.api.data.RotationState; @@ -11,10 +12,10 @@ import com.gregtechceu.gtceu.api.machine.multiblock.PartAbility; import com.gregtechceu.gtceu.api.pattern.FactoryBlockPattern; import com.gregtechceu.gtceu.api.registry.registrate.MachineBuilder; -import com.gregtechceu.gtceu.client.renderer.machine.MaintenanceHatchPartRenderer; import com.gregtechceu.gtceu.common.data.GTMaterials; import com.gregtechceu.gtceu.common.data.GTRecipeTypes; import com.gregtechceu.gtceu.common.data.machines.GTMachineUtils; +import com.gregtechceu.gtceu.common.data.models.GTMachineModels; import com.gregtechceu.gtceu.common.machine.electric.ConverterMachine; import com.gregtechceu.gtceu.common.machine.multiblock.part.CleaningMaintenanceHatchPartMachine; import com.gregtechceu.gtceu.config.ConfigHolder; @@ -22,8 +23,6 @@ import net.minecraft.ChatFormatting; import net.minecraft.network.chat.Component; import net.neganote.gtutilities.GregTechModernUtilities; -import net.neganote.gtutilities.client.renderer.machine.PTERBRenderer; -import net.neganote.gtutilities.client.renderer.machine.UtilConverterRenderer; import net.neganote.gtutilities.common.machine.multiblock.PTERBMachine; import net.neganote.gtutilities.common.materials.UtilMaterials; import net.neganote.gtutilities.config.UtilConfig; @@ -55,14 +54,15 @@ public class UtilMachines { .langValue("Sterile Cleaning Maintenance Hatch") .rotationState(RotationState.ALL) .abilities(PartAbility.MAINTENANCE) - .tooltips(Component.translatable("gtceu.universal.disabled"), + .tooltips(Component.translatable("gtceu.part_sharing.disabled"), Component.translatable("gtceu.machine.maintenance_hatch_cleanroom_auto.tooltip.0"), Component.translatable("gtceu.machine.maintenance_hatch_cleanroom_auto.tooltip.1")) .tooltipBuilder((stack, tooltips) -> tooltips.add(Component.literal(" ").append(Component .translatable(CleanroomType.STERILE_CLEANROOM.getTranslationKey()) .withStyle(ChatFormatting.GREEN)))) - .renderer(() -> new MaintenanceHatchPartRenderer(GTValues.UHV, - GregTechModernUtilities.id("block/machine/part/maintenance.sterile_cleaning"))) + .tier(UHV) + .overlayTieredHullModel( + GregTechModernUtilities.id("block/machine/part/sterile_cleaning_maintenance_hatch")) // Tier can always be changed later .register(); } @@ -76,9 +76,10 @@ public static MachineDefinition[] registerConverter(int amperage) { .rotationState(RotationState.ALL) .langValue("%s %s§eA§r Energy Converter".formatted(VCF[tier] + VN[tier] + ChatFormatting.RESET, amperage)) - .renderer(() -> new UtilConverterRenderer(tier, amperage)) + .modelProperty(ConverterMachine.FE_TO_EU_PROPERTY, false) + .model(GTMachineModels.createConverterModel(64)) .tooltips(Component.translatable("gtceu.machine.energy_converter.description"), - Component.translatable("gtmutils.machine.64a_energy_converter.tooltip_tool_usage"), + Component.translatable("gtceu.machine.energy_converter.tooltip_tool_usage"), Component.translatable("gtceu.machine.energy_converter.tooltip_conversion_native", FeCompat.toFeLong(V[tier] * amperage, FeCompat.ratio(true)), @@ -122,7 +123,7 @@ public static MachineDefinition[] registerTieredMachines(String name, if (UtilConfig.INSTANCE.features.pterbEnabled) { PTERB_MACHINE = REGISTRATE .multiblock("pterb_machine", PTERBMachine::new) - .langValue("Power Transfer Einstein-Rosen Bridge") + .langValue("Wireless Active Transformer") .rotationState(RotationState.ALL) .recipeType(GTRecipeTypes.DUMMY_RECIPES) .appearanceBlock(CASING_PALLADIUM_SUBSTATION) @@ -161,9 +162,10 @@ public static MachineDefinition[] registerTieredMachines(String name, .where('C', controller(blocks(definition.getBlock()))) .where('F', frames(GTMaterials.Neutronium)) .build()) - .renderer(PTERBRenderer::new) + .workableCasingModel(GTCEu.id("block/casings/solid/machine_casing_palladium_substation"), + GTCEu.id("block/multiblock/data_bank")) .allowExtendedFacing(true) - .hasTESR(true) + .hasBER(true) .register(); } } diff --git a/src/main/java/net/neganote/gtutilities/common/machine/multiblock/PTERBMachine.java b/src/main/java/net/neganote/gtutilities/common/machine/multiblock/PTERBMachine.java index 2a434bc..c6a0b01 100644 --- a/src/main/java/net/neganote/gtutilities/common/machine/multiblock/PTERBMachine.java +++ b/src/main/java/net/neganote/gtutilities/common/machine/multiblock/PTERBMachine.java @@ -3,7 +3,6 @@ import com.gregtechceu.gtceu.api.capability.IControllable; import com.gregtechceu.gtceu.api.capability.IEnergyContainer; import com.gregtechceu.gtceu.api.capability.recipe.EURecipeCapability; -import com.gregtechceu.gtceu.api.capability.recipe.FluidRecipeCapability; import com.gregtechceu.gtceu.api.capability.recipe.IO; import com.gregtechceu.gtceu.api.gui.GuiTextures; import com.gregtechceu.gtceu.api.gui.fancy.ConfiguratorPanel; @@ -25,6 +24,7 @@ import com.gregtechceu.gtceu.api.pattern.error.PatternError; import com.gregtechceu.gtceu.api.recipe.ingredient.FluidIngredient; import com.gregtechceu.gtceu.common.data.GTItems; +import com.gregtechceu.gtceu.common.data.GTRecipeCapabilities; import com.gregtechceu.gtceu.config.ConfigHolder; import com.gregtechceu.gtceu.utils.FormattingUtil; import com.gregtechceu.gtceu.utils.GTUtil; @@ -38,7 +38,6 @@ import com.lowdragmc.lowdraglib.syncdata.field.ManagedFieldHolder; import net.minecraft.ChatFormatting; -import net.minecraft.core.BlockPos; import net.minecraft.network.chat.Component; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.player.Player; @@ -70,10 +69,6 @@ public class PTERBMachine extends WorkableElectricMultiblockMachine protected ConditionalSubscriptionHandler converterSubscription; - @Persisted - @DescSynced - private BlockPos coolantHatchPos; - @Getter private int coolantDrain; @@ -130,21 +125,19 @@ public void convertEnergyTick() { if (isWorkingEnabled() && getRecipeLogic().getStatus() == RecipeLogic.Status.WORKING && UtilConfig.coolantEnabled() && coolantTimer == 0 && frequency != 0) { - IMultiPart coolantHatch = Objects - .requireNonNull((IMultiPart) getMachine(Objects.requireNonNull(getLevel()), coolantHatchPos)); + var coolantTanks = getCapabilitiesFlat(IO.IN, GTRecipeCapabilities.FLUID).stream() + .map(NotifiableFluidTank.class::cast).toList(); - NotifiableFluidTank tank = null; + List left = List + .of(FluidIngredient.of(coolantDrain, UtilMaterials.QuantumCoolant.getFluid())); - for (var handler : coolantHatch.getRecipeHandlers()) { - if (handler instanceof NotifiableFluidTank notifiableFluidTank) { - tank = notifiableFluidTank; + for (var tank : coolantTanks) { + left = tank.handleRecipe(IO.IN, null, left, false); + if (left == null) { + break; } } - assert tank != null; - - var ingredient = FluidIngredient.of(coolantDrain, UtilMaterials.QuantumCoolant.getFluid()); - List left = tank.handleRecipe(IO.IN, null, List.of(ingredient), null, false); if (left != null && !left.isEmpty()) { if (!ConfigHolder.INSTANCE.machines.harmlessActiveTransformers) { explode(); @@ -232,21 +225,20 @@ public void onStructureFormed() { for (IMultiPart part : getPrioritySortedParts()) { IO io = ioMap.getOrDefault(part.self().getPos().asLong(), IO.BOTH); if (io == IO.NONE) continue; - for (var handler : part.getRecipeHandlers()) { - var handlerIO = handler.getHandlerIO(); + for (var handlerList : part.getRecipeHandlers()) { + var handlerIO = handlerList.getHandlerIO(); // If IO not compatible if (io != IO.BOTH && handlerIO != IO.BOTH && io != handlerIO) continue; - if (handler.getCapability() == EURecipeCapability.CAP && - handler instanceof IEnergyContainer) { + var energyContainers = handlerList.getCapability(EURecipeCapability.CAP).stream() + .filter(IEnergyContainer.class::isInstance) + .map(IEnergyContainer.class::cast) + .toList(); + if (!energyContainers.isEmpty()) { if (handlerIO == IO.IN) { localPowerInput.add(part); } else if (handlerIO == IO.OUT) { localPowerOutput.add(part); } - traitSubscriptions.add(handler.addChangedListener(converterSubscription::updateSubscription)); - } - if (handler.getCapability() == FluidRecipeCapability.CAP && handler instanceof NotifiableFluidTank) { - this.coolantHatchPos = part.self().getPos(); } } } @@ -306,7 +298,6 @@ public void onStructureInvalid() { super.onStructureInvalid(); this.localPowerOutput = new ArrayList<>(); this.localPowerInput = new ArrayList<>(); - this.coolantHatchPos = null; setWorkingEnabled(false); converterSubscription.unsubscribe(); } diff --git a/src/main/java/net/neganote/gtutilities/config/UtilConfig.java b/src/main/java/net/neganote/gtutilities/config/UtilConfig.java index e79e71f..64d21f3 100644 --- a/src/main/java/net/neganote/gtutilities/config/UtilConfig.java +++ b/src/main/java/net/neganote/gtutilities/config/UtilConfig.java @@ -29,7 +29,7 @@ public static class FeatureConfigs { @Configurable @Configurable.Comment({ "Whether the Sterile Cleaning Maintenance Hatch is enabled." }) - public boolean sterileHatchEnabled = true; + public boolean sterileHatchEnabled = false; @Configurable @Configurable.Comment({ "Whether the 64A energy converters are enabled." }) public boolean converters64aEnabled = true; @@ -45,11 +45,11 @@ public static class FeatureConfigs { public long omnibreakerEnergyCapacity = 40_960_000L; @Configurable - @Configurable.Comment({ "Whether the Power-Transfer Einstein-Rosen Bridge is enabled." }) + @Configurable.Comment({ "Whether the Wireless Active Transformer is enabled." }) public boolean pterbEnabled = true; @Configurable - @Configurable.Comment({ "Base amount of PTERB coolant to drain every second.", + @Configurable.Comment({ "Base amount of WAT coolant to drain every second.", "(Setting both this amount and the IO multiplier to 0 disables the coolant mechanic.)" }) public int pterbCoolantBaseDrain = 0; diff --git a/src/main/java/net/neganote/gtutilities/datagen/lang/UtilLangHandler.java b/src/main/java/net/neganote/gtutilities/datagen/lang/UtilLangHandler.java index 1345e40..2ebfaa0 100644 --- a/src/main/java/net/neganote/gtutilities/datagen/lang/UtilLangHandler.java +++ b/src/main/java/net/neganote/gtutilities/datagen/lang/UtilLangHandler.java @@ -14,6 +14,13 @@ public class UtilLangHandler { public static void init(RegistrateLangProvider provider) { + provider.add("tooltip.omnibreaker.swappable_tools", "Also contains multiple tools in one!"); + provider.add("tooltip.omnibreaker.tool_mode", "Current mode: %s"); + provider.add("tooltip.omnibreaker.tool_mode_0", "Omnibreaker"); + provider.add("tooltip.omnibreaker.tool_mode_1", "Wrench"); + provider.add("tooltip.omnibreaker.tool_mode_2", "Screwdriver"); + provider.add("tooltip.omnibreaker.tool_mode_3", "Wire-cutter"); + provider.add("tooltip.omnibreaker.tool_mode_4", "Crowbar"); provider.add("tooltip.omnibreaker.can_break_anything", "The Omni-breaker can insta-mine ANYTHING!"); provider.add("tooltip.omnibreaker.charge_status", "Energy: %s EU / %s EU"); provider.add("tooltip.omnibreaker.right_click_function", "Break individual blocks with right-click!"); @@ -26,16 +33,16 @@ public static void init(RegistrateLangProvider provider) { "Starts as §fEU Converter§7, use Soft Mallet to change"); provider.add("gtmutils.multiblock.pterb_machine.coolant_usage", "§cDrains %sL of %s per second"); - provider.add("gtmutils.pterb_machine.invalid_frequency", "PTERBs will not work on frequency 0!"); + provider.add("gtmutils.pterb_machine.invalid_frequency", "WATs will not work on frequency 0!"); provider.add("gtmutils.gui.pterb.wireless_configurator.title", "Wireless frequency"); - provider.add("tooltip.pterb_machine.purpose", "Wireless Active Transformer (PTERB)"); + provider.add("tooltip.pterb_machine.purpose", "Power Transfer Einstein-Rosen Bridge (PTERB)"); provider.add("tooltip.pterb_machine.frequencies", - "All PTERBs with the same frequency act like a single Active Transformer."); + "All WATs with the same frequency act like a single Active Transformer."); provider.add("gtmutils.pterb.current_frequency", "Current frequency: %s"); - provider.add("config.jade.plugin_gtmutils.pterb_info", "PTERB Info"); + provider.add("config.jade.plugin_gtmutils.pterb_info", "WAT Info"); provider.add("material.gtmutils.quantum_coolant", "Quantum Coolant"); diff --git a/src/main/java/net/neganote/gtutilities/recipe/UtilRecipes.java b/src/main/java/net/neganote/gtutilities/recipe/UtilRecipes.java index 3fbcfd7..62e649d 100644 --- a/src/main/java/net/neganote/gtutilities/recipe/UtilRecipes.java +++ b/src/main/java/net/neganote/gtutilities/recipe/UtilRecipes.java @@ -19,7 +19,7 @@ import static com.gregtechceu.gtceu.common.data.GTBlocks.LASER_PIPES; import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLER_RECIPES; import static com.gregtechceu.gtceu.common.data.GTRecipeTypes.ASSEMBLY_LINE_RECIPES; -import static com.gregtechceu.gtceu.data.recipe.CraftingComponent.*; +import static com.gregtechceu.gtceu.data.recipe.GTCraftingComponents.*; import static net.neganote.gtutilities.common.item.UtilItems.OMNIBREAKER; import static net.neganote.gtutilities.common.machine.UtilMachines.ENERGY_CONVERTER_64A; @@ -39,12 +39,12 @@ public static void init(Consumer provider) { ASSEMBLY_LINE_RECIPES.recipeBuilder("pterb") .inputItems(GTMultiMachines.ACTIVE_TRANSFORMER) .inputItems(TagPrefix.plate, GTMaterials.Neutronium, 32) - .inputItems(SENSOR.getIngredient(GTValues.UV), 8) - .inputItems(EMITTER.getIngredient(GTValues.UV), 8) - .inputItems(FIELD_GENERATOR.getIngredient(GTValues.UV), 4) + .inputItems(SENSOR.get(GTValues.UV), 8) + .inputItems(EMITTER.get(GTValues.UV), 8) + .inputItems(FIELD_GENERATOR.get(GTValues.UV), 4) .inputItems(CustomTags.UHV_CIRCUITS, 2) .inputItems(TagPrefix.pipeLargeFluid, GTMaterials.Neutronium, 4) - .inputItems(CABLE_QUAD.getIngredient(GTValues.UV), 8) + .inputItems(CABLE_QUAD.get(GTValues.UV), 8) .inputItems(LASER_PIPES[0], 8) .inputFluids(GTMaterials.SolderingAlloy.getFluid(GTValues.L * 32)) .EUt(1_600_000L) @@ -59,10 +59,10 @@ public static void init(Consumer provider) { public static void register64AConverterRecipes(Consumer provider) { for (int tier : GTValues.tiersBetween(GTValues.ULV, GTCEuAPI.isHighTier() ? GTValues.MAX : GTValues.UHV)) { ASSEMBLER_RECIPES.recipeBuilder("converter_64a_" + GTValues.VN[tier]) - .inputItems(HULL.getIngredient(tier)) - .inputItems(CIRCUIT.getIngredient(tier)) - .inputItems(CABLE_HEX.getIngredient(0), 4) - .inputItems(CABLE_HEX.getIngredient(tier), 16) + .inputItems(HULL.get(tier)) + .inputItems(CIRCUIT.get(tier)) + .inputItems(CABLE_HEX.get(0), 4) + .inputItems(CABLE_HEX.get(tier), 16) .outputItems(ENERGY_CONVERTER_64A[tier]) .EUt(GTValues.VEX[tier]).duration(40) .save(provider); @@ -84,10 +84,10 @@ private static ItemStack getPowerUnit(int tier) { public static void registerOmnitoolRecipe(Consumer provider) { ASSEMBLER_RECIPES.recipeBuilder("omnibreaker") .inputItems(getPowerUnit(UtilConfig.INSTANCE.features.omnibreakerTier)) - .inputItems(CIRCUIT.getIngredient(UtilConfig.INSTANCE.features.omnibreakerTier), 2) - .inputItems(EMITTER.getIngredient(UtilConfig.INSTANCE.features.omnibreakerTier), 1) - .inputItems(CABLE_QUAD.getIngredient(UtilConfig.INSTANCE.features.omnibreakerTier), 3) - .inputItems(MOTOR.getIngredient(UtilConfig.INSTANCE.features.omnibreakerTier), 2) + .inputItems(CIRCUIT.get(UtilConfig.INSTANCE.features.omnibreakerTier), 2) + .inputItems(EMITTER.get(UtilConfig.INSTANCE.features.omnibreakerTier), 1) + .inputItems(CABLE_QUAD.get(UtilConfig.INSTANCE.features.omnibreakerTier), 3) + .inputItems(MOTOR.get(UtilConfig.INSTANCE.features.omnibreakerTier), 2) .outputItems(OMNIBREAKER) .EUt(GTValues.VEX[UtilConfig.INSTANCE.features.omnibreakerTier]).duration(20 * 60) .save(provider); diff --git a/src/main/java/net/neganote/gtutilities/saveddata/PTERBSavedData.java b/src/main/java/net/neganote/gtutilities/saveddata/PTERBSavedData.java index e0f13a0..a11415e 100644 --- a/src/main/java/net/neganote/gtutilities/saveddata/PTERBSavedData.java +++ b/src/main/java/net/neganote/gtutilities/saveddata/PTERBSavedData.java @@ -250,11 +250,12 @@ public EnergyContainerList getWirelessEnergyInputs(int freq) { } if (machine instanceof LaserHatchPartMachine hatch) { // unfortunately the laser hatch's buffer is private, so I have to do this instead - for (var handler : hatch.getRecipeHandlers()) { - if (handler.getCapability() == EURecipeCapability.CAP && - handler instanceof IEnergyContainer container) { - energyContainerList.add(container); - } + for (var handlerList : hatch.getRecipeHandlers()) { + var containers = handlerList.getCapability(EURecipeCapability.CAP).stream() + .filter(IEnergyContainer.class::isInstance) + .map(IEnergyContainer.class::cast) + .toList(); + energyContainerList.addAll(containers); } } } @@ -277,11 +278,12 @@ public EnergyContainerList getWirelessEnergyOutputs(int freq) { } if (machine instanceof LaserHatchPartMachine hatch) { // unfortunately the laser hatch's buffer is private, so I have to do this instead - for (var handler : hatch.getRecipeHandlers()) { - if (handler.getCapability() == EURecipeCapability.CAP && - handler instanceof IEnergyContainer container) { - energyContainerList.add(container); - } + for (var handlerList : hatch.getRecipeHandlers()) { + var containers = handlerList.getCapability(EURecipeCapability.CAP).stream() + .filter(IEnergyContainer.class::isInstance) + .map(IEnergyContainer.class::cast) + .toList(); + energyContainerList.addAll(containers); } } } diff --git a/src/main/java/net/neganote/gtutilities/utils/EnergyUtils.java b/src/main/java/net/neganote/gtutilities/utils/EnergyUtils.java index 2fee269..0703f55 100644 --- a/src/main/java/net/neganote/gtutilities/utils/EnergyUtils.java +++ b/src/main/java/net/neganote/gtutilities/utils/EnergyUtils.java @@ -20,11 +20,12 @@ public static EnergyContainerList getEnergyListFromMultiParts(List p } if (part instanceof LaserHatchPartMachine hatch) { // unfortunately the laser hatch's buffer is private, so I have to do this instead - for (var handler : hatch.getRecipeHandlers()) { - if (handler.getCapability() == EURecipeCapability.CAP && - handler instanceof IEnergyContainer container) { - energyContainerList.add(container); - } + for (var handlerList : hatch.getRecipeHandlers()) { + var containers = handlerList.getCapability(EURecipeCapability.CAP).stream() + .filter(IEnergyContainer.class::isInstance) + .map(IEnergyContainer.class::cast) + .toList(); + energyContainerList.addAll(containers); } } } diff --git a/src/main/resources/assets/gtmutils/models/block/machine/part/maintenance.sterile_cleaning.json b/src/main/resources/assets/gtmutils/models/block/machine/part/sterile_cleaning_maintenance_hatch.json similarity index 60% rename from src/main/resources/assets/gtmutils/models/block/machine/part/maintenance.sterile_cleaning.json rename to src/main/resources/assets/gtmutils/models/block/machine/part/sterile_cleaning_maintenance_hatch.json index ad62222..f3da157 100644 --- a/src/main/resources/assets/gtmutils/models/block/machine/part/maintenance.sterile_cleaning.json +++ b/src/main/resources/assets/gtmutils/models/block/machine/part/sterile_cleaning_maintenance_hatch.json @@ -1,7 +1,6 @@ { - "parent": "gtceu:block/overlay/front_emissive", + "parent": "gtceu:block/overlay/2_layer/front_emissive", "textures": { - "particle": "gtmutils:block/overlay/machine/overlay_maintenance_sterile_cleaning", "overlay": "gtmutils:block/overlay/machine/overlay_maintenance_sterile_cleaning", "overlay_emissive": "gtmutils:block/overlay/machine/overlay_maintenance_sterile_cleaning_emissive" }