1.21 cherrypick (#2016)

Co-authored-by: DancingSnow <[email protected]> Co-authored-by: kross <[email protected]> Co-authored-by: Spicierspace153 <[email protected]> Co-authored-by: Karthi Suresh <[email protected]> Co-authored-by: EasterFG <[email protected]> Co-authored-by: YoungOnion <[email protected]> Co-authored-by: Austin <[email protected]> Co-authored-by: a-a-GiTHuB-a-a <[email protected]> Co-authored-by: Spicierspace153 <[email protected]> Co-authored-by: Zorbatron <[email protected]>
GregTechCEu · Sep 25, 2024 · 41b9408 · 41b9408
1 parent a8bd4a8
commit 41b9408
Show file tree

Hide file tree

Showing 185 changed files with 752 additions and 508 deletions.
diff --git a/.github/workflows/auto-build.yml b/.github/workflows/auto-build.yml
@@ -13,7 +13,7 @@ jobs:
  build:
  runs-on: ubuntu-latest
  env:
- MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+ MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
  MAVEN_USER: ${{ secrets.MAVEN_USER }}
  SNAPSHOT: true
  permissions:
@@ -35,11 +35,10 @@ jobs:
  - name: Get Version
  id: var
  run: |
- MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep slim.jar -v | awk -F 'gtceu-|-SNAPSHOT.jar' '{print $2}')
- mv "build/libs/gtceu-$MESSAGE-SNAPSHOT.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT.jar"
- mv "build/libs/gtceu-$MESSAGE-SNAPSHOT-slim.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT-slim.jar"
- mv "build/libs/gtceu-$MESSAGE-SNAPSHOT-dev-shadow.jar" "build/libs/gtceu-$MESSAGE-build_${{ github.run_number }}-SNAPSHOT-dev-shadow.jar"
- echo "version=$MESSAGE-build_${{ github.run_number }}" >> $GITHUB_OUTPUT
+ VER=$(./gradlew -q printVersion)
+ BUILD_VER=$VER-build_${{ github.run_number }}
+ for jar in ./build/libs/*; do mv "$jar" "${jar/${VER}-SNAPSHOT/${BUILD_VER}-SNAPSHOT}";done 2>/dev/null
+ echo "version=$BUILD_VER" >> $GITHUB_OUTPUT
 
  - name: Release
  id: release

diff --git a/.github/workflows/auto-publish.yml b/.github/workflows/auto-publish.yml
@@ -27,7 +27,7 @@ jobs:
  build:
  runs-on: ubuntu-latest
  env:
- MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+ MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
  MAVEN_USER: ${{ secrets.MAVEN_USER }}
  permissions:
  contents: write
@@ -49,9 +49,7 @@ jobs:
  - if: ${{ inputs.publishCurseForgeAndModrinth }}
  name: Get Version
  id: var
- run: |
- MESSAGE=$(ls build/libs/* | grep sources.jar -v | grep shadow.jar -v | grep slim.jar -v | awk -F 'gtceu-|.jar' '{print $2}')
- echo version=$MESSAGE >> $GITHUB_OUTPUT
+ run: echo "version=$(./gradlew -q printVersion)" >> $GITHUB_OUTPUT
 
  - if: ${{ inputs.publishCurseForgeAndModrinth }}
  name: mc-publish-forge
@@ -77,7 +75,7 @@ jobs:
  name: GregTechCEu ${{ steps.var.outputs.version }}
  version: mc${{ steps.var.outputs.version }}
  version-type: ${{ inputs.releaseType }}
- changelog-file: CHANGELOG.*
+ changelog-file: RELEASE.*
 
  loaders: |
  neoforge

diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml
@@ -12,7 +12,7 @@ jobs:
  build:
  runs-on: ubuntu-latest
  env:
- MAVEN_PASS: ${{ secrets.MAVEN_PASS }}
+ MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
  MAVEN_USER: ${{ secrets.MAVEN_USER }}
  permissions:
  contents: write

diff --git a/RELEASE.md b/RELEASE.md
@@ -0,0 +1,36 @@
+## What's Changed
+
+### Added
+- Compressor recipe for snowballs to snow blocks ([#1969](https://github.com/GregTechCEu/GregTech-Modern/pull/1969))
+- Rubber Wood and Treated Wood boats ([#1980](https://github.com/GregTechCEu/GregTech-Modern/pull/1980))
+
+### Fixed
+- Coke Oven Hatches are now able to be automated again ([#1948](https://github.com/GregTechCEu/GregTech-Modern/pull/1948))
+- All sounds are now mono-audio (you will no longer be haunted by the global Research Station sound) ([#1966](https://github.com/GregTechCEu/GregTech-Modern/pull/1966))
+- Fixed Large Turbine logic which stopped them from running properly ([#1983](https://github.com/GregTechCEu/GregTech-Modern/pull/1983) and [#2010](https://github.com/GregTechCEu/GregTech-Modern/pull/2010))
+- Machine auto-export will now respect attached filter covers ([#1982](https://github.com/GregTechCEu/GregTech-Modern/pull/1982))
+- Quantum Tanks will no longer void fluids that don't match the stored fluid ([#1976](https://github.com/GregTechCEu/GregTech-Modern/pull/1976))
+- Quantum Chests will now properly drop items if your inventory is full rather than just voiding them ([#1976](https://github.com/GregTechCEu/GregTech-Modern/pull/1976))
+- The Multi Smelter now applies overclocks properly ([#2004](https://github.com/GregTechCEu/GregTech-Modern/pull/2004) and [#2008](https://github.com/GregTechCEu/GregTech-Modern/pull/2008))
+- ME Pattern Buffer Proxies now show a hand animation when opened ([#2005](https://github.com/GregTechCEu/GregTech-Modern/pull/2005))
+- Fixed ME parts not showing tooltips ([#1993](https://github.com/GregTechCEu/GregTech-Modern/pull/1993))
+- Rubber log variants now have the burnable tag ([#1914](https://github.com/GregTechCEu/GregTech-Modern/pull/1914))
+- Fixed solid boilers not being able to burn some vanilla furnace fuels ([#1998](https://github.com/GregTechCEu/GregTech-Modern/pull/1998))
+- Various texture fixes ([#1974](https://github.com/GregTechCEu/GregTech-Modern/pull/1974))
+- Multiblock machines now calculate their tier correctly ([#2019](https://github.com/GregTechCEu/GregTech-Modern/pull/2019))
+- Recipe fixes 🔥 ([#2022](https://github.com/GregTechCEu/GregTech-Modern/pull/2022) and [#2023](https://github.com/GregTechCEu/GregTech-Modern/pull/2023))
+- Other miscellaneous fixes
+
+### Changed
+- **ADDON DEVS:** Recipe Conditions and the GTRegistry class have changed slightly - please take note ([#1955](https://github.com/GregTechCEu/GregTech-Modern/pull/1955))
+- **ADDON DEVS:** We now publish to the official GTCEu Maven - check the updated README for further information
+- Chanced outputs for parallel recipes are now deterministic and guaranteed a minimum amount ([#1948](https://github.com/GregTechCEu/GregTech-Modern/pull/1948))
+- The highlight grid for tools and covers will now only appear if a possible interaction exists ([#1949](https://github.com/GregTechCEu/GregTech-Modern/pull/1949))
+- Optical Pipes can now hold covers ([#1953](https://github.com/GregTechCEu/GregTech-Modern/pull/1953))
+
+
+### Removed
+- Covers that have no plan to be implemented have been removed ([#1961](https://github.com/GregTechCEu/GregTech-Modern/pull/1961))
+
+\
+**Full Changelog found [here](https://github.com/GregTechCEu/GregTech-Modern/compare/1.20.1-1.4.2...1.20.1-1.4.4)**
diff --git a/gradle.properties b/gradle.properties
@@ -7,7 +7,7 @@ loader_version = 2
 # Mod Info
 mod_id = gtceu
 mod_name = GregTech
-mod_version = 1.4.2
+mod_version = 1.4.4
 mod_description = GregTech CE Unofficial, ported from 1.12.2
 mod_license = LGPL-3.0 license
 mod_url = https://github.com/GregTechCEu/GregTech-Modern/

diff --git a/gradle/scripts/publishing.gradle b/gradle/scripts/publishing.gradle
@@ -9,9 +9,11 @@ publishing {
  mavenJava(MavenPublication) {
  groupId = project.maven_group
  artifactId = project.archivesBaseName
- version = project.mod_version
+ version = project.version
 
  from components.java
+
+ artifact sourcesJar
  }
  }
 
@@ -22,7 +24,7 @@ publishing {
  url "https://maven.firstdarkdev.xyz/snapshots"
  credentials {
  username System.getenv("MAVEN_USER")
- password System.getenv("MAVEN_PASS")
+ password System.getenv("MAVEN_PASSWORD")
  }
  }
  }

diff --git a/gradle/scripts/resources.gradle b/gradle/scripts/resources.gradle
@@ -11,6 +11,12 @@ def mod_url = getConfig("mod_url")
 def mod_issue_tracker = getConfig("mod_issue_tracker")
 def loader_version = getConfig("loader_version")
 
+task printVersion {
+ doLast {
+ println libs.versions.minecraft.get() + "-" + mod_version
+ }
+}
+
 // This block of code expands all declared replace properties in the specified resource targets.
 // A missing property will result in an error. Properties are expanded using ${} Groovy notation.
 var generateModMetadata = tasks.register("generateModMetadata", ProcessResources) {

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json
@@ -1813,7 +1813,6 @@
  "compass.node.gtceu.covers/computer_monitor_cover": "ɹǝʌoƆ ɹoʇıuoW ɹǝʇndɯoƆ",
  "compass.node.gtceu.covers/conveyor": "ɹoʎǝʌuoƆ",
  "compass.node.gtceu.covers/cover": "¿ɹǝʌoƆ sı ʇɐɥM",
- "compass.node.gtceu.covers/crafting_table_cover": "ɹǝʌoƆ ǝןqɐ⟘ buıʇɟɐɹƆ",
  "compass.node.gtceu.covers/ender_fluid_link_cover": "ɹǝʌoƆ ʞuıꞀ pınןℲ ɹǝpuƎ",
  "compass.node.gtceu.covers/energy_detector_cover": "ɹǝʌoƆ ɹoʇɔǝʇǝᗡ ʎbɹǝuƎ",
  "compass.node.gtceu.covers/facade_cover": "ɹǝʌoƆ ǝpɐɔɐℲ",
@@ -2585,6 +2584,8 @@
  "enchantment.gtceu.disjunction.desc": "˙sqoɯ pǝʇɐןǝɹ-ɹǝpuƎ oʇ ssǝuʍoןS puɐ ssǝuʞɐǝM sǝıןddⱯ",
  "enchantment.gtceu.hard_hammer.desc": "˙ɹǝɯɯɐH ɥɔǝ⟘bǝɹ⅁ ɐ ɥʇıʍ pǝuıɯ ǝɹǝʍ ʎǝɥʇ ɟı sɐ sʞɔoןq sʞɐǝɹᗺ",
  "enchantment.hard_hammer": "buıɹǝɯɯɐH",
+ "entity.gtceu.boat": "ʇɐoᗺ",
+ "entity.gtceu.chest_boat": "ʇɐoᗺ ʇsǝɥƆ",
  "entity.gtceu.dynamite": "ǝʇıɯɐuʎᗡ",
  "entity.gtceu.industrial_tnt": "⟘N⟘ ןɐıɹʇsnpuI",
  "entity.gtceu.powderbarrel": "ןǝɹɹɐqɹǝpʍoԀ",
@@ -4108,7 +4109,6 @@
  "item.gtceu.cpu_chip.tooltip": "ʇıu∩ buıssǝɔoɹԀ ןɐɹʇuǝƆㄥ§",
  "item.gtceu.cpu_wafer": "ɹǝɟɐM ∩ԀƆ",
  "item.gtceu.cpu_wafer.tooltip": "ʇıu∩ buıssǝɔoɹԀ ʍɐᴚㄥ§",
- "item.gtceu.crafting_table_cover": "ɹǝʌoƆ ǝןqɐ⟘ buıʇɟɐɹƆ",
  "item.gtceu.crafting_table_cover.tooltip": "˙ㄥ§ɹǝʌoƆɟ§ sɐ ǝuıɥɔɐW ɐ uo ㄥ§ɥɔuǝqʞɹoM pǝɔuɐʌpⱯɟ§",
  "item.gtceu.credit_casting_mold": ")ǝbɐuıoƆ( pןoW buıʇsɐƆ",
  "item.gtceu.credit_casting_mold.tooltip": ")¡ʇı ǝsoן ʇ,uoᗡ( suıoƆ buıʞɐɯ ɹoɟ pןoW ǝɹnɔǝSㄥ§",
@@ -4145,7 +4145,6 @@
  "item.gtceu.data_stick": "ʞɔıʇS ɐʇɐᗡ",
  "item.gtceu.data_stick.tooltip": "ǝbɐɹoʇS ɐʇɐᗡ ʎʇıɔɐdɐƆ ʍoꞀ Ɐㄥ§",
  "item.gtceu.diamond_grinding_head": "pɐǝH buıpuıɹ⅁ puoɯɐıᗡ",
- "item.gtceu.digital_interface_cover": "ǝɔɐɟɹǝʇuI ןɐʇıbıᗡ",
  "item.gtceu.diode": "ǝpoıᗡ",
  "item.gtceu.diode.tooltip": "ʇuǝuodɯoƆ ɔıuoɹʇɔǝןƎ ɔısɐᗺㄥ§",
  "item.gtceu.doge_coin": "uıoƆ ǝboᗡ",
@@ -4654,6 +4653,8 @@
  "item.gtceu.rotor_casting_mold.tooltip": "sɹoʇoᴚ buıʞɐɯ ɹoɟ pןoWㄥ§",
  "item.gtceu.rotor_extruder_mold": ")ɹoʇoᴚ( pןoW ɹǝpnɹʇxƎ",
  "item.gtceu.rotor_extruder_mold.tooltip": "sɹoʇoᴚ buıʞɐɯ ɹoɟ ǝdɐɥS ɹǝpnɹʇxƎㄥ§",
+ "item.gtceu.rubber_boat": "ʇɐoᗺ ɹǝqqnᴚ",
+ "item.gtceu.rubber_chest_boat": "ʇsǝɥƆ ɥʇıʍ ʇɐoᗺ ɹǝqqnᴚ",
  "item.gtceu.rubber_gloves": "sǝʌoן⅁ ɹǝqqnᴚ",
  "item.gtceu.salt_dust": "ʇןɐS",
  "item.gtceu.saw_extruder_mold.tooltip": "sʍɐS buıʞɐɯ ɹoɟ ǝdɐɥS ɹǝpnɹʇxƎㄥ§",
@@ -4866,7 +4867,9 @@
  "item.gtceu.tool.wrench.tooltip": "sǝuıɥɔɐW ǝןʇuɐɯsıp oʇ ʞɔıןɔ ʇɟǝן pןoH8§",
  "item.gtceu.transistor": "ɹoʇsısuɐɹ⟘",
  "item.gtceu.transistor.tooltip": "ʇuǝuodɯoƆ ɔıuoɹʇɔǝןƎ ɔısɐᗺㄥ§",
+ "item.gtceu.treated_wood_boat": "ʇɐoᗺ pooM pǝʇɐǝɹ⟘",
  "item.gtceu.treated_wood_bolt": "ʞɔıʇS pooM pǝʇɐǝɹ⟘ ʇɹoɥS",
+ "item.gtceu.treated_wood_chest_boat": "ʇsǝɥƆ ɥʇıʍ ʇɐoᗺ pooM pǝʇɐǝɹ⟘",
  "item.gtceu.treated_wood_dust": "dןnԀ pooM pǝʇɐǝɹ⟘",
  "item.gtceu.treated_wood_plate": "ʞuɐןԀ pooM pǝʇɐǝɹ⟘",
  "item.gtceu.treated_wood_rod": "ʞɔıʇS pooM pǝʇɐǝɹ⟘",
@@ -4966,7 +4969,6 @@
  "item.gtceu.white_dye_spray_can": ")ǝʇıɥM( uɐƆ ʎɐɹdS",
  "item.gtceu.wire_extruder_mold": ")ǝɹıM( pןoW ɹǝpnɹʇxƎ",
  "item.gtceu.wire_extruder_mold.tooltip": "sǝɹıM buıʞɐɯ ɹoɟ ǝdɐɥS ɹǝpnɹʇxƎㄥ§",
- "item.gtceu.wireless_digital_interface_cover": "ǝɔɐɟɹǝʇuI ןɐʇıbıᗡ ssǝןǝɹıM",
  "item.gtceu.wood_bolt": "ʞɔıʇS pooM ʇɹoɥS",
  "item.gtceu.wood_dust": "dןnԀ pooM",
  "item.gtceu.wood_plate": "ʞuɐןԀ pooM",
@@ -5173,7 +5175,7 @@
  "material.gtceu.dubnium": "ɯnıuqnᗡ",
  "material.gtceu.duranium": "ɯnıuɐɹnᗡ",
  "material.gtceu.dysprosium": "ɯnısoɹdsʎᗡ",
- "material.gtceu.echo": "oɥɔƎ",
+ "material.gtceu.echo_shard": "pɹɐɥS oɥɔƎ",
  "material.gtceu.einsteinium": "ɯnıuıǝʇsuıƎ",
  "material.gtceu.electrotine": "ǝuıʇoɹʇɔǝןƎ",
  "material.gtceu.electrum": "ɯnɹʇɔǝןƎ",

diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json
@@ -1813,7 +1813,6 @@
  "compass.node.gtceu.covers/computer_monitor_cover": "Computer Monitor Cover",
  "compass.node.gtceu.covers/conveyor": "Conveyor",
  "compass.node.gtceu.covers/cover": "What is Cover?",
- "compass.node.gtceu.covers/crafting_table_cover": "Crafting Table Cover",
  "compass.node.gtceu.covers/ender_fluid_link_cover": "Ender Fluid Link Cover",
  "compass.node.gtceu.covers/energy_detector_cover": "Energy Detector Cover",
  "compass.node.gtceu.covers/facade_cover": "Facade Cover",
@@ -2585,6 +2584,8 @@
  "enchantment.gtceu.disjunction.desc": "Applies Weakness and Slowness to Ender-related mobs.",
  "enchantment.gtceu.hard_hammer.desc": "Breaks blocks as if they were mined with a GregTech Hammer.",
  "enchantment.hard_hammer": "Hammering",
+ "entity.gtceu.boat": "Boat",
+ "entity.gtceu.chest_boat": "Chest Boat",
  "entity.gtceu.dynamite": "Dynamite",
  "entity.gtceu.industrial_tnt": "Industrial TNT",
  "entity.gtceu.powderbarrel": "Powderbarrel",
@@ -4108,7 +4109,6 @@
  "item.gtceu.cpu_chip.tooltip": "§7Central Processing Unit",
  "item.gtceu.cpu_wafer": "CPU Wafer",
  "item.gtceu.cpu_wafer.tooltip": "§7Raw Processing Unit",
- "item.gtceu.crafting_table_cover": "Crafting Table Cover",
  "item.gtceu.crafting_table_cover.tooltip": "§fAdvanced Workbench§7 on a Machine as §fCover§7.",
  "item.gtceu.credit_casting_mold": "Casting Mold (Coinage)",
  "item.gtceu.credit_casting_mold.tooltip": "§7Secure Mold for making Coins (Don't lose it!)",
@@ -4145,7 +4145,6 @@
  "item.gtceu.data_stick": "Data Stick",
  "item.gtceu.data_stick.tooltip": "§7A Low Capacity Data Storage",
  "item.gtceu.diamond_grinding_head": "Diamond Grinding Head",
- "item.gtceu.digital_interface_cover": "Digital Interface",
  "item.gtceu.diode": "Diode",
  "item.gtceu.diode.tooltip": "§7Basic Electronic Component",
  "item.gtceu.doge_coin": "Doge Coin",
@@ -4654,6 +4653,8 @@
  "item.gtceu.rotor_casting_mold.tooltip": "§7Mold for making Rotors",
  "item.gtceu.rotor_extruder_mold": "Extruder Mold (Rotor)",
  "item.gtceu.rotor_extruder_mold.tooltip": "§7Extruder Shape for making Rotors",
+ "item.gtceu.rubber_boat": "Rubber Boat",
+ "item.gtceu.rubber_chest_boat": "Rubber Boat with Chest",
  "item.gtceu.rubber_gloves": "Rubber Gloves",
  "item.gtceu.salt_dust": "Salt",
  "item.gtceu.saw_extruder_mold.tooltip": "§7Extruder Shape for making Saws",
@@ -4866,7 +4867,9 @@
  "item.gtceu.tool.wrench.tooltip": "§8Hold left click to dismantle Machines",
  "item.gtceu.transistor": "Transistor",
  "item.gtceu.transistor.tooltip": "§7Basic Electronic Component",
+ "item.gtceu.treated_wood_boat": "Treated Wood Boat",
  "item.gtceu.treated_wood_bolt": "Short Treated Wood Stick",
+ "item.gtceu.treated_wood_chest_boat": "Treated Wood Boat with Chest",
  "item.gtceu.treated_wood_dust": "Treated Wood Pulp",
  "item.gtceu.treated_wood_plate": "Treated Wood Plank",
  "item.gtceu.treated_wood_rod": "Treated Wood Stick",
@@ -4966,7 +4969,6 @@
  "item.gtceu.white_dye_spray_can": "Spray Can (White)",
  "item.gtceu.wire_extruder_mold": "Extruder Mold (Wire)",
  "item.gtceu.wire_extruder_mold.tooltip": "§7Extruder Shape for making Wires",
- "item.gtceu.wireless_digital_interface_cover": "Wireless Digital Interface",
  "item.gtceu.wood_bolt": "Short Wood Stick",
  "item.gtceu.wood_dust": "Wood Pulp",
  "item.gtceu.wood_plate": "Wood Plank",
@@ -5173,7 +5175,7 @@
  "material.gtceu.dubnium": "Dubnium",
  "material.gtceu.duranium": "Duranium",
  "material.gtceu.dysprosium": "Dysprosium",
- "material.gtceu.echo": "Echo",
+ "material.gtceu.echo_shard": "Echo Shard",
  "material.gtceu.einsteinium": "Einsteinium",
  "material.gtceu.electrotine": "Electrotine",
  "material.gtceu.electrum": "Electrum",

diff --git a/src/generated/resources/assets/gtceu/models/block/empty_tier_i_battery.json b/src/generated/resources/assets/gtceu/models/block/empty_tier_i_battery.json
@@ -2,7 +2,7 @@
  "parent": "minecraft:block/cube_bottom_top",
  "textures": {
  "bottom": "gtceu:block/casings/battery/empty_tier_i/top",
- "side": "gtceu:block/casings/battery/empty_tier_i/top",
- "top": "gtceu:block/casings/battery/empty_tier_i/side"
+ "side": "gtceu:block/casings/battery/empty_tier_i/side",
+ "top": "gtceu:block/casings/battery/empty_tier_i/top"
  }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/empty_tier_ii_battery.json b/src/generated/resources/assets/gtceu/models/block/empty_tier_ii_battery.json
@@ -2,7 +2,7 @@
  "parent": "minecraft:block/cube_bottom_top",
  "textures": {
  "bottom": "gtceu:block/casings/battery/empty_tier_ii/top",
- "side": "gtceu:block/casings/battery/empty_tier_ii/top",
- "top": "gtceu:block/casings/battery/empty_tier_ii/side"
+ "side": "gtceu:block/casings/battery/empty_tier_ii/side",
+ "top": "gtceu:block/casings/battery/empty_tier_ii/top"
  }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/empty_tier_iii_battery.json b/src/generated/resources/assets/gtceu/models/block/empty_tier_iii_battery.json
@@ -2,7 +2,7 @@
  "parent": "minecraft:block/cube_bottom_top",
  "textures": {
  "bottom": "gtceu:block/casings/battery/empty_tier_iii/top",
- "side": "gtceu:block/casings/battery/empty_tier_iii/top",
- "top": "gtceu:block/casings/battery/empty_tier_iii/side"
+ "side": "gtceu:block/casings/battery/empty_tier_iii/side",
+ "top": "gtceu:block/casings/battery/empty_tier_iii/top"
  }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/ev_lapotronic_battery.json b/src/generated/resources/assets/gtceu/models/block/ev_lapotronic_battery.json
@@ -2,7 +2,7 @@
  "parent": "minecraft:block/cube_bottom_top",
  "textures": {
  "bottom": "gtceu:block/casings/battery/ev_lapotronic/top",
- "side": "gtceu:block/casings/battery/ev_lapotronic/top",
- "top": "gtceu:block/casings/battery/ev_lapotronic/side"
+ "side": "gtceu:block/casings/battery/ev_lapotronic/side",
+ "top": "gtceu:block/casings/battery/ev_lapotronic/top"
  }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/industrial_tnt.json b/src/generated/resources/assets/gtceu/models/block/industrial_tnt.json
@@ -2,7 +2,7 @@
  "parent": "minecraft:block/cube_bottom_top",
  "textures": {
  "bottom": "minecraft:block/tnt_bottom",
- "side": "gtceu:block/industrial_tnt_side",
+ "side": "gtceu:block/misc/industrial_tnt_side",
  "top": "minecraft:block/tnt_top"
  }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/iv_lapotronic_battery.json b/src/generated/resources/assets/gtceu/models/block/iv_lapotronic_battery.json
@@ -2,7 +2,7 @@
  "parent": "minecraft:block/cube_bottom_top",
  "textures": {
  "bottom": "gtceu:block/casings/battery/iv_lapotronic/top",
- "side": "gtceu:block/casings/battery/iv_lapotronic/top",
- "top": "gtceu:block/casings/battery/iv_lapotronic/side"
+ "side": "gtceu:block/casings/battery/iv_lapotronic/side",
+ "top": "gtceu:block/casings/battery/iv_lapotronic/top"
  }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/luv_lapotronic_battery.json b/src/generated/resources/assets/gtceu/models/block/luv_lapotronic_battery.json
@@ -2,7 +2,7 @@
  "parent": "minecraft:block/cube_bottom_top",
  "textures": {
  "bottom": "gtceu:block/casings/battery/luv_lapotronic/top",
- "side": "gtceu:block/casings/battery/luv_lapotronic/top",
- "top": "gtceu:block/casings/battery/luv_lapotronic/side"
+ "side": "gtceu:block/casings/battery/luv_lapotronic/side",
+ "top": "gtceu:block/casings/battery/luv_lapotronic/top"
  }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/uhv_ultimate_battery.json b/src/generated/resources/assets/gtceu/models/block/uhv_ultimate_battery.json
@@ -2,7 +2,7 @@
  "parent": "minecraft:block/cube_bottom_top",
  "textures": {
  "bottom": "gtceu:block/casings/battery/uhv_ultimate/top",
- "side": "gtceu:block/casings/battery/uhv_ultimate/top",
- "top": "gtceu:block/casings/battery/uhv_ultimate/side"
+ "side": "gtceu:block/casings/battery/uhv_ultimate/side",
+ "top": "gtceu:block/casings/battery/uhv_ultimate/top"
  }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/uv_lapotronic_battery.json b/src/generated/resources/assets/gtceu/models/block/uv_lapotronic_battery.json
@@ -2,7 +2,7 @@
  "parent": "minecraft:block/cube_bottom_top",
  "textures": {
  "bottom": "gtceu:block/casings/battery/uv_lapotronic/top",
- "side": "gtceu:block/casings/battery/uv_lapotronic/top",
- "top": "gtceu:block/casings/battery/uv_lapotronic/side"
+ "side": "gtceu:block/casings/battery/uv_lapotronic/side",
+ "top": "gtceu:block/casings/battery/uv_lapotronic/top"
  }
 }
diff --git a/src/generated/resources/assets/gtceu/models/block/zpm_lapotronic_battery.json b/src/generated/resources/assets/gtceu/models/block/zpm_lapotronic_battery.json
@@ -2,7 +2,7 @@
  "parent": "minecraft:block/cube_bottom_top",
  "textures": {
  "bottom": "gtceu:block/casings/battery/zpm_lapotronic/top",
- "side": "gtceu:block/casings/battery/zpm_lapotronic/top",
- "top": "gtceu:block/casings/battery/zpm_lapotronic/side"
+ "side": "gtceu:block/casings/battery/zpm_lapotronic/side",
+ "top": "gtceu:block/casings/battery/zpm_lapotronic/top"
  }
 }