Merge branch 'development' into 100-cellar-config-issues

README.md

@@ -1,6 +1,6 @@
 # Growthcraft 9 for Minecraft 1.20.1 (Forge)
 
-[![Growthcraft Version](https://img.shields.io/badge/Growthcraft-9.1.3-orange.svg)](https://github.com/GrowthcraftCE/Growthcraft-1.20)
+[![Growthcraft Version](https://img.shields.io/badge/Growthcraft-9.2.0-orange.svg)](https://github.com/GrowthcraftCE/Growthcraft-1.20)
 [![](http://cf.way2muchnoise.eu/versions/growthcraft-community-edition_latest.svg)](https://minecraft.curseforge.com/projects/growthcraft-community-edition/)
 [![](http://cf.way2muchnoise.eu/short_growthcraft-community-edition.svg)](https://minecraft.curseforge.com/projects/growthcraft-community-edition/)
 [![Forge Version](https://img.shields.io/badge/Minecraft%20Forge-47.2.0-yellow.svg)](http://files.minecraftforge.net/maven/net/minecraftforge/forge/index_1.20.1.html)
@@ -23,7 +23,7 @@ to our GitHub wiki documentation. As of version 9 we have included an in-game ma
 
 End of Support: TBD  
 Latest Version: 9.1.2  
-Stable Version: 9.1.3
+Stable Version: 9.2.0
 
 ### Growthcraft 8 (Minecraft 1.19.4)
 

build.gradle

@@ -68,7 +68,7 @@ minecraft {
 
         data {
             workingDirectory project.file('run-data')
-            args '--mod', mod_id+',growthcraft_milk', '--all', '--output', file('src/generated/resources/'),
+            args '--mod', mod_id+',growthcraft_apiary'+',growthcraft_apples'+',growthcraft_bamboo'+',growthcraft_cellar'+',growthcraft_milk'+',growthcraft_rice', '--all', '--output', file('src/generated/resources/'),
             '--existing', file('src/main/resources/'), '--flat'
         }
     }
@@ -86,7 +86,7 @@ repositories {
 dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
-    // JEI is required for custom recipe lookup.
+    // Compile time mods for integration
     compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-common-api:${jei_version}"))
     compileOnly(fg.deobf("mezz.jei:jei-${minecraft_version}-forge-api:${jei_version}"))
 
@@ -96,7 +96,11 @@ dependencies {
     runtimeOnly fg.deobf("curse.maven:patchouli-${curseforge_patchouli}")
     runtimeOnly fg.deobf("curse.maven:appleskin-${curseforge_appleskin}")
     runtimeOnly fg.deobf("curse.maven:mekanism-${curseforge_mekanism}")
-    runtimeOnly fg.deobf("curse.maven:mekanism-${curseforge_farmers_delight}")
+    runtimeOnly fg.deobf("curse.maven:farmers-delight-${curseforge_farmers_delight}")
+    runtimeOnly fg.deobf("curse.maven:immersive-engineering-${curseforge_immersive_engineering}")
+
+    // Nice thing that shows the nbt in scrollable manner
+    runtimeOnly fg.deobf("curse.maven:item-nbt-viewer-514135:4578522")
 }
 
 // This block of code expands all declared replace properties in the specified resource targets.

gradle.properties

@@ -21,7 +21,7 @@ mod_id=growthcraft
 mod_archive_base=growthcraft
 mod_name=Growthcraft
 mod_license=GNU General Public License v3.0
-mod_version=9.1.3
+mod_version=9.2.0
 mod_group_id=growthcraft
 mod_authors=Alatyami
 mod_description=Growthcraft is a realistic and immersive Forge mod that adds various new elements to the game of Minecraft.
@@ -51,3 +51,6 @@ curseforge_mekanism=268560:4807067
 # Farmer's Delight, for testing rice tags
 curseforge_farmers_delight=398521:4679319
 # ------------------------------------------------
+# Immersive Engineering
+curseforge_immersive_engineering=231951:5224387
+# ------------------------------------------------

settings.gradle

@@ -5,6 +5,7 @@ pluginManagement {
             name = 'MinecraftForge'
             url = 'https://maven.minecraftforge.net/'
         }
+        maven {url 'https://repo.spongepowered.org/repository/maven-public/'}
     }
 }
 

src/main/resources/data/forge/tags/blocks/ores.json → src/generated/resources/data/forge/tags/blocks/ores.json

@@ -1,9 +1,8 @@
 {
-  "replace": false,
   "values": [
     "growthcraft:salt_ore",
     "growthcraft:salt_ore_deepslate",
-	"growthcraft:salt_ore_nether",
+    "growthcraft:salt_ore_nether",
     "growthcraft:salt_ore_end"
   ]
 }

src/generated/resources/data/forge/tags/blocks/ores_in_ground/deepslate.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft:salt_ore_deepslate"
+  ]
+}

src/main/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json → src/generated/resources/data/forge/tags/blocks/ores_in_ground/netherrack.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft:salt_ore_nether"
   ]

src/main/resources/data/forge/tags/blocks/ores_in_ground/stone.json → src/generated/resources/data/forge/tags/blocks/ores_in_ground/stone.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft:salt_ore"
   ]

src/main/resources/data/forge/tags/items/crops/rice.json → src/generated/resources/data/forge/tags/items/crops/rice.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft_rice:rice_stalk"
   ]

src/main/resources/data/growthcraft/tags/items/salt.json → src/generated/resources/data/forge/tags/items/dusts/salt.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft:salt"
   ]

src/generated/resources/data/forge/tags/items/dyes/black.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_black"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/blue.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_blue"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/brown.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_brown"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/cyan.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_cyan"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/gray.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_gray"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/green.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_green"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/light_blue.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_light_blue"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/light_gray.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_light_gray"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/lime.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_lime"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/magenta.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_magenta"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/orange.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_orange"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/pink.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_pink"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/purple.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_purple"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/red.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_red"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/white.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_white"
+  ]
+}

src/generated/resources/data/forge/tags/items/dyes/yellow.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apiary:bees_wax_yellow"
+  ]
+}

