Nuclearcraft server connection issue #149

igentuman · igentuman · commit d589e57e1b3b · 2024-12-29T00:08:39.000+01:00
diff --git a/src/generated/resources/assets/emi/lang/en_us.json b/src/generated/resources/assets/emi/lang/en_us.json
diff --git a/src/generated/resources/assets/nuclearcraft/blockstates/turbine_aluminium_coil.json b/src/generated/resources/assets/nuclearcraft/blockstates/turbine_aluminium_coil.json
diff --git a/src/generated/resources/assets/nuclearcraft/blockstates/turbine_aluminum_coil.json b/src/generated/resources/assets/nuclearcraft/blockstates/turbine_aluminum_coil.json
@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "nuclearcraft:block/multiblock/turbine_aluminum_coil"
+    }
+  }
+}
diff --git a/src/generated/resources/assets/nuclearcraft/lang/en_us.json b/src/generated/resources/assets/nuclearcraft/lang/en_us.json
@@ -26,6 +26,7 @@
   "block.nuclearcraft.basic_storage_container": "Basic Storage Container",
   "block.nuclearcraft.basic_voltaic_pile": "Basic Voltaic Pile",
   "block.nuclearcraft.beryllium_block": "Beryllium Block",
+  "block.nuclearcraft.black_hole": "Black Hole",
   "block.nuclearcraft.boron_block": "Boron Block",
   "block.nuclearcraft.boron_deepslate_ore": "Boron Deepslate Ore",
   "block.nuclearcraft.boron_heat_sink": "Boron Heat Sink",
@@ -157,7 +158,7 @@
   "block.nuclearcraft.tin_block": "Tin Block",
   "block.nuclearcraft.tin_heat_sink": "Tin Heat Sink",
   "block.nuclearcraft.tin_ore": "Tin Ore",
-  "block.nuclearcraft.turbine_aluminium_coil": "Turbine Aluminium Coil",
+  "block.nuclearcraft.turbine_aluminum_coil": "Turbine Aluminum Coil",
   "block.nuclearcraft.turbine_basic_rotor_blade": "Turbine Basic Rotor Blade",
   "block.nuclearcraft.turbine_bearing": "Turbine Bearing",
   "block.nuclearcraft.turbine_beryllium_coil": "Turbine Beryllium Coil",
diff --git a/src/generated/resources/assets/nuclearcraft/models/block/multiblock/turbine_aluminum_coil.json b/src/generated/resources/assets/nuclearcraft/models/block/multiblock/turbine_aluminum_coil.json
@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:block/cube_all",
   "textures": {
-    "all": "nuclearcraft:block/turbine/aluminium_coil"
+    "all": "nuclearcraft:block/turbine/aluminum_coil"
   }
 }
diff --git a/src/generated/resources/assets/nuclearcraft/models/item/black_hole.json b/src/generated/resources/assets/nuclearcraft/models/item/black_hole.json
@@ -0,0 +1,3 @@
+{
+  "parent": "nuclearcraft:block/multiblock/black_hole"
+}
diff --git a/src/generated/resources/assets/nuclearcraft/models/item/turbine_aluminium_coil.json b/src/generated/resources/assets/nuclearcraft/models/item/turbine_aluminium_coil.json
diff --git a/src/generated/resources/assets/nuclearcraft/models/item/turbine_aluminum_coil.json b/src/generated/resources/assets/nuclearcraft/models/item/turbine_aluminum_coil.json
@@ -0,0 +1,3 @@
+{
+  "parent": "nuclearcraft:block/multiblock/turbine_aluminum_coil"
+}
diff --git a/src/generated/resources/data/nuclearcraft/advancements/recipes/misc/turbine_aluminum_coil.json b/src/generated/resources/data/nuclearcraft/advancements/recipes/misc/turbine_aluminum_coil.json
@@ -3,7 +3,7 @@
   "criteria": {
     "has_the_recipe": {
       "conditions": {
-        "recipe": "nuclearcraft:turbine_aluminium_coil"
+        "recipe": "nuclearcraft:turbine_aluminum_coil"
       },
       "trigger": "minecraft:recipe_unlocked"
     },
@@ -26,7 +26,7 @@
   ],
   "rewards": {
     "recipes": [
-      "nuclearcraft:turbine_aluminium_coil"
+      "nuclearcraft:turbine_aluminum_coil"
     ]
   },
   "sends_telemetry_event": false
diff --git a/src/generated/resources/data/nuclearcraft/loot_tables/blocks/black_hole.json b/src/generated/resources/data/nuclearcraft/loot_tables/blocks/black_hole.json
@@ -6,12 +6,12 @@
       "entries": [
         {
           "type": "minecraft:item",
-          "name": "nuclearcraft:turbine_aluminium_coil"
+          "name": "nuclearcraft:black_hole"
         }
       ],
       "name": "block",
       "rolls": 1.0
     }
   ],
