ingots

gradle.properties

@@ -9,7 +9,7 @@
 	loader_version=0.15.1
 
 # Mod Properties
-	mod_version = 1.20.4.2
+	mod_version = 1.20.4.3
 	maven_group = de.jottyfan.minecraft
 	archives_base_name = quickiefabric
 

src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java

@@ -1,7 +1,5 @@
 package de.jottyfan.minecraft.quickiefabric.init;
 
-import java.util.List;
-
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -24,8 +22,6 @@ import de.jottyfan.minecraft.quickiefabric.event.EventBlockBreak;
 import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
 import de.jottyfan.minecraft.quickiefabric.loot.LootHelper;
 import de.jottyfan.minecraft.quickiefabric.tools.QuickieTools;
-import de.jottyfan.minecraft.quickiefabric.world.gen.feature.SulforpadFeature;
-import de.jottyfan.minecraft.quickiefabric.world.gen.feature.SulforpadFeatureConfig;
 import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
 import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
 import net.fabricmc.fabric.api.biome.v1.ModificationPhase;
@@ -44,22 +40,15 @@ import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
-import net.minecraft.registry.BuiltinRegistries;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.registry.entry.RegistryEntry;
 import net.minecraft.registry.tag.TagKey;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.text.Text;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Identifier;
-import net.minecraft.world.gen.GenerationStep;
-import net.minecraft.world.gen.feature.ConfiguredFeature;
-import net.minecraft.world.gen.feature.Feature;
-import net.minecraft.world.gen.feature.PlacedFeature;
-import net.minecraft.world.gen.placementmodifier.SquarePlacementModifier;
 
 /**
  *
@@ -89,6 +78,8 @@ public class RegistryManager {
 							stacks.add(new ItemStack(QuickieItems.SULPHOR));
 							stacks.add(new ItemStack(QuickieItems.SPEEDPOWDER));
 							stacks.add(new ItemStack(QuickieItems.QUICKIEPOWDER));
+							stacks.add(new ItemStack(QuickieItems.SPEEDINGOT));
+							stacks.add(new ItemStack(QuickieItems.QUICKIEINGOT));
 							stacks.add(new ItemStack(QuickieItems.LEVELUP));
 							stacks.add(new ItemStack(QuickieItems.PENCIL));
 							stacks.add(new ItemStack(QuickieItems.ROTTEN_FLESH_STRIPES));
@@ -113,6 +104,7 @@ public class RegistryManager {
 							stacks.add(new ItemStack(QuickieItems.BACKPACK_LIGHTBLUE));
 							stacks.add(new ItemStack(QuickieItems.BAG));
 							stacks.add(new ItemStack(QuickieItems.STUB));
+							stacks.add(new ItemStack(QuickieItems.OXIDIZEDCOPPERPOWDER));
 							stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERAXE));
 							stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERPICKAXE));
 							stacks.add(new ItemStack(QuickieTools.SPEEDPOWDERSHOVEL));
@@ -267,6 +259,9 @@ public class RegistryManager {
 		registerItem(QuickieItems.BACKPACK_LIGHTBLUE, "backpack_lightblue");
 		registerItem(QuickieItems.BAG, "bag");
 		registerItem(QuickieItems.STUB, "stub");
+		registerItem(QuickieItems.OXIDIZEDCOPPERPOWDER, "oxidizedcopperpowder");
+		registerItem(QuickieItems.SPEEDINGOT, "speedingot");
+		registerItem(QuickieItems.QUICKIEINGOT, "quickieingot");
 
 		ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(QuickieItems.COTTONSEED, 0.5f);
 		ComposterBlock.ITEM_TO_LEVEL_INCREASE_CHANCE.put(QuickieItems.COTTON, 0.75f);

src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemOxidizedcopperpowder.java

@@ -0,0 +1,16 @@
+package de.jottyfan.minecraft.quickiefabric.items;
+
+import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
+import net.minecraft.item.Item;
+
+/**
+ *
+ * @author jotty
+ *
+ */
+public class ItemOxidizedcopperpowder extends Item {
+
+	public ItemOxidizedcopperpowder() {
+		super(new FabricItemSettings().maxCount(64));
+	}
+}

src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemQuickieingot.java

@@ -0,0 +1,16 @@
+package de.jottyfan.minecraft.quickiefabric.items;
+
+import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
+import net.minecraft.item.Item;
+
+/**
+ *
+ * @author jotty
+ *
+ */
+public class ItemQuickieingot extends Item {
+
+	public ItemQuickieingot() {
+		super(new FabricItemSettings());
+	}
+}

src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemSpeedingot.java

@@ -0,0 +1,16 @@
+package de.jottyfan.minecraft.quickiefabric.items;
+
+import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
+import net.minecraft.item.Item;
+
+/**
+ *
+ * @author jotty
+ *
+ */
+public class ItemSpeedingot extends Item {
+
+	public ItemSpeedingot() {
+		super(new FabricItemSettings());
+	}
+}

src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java

