added turquoise

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings=1.21.7+build.2
 loader_version=0.16.14
 
 # Mod Properties
-mod_version=1.21.7.1
+mod_version=1.21.7.2
 maven_group=de.jottyfan.quickiemod
 archives_base_name=quickiemod
 

src/main/java/de/jottyfan/quickiemod/block/BlockOreDeepslateTurquoise.java

@@ -0,0 +1,33 @@
+package de.jottyfan.quickiemod.block;
+
+import java.util.Arrays;
+import java.util.List;
+
+import de.jottyfan.quickiemod.block.help.IntProviderHelper;
+import de.jottyfan.quickiemod.item.ModItems;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.ExperienceDroppingBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.loot.context.LootWorldContext.Builder;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.util.Identifier;
+
+/**
+ *
+ * @author jotty
+ *
+ */
+public class BlockOreDeepslateTurquoise extends ExperienceDroppingBlock {
+
+	public BlockOreDeepslateTurquoise(Identifier identifier) {
+		super(IntProviderHelper.of(0, 2), Settings.create().strength(3.0f).hardness(3.5f).sounds(BlockSoundGroup.AMETHYST_BLOCK)
+				.requiresTool().registryKey(RegistryKey.of(RegistryKeys.BLOCK, identifier)));
+	}
+
+	@Override
+	public List<ItemStack> getDroppedStacks(BlockState state, Builder builder) {
+		return Arrays.asList(new ItemStack[] { new ItemStack(ModItems.ITEM_RAWTURQUOISE, 2) });
+	}
+}

src/main/java/de/jottyfan/quickiemod/block/BlockOreTurquoise.java

@@ -0,0 +1,33 @@
+package de.jottyfan.quickiemod.block;
+
+import java.util.Arrays;
+import java.util.List;
+
+import de.jottyfan.quickiemod.block.help.IntProviderHelper;
+import de.jottyfan.quickiemod.item.ModItems;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.ExperienceDroppingBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.loot.context.LootWorldContext.Builder;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.util.Identifier;
+
+/**
+ *
+ * @author jotty
+ *
+ */
+public class BlockOreTurquoise extends ExperienceDroppingBlock {
+
+	public BlockOreTurquoise(Identifier identifier) {
+		super(IntProviderHelper.of(0, 2), Settings.create().strength(3.0f).hardness(3.5f).sounds(BlockSoundGroup.AMETHYST_BLOCK)
+				.requiresTool().registryKey(RegistryKey.of(RegistryKeys.BLOCK, identifier)));
+	}
+
+	@Override
+	public List<ItemStack> getDroppedStacks(BlockState state, Builder builder) {
+		return Arrays.asList(new ItemStack[] { new ItemStack(ModItems.ITEM_RAWTURQUOISE) });
+	}
+}

src/main/java/de/jottyfan/quickiemod/block/ModBlocks.java

@@ -59,6 +59,10 @@ public class ModBlocks {
 			new BlockOreDeepslateSpeedpowder(ModIdentifiers.BLOCK_OREDEEPSLATESPEEDPOWDER));
 	public static final Block BLOCK_SANDSALPETER = registerBlock(ModIdentifiers.BLOCK_SANDSALPETER,
 			new BlockSandSalpeter(ModIdentifiers.BLOCK_SANDSALPETER));