src/generated/resources/data/forge/tags/items/fence_gates/wooden.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_apples:apple_plank_fence_gate"
+  ]
+}

src/main/resources/data/forge/tags/items/fruits/grapes.json → src/generated/resources/data/forge/tags/items/fruits/grapes.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft_cellar:grape_purple",
     "growthcraft_cellar:grape_red",

src/main/resources/data/forge/tags/items/grain/barley.json → src/generated/resources/data/forge/tags/items/grain/barley.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft_cellar:grain",
     "growthcraft_cellar:grain_amber",

src/main/resources/data/forge/tags/items/grain/rice.json → src/generated/resources/data/forge/tags/items/grain/rice.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft_rice:rice"
   ]

src/main/resources/data/forge/tags/items/seeds/grape.json → src/generated/resources/data/forge/tags/items/seeds/grapes.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "growthcraft_cellar:grape_seeds_purple",
     "growthcraft_cellar:grape_seeds_red",

src/generated/resources/data/forge/tags/items/tools/knives.json

@@ -0,0 +1,5 @@
+{
+  "values": [
+    "growthcraft_rice:knife"
+  ]
+}

src/generated/resources/data/growthcraft/advancements/recipes/misc/rope_linen.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:lead"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "growthcraft:rope_linen"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "growthcraft:rope_linen"
+    ]
+  },
+  "sends_telemetry_event": false
+}

src/generated/resources/data/growthcraft/advancements/recipes/misc/rope_linen_lengthen.json

@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_item": {
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:lead"
+            ]
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "growthcraft:rope_linen_lengthen"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_item",
+      "has_the_recipe"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "growthcraft:rope_linen_lengthen"
+    ]
+  },
+  "sends_telemetry_event": false
+}

src/main/resources/data/growthcraft/advancements/recipes/misc/salt.json → src/generated/resources/data/growthcraft/advancements/recipes/misc/salt.json

@@ -1,12 +1,12 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_salt_block": {
+    "has_item": {
       "conditions": {
         "items": [
           {
             "items": [
-              "growthcraft:salt_block"
+              "growthcraft:salt"
             ]
           }
         ]
@@ -22,13 +22,14 @@
   },
   "requirements": [
     [
-      "has_salt_block",
+      "has_item",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
       "growthcraft:salt"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }

src/main/resources/data/growthcraft/advancements/recipes/misc/salt_block.json → src/generated/resources/data/growthcraft/advancements/recipes/misc/salt_block.json

@@ -1,7 +1,7 @@
 {
   "parent": "minecraft:recipes/root",
   "criteria": {
-    "has_salt": {
+    "has_item": {
       "conditions": {
         "items": [
           {
@@ -22,13 +22,14 @@
   },
   "requirements": [
     [
-      "has_salt",
+      "has_item",
       "has_the_recipe"
     ]
   ],
   "rewards": {
     "recipes": [
       "growthcraft:salt_block"
     ]
-  }
+  },
+  "sends_telemetry_event": false
 }