Refactor the entire codebase.

build.gradle

@@ -1,18 +1,18 @@
 plugins {
-	id 'fabric-loom' version '1.4-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
 loom {
 	accessWidenerPath = file("src/main/resources/proviorigins.accesswidener")
-	runs {
-        datagenClient {
-            inherit client
+    runs {
+        datagen {
+            inherit server
             name "Data Generation"
             vmArg "-Dfabric-api.datagen"
             vmArg "-Dfabric-api.datagen.output-dir=${file("src/main/generated")}"
             vmArg "-Dfabric-api.datagen.modid=${modid}"
- 
+
             runDir "build/datagen"
         }
     }
@@ -28,11 +28,8 @@ sourceSets {
     }
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
-
 archivesBaseName = project.archives_base_name
-version = project.mod_version
+version = project.mod_version + "+" + project.minecraft_version
 group = project.maven_group
 
 repositories {
@@ -98,6 +95,9 @@ dependencies {
 
 	modImplementation "com.github.apace100:origins-fabric:${project.origins_version}"
 	modCompileOnly "maven.modrinth:lambdynamiclights:${project.dynlights_version}"
+
+    modImplementation "com.github.Provismet:LilyLib:${project.lilylib_version}"
+    include "com.github.Provismet:LilyLib:${project.lilylib_version}"
 }
 
 processResources {
@@ -118,6 +118,9 @@ java {
 	// if it is present.
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
+
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 jar {

gradle.properties

@@ -2,20 +2,21 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-	# check these on https://fabricmc.net/develop
-	minecraft_version=1.20.2
-	yarn_mappings=1.20.2+build.4
-	loader_version=0.15.2
+# check these on https://fabricmc.net/develop
+minecraft_version=1.20.2
+yarn_mappings=1.20.2+build.4
+loader_version=0.15.2
 
 # Mod Properties
-	mod_version = 1.6.1
-	maven_group = com.provismet
-	archives_base_name = provi-origins
-	modid = proviorigins
+mod_version = 1.6.1
+maven_group = com.provismet
+archives_base_name = provi-origins
+modid = proviorigins
 
 # Dependencies
-	fabric_version=0.91.2+1.20.2
-	origins_version=1.12.0
-	extrade_oa_version=1.1.0
-	pehkui_version=3.7.5
-	dynlights_version=mYl4RvKg
+fabric_version=0.91.2+1.20.2
+origins_version=1.12.0
+extrade_oa_version=1.1.0
+pehkui_version=3.7.5
+dynlights_version=mYl4RvKg
+lilylib_version=1.1.3-mc1.20

src/main/generated/assets/proviorigins/blockstates/lily_of_the_void.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "proviorigins:block/lily_of_the_void"
+    }
+  }
+}

src/main/generated/assets/proviorigins/blockstates/potted_lily_of_the_void.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "proviorigins:block/potted_lily_of_the_void"
+    }
+  }
+}

src/main/generated/assets/proviorigins/lang/en_gb.json

@@ -0,0 +1,9 @@
+{
+  "item.proviorigins.crystalliser_icon": "Crystalliser Origin Icon",
+  "power.proviorigins.alraune.summon_plant.badge.2": "Flower Sprites\n- Will take damage if not placed on plantable blocks such as dirt or grass.\n- Will die after 1200 ticks unless fed with a super fertiliser such as dragon breath.",
+  "power.proviorigins.crystalliser.name": "Crystalliser",
+  "power.proviorigins.drakling.chain_crafting.description": "You can craft chainmail armour.",
+  "power.proviorigins.drakling.weak_armour.description": "Your newfound strength allows you to wear stronger armour, but your bodily heat loosens the material and makes it weaker than normal.",
+  "power.proviorigins.jellysculk.catalyse.name": "Catalyser",
+  "tooltip.proviorigins.alraune.super_fertiliser": "§8A super effective fertiliser."
+}

src/main/generated/assets/proviorigins/models/block/lily_of_the_void.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "proviorigins:block/lily_of_the_void"
+  }
+}

src/main/generated/assets/proviorigins/models/block/potted_lily_of_the_void.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/flower_pot_cross",
+  "textures": {
+    "plant": "proviorigins:block/lily_of_the_void"
+  }
+}

src/main/generated/assets/proviorigins/models/item/alraune_icon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "proviorigins:icons/alraune"
+  }
+}

src/main/generated/assets/proviorigins/models/item/crystalliser_icon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "proviorigins:icons/crystalliser"
+  }
+}

