fix: Fix sieve meshes

TwelveIterationMods · Jun 30, 2024 · d0dca60 · d0dca60
1 parent 571eaad
commit d0dca60
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 9 deletions.
diff --git a/...a/net/blay09/mods/excompressum/forge/compat/exnihilosequentia/ExNihiloSequentiaAddon.java b/...a/net/blay09/mods/excompressum/forge/compat/exnihilosequentia/ExNihiloSequentiaAddon.java
@@ -67,6 +67,8 @@ public ExNihiloSequentiaAddon() {
         itemMap.put(NihiloItems.ANDESITE_GRAVEL, findBlock("crushed_andesite"));
         itemMap.put(NihiloItems.GRANITE_GRAVEL, findBlock("crushed_granite"));
 
+        SieveMeshRegistry.registerDefaults(MeshType.STRING);
+
         ItemStack stringMeshItem = findItem("string_mesh");
         if (!stringMeshItem.isEmpty()) {
             SieveMeshRegistryEntry stringMesh = new SieveMeshRegistryEntry(CommonMeshType.STRING, stringMeshItem, MeshType.STRING);

diff --git a/shared/src/main/java/net/blay09/mods/excompressum/registry/ExRegistries.java b/shared/src/main/java/net/blay09/mods/excompressum/registry/ExRegistries.java
@@ -9,6 +9,7 @@
 import net.blay09.mods.excompressum.registry.compressor.CompressedRecipeRegistry;
 import net.blay09.mods.excompressum.registry.hammer.HammerRegistry;
 import net.blay09.mods.excompressum.registry.heavysieve.HeavySieveRegistry;
+import net.blay09.mods.excompressum.registry.sievemesh.SieveMeshRegistry;
 import net.blay09.mods.excompressum.registry.woodencrucible.WoodenCrucibleRegistry;
 
 public class ExRegistries {

diff --git a/shared/src/main/java/net/blay09/mods/excompressum/registry/NihilisticNihiloProvider.java b/shared/src/main/java/net/blay09/mods/excompressum/registry/NihilisticNihiloProvider.java
@@ -4,6 +4,7 @@
 import net.blay09.mods.excompressum.api.IHammerRecipe;
 import net.blay09.mods.excompressum.api.sievemesh.SieveMeshRegistryEntry;
 
+import net.blay09.mods.excompressum.registry.sievemesh.SieveMeshRegistry;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.RandomSource;
@@ -19,6 +20,10 @@
 import java.util.List;
 
 public class NihilisticNihiloProvider implements ExNihiloProvider {
+	public NihilisticNihiloProvider() {
+		SieveMeshRegistry.registerDefaults(null);
+	}
+
 	@Override
 	public ItemStack getNihiloItem(NihiloItems type) {
 		return ItemStack.EMPTY;

diff --git a/shared/src/main/java/net/blay09/mods/excompressum/registry/sievemesh/SieveMeshRegistry.java b/shared/src/main/java/net/blay09/mods/excompressum/registry/sievemesh/SieveMeshRegistry.java
@@ -16,8 +16,8 @@ public class SieveMeshRegistry {
     private static final Map<CommonMeshType, SieveMeshRegistryEntry> entriesByType = new HashMap<>();
     private static final Map<ResourceLocation, SieveMeshRegistryEntry> entriesByItem = new HashMap<>();
 
-    public static void registerDefaults() {
-        SieveMeshRegistryEntry ironMesh = new SieveMeshRegistryEntry(CommonMeshType.IRON, new ItemStack(ModItems.ironMesh), null);
+    public static void registerDefaults(@Nullable Object backingMesh) {
+        SieveMeshRegistryEntry ironMesh = new SieveMeshRegistryEntry(CommonMeshType.IRON, new ItemStack(ModItems.ironMesh), backingMesh);
         ironMesh.setHeavy(true);
         ironMesh.setMeshLevel(3);
         ironMesh.setModelName("iron");

diff --git a/shared/src/main/resources/assets/excompressum/models/block/diamond_mesh.json b/shared/src/main/resources/assets/excompressum/models/block/diamond_mesh.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"parent": "minecraft:block/block",
 	"textures": {
-		"mesh": "excompressum:blocks/diamond_mesh"
+		"mesh": "excompressum:block/diamond_mesh"
 	},
 	"elements": [
 		{

diff --git a/shared/src/main/resources/assets/excompressum/models/block/emerald_mesh.json b/shared/src/main/resources/assets/excompressum/models/block/emerald_mesh.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"parent": "minecraft:block/block",
 	"textures": {
-		"mesh": "excompressum:blocks/emerald_mesh"
+		"mesh": "excompressum:block/emerald_mesh"
 	},
 	"elements": [
 		{

diff --git a/shared/src/main/resources/assets/excompressum/models/block/flint_mesh.json b/shared/src/main/resources/assets/excompressum/models/block/flint_mesh.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"parent": "minecraft:block/block",
 	"textures": {
-		"mesh": "excompressum:blocks/flint_mesh"
+		"mesh": "excompressum:block/flint_mesh"
 	},
 	"elements": [
 		{

diff --git a/shared/src/main/resources/assets/excompressum/models/block/heavy_sieve_with_mesh.json b/shared/src/main/resources/assets/excompressum/models/block/heavy_sieve_with_mesh.json
@@ -3,7 +3,7 @@
 "__comment": "Designed by Blay09 with BDcraft Cubik PRO 0.96 Beta - http://bdcraft.net",
 "textures": {
     "particle": "#texture",
-    "iron_mesh": "excompressum:blocks/iron_mesh"
+    "iron_mesh": "excompressum:block/iron_mesh"
 },
 "elements": [ 
 {

diff --git a/shared/src/main/resources/assets/excompressum/models/block/iron_mesh.json b/shared/src/main/resources/assets/excompressum/models/block/iron_mesh.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"parent": "minecraft:block/block",
 	"textures": {
-		"mesh": "excompressum:blocks/iron_mesh"
+		"mesh": "excompressum:block/iron_mesh"
 	},
 	"elements": [
 		{

diff --git a/shared/src/main/resources/assets/excompressum/models/block/netherite_mesh.json b/shared/src/main/resources/assets/excompressum/models/block/netherite_mesh.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"parent": "minecraft:block/block",
 	"textures": {
-		"mesh": "excompressum:blocks/netherite_mesh"
+		"mesh": "excompressum:block/netherite_mesh"
 	},
 	"elements": [
 		{

diff --git a/shared/src/main/resources/assets/excompressum/models/block/string_mesh.json b/shared/src/main/resources/assets/excompressum/models/block/string_mesh.json
@@ -2,7 +2,7 @@
 	"credit": "Made with Blockbench",
 	"parent": "minecraft:block/block",
 	"textures": {
-		"mesh": "excompressum:blocks/string_mesh"
+		"mesh": "excompressum:block/string_mesh"
 	},
 	"elements": [
 		{