cherrypick 1.3.1 to 1.21 (#1531)

Co-authored-by: YoungOnion <[email protected]> Co-authored-by: IamNotBrianZ <[email protected]> Co-authored-by: Lura Skye <[email protected]> Co-authored-by: DancingSnow <[email protected]> Co-authored-by: Rundas <[email protected]> Co-authored-by: Gate Guardian <[email protected]> Co-authored-by: Gate Guardian <[email protected]> Co-authored-by: KuhnChris <[email protected]> Co-authored-by: 3x1t-5tyl3 <[email protected]> Co-authored-by: liansishen <[email protected]> Co-authored-by: code-onigiri <[email protected]> Co-authored-by: Shibata Masanari <[email protected]> Co-authored-by: DancingSnow <[email protected]> Co-authored-by: Miner239 <[email protected]>
GregTechCEu · Jul 1, 2024 · e986f52 · e986f52
1 parent d7e013c
commit e986f52
Show file tree

Hide file tree

Showing 572 changed files with 7,426 additions and 866 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,43 +1,34 @@
 # ChangeLog
 
-Version: 1.3.0-a
+Version: 1.3.1
 
 # **1.21 IS A *VERY* BREAKING UPDATE, DO NOT TRY TO UPDATE FROM 1.20.1 OR 1.19.2**
 
 ### ADDITIONS:
-- Added the subtitle language values for machine/tool sounds
-- Added various missing, commented out recipes back
-- Added the ability to disable ore processing categories per material
+- Ordered Assembly Lines
+- Integration of Monazite: providing lots of additional functionality to jade
+- Ghost Circuits for fluid hatches
+- Overclocking beyond MAX voltage
+- Much more lamp variants, with bloom support
+- Subtick parallels, if a recipe oc's past 1 tick it does parallels instead
 
 ### CHANGES:
-- Updated mod compatibilities now that the dependencies exist
-- Changed RedGranite material's id to actually be `red_granite`
-- updated to latest KJS 1.21 changes
-- Made pollution more bearable
-- Made pollution shrink away slowly (speed is configurable)
-- Made pollution spawn a fixed amount of particles instead of a massive amount
-- Made pollution change the grass/leaf/water color of the area it's in
-- Made singleblock generators produce a small amount of pollution
-- Made air ducts more sensible to use
-- Made all medical conditions be unconditionally removed on death
-- Made normal naquadah not radioactive
-- Made higher-tier air scrubbers have a higher radius
-- Updated ja_jp & zh_cn language files
+- In world multiblock preview now properly works with rotated multiblocks
+- Updated jp and tw lang
+- Fusion Reactors now show a bloom ring when running a recipe
+- Pipes of any kind can be water logged
+- Updated NeoForge, EMI, KubeJS
+- Removed registerX methods from IGTAddon in favor of the GT register event
 
 ### FIXES:
-- Fixed tools not taking durability damage when using
-- Fixed fluid stack networking crash that sometimes could happen
-- Fixed JEI crashing when loading a world
-- Fixed EMI spamming the log when loading a world
-- Fixed addons' material registries being stuck frozen
-- Fixed infinite loop in fluid tank filling via automation
-- Fixed EMI/JEI/REI not loading GT's pages
-- Fixed missing null checks on create compatibility machines sometimes causing crashes
-- Fixed fluid parallel logic
-- Fixed GT recipe removal filtering
-- Fixed pipe frame material not loading correctly when a world is loaded
-- Fixed custom veins not generating when no biomes are set
-- Fixed "%s B" and "%s mB" being inverted in the language values
-- Fixed unsafe set operation in recipe logic that could cause crashes
-- Fixed removal of vanilla GT ore veins not working correctly on singleplayer
-- Fixed xaero's minimap spamming the log when it's rendering a material block
+- Disabling hazard config now properly disables everything hazard related
+- Rubber trees spawn chance config now works
+- Singleblock machines can no longer run a recipe beyond its tier
+- Fluid Hatch locking properly saves between world loads
+- Color-changing tooltip now changes colors properly
+- Fixed recipe conflicts in ore recipes
+- Fixed Drill GUI not updating after 1st click
+- Fixed batteries always working as ULV once charged
+- Fixed crafting with tools crashing the game
+- Fixed GT's recipe removal not working
+- Fixed GT causing options.txt to reset every launch
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.3.0-a
+mod_version = 1.3.1
 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/settings.gradle b/settings.gradle
@@ -28,7 +28,7 @@ dependencyResolutionManagement {
         def reiVersion = "16.0.729"
         def emiVersion = "1.1.8"
         def ae2Version = "18.1.3-alpha"
-        def kjsVersion = "2100.7.0-build.56"
+        def kjsVersion = "2100.7.0-build.57"
         def auVersion = "1.20.1-0.6.0"
 
         // NeoForge

diff --git a/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/black_borderless_lamp.json
@@ -0,0 +1,52 @@
+{
+  "variants": {
+    "bloom=false,inverted=false,lit=false,powered=false": {
+      "model": "gtceu:block/black_borderless_lamp_off"
+    },
+    "bloom=false,inverted=false,lit=false,powered=true": {
+      "model": "gtceu:block/black_borderless_lamp_off"
+    },
+    "bloom=false,inverted=false,lit=true,powered=false": {
+      "model": "gtceu:block/black_borderless_lamp"
+    },
+    "bloom=false,inverted=false,lit=true,powered=true": {
+      "model": "gtceu:block/black_borderless_lamp"
+    },
+    "bloom=false,inverted=true,lit=false,powered=false": {
+      "model": "gtceu:block/black_borderless_lamp_off"
+    },
+    "bloom=false,inverted=true,lit=false,powered=true": {
+      "model": "gtceu:block/black_borderless_lamp_off"
+    },
+    "bloom=false,inverted=true,lit=true,powered=false": {
+      "model": "gtceu:block/black_borderless_lamp"
+    },
+    "bloom=false,inverted=true,lit=true,powered=true": {
+      "model": "gtceu:block/black_borderless_lamp"
+    },
+    "bloom=true,inverted=false,lit=false,powered=false": {
+      "model": "gtceu:block/black_borderless_lamp_off"
+    },
+    "bloom=true,inverted=false,lit=false,powered=true": {
+      "model": "gtceu:block/black_borderless_lamp_off"
+    },
+    "bloom=true,inverted=false,lit=true,powered=false": {
+      "model": "gtceu:block/black_borderless_lamp_bloom"
+    },
+    "bloom=true,inverted=false,lit=true,powered=true": {
+      "model": "gtceu:block/black_borderless_lamp_bloom"
+    },
+    "bloom=true,inverted=true,lit=false,powered=false": {
+      "model": "gtceu:block/black_borderless_lamp_off"
+    },
+    "bloom=true,inverted=true,lit=false,powered=true": {
+      "model": "gtceu:block/black_borderless_lamp_off"
+    },
+    "bloom=true,inverted=true,lit=true,powered=false": {
+      "model": "gtceu:block/black_borderless_lamp_bloom"
+    },
+    "bloom=true,inverted=true,lit=true,powered=true": {
+      "model": "gtceu:block/black_borderless_lamp_bloom"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/gtceu/blockstates/black_lamp.json b/src/generated/resources/assets/gtceu/blockstates/black_lamp.json
@@ -1,7 +1,52 @@
 {
   "variants": {
-    "": {
+    "bloom=false,inverted=false,lit=false,powered=false": {
+      "model": "gtceu:block/black_lamp_off"
+    },
+    "bloom=false,inverted=false,lit=false,powered=true": {
+      "model": "gtceu:block/black_lamp_off"
+    },
+    "bloom=false,inverted=false,lit=true,powered=false": {
       "model": "gtceu:block/black_lamp"
+    },
+    "bloom=false,inverted=false,lit=true,powered=true": {
+      "model": "gtceu:block/black_lamp"
+    },
+    "bloom=false,inverted=true,lit=false,powered=false": {
+      "model": "gtceu:block/black_lamp_off"
+    },
+    "bloom=false,inverted=true,lit=false,powered=true": {
+      "model": "gtceu:block/black_lamp_off"
+    },
+    "bloom=false,inverted=true,lit=true,powered=false": {
+      "model": "gtceu:block/black_lamp"
+    },
+    "bloom=false,inverted=true,lit=true,powered=true": {
+      "model": "gtceu:block/black_lamp"
+    },
+    "bloom=true,inverted=false,lit=false,powered=false": {
+      "model": "gtceu:block/black_lamp_off"
+    },
+    "bloom=true,inverted=false,lit=false,powered=true": {
+      "model": "gtceu:block/black_lamp_off"
+    },
+    "bloom=true,inverted=false,lit=true,powered=false": {
+      "model": "gtceu:block/black_lamp_bloom"
+    },
+    "bloom=true,inverted=false,lit=true,powered=true": {
+      "model": "gtceu:block/black_lamp_bloom"
+    },
+    "bloom=true,inverted=true,lit=false,powered=false": {
+      "model": "gtceu:block/black_lamp_off"
+    },
+    "bloom=true,inverted=true,lit=false,powered=true": {
+      "model": "gtceu:block/black_lamp_off"
+    },
+    "bloom=true,inverted=true,lit=true,powered=false": {
+      "model": "gtceu:block/black_lamp_bloom"
+    },
+    "bloom=true,inverted=true,lit=true,powered=true": {
+      "model": "gtceu:block/black_lamp_bloom"
     }
   }
 }
diff --git a/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/blue_borderless_lamp.json
@@ -0,0 +1,52 @@
+{
+  "variants": {
+    "bloom=false,inverted=false,lit=false,powered=false": {
+      "model": "gtceu:block/blue_borderless_lamp_off"
+    },
+    "bloom=false,inverted=false,lit=false,powered=true": {
+      "model": "gtceu:block/blue_borderless_lamp_off"
+    },
+    "bloom=false,inverted=false,lit=true,powered=false": {
+      "model": "gtceu:block/blue_borderless_lamp"
+    },
+    "bloom=false,inverted=false,lit=true,powered=true": {
+      "model": "gtceu:block/blue_borderless_lamp"
+    },
+    "bloom=false,inverted=true,lit=false,powered=false": {
+      "model": "gtceu:block/blue_borderless_lamp_off"
+    },
+    "bloom=false,inverted=true,lit=false,powered=true": {
+      "model": "gtceu:block/blue_borderless_lamp_off"
+    },
+    "bloom=false,inverted=true,lit=true,powered=false": {
+      "model": "gtceu:block/blue_borderless_lamp"
+    },
+    "bloom=false,inverted=true,lit=true,powered=true": {
+      "model": "gtceu:block/blue_borderless_lamp"
+    },
+    "bloom=true,inverted=false,lit=false,powered=false": {
+      "model": "gtceu:block/blue_borderless_lamp_off"
+    },
+    "bloom=true,inverted=false,lit=false,powered=true": {
+      "model": "gtceu:block/blue_borderless_lamp_off"
+    },
+    "bloom=true,inverted=false,lit=true,powered=false": {
+      "model": "gtceu:block/blue_borderless_lamp_bloom"
+    },
+    "bloom=true,inverted=false,lit=true,powered=true": {
+      "model": "gtceu:block/blue_borderless_lamp_bloom"
+    },
+    "bloom=true,inverted=true,lit=false,powered=false": {
+      "model": "gtceu:block/blue_borderless_lamp_off"
+    },
+    "bloom=true,inverted=true,lit=false,powered=true": {
+      "model": "gtceu:block/blue_borderless_lamp_off"
+    },
+    "bloom=true,inverted=true,lit=true,powered=false": {
+      "model": "gtceu:block/blue_borderless_lamp_bloom"
+    },
+    "bloom=true,inverted=true,lit=true,powered=true": {
+      "model": "gtceu:block/blue_borderless_lamp_bloom"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json b/src/generated/resources/assets/gtceu/blockstates/blue_lamp.json
@@ -1,7 +1,52 @@
 {
   "variants": {
-    "": {
+    "bloom=false,inverted=false,lit=false,powered=false": {
+      "model": "gtceu:block/blue_lamp_off"
+    },
+    "bloom=false,inverted=false,lit=false,powered=true": {
+      "model": "gtceu:block/blue_lamp_off"
+    },
+    "bloom=false,inverted=false,lit=true,powered=false": {
       "model": "gtceu:block/blue_lamp"
+    },
+    "bloom=false,inverted=false,lit=true,powered=true": {
+      "model": "gtceu:block/blue_lamp"
+    },
+    "bloom=false,inverted=true,lit=false,powered=false": {
+      "model": "gtceu:block/blue_lamp_off"
+    },
+    "bloom=false,inverted=true,lit=false,powered=true": {
+      "model": "gtceu:block/blue_lamp_off"
+    },
+    "bloom=false,inverted=true,lit=true,powered=false": {
+      "model": "gtceu:block/blue_lamp"
+    },
+    "bloom=false,inverted=true,lit=true,powered=true": {
+      "model": "gtceu:block/blue_lamp"
+    },
+    "bloom=true,inverted=false,lit=false,powered=false": {
+      "model": "gtceu:block/blue_lamp_off"
+    },
+    "bloom=true,inverted=false,lit=false,powered=true": {
+      "model": "gtceu:block/blue_lamp_off"
+    },
+    "bloom=true,inverted=false,lit=true,powered=false": {
+      "model": "gtceu:block/blue_lamp_bloom"
+    },
+    "bloom=true,inverted=false,lit=true,powered=true": {
+      "model": "gtceu:block/blue_lamp_bloom"
+    },
+    "bloom=true,inverted=true,lit=false,powered=false": {
+      "model": "gtceu:block/blue_lamp_off"
+    },
+    "bloom=true,inverted=true,lit=false,powered=true": {
+      "model": "gtceu:block/blue_lamp_off"
+    },
+    "bloom=true,inverted=true,lit=true,powered=false": {
+      "model": "gtceu:block/blue_lamp_bloom"
+    },
+    "bloom=true,inverted=true,lit=true,powered=true": {
+      "model": "gtceu:block/blue_lamp_bloom"
     }
   }
 }
diff --git a/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json b/src/generated/resources/assets/gtceu/blockstates/brown_borderless_lamp.json
@@ -0,0 +1,52 @@
+{
+  "variants": {
+    "bloom=false,inverted=false,lit=false,powered=false": {
+      "model": "gtceu:block/brown_borderless_lamp_off"
+    },
+    "bloom=false,inverted=false,lit=false,powered=true": {
+      "model": "gtceu:block/brown_borderless_lamp_off"
+    },
+    "bloom=false,inverted=false,lit=true,powered=false": {
+      "model": "gtceu:block/brown_borderless_lamp"
+    },
+    "bloom=false,inverted=false,lit=true,powered=true": {
+      "model": "gtceu:block/brown_borderless_lamp"
+    },
+    "bloom=false,inverted=true,lit=false,powered=false": {
+      "model": "gtceu:block/brown_borderless_lamp_off"
+    },
+    "bloom=false,inverted=true,lit=false,powered=true": {
+      "model": "gtceu:block/brown_borderless_lamp_off"
+    },
+    "bloom=false,inverted=true,lit=true,powered=false": {
+      "model": "gtceu:block/brown_borderless_lamp"
+    },
+    "bloom=false,inverted=true,lit=true,powered=true": {
+      "model": "gtceu:block/brown_borderless_lamp"
+    },
+    "bloom=true,inverted=false,lit=false,powered=false": {
+      "model": "gtceu:block/brown_borderless_lamp_off"
+    },
+    "bloom=true,inverted=false,lit=false,powered=true": {
+      "model": "gtceu:block/brown_borderless_lamp_off"
+    },
+    "bloom=true,inverted=false,lit=true,powered=false": {
+      "model": "gtceu:block/brown_borderless_lamp_bloom"
+    },
+    "bloom=true,inverted=false,lit=true,powered=true": {
+      "model": "gtceu:block/brown_borderless_lamp_bloom"
+    },
+    "bloom=true,inverted=true,lit=false,powered=false": {
+      "model": "gtceu:block/brown_borderless_lamp_off"
+    },
+    "bloom=true,inverted=true,lit=false,powered=true": {
+      "model": "gtceu:block/brown_borderless_lamp_off"
+    },
+    "bloom=true,inverted=true,lit=true,powered=false": {
+      "model": "gtceu:block/brown_borderless_lamp_bloom"
+    },
+    "bloom=true,inverted=true,lit=true,powered=true": {
+      "model": "gtceu:block/brown_borderless_lamp_bloom"
+    }
+  }
+}