Merge branch 'next' into 1.20

# Conflicts:
#	common/src/main/java/dev/sweetberry/wwizardry/mixin/client/Mixin_SignRenderer_HangingSignRenderer.java
#	common/src/main/resources/wwizardry.mixins.json
#	fabric/src/main/java/dev/sweetberry/wwizardry/fabric/FabricInitializer.java
#	gradle.properties
#	neoforge/src/main/java/dev/sweetberry/wwizardry/neoforge/NeoForgeInitializer.java

.gitignore

@@ -13,10 +13,11 @@ neoforge/runs/
 *.launch
 
 # IntelliJ Idea
-.idea/
+.idea/*
 *.iml
 *.ipr
 *.iws
+!.idea/scopes/
 
 # Visual Studio Code
 .settings/

.woodpecker.yaml

@@ -1,6 +1,6 @@
 steps:
   - name: build
-    image: "eclipse-temurin:17.0.10_7-jdk-alpine"
+    image: "eclipse-temurin:21.0.4_7-jdk-alpine"
     commands:
       - ./gradlew build
   - name: notify

README.md

@@ -12,6 +12,6 @@ If you're contributing translations or tags, make sure to use the `data` directo
 Data there is converted from [FennecConfig](https://github.com/Oliver-makes-code/FennecConfig) to JSON at compiletime.
 
 ## Building the mod
-To build the mod, you need a JDK >= 17, as well as [Deno](https://deno.com/runtime)
+To build the mod, you need a JDK >= 21, as well as [Deno](https://deno.com/runtime)
 
 Everything should be done using the `./gradlew build` command.

build.gradle

@@ -1,6 +1,7 @@
 plugins {
 	id 'java'
 	alias libs.plugins.idea.ext
+	alias libs.plugins.loom apply false
 }
 
 version = "${project.version}+mc.${libs.versions.minecraft.get()}"
@@ -9,10 +10,6 @@ if (!project.classification.isBlank())
 group = project.maven_group
 
 repositories {
-	maven {
-		name = 'Quilt'
-		url = 'https://maven.quiltmc.org/repository/release'
-	}
 	maven {
 		name = 'TerraformersMC'
 		url = 'https://maven.terraformersmc.com/'
@@ -66,13 +63,13 @@ tasks.register("generateData") {
 			generate("lang", "assets/wwizardry/lang")
 			generate("tags", "data")
 			generate("archex", "staticdata/architecture_extensions")
-			loot("basic_block_loot.fennec", "data/wwizardry/loot_tables/blocks")
-			generate("bricks", "data/wwizardry/recipes")
-			transpile("recipes", "data/wwizardry/recipes")
-			transpile("loot", "data/wwizardry/loot_tables")
+			loot("basic_block_loot.fennec", "data/wwizardry/loot_table/blocks")
+			generate("bricks", "data/wwizardry/recipe")
+			transpile("recipes", "data/wwizardry/recipe")
+			transpile("loot", "data/wwizardry/loot_table")
 			transpile("world", "data/wwizardry/worldgen")
 			generate("blockstate", "assets/wwizardry/blockstates")
-			awToAt()
+//			awToAt()
 		} catch (e) {
 			e.printStackTrace()
 		}
@@ -81,13 +78,13 @@ tasks.register("generateData") {
 
 tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = 'UTF-8'
-	it.options.release = 17
+	it.options.release = 21
 	dependsOn "generateData"
 }
 
 java {
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 
 	withSourcesJar()
 }

common/build.gradle

@@ -51,6 +51,6 @@ dependencies {
 
 tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = 'UTF-8'
-	it.options.release = 17
+	it.options.release = 21
 	dependsOn ":generateData"
 }

common/src/generated/resources/assets/wwizardry/blockstates/altar_catalyzer.json

@@ -1 +1,33 @@
-{"multipart":[{"when":{"sculked":"false"},"apply":{"model":"wwizardry:block/altar_catalyzer","uvlock":true}},{"when":{"sculked":"true"},"apply":{"model":"wwizardry:block/altar_catalyzer_sculk","uvlock":true}},{"when":{"sculked":"true","sculk_below":"false"},"apply":{"model":"wwizardry:block/altar_sculk_vein","uvlock":true,"x":90}}]}
+{
+  "multipart": [
+    {
+      "when": {
+        "sculked": "false"
+      },
+      "apply": {
+        "model": "wwizardry:block/altar_catalyzer",
+        "uvlock": true
+      }
+    },
+    {
+      "when": {
+        "sculked": "true"
+      },
+      "apply": {
+        "model": "wwizardry:block/altar_catalyzer_sculk",
+        "uvlock": true
+      }
+    },
+    {
+      "when": {
+        "sculked": "true",
+        "sculk_below": "false"
+      },
+      "apply": {
+        "model": "wwizardry:block/altar_sculk_vein",
+        "uvlock": true,
+        "x": 90
+      }
+    }
+  ]
+}

common/src/generated/resources/assets/wwizardry/blockstates/altar_pedestal.json

@@ -1 +1,101 @@
-{"multipart":[{"when":{"sculked":"false","facing":"north"},"apply":{"model":"wwizardry:block/altar_pedestal","uvlock":true,"y":180}},{"when":{"sculked":"true","facing":"north"},"apply":{"model":"wwizardry:block/altar_pedestal_sculk","uvlock":true,"y":180}},{"when":{"sculked":"false","facing":"south"},"apply":{"model":"wwizardry:block/altar_pedestal","uvlock":true}},{"when":{"sculked":"true","facing":"south"},"apply":{"model":"wwizardry:block/altar_pedestal_sculk","uvlock":true}},{"when":{"sculked":"false","facing":"east"},"apply":{"model":"wwizardry:block/altar_pedestal","uvlock":true,"y":270}},{"when":{"sculked":"true","facing":"east"},"apply":{"model":"wwizardry:block/altar_pedestal_sculk","uvlock":true,"y":270}},{"when":{"sculked":"false","facing":"west"},"apply":{"model":"wwizardry:block/altar_pedestal","uvlock":true,"y":90}},{"when":{"sculked":"true","facing":"west"},"apply":{"model":"wwizardry:block/altar_pedestal_sculk","uvlock":true,"y":90}},{"when":{"sculked":"true","sculk_below":"false"},"apply":{"model":"wwizardry:block/altar_sculk_vein","uvlock":true,"x":90}}]}
+{
+  "multipart": [
+    {
+      "when": {
+        "sculked": "false",
+        "facing": "north"
+      },
+      "apply": {
+        "model": "wwizardry:block/altar_pedestal",
+        "uvlock": true,
+        "y": 180
+      }
+    },
+    {
+      "when": {
+        "sculked": "true",
+        "facing": "north"
+      },
+      "apply": {
+        "model": "wwizardry:block/altar_pedestal_sculk",
+        "uvlock": true,
+        "y": 180
+      }
+    },
+    {
+      "when": {
+        "sculked": "false",
+        "facing": "south"
+      },
+      "apply": {
+        "model": "wwizardry:block/altar_pedestal",
+        "uvlock": true
+      }
+    },
+    {
+      "when": {
+        "sculked": "true",
+        "facing": "south"
+      },
+      "apply": {
+        "model": "wwizardry:block/altar_pedestal_sculk",
+        "uvlock": true
+      }
+    },
+    {
+      "when": {
+        "sculked": "false",
+        "facing": "east"
+      },
+      "apply": {
+        "model": "wwizardry:block/altar_pedestal",
+        "uvlock": true,
+        "y": 270
+      }
+    },
+    {
+      "when": {
+        "sculked": "true",
+        "facing": "east"
+      },
+      "apply": {
+        "model": "wwizardry:block/altar_pedestal_sculk",
+        "uvlock": true,
+        "y": 270
+      }
+    },
+    {
+      "when": {
+        "sculked": "false",
+        "facing": "west"
+      },
+      "apply": {
+        "model": "wwizardry:block/altar_pedestal",
+        "uvlock": true,
+        "y": 90
+      }
+    },
+    {
+      "when": {
+        "sculked": "true",
+        "facing": "west"
+      },
+      "apply": {
+        "model": "wwizardry:block/altar_pedestal_sculk",
+        "uvlock": true,
+        "y": 90
+      }
+    },
+    {
+      "when": {
+        "sculked": "true",
+        "sculk_below": "false"
+      },
+      "apply": {
+        "model": "wwizardry:block/altar_sculk_vein",
+        "uvlock": true,
+        "x": 90
+      }
+    }
+  ]
+}

common/src/generated/resources/assets/wwizardry/blockstates/amethyst_glass.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "wwizardry:block/amethyst_glass"
+    }
+  }
+}

common/src/generated/resources/assets/wwizardry/blockstates/budding_sculk_crystal.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "wwizardry:block/budding_sculk_crystal"
+    }
+  }
+}

common/src/generated/resources/assets/wwizardry/blockstates/camera.json

@@ -1 +1,19 @@
-{"variants":{"facing=north":{"model":"wwizardry:block/camera","y":180},"facing=south":{"model":"wwizardry:block/camera"},"facing=east":{"model":"wwizardry:block/camera","y":270},"facing=west":{"model":"wwizardry:block/camera","y":90}}}
+{
+  "variants": {
+    "facing=north": {
+      "model": "wwizardry:block/camera",
+      "y": 180
+    },
+    "facing=south": {
+      "model": "wwizardry:block/camera"
+    },
+    "facing=east": {
+      "model": "wwizardry:block/camera",
+      "y": 270
+    },
+    "facing=west": {
+      "model": "wwizardry:block/camera",
+      "y": 90
+    }
+  }
+}

common/src/generated/resources/assets/wwizardry/blockstates/copper_lens.json

@@ -0,0 +1,52 @@
+{
+  "variants": {
+    "powered=false,focus=focused,axis=x": {
+      "model": "wwizardry:block/copper_lens/normal/unpowered/focused",
+      "x": 90,
+      "y": 90
+    },
+    "powered=true,focus=focused,axis=x": {
+      "model": "wwizardry:block/copper_lens/normal/powered/focused",
+      "x": 90,
+      "y": 90
+    },
+    "powered=false,focus=unfocused,axis=x": {
+      "model": "wwizardry:block/copper_lens/normal/unpowered/unfocused",
+      "x": 90,
+      "y": 90
+    },
+    "powered=true,focus=unfocused,axis=x": {
+      "model": "wwizardry:block/copper_lens/normal/powered/unfocused",
+      "x": 90,
+      "y": 90
+    },
+    "powered=false,focus=focused,axis=y": {
+      "model": "wwizardry:block/copper_lens/normal/unpowered/focused"
+    },
+    "powered=true,focus=focused,axis=y": {
+      "model": "wwizardry:block/copper_lens/normal/powered/focused"
+    },
+    "powered=false,focus=unfocused,axis=y": {
+      "model": "wwizardry:block/copper_lens/normal/unpowered/unfocused"
+    },
+    "powered=true,focus=unfocused,axis=y": {
+      "model": "wwizardry:block/copper_lens/normal/powered/unfocused"
+    },
+    "powered=false,focus=focused,axis=z": {
+      "model": "wwizardry:block/copper_lens/normal/unpowered/focused",
+      "x": 90
+    },
+    "powered=true,focus=focused,axis=z": {
+      "model": "wwizardry:block/copper_lens/normal/powered/focused",
+      "x": 90
+    },
+    "powered=false,focus=unfocused,axis=z": {
+      "model": "wwizardry:block/copper_lens/normal/unpowered/unfocused",
+      "x": 90
+    },
+    "powered=true,focus=unfocused,axis=z": {
+      "model": "wwizardry:block/copper_lens/normal/powered/unfocused",
+      "x": 90
+    }
+  }
+}

common/src/generated/resources/assets/wwizardry/blockstates/crystalline_sculk_block.json

@@ -1 +1,7 @@
-{"variants":{"":{"model":"wwizardry:block/crystalline_sculk_block"}}}
+{
+  "variants": {
+    "": {
+      "model": "wwizardry:block/crystalline_sculk_block"
+    }
+  }
+}

common/src/generated/resources/assets/wwizardry/blockstates/deepslate_rose_quartz_ore.json

@@ -1 +1,7 @@
-{"variants":{"":{"model":"wwizardry:block/deepslate_rose_quartz_ore"}}}
+{
+  "variants": {
+    "": {
+      "model": "wwizardry:block/deepslate_rose_quartz_ore"
+    }
+  }
+}

common/src/generated/resources/assets/wwizardry/blockstates/diamond_glass.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "wwizardry:block/diamond_glass"
+    }
+  }
+}