-  "random_sequence": "nuclearcraft:blocks/turbine_aluminium_coil"
+  "random_sequence": "nuclearcraft:blocks/black_hole"
 }
diff --git a/src/generated/resources/data/nuclearcraft/loot_tables/blocks/turbine_aluminum_coil.json b/src/generated/resources/data/nuclearcraft/loot_tables/blocks/turbine_aluminum_coil.json
@@ -0,0 +1,17 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "nuclearcraft:turbine_aluminum_coil"
+        }
+      ],
+      "name": "block",
+      "rolls": 1.0
+    }
+  ],
+  "random_sequence": "nuclearcraft:blocks/turbine_aluminum_coil"
+}
diff --git a/src/generated/resources/data/nuclearcraft/recipes/turbine_aluminum_coil.json b/src/generated/resources/data/nuclearcraft/recipes/turbine_aluminum_coil.json
@@ -4,7 +4,7 @@
   "group": "nuclearcraft_turbine",
   "key": {
     "B": {
-      "tag": "forge:ingots/aluminium"
+      "tag": "forge:ingots/aluminum"
     },
     "S": {
       "tag": "forge:ingots/stainless_steel"
@@ -16,7 +16,7 @@
     "SBS"
   ],
   "result": {
-    "item": "nuclearcraft:turbine_aluminium_coil"
+    "item": "nuclearcraft:turbine_aluminum_coil"
   },
   "show_notification": true
 }
diff --git a/src/generated/resources/data/nuclearcraft/tags/blocks/turbine_casing.json b/src/generated/resources/data/nuclearcraft/tags/blocks/turbine_casing.json
@@ -6,10 +6,10 @@
     "nuclearcraft:turbine_controller",
     "nuclearcraft:turbine_port",
     "nuclearcraft:turbine_gold_coil",
-    "nuclearcraft:turbine_aluminium_coil",
     "nuclearcraft:turbine_copper_coil",
     "nuclearcraft:turbine_magnesium_coil",
     "nuclearcraft:turbine_beryllium_coil",
-    "nuclearcraft:turbine_silver_coil"
+    "nuclearcraft:turbine_silver_coil",
+    "nuclearcraft:turbine_aluminum_coil"
   ]
 }
diff --git a/src/main/java/igentuman/nc/multiblock/turbine/TurbineRegistration.java b/src/main/java/igentuman/nc/multiblock/turbine/TurbineRegistration.java
@@ -61,7 +61,7 @@ public static HashMap<String, CoilDef> coils() {
         tmp.put("silver", new CoilDef("silver", 112, "turbine_magnesium_coil", "turbine_gold_coil"));
         tmp.put("gold", new CoilDef("gold", 104, "turbine_beryllium_coil"));
         tmp.put("beryllium", new CoilDef("beryllium", 90, "turbine_magnesium_coil"));
-        tmp.put("aluminium", new CoilDef("aluminium", 98, "turbine_gold_coil|turbine_magnesium_coil|turbine_beryllium_coil|turbine_gold_coil|turbine_copper_coil"));
+        tmp.put("aluminum", new CoilDef("aluminum", 98, "turbine_gold_coil|turbine_magnesium_coil|turbine_beryllium_coil|turbine_gold_coil|turbine_copper_coil"));
         return tmp;
     }
 
diff --git a/src/main/java/igentuman/nc/recipes/AbstractRecipe.java b/src/main/java/igentuman/nc/recipes/AbstractRecipe.java
@@ -162,13 +162,13 @@ public boolean isIncomplete()
         if(empty) return true;
         for(ItemStackIngredient inputItem: inputItems) {
             if(inputItem == null || inputItem.getRepresentations().isEmpty()
-                    || inputItem.getRepresentations().get(0).getItem().equals(BARRIER)) {
+                    || inputItem.getRepresentations().get(0).is(BARRIER)) {
                 return true;
             }
         }
         for(ItemStackIngredient output: outputItems) {
             if(output == null || output.getRepresentations().isEmpty()
-                    || output.getRepresentations().get(0).equals(BARRIER)) {
+                    || output.getRepresentations().get(0).is(BARRIER)) {
                 return true;
             }
         }
diff --git a/src/main/java/igentuman/nc/recipes/ingredient/creator/ItemStackIngredientCreator.java b/src/main/java/igentuman/nc/recipes/ingredient/creator/ItemStackIngredientCreator.java
@@ -29,6 +29,7 @@
 import java.util.stream.Stream;
 
 import static igentuman.nc.setup.registration.Registries.ITEM_REGISTRY;