@@ -34,4 +34,7 @@ public class QuickieItems {
 	public static final ItemCotton COTTON = new ItemCotton();
 	public static final ItemCottonseed COTTONSEED = new ItemCottonseed();
 	public static final ItemStub STUB = new ItemStub();
+	public static final ItemOxidizedcopperpowder OXIDIZEDCOPPERPOWDER = new ItemOxidizedcopperpowder();
+	public static final ItemSpeedingot SPEEDINGOT = new ItemSpeedingot();
+	public static final ItemQuickieingot QUICKIEINGOT = new ItemQuickieingot();
 }

src/main/resources/assets/quickiefabric/lang/de_de.json

@@ -41,6 +41,9 @@
 	"item.quickiefabric.cotton": "Baumwolle",
 	"item.quickiefabric.cottonseed": "Baumwollsaat",
   "item.quickiefabric.stub": "Stummel",
+  "item.quickiefabric.oxidizedcopperpowder": "oxidiertes Kupferpulver",
+  "item.quickiefabric.speedingot": "Fluchtpulverbarren",
+  "item.quickiefabric.quickieingot": "Eilpulverbarren",
 	"block.quickiefabric.orenethersulphor": "Nether-Schwefel",
 	"block.quickiefabric.oresalpeter": "Salpetererz",
 	"block.quickiefabric.oresandsalpeter": "Salpetergestein",

src/main/resources/assets/quickiefabric/lang/en_us.json

@@ -41,6 +41,9 @@
 	"item.quickiefabric.cotton": "cotton",
 	"item.quickiefabric.cottonseed": "cotton seed",
   "item.quickiefabric.stub": "stub",
+  "item.quickiefabric.oxidizedcopperpowder": "oxidized copper powder",
+  "item.quickiefabric.speedingot": "Speedpowderingot",
+  "item.quickiefabric.quickieingot": "Hurrypowderingot",
 	"block.quickiefabric.orenethersulphor": "nether sulfur",
 	"block.quickiefabric.oresalpeter": "salpeter ore",
 	"block.quickiefabric.oresandsalpeter": "salpeter stone",

src/main/resources/assets/quickiefabric/models/item/oxidizedcopperpowder.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/coal",
+    "textures": {
+        "layer0": "quickiefabric:item/oxidizedcopperpowder"
+    }
+}

src/main/resources/assets/quickiefabric/models/item/quickieingot.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/coal",
+    "textures": {
+        "layer0": "quickiefabric:item/quickieingot"
+    }
+}

src/main/resources/assets/quickiefabric/models/item/speedingot.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/coal",
+    "textures": {
+        "layer0": "quickiefabric:item/speedingot"
+    }
+}

src/main/resources/data/quickiefabric/loot_tables/blocks/chestaddition.json

@@ -0,0 +1,38 @@
+{
+  "type": "minecraft:chest",
+  "pools": [
+    {
+      "rolls": 2,
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "quickiefabric:quickiepowder"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "quickiefabric:speedpowder"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "quickiefabric:sulphor"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "quickiefabric:salpeter"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "quickiefabric:rotten_flesh_stripes"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "quickiefabric:quickieingot"
+        },
+        {
+          "type": "minecraft:item",
+          "name": "quickiefabric:speedingot"
+        }
+      ]
+    }
+  ]
+}

src/main/resources/data/quickiefabric/loot_tables/blocks/speedpowder.json

@@ -1,48 +0,0 @@
-{
-  "type": "minecraft:block",
-  "pools": [
-    {"name": "main",
-      "rolls": 1,
-      "entries": [
-        {
-          "type": "minecraft:alternatives",
-          "children": [
-            {
-              "type": "minecraft:item",
-              "conditions": [
-                {
-                  "condition": "minecraft:match_tool",
-                  "predicate": {
-                    "enchantments": [
-                      {
-                        "enchantment": "minecraft:silk_touch",
-                        "levels": {
-                          "min": 1
-                        }
-                      }
-                    ]
-                  }
-                }
-              ],
-              "name": "quickiefabric:speedpowder"
-            },
-            {
-              "type": "minecraft:item",
-              "functions": [
-                {
-                  "function": "minecraft:apply_bonus",
-                  "enchantment": "minecraft:fortune",
-                  "formula": "minecraft:ore_drops"
-                },
-                {
-                  "function": "minecraft:explosion_decay"
-                }
-              ],
-              "name": "quickiefabric:speedpowder"
-            }
-          ]
-        }
-      ]
-    }
-  ]
-}

src/main/resources/data/quickiefabric/recipes/oxidized_copper_powder1.json

@@ -0,0 +1,9 @@
+{
+    "type": "minecraft:blasting",
+    "ingredient": {
+        "item": "minecraft:oxidized_copper"
+    },
+    "result": "quickiefabric:oxidizedcopperpowder",
+    "experience": 0.1,
+    "cookingtime": 200
+}

src/main/resources/data/quickiefabric/recipes/oxidized_copper_powder2.json

@@ -0,0 +1,9 @@
+{
+    "type": "minecraft:blasting",
+    "ingredient": {
+        "item": "minecraft:oxidized_cut_copper"
+    },
+    "result": "quickiefabric:oxidizedcopperpowder",
+    "experience": 0.1,
+    "cookingtime": 200
+}