+	public static final Block BLOCK_ORETURQUOISE = registerBlock(ModIdentifiers.BLOCK_ORETURQUOISE,
+			new BlockOreTurquoise(ModIdentifiers.BLOCK_ORETURQUOISE));
+	public static final Block BLOCK_OREDEEPSLATETURQUOISE = registerBlock(ModIdentifiers.BLOCK_OREDEEPSLATETURQUOISE,
+			new BlockOreDeepslateTurquoise(ModIdentifiers.BLOCK_OREDEEPSLATETURQUOISE));
 	public static final Block BLOCK_KELPSTACK = registerBlock(ModIdentifiers.BLOCK_KELPSTACK,
 			new BlockSlippery(ModIdentifiers.BLOCK_KELPSTACK, 0.1f, 1.0f, BlockSoundGroup.WET_GRASS));
 	public static final Block BLOCK_COTTONPLANT = registerBlock(ModIdentifiers.BLOCK_COTTONPLANT,
@@ -121,6 +125,8 @@ public class ModBlocks {
 		blocks.add(BLOCK_ORESPEEDPOWDER);
 		blocks.add(BLOCK_OREDEEPSLATESPEEDPOWDER);
 		blocks.add(BLOCK_SANDSALPETER);
+		blocks.add(BLOCK_ORETURQUOISE);
+		blocks.add(BLOCK_OREDEEPSLATETURQUOISE);
 		blocks.add(BLOCK_KELPSTACK);
 		blocks.add(BLOCK_DRILL_DOWN);
 		blocks.add(BLOCK_DRILL_EAST);

src/main/java/de/jottyfan/quickiemod/feature/ModFeatures.java

@@ -27,6 +27,7 @@ public class ModFeatures {
 	public static final RegistryKey<ConfiguredFeature<?, ?>> CF_SANDSALPETER = genCf("sandsalpeter");
 	public static final RegistryKey<ConfiguredFeature<?, ?>> CF_ORESANDSALPETER = genCf("oresandsalpeter");
 	public static final RegistryKey<ConfiguredFeature<?, ?>> CF_ORESPEEDPOWDER = genCf("orespeedpowder");
+	public static final RegistryKey<ConfiguredFeature<?, ?>> CF_ORETURQUOISE = genCf("oreturquoise");
 
 	public static final RegistryKey<PlacedFeature> PF_ORESULPHOR = genPf("oresulphor");
 	public static final RegistryKey<PlacedFeature> PF_OREDEEPSLATESULPHOR = genPf("oredeepslatesulphor");
@@ -37,6 +38,7 @@ public class ModFeatures {
 	public static final RegistryKey<PlacedFeature> PF_SANDSALPETER = genPf("sandsalpeter");
 	public static final RegistryKey<PlacedFeature> PF_ORESANDSALPETER = genPf("oresandsalpeter");
 	public static final RegistryKey<PlacedFeature> PF_ORESPEEDPOWDER = genPf("orespeedpowder");
+	public static final RegistryKey<PlacedFeature> PF_ORETURQUOISE = genPf("oreturquoise");
 
 	private static final RegistryKey<ConfiguredFeature<?, ?>> genCf(String name) {
 		return RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, Identifier.of(Quickiemod.MOD_ID, name));
@@ -57,6 +59,7 @@ public class ModFeatures {
 					bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORESANDSALPETER);
 					bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_OREDEEPSLATESULPHOR);
 					bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORESPEEDPOWDER);
+					bmc.getGenerationSettings().addFeature(GenerationStep.Feature.UNDERGROUND_ORES, PF_ORETURQUOISE);
 				});
 
 		// Nether features

src/main/java/de/jottyfan/quickiemod/identifier/ModIdentifiers.java

