cherrypick 1.2.2 to 1.19 (#1231)

* Update zh_cn.json (#1183)

* Update for ru_ru lang file (#1188)

* Translated using Weblate (Russian)

Currently translated at 99.8% (5254 of 5261 strings)

Translation: Gregicality/GregTech Modern
Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/

* Translated using Weblate (Russian)

Currently translated at 100.0% (5261 of 5261 strings)

Translation: Gregicality/GregTech Modern
Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/

* Translated using Weblate (Russian)

Currently translated at 99.9% (5380 of 5384 strings)

Translation: Gregicality/GregTech Modern
Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/

* Translated using Weblate (Russian)

Currently translated at 100.0% (5384 of 5384 strings)

Translation: Gregicality/GregTech Modern
Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/

---------

Co-authored-by: Western01 <[email protected]>

* make "natural" decor blocks obtainable (#1187)

* remove accidental accesswidener file

* fix the damn treated wood textures. again. also add the windmill blocks.

* run data

* fix ignores

* fix ignores, recipe IDs

* remove now unused void ore values in GTOreDefinition, make it use IntProviders for size to allow for min & max size.

* add stone blobs

* fix? wood recipes

* cap Z size to make cylinder a ball

* fix some lang & other issues with the new wood things, add biome modifier for stone blobs

* run datagen

* remove "smooth" block type as it's unused and useless and has the same texture as the normal block

* add red granite & marble ores

* boom booms (#1194)

* add non-varargs `attachComponents` for single component additions

* make casing blocks invalid for mob spawns

* add ITNT, powderbarrel

* move stone block loading to be above ores so that the game loads

* run datagen

* make explosion not drop everything twice, fix renderers

* sync explosion to clients if on server, fix dynamite movement, remove exact copy of movement code from GTExplosiveEntity

* reviews

* ignore existing recipes (#1192)

* make TagPrefix get the recipe provider in the generator method to clean up the recipe handlers

* make MaterialRecipeHandler not add compression recipes for ignored materials

* fix fluid locking (#1196)

* Fix when autoBuild, reducing inventory even when block placement fails. (#1179)

* fix a bug in cn.lang

* fix: when autoBuild, reducing inventory even when block placement fails

* change: Do not adjust facing of the blocks already placed

* change: Do not adjust facing of the blocks already placed, part 2

* fix laser & optical pipes not dropping anything (#1197)

* add back chest recipe replacement (#1198)

* Update for ru_ru lang.file (#1199)

* Translated using Weblate (Russian)

Currently translated at 99.5% (5382 of 5405 strings)

Translation: Gregicality/GregTech Modern
Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/

* Translated using Weblate (Russian)

Currently translated at 99.7% (5394 of 5405 strings)

Translation: Gregicality/GregTech Modern
Translate-URL: http://weblate.pantsu.moe/projects/gregicality/gregtech-modern/ru/

---------

Co-authored-by: Western01 <[email protected]>

* fix KJS bedrock/fluid veins, cable transfer rate in scanner (#1200)

* fix: setting the dimenson for bedrock ore and fluid veins in kjs

* fix: display correct voltage for average cable transfer (port. scanner)

* fix parallel issues (#1201)

* remake parallel logic in hopes of it being faster this way

* fix multi smelter not overclocking (fixes #1191)

* move EU/t logic into EURecipeCapability, also check for tick inputs in ParallelLogic

* fix OC display doing an overclock for ULV (#1202)

* fix crash if can't parallel (oops,,,), steam machine parallel (#1203)

* how'd it not commit these last time,,, (#1204)

* fix crash if can't parallel (oops,,,), steam machine parallel

* what the fuck how did it not commit these

* fix raw ores being able to be smelted into ingots even with NO_SMELTING flag. (#1206)

* fixed up treated wood sign creating lang for air (#1215)

* fix sign rendering

* Fix AveragingPerTickCounter.checkValueState (#1205)

* fix chainsaw durability usage (#1218)

* Fix mud recipe, use circuit 1 to distinguish it from fertilizer recipe (#1213)

(cherry picked from commit d957b0a01e180430ae0bfe2cd4720cabc62da875)

* move coil, filter & pss battery maps out of GTBlocks so addons have an easier time adding to them (#1224)

* ARMORS (#1210)

* remake: feat: start on armor system, netherite + echo stuff

* holy shit armor again?!?!??!

* more stuff:tm:

* this should:tm: do

* add manual models for fluids (hoping this'll make them all have the actual textures?)

* add manual liquid fuel jetpack model (for fluid), rename all the armor models to match modern IDs

* run datagen

* fixes (holy shit it work) (gotta figure out what the /**/ commented code is doing)

* fix keys being wack

* fix armor damaging

* fix armor protection display, durability/power bars

* fix some other direct usages of ComponentItem instead of IComponentItem, fix jetpack movement

* fix FluidRecipeHandler not reporting its tank count correctly

* clean up unnecessary PowerlessJetpack code

* fix PowerlessJetpack recipe matching not having an EU out at all

* fix QuarkTech:tm: pants giving flight??

* fix uses of wrong container sync method

* fix armor attribute modifier values

* remove new materials (no uses lol)

* fix some crashes (#1226)

* fix prod crash

* fix bedrock ore crash that sometimes happened

* Fixes (#1207)

* fix: update lang for portable scanner

* fix: machine controller works with indirect redstone signal as well now

* refactor: cleanup LargeTurbineMachine

* chore: version and changelog

* chore: remove unnecessary changelog entry

* chore: changelog

* fix errors part 1

* fix errors part 2

---------

Co-authored-by: iouter <[email protected]>
Co-authored-by: marisathewitch <[email protected]>
Co-authored-by: Western01 <[email protected]>
Co-authored-by: MOYINGCrystal <[email protected]>
Co-authored-by: Mikerooni <[email protected]>
Co-authored-by: YoungOnion <[email protected]>
Co-authored-by: richie3366 <[email protected]>

CHANGELOG.md

@@ -1,44 +1,31 @@
 # ChangeLog
 
-Version: 1.2.1
+Version: 1.2.2
 
 ### ADDITIONS:
-- Ported decorative blocks from 1.12
-- Added filtering to Output Hatches
-- Added several utility functions to KJS
-- Added more ore generator types (Classic & Cuboid)
-- Added partial NBT support for recipe inputs
-- Added Wood Cutter recipes
+- Ported Powder Barrels, Industrial TNT and Dynamite from 1.12
+- Ported Armor from 1.12
 
 ### CHANGES:
-- Reworked Bedrock Ores
-  - Note that it is now entirely up to pack developers to register Bedrock Ore Veins!
-- Added certain fluid blocks to the minecraft:replaceable tag
 - Updated Russian translation
+- Moved coils, filters, PSS battery maps out of GTBlocks, to make it easier for addons to add to them
 
 ### FIXES:
-- Fixed some Multiblock builders not working in KJS
-- Fixed Turbine Rotors not being damaged
-- Fixed Shutter Covers not being registered
-- Fixed missing Multiblock Tank recipes
-- Fixed GCyM Multiblocks using Perfect Overclocking
-- Fixed crash related to the Network Switch Multiblock
-- Fixed Data Bank chaining
-- Fixed HPCA energy consumption for energy that wasn't input recently
-- Fixed Kinetic Output Boxes never stopping
-- Fixed World Accelerators using too much energy and always accelerating Block Entities
-- Fixed connectivity for Long Distance Pipes
-- Fixed Item Collector (now works after reload, no longer requires KJS, fixed tooltip)
-- Fixed Research items not rendering in JEI when playing on a server
-- Fixed recipes randomly not working after server restarts
-- Fixed recipes for ABS & Large Electrolyzer using the wrong wires
-- Fixed sounds for Arc Furnace & Boilers not being registered properly
-- Fixed Parallel Control Hatch behavior when the recipe voltage matches the machine voltage
-- Fixed Wrench interactions in certain situations
-- Fixed recipe for Treated Wood
-- Fixed KJS Research recipes not registering
-- Fixed machines and pipes causing excessive updates to neighboring blocks
-- Fixed language entry for Iron III Chloride
-- Fixed recycling recipe for Titanium Fluid Cells
-- Fixed recipe for Engine Intake Casing
-- Fixed any custom recipe capabilities being removed when KJS is installed
+- Made natural decor blocks obtainable
+- Fixed compression recipes being generated for ignored materials
+- Fixed fluid locking
+- Fixed items being voided when Multiblock auto-building fails
+- Fixed missing drops for Laser Pipes and Optical Pipes
+- Fixed missing harder chest recipes
+- Fixed setting the dimension for Bedrock Ore Veins and Fluid Veins in KJS
+- Fixed energy transfer display in the Portable Scanner
+- Fixed parallel issues, multi smelter not overclocking
+- Fixed Overclocking display for ULV in recipe viewers
+- Fixed parallel processing for steam machines
+- Fixed machine controllers not working for indirectly powered blocks
+- Fixed raw ores being smeltable into ingots even with the NO_SMELTING flag
+- Fixed language entries for treated/rubber wood signs
+- Fixed sign rendering
+- Fixed wire throughput counting
+- Fixed chainsaw durability usage
+- Fixed recipe conflict between mud and fertilizer recipes

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx6G
 # Mod Info
 mod_id = gtceu
 mod_name = GregTech
-mod_version = 1.2.1
+mod_version = 1.2.2
 mod_description = GregTech CE Unofficial, ported from 1.12.2
 mod_license = LGPL-3.0 license
 mod_url = https://github.com/GregTechCEu/GregTech-Modern/

settings.gradle

@@ -42,7 +42,7 @@ dependencyResolutionManagement {
         def architecturyPluginVersion = "3.4-SNAPSHOT"
         def architecturyLoomVersion = "1.5-SNAPSHOT"
         def macheteVersion = "1.+"
-        def ldLibVersion = "1.0.25.f"
+        def ldLibVersion = "1.0.25.g"
         def mixinextrasVersion = "0.2.0"
 
         forge {

src/generated/resources/assets/gtceu/blockstates/dark_concrete_windmill_a.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/dark_concrete_windmill_a"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/dark_concrete_windmill_b.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/dark_concrete_windmill_b"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/industrial_tnt.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/industrial_tnt"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/light_concrete_windmill_a.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/light_concrete_windmill_a"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/light_concrete_windmill_b.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/light_concrete_windmill_b"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/marble_windmill_a.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/marble_windmill_a"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/marble_windmill_b.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/marble_windmill_b"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/powderbarrel.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/powderbarrel"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/red_granite_windmill_a.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/red_granite_windmill_a"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/red_granite_windmill_b.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtceu:block/red_granite_windmill_b"
+    }
+  }
+}

src/generated/resources/assets/gtceu/blockstates/rubber_trapdoor.json

@@ -1,7 +1,68 @@
 {
   "variants": {
-    "": {
-      "model": "gtceu:block/rubber_trapdoor"
+    "facing=east,half=bottom,open=false": {
+      "model": "gtceu:block/rubber_trapdoor_bottom",
+      "y": 90
+    },
+    "facing=east,half=bottom,open=true": {
+      "model": "gtceu:block/rubber_trapdoor_open",
+      "y": 90
+    },
+    "facing=east,half=top,open=false": {
+      "model": "gtceu:block/rubber_trapdoor_top",
+      "y": 90
+    },
+    "facing=east,half=top,open=true": {
+      "model": "gtceu:block/rubber_trapdoor_open",
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=bottom,open=false": {
+      "model": "gtceu:block/rubber_trapdoor_bottom"
+    },
+    "facing=north,half=bottom,open=true": {
+      "model": "gtceu:block/rubber_trapdoor_open"
+    },
+    "facing=north,half=top,open=false": {
+      "model": "gtceu:block/rubber_trapdoor_top"
+    },
+    "facing=north,half=top,open=true": {
+      "model": "gtceu:block/rubber_trapdoor_open",
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=bottom,open=false": {
+      "model": "gtceu:block/rubber_trapdoor_bottom",
+      "y": 180
+    },
+    "facing=south,half=bottom,open=true": {
+      "model": "gtceu:block/rubber_trapdoor_open",
+      "y": 180
+    },
+    "facing=south,half=top,open=false": {
+      "model": "gtceu:block/rubber_trapdoor_top",
+      "y": 180
+    },
+    "facing=south,half=top,open=true": {
+      "model": "gtceu:block/rubber_trapdoor_open",
+      "x": 180
+    },
+    "facing=west,half=bottom,open=false": {
+      "model": "gtceu:block/rubber_trapdoor_bottom",
+      "y": 270
+    },
+    "facing=west,half=bottom,open=true": {
+      "model": "gtceu:block/rubber_trapdoor_open",
+      "y": 270
+    },
+    "facing=west,half=top,open=false": {
+      "model": "gtceu:block/rubber_trapdoor_top",
+      "y": 270
+    },
+    "facing=west,half=top,open=true": {
+      "model": "gtceu:block/rubber_trapdoor_open",
+      "x": 180,
+      "y": 90
     }
   }
 }

src/generated/resources/assets/gtceu/blockstates/rubber_wall_sign.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "": {
-      "model": "gtceu:block/rubber_wall_sign"
+      "model": "gtceu:block/rubber_sign"
     }
   }
 }

src/generated/resources/assets/gtceu/blockstates/treated_wood_trapdoor.json

@@ -1,7 +1,68 @@
 {
   "variants": {
-    "": {
-      "model": "gtceu:block/treated_wood_trapdoor"
+    "facing=east,half=bottom,open=false": {
+      "model": "gtceu:block/treated_wood_trapdoor_bottom",
+      "y": 90
+    },
+    "facing=east,half=bottom,open=true": {
+      "model": "gtceu:block/treated_wood_trapdoor_open",
+      "y": 90
+    },
+    "facing=east,half=top,open=false": {
+      "model": "gtceu:block/treated_wood_trapdoor_top",
+      "y": 90
+    },
+    "facing=east,half=top,open=true": {
+      "model": "gtceu:block/treated_wood_trapdoor_open",
+      "x": 180,
+      "y": 270
+    },
+    "facing=north,half=bottom,open=false": {
+      "model": "gtceu:block/treated_wood_trapdoor_bottom"
+    },
+    "facing=north,half=bottom,open=true": {
+      "model": "gtceu:block/treated_wood_trapdoor_open"
+    },
+    "facing=north,half=top,open=false": {
+      "model": "gtceu:block/treated_wood_trapdoor_top"
+    },
+    "facing=north,half=top,open=true": {
+      "model": "gtceu:block/treated_wood_trapdoor_open",
+      "x": 180,
+      "y": 180
+    },
+    "facing=south,half=bottom,open=false": {
+      "model": "gtceu:block/treated_wood_trapdoor_bottom",
+      "y": 180
+    },
+    "facing=south,half=bottom,open=true": {
+      "model": "gtceu:block/treated_wood_trapdoor_open",
+      "y": 180
+    },
+    "facing=south,half=top,open=false": {
+      "model": "gtceu:block/treated_wood_trapdoor_top",
+      "y": 180
+    },
+    "facing=south,half=top,open=true": {
+      "model": "gtceu:block/treated_wood_trapdoor_open",
+      "x": 180
+    },
+    "facing=west,half=bottom,open=false": {
+      "model": "gtceu:block/treated_wood_trapdoor_bottom",
+      "y": 270
+    },
+    "facing=west,half=bottom,open=true": {
+      "model": "gtceu:block/treated_wood_trapdoor_open",
+      "y": 270
+    },
+    "facing=west,half=top,open=false": {
+      "model": "gtceu:block/treated_wood_trapdoor_top",
+      "y": 270
+    },
+    "facing=west,half=top,open=true": {
+      "model": "gtceu:block/treated_wood_trapdoor_open",
+      "x": 180,
+      "y": 90
     }
   }
 }

src/generated/resources/assets/gtceu/blockstates/treated_wood_wall_sign.json

@@ -1,7 +1,7 @@
 {
   "variants": {
     "": {
-      "model": "gtceu:block/treated_wood_wall_sign"
+      "model": "gtceu:block/treated_wood_sign"
     }
   }
 }

src/generated/resources/assets/gtceu/compass/nodes/generation/basalt.json

@@ -117,7 +117,7 @@
   ],
   "page": "gtceu:generation/basalt",
   "position": [
-    -250,
+    -150,
     150
   ],
   "pre_nodes": [

src/generated/resources/assets/gtceu/compass/nodes/generation/deepslate.json

@@ -117,7 +117,7 @@
   ],
   "page": "gtceu:generation/deepslate",
   "position": [
-    -250,
+    -150,
     100
   ],
   "pre_nodes": [