cherrypick 1.2.1 to 1.19 (#1182)

* Fix can not create multiblock by using custom function (#1098)

* fix turbine rotors not getting damaged (#1099)

* fix shutter cover not being registered (#1100)

* More KubeJS utility functions for machines (#1101)

* clean up Content, GTRecipeBuilder

* make research methods accessible from KJS

* add callbacks for machine working/waiting/beforeWorking/afterWorking

* add KubeJS IngredientAction support for item inputs.

* add multiblock tank recipes (#1102)

* add recipe to beforeWorking callback (#1106)

* add filtering to output hatches (#1108)

* make any recipe capability able to have slots like item and fluid do.

* fix OreDataLoader crashing if because of already unfrozen registries if loading failed before

* make `capabilitiesProxy`s use IdentityHashMaps for tables, for faster(?) lookup.

* fix most inputs being marked as per tick

* make recipe types sort inputs based on capability value, for consistent slot layout

* add fluid output hatch filter

* make pump hatch & steam boiler use fluid tags for filtration, for compatibility reasons

* add way to get total amount of "stuff" from an IRecipeHandler, for sorting

* make inputs & outputs be sorted according to 1. if the hatch has contents, and 2. filter priority

* fix quantum tank renderer error

* fix fluid hatch text

* fix fusion reactor being able to run with less than required heat once recipe has started

* update LDLib

* fix GCyM multis using perfect OC, add recipe method for non-consumed fluid inputs, refactor recipe modifiers (#1103)

* add more ore generator types. (#1104)

* add `ClassicVeinGenerator` for the grognards among us

* make VeinGenerator#copy() do deeper copies for safety reasons

* add shortcut in GTOreDefinition for ClassicVeinGenerator

* fix float provider crashing with constant value because of mojank.

* finalize classic generator

* add CuboidVeinGenerator

* finalize cuboid generator

* fix gradual falloff in cuboid vein

* fix network switch crash, data bank chaining (#1114)

* fix network switch sometimes crashing when the GUI is opened

* fix optical cables sometimes not functioning at all

* fix research recipe ids being weird sometimes (e.g. when using GT material items as input)

* fix advanced data access hatch GUI being offcenter

* fix scanner & research station recipes having both inputs and outputs be the output (this was introduced in #1108)

* fix data bank chaining

* fix fluid input hatch UI (#1115)

* add partial NBT input support (#1121)

* make coil material a supplier for safety

* fix KJS machines not being able to have multiple recipe modifiers

* try to add partial nbt support (doesn't work yet.)

* fix recipe lookup finding inputs in proxies, thus doubling input stacks in lookup

* it work

* Use getEnergyStored in cases where energy is available but was not input recently (#1127)

* rework bedrock ore miner (#1124)

* it works except I get a weird codec error...

* it work

* mfw I accidentally swapped fluid & bedrock ore vein event

* fix veined generator crashing on copy because `rareBlocks == null`

* add setter for `RecipeLogic#progress`

* fix miner having way too high of a multiplier

* run data

* fix n mB/s ore

* fix singleblocks not being able to accept items via GUI

* fix singleblocks not being able to accept items via GUI 2: electic boogaloo

* remove useless forge impls of data loaders

* return early if no valid items are found

* Fix that kinetic stress output will never not stop (#1110)

* Fix that kinetic stress output will never not stop

* Add onPaused callback which is called when the WorkableMultiblockMachine set workingEnabled to false

* Format code

* fix world accelerator issues (#1126)

* fix world accelerator class formatting
fix world accelerator using 2x energy
fix world accelerator always accelerating BEs even in random tick mode

* remove bad return

* fix LD pipes disconnecting on reload, not working before being rotated once (#1131)

* fix item collector not working after unload & reload; fix item collector requiring KubeJS; fix item collector tooltip being broken (#1132)

* fix research items not rendering in JEI if on a server (#1134)

* fix research items not rendering in JEI if on a server

* fix #1134

* add wood cutter recipes (#1133)

* add wood cutter recipes, remake how we remove & add the wood recipes to match 1.12
fixes #1117
fixes #1051
fixes #1048

* run datagen

* Remove "equality jank" in MapFluidTagIngredient to fix recipes randomly not working when server restarts (#1142)

* fix ABS & large electrolyzer recipes (#1147)

* Remove unused, invalidly-named files so Minecraft stops complaining in a dev environment (#1149)

* Rename sounds so they get added to sound events properly (#1150)

* Add various fluid blocks to tag `minecraft:replaceable` (#1148)

* Fix #1125 (#1151)

* Fix wrench interaction to not care about durability (#1155) (#1156)

* fix treated wood recipe (#1159)

* Override `BE.setChanged` to significantly reduce neighbor updates (#1164)

* Add special lang-generation case for "Iron III Chloride" (#1059) (#1157)

* Add special lang-generation case for "Iron III Chloride" (#1059)

* Relocate fix to its proper place

* Re-add chipped/flawed gem lang keys

* Fix titanium large fluid cell recycling & engine intake casing assembling (#1169)

Fix titanium large fluid cell recycling bug in #1068

Fix engine intake casing assembling bug in #1166

* fix all custom recipe capabilities being removed (#1165)

* update ru.lang (#1173)

* 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/

---------

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

* chore: version & changelog for 1.2.1 (#1175)

* chore: version & changelog

* chore: add decorative blocks to changelog

* better #1176 (#1181)

* added Every Single Missing Block

* fix blank assets..

* fix

* a

* oops

* greg?

* ...

* bruh.

* fix blank assets..

* optimize the shit out of this, remove wack textures, go back to original ones

* rename stone textures (we need smooth variants for dark, light concrete, marble, red granite still)

* run data.

* Update src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java

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

* Update src/main/java/com/gregtechceu/gtceu/common/data/GTBlocks.java

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

---------

Co-authored-by: NemEzanevem <[email protected]>
Co-authored-by: Mikerooni <[email protected]>

* fix errors

* fix errors 2: electric boogaloo

* fix errors 3: return of the compile errors

* run datagen

---------

Co-authored-by: SmallY <[email protected]>
Co-authored-by: Mikerooni <[email protected]>
Co-authored-by: Alex Loving <[email protected]>
Co-authored-by: Yibo Cao <[email protected]>
Co-authored-by: ctrlaltmilk <[email protected]>
Co-authored-by: gjmhmm8 <[email protected]>
Co-authored-by: richie3366 <[email protected]>
Co-authored-by: EliAyase <[email protected]>
Co-authored-by: marisathewitch <[email protected]>
Co-authored-by: Western01 <[email protected]>
Co-authored-by: NemEzanevem <[email protected]>

CHANGELOG.md

@@ -1,13 +1,44 @@
 # ChangeLog
 
-Version: 1.2.0.a
+Version: 1.2.1
 
 ### 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
 
 ### 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
 
 ### FIXES:
-- Fixed some components not requiring data
-- Fixed assembly line recipes with no data not working
-- Fixed data module recipe being missing
-- Fixed tiered multiblock builders not working
+- 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

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs = -Xmx6G
 # Mod Info
 mod_id = gtceu
 mod_name = GregTech
-mod_version = 1.2.0.a
+mod_version = 1.2.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/

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.d"
+        def ldLibVersion = "1.0.25.f"
         def mixinextrasVersion = "0.2.0"
 
         forge {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,20 @@
+{
+  "variants": {
+    "": [
+      {
+        "model": "gtceu:block/marble"
+      },
+      {
+        "model": "gtceu:block/marble",
+        "y": 180
+      },
+      {
+        "model": "gtceu:block/marble_mirrored"
+      },
+      {
+        "model": "gtceu:block/marble_mirrored",
+        "y": 180
+      }
+    ]
+  }
+}

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

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

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

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

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

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

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

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

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

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