@@ -31,6 +31,8 @@ public class ModIdentifiers {
 	public static final Identifier ITEM_COPPERPOWDER = Identifier.of(Quickiemod.MOD_ID, "copperpowder");
 	public static final Identifier ITEM_COPPERSTUB = Identifier.of(Quickiemod.MOD_ID, "copperstub");
 	public static final Identifier ITEM_COPPERSTICK = Identifier.of(Quickiemod.MOD_ID, "copperstick");
+	public static final Identifier ITEM_RAWTURQUOISE = Identifier.of(Quickiemod.MOD_ID, "rawturquoise");
+	public static final Identifier ITEM_TURQUOISEINGOT = Identifier.of(Quickiemod.MOD_ID, "turquoiseingot");
 
 	public static final Identifier TOOL_SPEEDPOWDERAXE = Identifier.of(Quickiemod.MOD_ID, "speedpowderaxe");
 	public static final Identifier TOOL_SPEEDPOWDERHOE = Identifier.of(Quickiemod.MOD_ID, "speedpowderhoe");
@@ -61,6 +63,8 @@ public class ModIdentifiers {
 	public static final Identifier BLOCK_ORESULFOR = Identifier.of(Quickiemod.MOD_ID, "oresulphor");
 	public static final Identifier BLOCK_ORESPEEDPOWDER = Identifier.of(Quickiemod.MOD_ID, "orespeedpowder");
 	public static final Identifier BLOCK_OREDEEPSLATESPEEDPOWDER = Identifier.of(Quickiemod.MOD_ID, "oredeepslatespeedpowder");
+	public static final Identifier BLOCK_ORETURQUOISE = Identifier.of(Quickiemod.MOD_ID, "oreturquoise");
+	public static final Identifier BLOCK_OREDEEPSLATETURQUOISE = Identifier.of(Quickiemod.MOD_ID, "oredeepslateturquoise");
 	public static final Identifier BLOCK_SANDSALPETER = Identifier.of(Quickiemod.MOD_ID, "sandsalpeter");
 	public static final Identifier BLOCK_KELPSTACK = Identifier.of(Quickiemod.MOD_ID, "kelpstack");
 	public static final Identifier BLOCK_COTTONPLANT = Identifier.of(Quickiemod.MOD_ID, "blockcottonplant");

src/main/java/de/jottyfan/quickiemod/item/ModItems.java

@@ -60,6 +60,10 @@ public class ModItems {
 			new Item64Stack(ModIdentifiers.ITEM_COPPERSTUB));
 	public static final Item ITEM_COPPERSTICK = registerItem(ModIdentifiers.ITEM_COPPERSTICK,
 			new Item64Stack(ModIdentifiers.ITEM_COPPERSTICK));
+	public static final Item ITEM_RAWTURQUOISE = registerItem(ModIdentifiers.ITEM_RAWTURQUOISE,
+			new Item64Stack(ModIdentifiers.ITEM_RAWTURQUOISE));
+	public static final Item ITEM_TURQUOISEINGOT = registerItem(ModIdentifiers.ITEM_TURQUOISEINGOT,
+			new Item64Stack(ModIdentifiers.ITEM_TURQUOISEINGOT));
 
 	public static final Item TOOL_SPEEDPOWDERAXE = registerItem(ModIdentifiers.TOOL_SPEEDPOWDERAXE,
 			new ToolSpeedpowderAxe(ModIdentifiers.TOOL_SPEEDPOWDERAXE));
@@ -114,6 +118,8 @@ public class ModItems {
 		items.add(ITEM_COPPERSTRING);
 		items.add(ITEM_COPPERSTICK);
 		items.add(ITEM_COPPERSTUB);
+		items.add(ITEM_RAWTURQUOISE);
+		items.add(ITEM_TURQUOISEINGOT);
 
 		items.add(TOOL_SPEEDPOWDERPICKAXE);
 		items.add(TOOL_SPEEDPOWDERAXE);

src/main/resources/assets/quickiemod/blockstates/oredeepslateturquoise.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "quickiemod:block/oredeepslateturquoise"
+		}
+	}
+}

src/main/resources/assets/quickiemod/blockstates/oreturquoise.json

@@ -0,0 +1,7 @@
+{
+	"variants": {
+		"": {
+			"model": "quickiemod:block/oreturquoise"
+		}
+	}
+}

src/main/resources/assets/quickiemod/items/oredeepslateturquoise.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/oredeepslateturquoise"
+	}
+}

src/main/resources/assets/quickiemod/items/oreturquoise.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:block/oreturquoise"
+	}
+}

src/main/resources/assets/quickiemod/items/rawturquoise.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:item/rawturquoise"
+	}
+}

src/main/resources/assets/quickiemod/items/turquoiseingot.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+		"model": "quickiemod:item/turquoiseingot"
+	}
+}

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

@@ -54,6 +54,8 @@
   "item.quickiemod.copperpowder": "Kupferpulver",
   "item.quickiemod.copperstub": "Kupferstummel",
   "item.quickiemod.copperstick": "Kupferstock",
+  "item.quickiemod.rawturquoise": "Türkisroherz",
+  "item.quickiemod.turquoiseingot": "Türkisbarren",
 	"block.quickiemod.orenethersulphor": "Nether-Schwefel",
 	"block.quickiemod.oresalpeter": "Salpetererz",
 	"block.quickiemod.oresandsalpeter": "Salpetergestein",
@@ -63,6 +65,8 @@
 	"block.quickiemod.oredeepslatespeedpowder": "Eilpulvertiefengesteinerz",
 	"block.quickiemod.dirtsalpeter": "Salpetererde",
 	"block.quickiemod.sandsalpeter": "Salpetersand",
+	"block.quickiemod.oreturquoise": "Türkiserz",
+	"block.quickiemod.oredeepslateturquoise": "Türkistiefengesteinerz",
 	"block.quickiemod.constructionborder": "Bauplangrenzblock",
 	"block.quickiemod.rotateclockwise": "im Urzeigersinn Bauplandreher",
 	"block.quickiemod.rotatecounterclockwise": "gegen den Urzeigersinn Bauplandreher",

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

@@ -54,6 +54,8 @@
   "item.quickiemod.copperpowder": "copper powder",
   "item.quickiemod.copperstub": "copper stub",
   "item.quickiemod.copperstick": "copper stick",