src/main/resources/data/quickiefabric/recipes/oxidized_copper_powder3.json

@@ -0,0 +1,9 @@
+{
+    "type": "minecraft:blasting",
+    "ingredient": {
+        "item": "minecraft:oxidized_cut_copper_stairs"
+    },
+    "result": "quickiefabric:oxidizedcopperpowder",
+    "experience": 0.1,
+    "cookingtime": 200
+}

src/main/resources/data/quickiefabric/recipes/oxidized_copper_powder4.json

@@ -0,0 +1,9 @@
+{
+    "type": "minecraft:blasting",
+    "ingredient": {
+        "item": "minecraft:oxidized_cut_copper_slab"
+    },
+    "result": "quickiefabric:oxidizedcopperpowder",
+    "experience": 0.1,
+    "cookingtime": 200
+}

src/main/resources/data/quickiefabric/recipes/quickieingot.json

@@ -0,0 +1,9 @@
+{
+    "type": "minecraft:blasting",
+    "ingredient": {
+        "item": "quickiefabric:quickiepowder"
+    },
+    "result": "quickiefabric:quickieingot",
+    "experience": 0.1,
+    "cookingtime": 200
+}

src/main/resources/data/quickiefabric/recipes/quickiepowder_from_oxidizedcopperpowder.json

@@ -0,0 +1,15 @@
+{
+	"type": "minecraft:crafting_shapeless",
+	"ingredients": [
+		{
+			"item": "quickiefabric:speedpowder"
+		},
+		{
+			"item": "quickiefabric:oxidizedcopperpowder"
+		}
+	],
+	"result": {
+		"item": "quickiefabric:quickiepowder",
+		"count": 1
+	}
+}

src/main/resources/data/quickiefabric/recipes/quickiepowder_from_slimeball.json

@@ -10,6 +10,6 @@
 	],
 	"result": {
 		"item": "quickiefabric:quickiepowder",
-		"count": 2
+		"count": 1
 	}
 }

src/main/resources/data/quickiefabric/recipes/quickiepowderaxe.json

@@ -7,7 +7,7 @@
 	],
 	"key": {
 		"s": {
-			"item": "quickiefabric:quickiepowder"
+			"item": "quickiefabric:quickieingot"
 		},
 		"|": {
 			"item": "minecraft:stick"

src/main/resources/data/quickiefabric/recipes/quickiepowderhoe.json

@@ -7,7 +7,7 @@
 	],
 	"key": {
 		"s": {
-			"item": "quickiefabric:quickiepowder"
+			"item": "quickiefabric:quickieingot"
 		},
 		"|": {
 			"item": "minecraft:stick"

src/main/resources/data/quickiefabric/recipes/quickiepowderpickaxe.json

@@ -7,7 +7,7 @@
 	],
 	"key": {
 		"s": {
-			"item": "quickiefabric:quickiepowder"
+			"item": "quickiefabric:quickieingot"
 		},
 		"|": {
 			"item": "minecraft:stick"

src/main/resources/data/quickiefabric/recipes/quickiepowdershovel.json

@@ -7,7 +7,7 @@
 	],
 	"key": {
 		"s": {
-			"item": "quickiefabric:quickiepowder"
+			"item": "quickiefabric:quickieingot"
 		},
 		"|": {
 			"item": "minecraft:stick"

src/main/resources/data/quickiefabric/recipes/speedingot.json

@@ -0,0 +1,9 @@
+{
+    "type": "minecraft:blasting",
+    "ingredient": {
+        "item": "quickiefabric:speedpowder"
+    },
+    "result": "quickiefabric:speedingot",
+    "experience": 0.1,
+    "cookingtime": 200
+}

src/main/resources/data/quickiefabric/recipes/speedpowderaxe.json

@@ -7,7 +7,7 @@
 	],
 	"key": {
 		"s": {
-			"item": "quickiefabric:speedpowder"
+			"item": "quickiefabric:speedingot"
 		},
 		"|": {
 			"item": "minecraft:stick"

src/main/resources/data/quickiefabric/recipes/speedpowderhoe.json

@@ -7,7 +7,7 @@
 	],
 	"key": {
 		"s": {
-			"item": "quickiefabric:speedpowder"
+			"item": "quickiefabric:speedingot"
 		},
 		"|": {
 			"item": "minecraft:stick"

src/main/resources/data/quickiefabric/recipes/speedpowderpickaxe.json

@@ -7,7 +7,7 @@
 	],
 	"key": {
 		"s": {
-			"item": "quickiefabric:speedpowder"
+			"item": "quickiefabric:speedingot"
 		},
 		"|": {
 			"item": "minecraft:stick"

src/main/resources/data/quickiefabric/recipes/speedpowdershovel.json

@@ -7,7 +7,7 @@
 	],
 	"key": {
 		"s": {
-			"item": "quickiefabric:speedpowder"
+			"item": "quickiefabric:speedingot"
 		},
 		"|": {
 			"item": "minecraft:stick"