src/main/generated/assets/proviorigins/models/item/drake_icon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "proviorigins:icons/drake"
+  }
+}

src/main/generated/assets/proviorigins/models/item/drakling_icon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "proviorigins:icons/drakling"
+  }
+}

src/main/generated/assets/proviorigins/models/item/fae_moth_icon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "proviorigins:icons/fae_moth"
+  }
+}

src/main/generated/assets/proviorigins/models/item/homunculus_icon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "proviorigins:icons/homunculus"
+  }
+}

src/main/generated/assets/proviorigins/models/item/jelly_icon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "proviorigins:icons/jelly"
+  }
+}

src/main/generated/assets/proviorigins/models/item/kraken_of_decay_icon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "proviorigins:icons/kraken_of_decay"
+  }
+}

src/main/generated/assets/proviorigins/models/item/lily_of_the_void.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "proviorigins:block/lily_of_the_void"
+  }
+}

src/main/generated/assets/proviorigins/models/item/lily_of_the_void_icon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "proviorigins:icons/lily_of_the_void"
+  }
+}

src/main/generated/assets/proviorigins/models/item/splinter_icon.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "proviorigins:icons/splinter"
+  }
+}

src/main/generated/data/c/tags/items/hidden_from_recipe_viewers.json

@@ -0,0 +1,14 @@
+{
+  "replace": false,
+  "values": [
+    "proviorigins:lily_of_the_void_icon",
+    "proviorigins:kraken_of_decay_icon",
+    "proviorigins:drakling_icon",
+    "proviorigins:drake_icon",
+    "proviorigins:splinter_icon",
+    "proviorigins:fae_moth_icon",
+    "proviorigins:alraune_icon",
+    "proviorigins:homunculus_icon",
+    "proviorigins:crystalliser_icon"
+  ]
+}

src/main/generated/data/minecraft/tags/blocks/small_flowers.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "proviorigins:lily_of_the_void"
+  ]
+}

src/main/generated/data/minecraft/tags/items/piglin_repellents.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "proviorigins:kraken_soul_lantern"
+  ]
+}

src/main/generated/data/minecraft/tags/items/small_flowers.json

@@ -0,0 +1,6 @@
+{
+  "replace": false,
+  "values": [
+    "proviorigins:lily_of_the_void"
+  ]
+}

src/main/generated/data/proviorigins/advancements/recipes/decorations/lantern.json

@@ -34,9 +34,9 @@
   },
   "requirements": [
     [
+      "has_the_recipe",
       "has_lantern",
-      "has_solid_lantern",
-      "has_the_recipe"
+      "has_solid_lantern"
     ]
   ],
   "rewards": {

src/main/generated/data/proviorigins/advancements/recipes/decorations/soul_lantern.json

@@ -34,9 +34,9 @@
   },
   "requirements": [
     [
+      "has_the_recipe",
       "has_soul_lantern",
-      "has_kraken_soul_lantern",
-      "has_the_recipe"
+      "has_kraken_soul_lantern"
     ]
   ],
   "rewards": {

src/main/generated/data/proviorigins/advancements/recipes/misc/purple_dye.json

@@ -34,9 +34,9 @@
   },
   "requirements": [
     [
+      "has_the_recipe",
       "has_purple_dye",
-      "has_lily_of_the_void",
-      "has_the_recipe"
+      "has_lily_of_the_void"
     ]
   ],
   "rewards": {

src/main/generated/data/proviorigins/loot_tables/blocks/lily_of_the_void.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "proviorigins:lily_of_the_void"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/proviorigins/loot_tables/blocks/potted_lily_of_the_void.json

@@ -0,0 +1,35 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "minecraft:flower_pot"
+        }
+      ],
+      "rolls": 1.0
+    },
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "proviorigins:lily_of_the_void"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/generated/data/proviorigins/tags/blocks/alraune/foliage.json

@@ -0,0 +1,13 @@
+{
+  "replace": false,
+  "values": [
+    {
+      "id": "#minecraft:flowers",
+      "required": false
+    },
+    {
+      "id": "#minecraft:saplings",
+      "required": false
+    }
+  ]
+}

src/main/generated/data/proviorigins/tags/blocks/decaykraken/soul_fires.json

@@ -0,0 +1,9 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:soul_torch",
+    "minecraft:soul_wall_torch",
+    "minecraft:soul_lantern",
+    "minecraft:soul_fire"
+  ]
+}