+  "item.quickiemod.rawturquoise": "raw turquoise ore",
+  "item.quickiemod.turquoiseingot": "turquoise ingot",
 	"block.quickiemod.orenethersulphor": "nether sulfur",
 	"block.quickiemod.oresalpeter": "salpeter ore",
 	"block.quickiemod.oresandsalpeter": "salpeter stone",
@@ -63,6 +65,8 @@
 	"block.quickiemod.oredeepslatespeedpowder": "deepslate speed powder ore",
 	"block.quickiemod.dirtsalpeter": "salpeter dirt",
 	"block.quickiemod.sandsalpeter": "salpeter sand",
+	"block.quickiemod.oreturquoise": "turquoise ore",
+	"block.quickiemod.oredeepslateturquoise": "turquoise deepslate ore",
 	"block.quickiemod.constructionborder": "building plan border block",
 	"block.quickiemod.rotateclockwise": "rotate clockwise building plan",
 	"block.quickiemod.rotatecounterclockwise": "rotate counterclockwise building plan",

src/main/resources/assets/quickiemod/models/block/oredeepslateturquoise.json

@@ -0,0 +1,6 @@
+{
+		"parent": "block/cube_all",
+		"textures": {
+				"all": "quickiemod:block/oredeepslateturquoise"
+		}
+}

src/main/resources/assets/quickiemod/models/block/oreturquoise.json

@@ -0,0 +1,6 @@
+{
+		"parent": "block/cube_all",
+		"textures": {
+				"all": "quickiemod:block/oreturquoise"
+		}
+}

src/main/resources/assets/quickiemod/models/item/rawturquoise.json

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

src/main/resources/assets/quickiemod/models/item/turquoiseingot.json

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

src/main/resources/data/minecraft/tags/block/mineable/pickaxe.json

@@ -14,6 +14,8 @@
 			"quickiemod:sandsalpeter",
 			"quickiemod:dirtsalpeter",
 			"quickiemod:orespeedpowder",
-			"quickiemod:oredeepslatespeedpowder"
+			"quickiemod:oredeepslatespeedpowder",
+			"quickiemod:oreturquoise",
+			"quickiemod:oredeepslateturquoise"
 		]
 	}

src/main/resources/data/quickiemod/recipe/blasting_turquoiseingot.json

@@ -0,0 +1,7 @@
+{
+    "type": "minecraft:blasting",
+    "ingredient": "quickiemod:rawturquoise",
+    "result": {"id":"quickiemod:turquoiseingot"},
+    "experience": 0.0,
+    "cookingtime": 200
+}

src/main/resources/data/quickiemod/tag/items/ores/oreturquoise.json

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

src/main/resources/data/quickiemod/tags/block/mineable/pickaxe.json

@@ -9,6 +9,8 @@
 			"quickiemod:sandsalpeter",
 			"quickiemod:dirtsalpeter",
 			"quickiemod:orespeedpowder",
-			"quickiemod:oredeepslatespeedpowder"
+			"quickiemod:oredeepslatespeedpowder",
+			"quickiemod:oreturquoise",
+			"quickiemod:oredeepslateturquoise"
 		]
 	}

src/main/resources/data/quickiemod/worldgen/configured_feature/oreturquoise.json

@@ -0,0 +1,27 @@
+{
+  "type": "minecraft:ore",
+  "config": {
+    "discard_chance_on_air_exposure": 0.0,
+    "size": 10,
+    "targets": [
+      {
+        "state": {
+          "Name": "quickiemod:oreturquoise"
+        },
+        "target": {
+          "predicate_type": "minecraft:tag_match",
+          "tag": "minecraft:stone_ore_replaceables"
+        }
+      },
+      {
+        "state": {
+          "Name": "quickiemod:oredeepslateturquoise"
+        },
+        "target": {
+          "predicate_type": "minecraft:tag_match",
+          "tag": "minecraft:deepslate_ore_replaceables"
+        }
+      }
+    ]
+  }
+}

src/main/resources/data/quickiemod/worldgen/placed_feature/oreturquoise.json

@@ -0,0 +1,27 @@
+{
+  "feature": "quickiemod:oreturquoise",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": 16
+    },
+    {
+    	"type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:trapezoid",
+        "max_inclusive": {
+          "absolute": 128
+        },
+        "min_inclusive": {
+          "absolute": -120
+        }
+      }
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}