+import static net.minecraft.world.item.Items.BARRIER;
 
 @NothingNullByDefault
 public class ItemStackIngredientCreator implements IItemStackIngredientCreator {
@@ -43,7 +44,8 @@ public ItemStackIngredient from(Ingredient ingredient, int amount) {
         Objects.requireNonNull(ingredient, "ItemStackIngredients cannot be created from a null ingredient.");
         if (ingredient == Ingredient.EMPTY) {
             //Instance check for empty ingredient, because we could just be empty currently during datagen and want to allow it
-            throw new IllegalArgumentException("ItemStackIngredients cannot be created using the empty ingredient.");
+            //throw new IllegalArgumentException("ItemStackIngredients cannot be created using the empty ingredient.");
+            return new SingleItemStackIngredient(Ingredient.of(BARRIER), amount);
         } else if (amount <= 0) {
             throw new IllegalArgumentException("ItemStackIngredients must have an amount of at least one. Received size was: " + amount);
         }
@@ -165,7 +167,7 @@ public boolean hasNoMatchingInstances() {
                 return true;
             } else if (items.length == 1) {
                 ItemStack item = items[0];
-                return item.getItem() == Items.BARRIER && item.getHoverName().getContents() instanceof LiteralContents contents && contents.text().startsWith("Empty Tag: ");
+                return item.getItem() == BARRIER && item.getHoverName().getContents() instanceof LiteralContents contents && contents.text().startsWith("Empty Tag: ");
             }
             return false;
         }
diff --git a/src/main/java/igentuman/nc/recipes/type/NcRecipe.java b/src/main/java/igentuman/nc/recipes/type/NcRecipe.java
@@ -86,15 +86,15 @@ protected FluidStackIngredient getEmptyFluid()
     public void write(FriendlyByteBuf buffer) {
         buffer.writeInt(inputItems.length);
         for (ItemStackIngredient input : inputItems) {
-            if(input == null) {
+            if(input == null || input.getRepresentations().isEmpty()) {
                 input = getBarrier();
             }
             input.write(buffer);
         }
 
         buffer.writeInt(outputItems.length);
         for (ItemStackIngredient output : outputItems) {
-            if(output == null) {
+            if(output == null || output.getRepresentations().isEmpty()) {
                 output = getBarrier();
             }
             output.write(buffer);
diff --git a/src/main/java/igentuman/nc/setup/registration/Tags.java b/src/main/java/igentuman/nc/setup/registration/Tags.java
@@ -70,6 +70,7 @@ public static void addChunkTag(String name) {
 
     public static TagKey<Item> forgeIngot(String name)
     {
+
         return TagKey.create(ITEM_REGISTRY, new ResourceLocation("forge:ingots/"+name));
     }
 
diff --git a/src/main/resources/assets/nuclearcraft/models/block/multiblock/black_hole.json b/src/main/resources/assets/nuclearcraft/models/block/multiblock/black_hole.json
@@ -0,0 +1,7 @@
+{
+	"parent": "block/cube_all",
+	"textures": {
+		"all": "nuclearcraft:block/dummy"
+	},
+	"render_type": "minecraft:cutout"
+}
diff --git a/src/main/resources/assets/nuclearcraft/textures/block/turbine/aluminum_coil.png b/src/main/resources/assets/nuclearcraft/textures/block/turbine/aluminum_coil.png

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +{
 +  "variants": {
 +    "": {
 +      "model": "nuclearcraft:block/multiblock/turbine_aluminum_coil"
 +    }
 +  }
 +}
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"parent": "minecraft:block/cube_all",`
`3`	`3`	`"textures": {`
`4`		`- "all": "nuclearcraft:block/turbine/aluminium_coil"`
	`4`	`+ "all": "nuclearcraft:block/turbine/aluminum_coil"`
`5`	`5`	`}`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "parent": "nuclearcraft:block/multiblock/black_hole"`
	`3`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,12 @@`
`6`	`6`	`"entries": [`
`7`	`7`	`{`
`8`	`8`	`"type": "minecraft:item",`
`9`		`- "name": "nuclearcraft:turbine_aluminium_coil"`
	`9`	`+ "name": "nuclearcraft:black_hole"`
`10`	`10`	`}`
`11`	`11`	`],`
`12`	`12`	`"name": "block",`
`13`	`13`	`"rolls": 1.0`
`14`	`14`	`}`
`15`	`15`	`],`
`16`		`- "random_sequence": "nuclearcraft:blocks/turbine_aluminium_coil"`
	`16`	`+ "random_sequence": "nuclearcraft:blocks/black_hole"`
`17`	`17`	`}`