ore generation

gradle.properties

@@ -4,10 +4,10 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_version=1.21.9
+minecraft_version=1.21.11
-yarn_mappings=1.21.9+build.1
+yarn_mappings=1.21.11+build.4
-loader_version=0.17.2
+loader_version=0.18.4
-loom_version=1.11-SNAPSHOT
+loom_version=1.15-SNAPSHOT
 
 # Mod Properties
 mod_version=1.0.0
@@ -15,4 +15,4 @@ maven_group=de.jottyfan.minecraft
 archives_base_name=gtamfmd
 
 # Dependencies
-fabric_version=0.133.14+1.21.9
+fabric_version=0.141.2+1.21.11

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/de/jottyfan/minecraft/Gtamfmd.java

@@ -7,6 +7,7 @@ import org.slf4j.LoggerFactory;
 
 import de.jottyfan.minecraft.block.ModBlocks;
 import de.jottyfan.minecraft.item.ModItems;
+import de.jottyfan.minecraft.world.gen.ModOreGeneration;
 
 public class Gtamfmd implements ModInitializer {
 	public static final String MOD_ID = "gtamfmd";
@@ -16,6 +17,7 @@ public class Gtamfmd implements ModInitializer {
 	public void onInitialize() {
 		ModItems.registerModItems();
 		ModBlocks.registerModBlocks();
+		ModOreGeneration.generateOres();
 	}
 }
 

src/main/java/de/jottyfan/minecraft/GtamfmdClient.java

@@ -1,9 +1,13 @@
 package de.jottyfan.minecraft;
 
+import de.jottyfan.minecraft.block.ModBlocks;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.rendering.v1.BlockRenderLayerMap;
+import net.minecraft.client.render.BlockRenderLayer;
 
 public class GtamfmdClient implements ClientModInitializer {
 	@Override
 	public void onInitializeClient() {
+		BlockRenderLayerMap.putBlock(ModBlocks.CHRISTMASTREE, BlockRenderLayer.CUTOUT);
 	}
 }

src/main/java/de/jottyfan/minecraft/block/ChristmasTree.java

@@ -0,0 +1,49 @@
+package de.jottyfan.minecraft.block;
+
+import de.jottyfan.minecraft.item.ModItems;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.SweetBerryBushBlock;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.state.StateManager.Builder;
+import net.minecraft.state.property.BooleanProperty;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.WorldView;
+import net.minecraft.world.event.GameEvent;
+
+public class ChristmasTree extends SweetBerryBushBlock {
+	public static final BooleanProperty ACTIVATED = BooleanProperty.of("activated");
+
+	public ChristmasTree(Settings settings) {
+		super(settings.ticksRandomly().noCollision().luminance(state -> state.get(ACTIVATED) ? 15 : 0));
+		setDefaultState(getDefaultState().with(ACTIVATED, false));
+	}
+
+	@Override
+	protected void appendProperties(Builder<Block, BlockState> builder) {
+		builder.add(ACTIVATED);
+		super.appendProperties(builder);
+	}
+
+	@Override
+	protected ItemStack getPickStack(WorldView world, BlockPos pos, BlockState state, boolean includeData) {
+		return new ItemStack(ModItems.GINGERBREAD);
+	}
+
+	@Override
+	protected ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEntity player, BlockHitResult hit) {
+		if (state.get(AGE) > 1 && state.get(ACTIVATED)) {
+			dropStack(world, pos, new ItemStack(ModItems.GINGERBREAD));
+			BlockState blockState = state.with(AGE, 0).cycle(ACTIVATED);
+			world.setBlockState(pos, blockState, Block.NOTIFY_LISTENERS);
+			world.emitGameEvent(GameEvent.BLOCK_CHANGE, pos, GameEvent.Emitter.of(player, blockState));
+		} else if (state.get(AGE) <= 1) {
+			world.setBlockState(pos, state.cycle(ACTIVATED));
+		}
+		return ActionResult.SUCCESS;
+	}
+}

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

@@ -1,8 +1,11 @@
 package de.jottyfan.minecraft.block;
 
+import java.util.function.Function;
+
 import de.jottyfan.minecraft.Gtamfmd;
 import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.block.AbstractBlock;
+import net.minecraft.block.AbstractBlock.Settings;
 import net.minecraft.block.Block;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.Item;
@@ -11,30 +14,40 @@ import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
-import net.minecraft.sound.BlockSoundGroup;
 import net.minecraft.util.Identifier;
 
 public class ModBlocks {
 
-  public static final Block RUBY_BLOCK = registerBlock(Identifier.of(Gtamfmd.MOD_ID, "ruby_block"),
+	public static final Block RUBY_BLOCK = registerBlock(Identifier.of(Gtamfmd.MOD_ID, "ruby_block"), x -> new Block(x));
-      AbstractBlock.Settings.create().strength(4f).requiresTool().sounds(BlockSoundGroup.AMETHYST_BLOCK));
+	public static final Block RUBY_ORE = registerBlock(Identifier.of(Gtamfmd.MOD_ID, "ruby_ore"),
+			x -> new Block(x.strength(4).requiresTool()));
+	public static final Block RUBY_DEEPSLATE_ORE = registerBlock(Identifier.of(Gtamfmd.MOD_ID, "ruby_deepslate_ore"),
+			x -> new Block(x.strength(4).requiresTool()));
+	public static final Block CHRISTMASTREE = registerBlock(Identifier.of(Gtamfmd.MOD_ID, "christmastree"),
+			x -> new ChristmasTree(x));
 
-  private static Block registerBlock(Identifier identifier, Block.Settings settings) {
+	private static Block registerBlock(Identifier identifier, Function<Settings, Block> function) {
-    Block block = new Block(settings.registryKey(RegistryKey.of(RegistryKeys.BLOCK, identifier)));
+		return registerBlock(identifier, AbstractBlock.Settings.create(), function);
-    registerBlockItem(identifier, block, new Item.Settings());
+	}
-    return Registry.register(Registries.BLOCK, identifier, block);
-  }
 
-  private static void registerBlockItem(Identifier identifier, Block block, Item.Settings settings) {
+	// functional interface
-    Registry.register(Registries.ITEM, identifier, new BlockItem(block,
+	private static Block registerBlock(Identifier identifier, Settings settings, Function<Settings, Block> function) {
-        settings.useItemPrefixedTranslationKey().registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier))));
+		Block block = function.apply(settings.registryKey(RegistryKey.of(RegistryKeys.BLOCK, identifier)));
-  }
+		registerBlockItem(identifier, block, new Item.Settings());
+		return Registry.register(Registries.BLOCK, identifier, block);
+	}
 
-  public static void registerModBlocks() {
+	private static void registerBlockItem(Identifier identifier, Block block, Item.Settings settings) {
-    Gtamfmd.LOGGER.info("Registering Mod Blocks for {}", Gtamfmd.MOD_ID);
+		Registry.register(Registries.ITEM, identifier, new BlockItem(block,
-    ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS)
+				settings.useItemPrefixedTranslationKey().registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier))));
-      .register(entries -> {
+	}
-        entries.add(RUBY_BLOCK);
+
-      });
+	public static void registerModBlocks() {
-  }
+		Gtamfmd.LOGGER.info("Registering Mod Blocks for {}", Gtamfmd.MOD_ID);
+		ItemGroupEvents.modifyEntriesEvent(ItemGroups.BUILDING_BLOCKS).register(entries -> {
+			entries.add(RUBY_BLOCK);
+			entries.add(RUBY_ORE);
+			entries.add(RUBY_DEEPSLATE_ORE);
+		});
+	}
 }

src/main/java/de/jottyfan/minecraft/item/Food.java

@@ -0,0 +1,20 @@
+package de.jottyfan.minecraft.item;
+
+import net.minecraft.component.type.FoodComponent;
+
+public enum Food {
+	GINGERBREAD(new FoodComponent.Builder()
+			.nutrition(1).saturationModifier(0.1f)
+			.build());
+
+	private final FoodComponent component;
+
+	private Food(FoodComponent component) {
+		this.component = component;
+	}
+
+	public FoodComponent get() {
+		return component;
+	}
+}
+

src/main/java/de/jottyfan/minecraft/item/ModArmorMaterial.java

@@ -0,0 +1,30 @@
+package de.jottyfan.minecraft.item;
+
+import java.util.EnumMap;
+
+import de.jottyfan.minecraft.Gtamfmd;
+import net.minecraft.item.equipment.ArmorMaterial;
+import net.minecraft.item.equipment.EquipmentAsset;
+import net.minecraft.item.equipment.EquipmentType;
+import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.Util;
+
+public class ModArmorMaterial {
+	public static RegistryKey<? extends Registry<EquipmentAsset>> REGISTRY_KEY = RegistryKey
+			.ofRegistry(Identifier.ofVanilla("equipment_asset"));
+
+	public static final RegistryKey<EquipmentAsset> RUBY_KEY = RegistryKey.of(REGISTRY_KEY,
+			Identifier.of(Gtamfmd.MOD_ID, "ruby"));
+
+	public static final ArmorMaterial RUBY_ARMOR_MATERIAL = new ArmorMaterial(500,
+			Util.make(new EnumMap<>(EquipmentType.class), map -> {
+				map.put(EquipmentType.BOOTS, 3);
+				map.put(EquipmentType.LEGGINGS,4);
+				map.put(EquipmentType.CHESTPLATE, 10);
+				map.put(EquipmentType.HELMET, 3);
+				map.put(EquipmentType.BODY, 5);
+			}), 20, SoundEvents.ITEM_ARMOR_EQUIP_DIAMOND, 0, 0, null, RUBY_KEY);
+}

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

@@ -5,6 +5,7 @@ import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.Settings;
 import net.minecraft.item.ItemGroups;
+import net.minecraft.item.equipment.EquipmentType;
 import net.minecraft.registry.Registries;
 import net.minecraft.registry.Registry;
 import net.minecraft.registry.RegistryKey;
@@ -13,10 +14,27 @@ import net.minecraft.util.Identifier;
 
 public class ModItems {
 
-	public static final Item STUB = registerItem(
+	public static final Item STUB = registerStubItem(Identifier.of(Gtamfmd.MOD_ID, "stub"), new Item.Settings());
-		Identifier.of(Gtamfmd.MOD_ID, "stub"), new Item.Settings());
+
-	public static final Item RUBY = registerItem(
+	public static final Item RUBY = registerItem(Identifier.of(Gtamfmd.MOD_ID, "ruby"), new Item.Settings());
-			Identifier.of(Gtamfmd.MOD_ID, "ruby"), new Item.Settings());
+	public static final Item GINGERBREAD = registerItem(Identifier.of(Gtamfmd.MOD_ID, "gingerbread"),
+			new Item.Settings().food(Food.GINGERBREAD.get()));
+
+	public static final Item RUBY_BOOTS = registerArmorItem("ruby_boots", EquipmentType.BOOTS);
+	public static final Item RUBY_HELMET = registerArmorItem("ruby_helmet", EquipmentType.HELMET);
+	public static final Item RUBY_CHESTPLATE = registerArmorItem("ruby_chestplate", EquipmentType.CHESTPLATE);
+	public static final Item RUBY_LEGGINGS = registerArmorItem("ruby_leggings", EquipmentType.LEGGINGS);
+
+	private static Item registerArmorItem(String name, EquipmentType type) {
+		Identifier identifier = Identifier.of(Gtamfmd.MOD_ID, name);
+		Item.Settings settings = new Item.Settings().maxCount(1).armor(ModArmorMaterial.RUBY_ARMOR_MATERIAL, type);
+		return registerItem(identifier, settings);
+	}
+
+	private static Item registerStubItem(Identifier identifier, Settings settings) {
+		return Registry.register(Registries.ITEM, identifier, new StubItem(
+				settings.useItemPrefixedTranslationKey().registryKey(RegistryKey.of(RegistryKeys.ITEM, identifier))));
+	}
 
 	private static Item registerItem(Identifier identifier, Settings settings) {
 		RegistryKey<Item> registrykey = RegistryKey.of(RegistryKeys.ITEM, identifier);
@@ -27,10 +45,14 @@ public class ModItems {
 	public static void registerModItems() {
 		Gtamfmd.LOGGER.info("registering mod items for " + Gtamfmd.MOD_ID);
 
-		ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS)
+		ItemGroupEvents.modifyEntriesEvent(ItemGroups.TOOLS).register(entries -> {
-		  .register(entries -> {
+			entries.add(STUB);
-		  	entries.add(STUB);
+			entries.add(RUBY);
-		  	entries.add(RUBY);
+			entries.add(GINGERBREAD);
-		  });
+			entries.add(RUBY_HELMET);
+			entries.add(RUBY_CHESTPLATE);
+			entries.add(RUBY_LEGGINGS);
+			entries.add(RUBY_BOOTS);
+		});
 	}
 }

src/main/java/de/jottyfan/minecraft/item/StubItem.java

@@ -0,0 +1,65 @@
+package de.jottyfan.minecraft.item;
+
+import java.util.Map;
+
+import org.joml.Random;
+
+import de.jottyfan.minecraft.block.ModBlocks;
+import net.minecraft.block.Block;
+import net.minecraft.block.Blocks;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemUsageContext;
+import net.minecraft.item.Items;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public class StubItem extends Item {
+
+	private static final Map<Block, Item> SLASH_MAP = Map.of(
+			Blocks.HAY_BLOCK, Items.WHEAT,
+			Blocks.DRIED_KELP_BLOCK, Items.DRIED_KELP);
+
+	public StubItem(Settings settings) {
+		super(settings);
+	}
+
+	@Override
+	public ActionResult useOnBlock(ItemUsageContext context) {
+		World world = context.getWorld();
+		BlockPos pos = context.getBlockPos();
+		Block clickedBlock = world.getBlockState(pos).getBlock();
+		if (SLASH_MAP.containsKey(clickedBlock)) {
+			if (!world.isClient()) {
+				world.setBlockState(pos, Blocks.AIR.getDefaultState());
+				world.playSound(null, pos, SoundEvents.ITEM_HOE_TILL,
+						SoundCategory.BLOCKS);
+				for (int i = 0; i < 9; i++) {
+					ItemStack stack = new ItemStack(SLASH_MAP.get(clickedBlock));
+					float scatter = new Random().nextFloat();
+					ItemEntity entity = new ItemEntity(world, pos.getX(),
+							pos.getY(), pos.getZ(),	stack, scatter, scatter, 0.2);
+					world.spawnEntity(entity);
+				}
+			}
+		} else if (Blocks.DIRT.equals(clickedBlock) && world.getBlockState(pos.up()).isAir()) {
+			if (!world.isClient()) {
+				world.setBlockState(pos.up(), ModBlocks.CHRISTMASTREE.getDefaultState());
+				world.playSound(null, pos, SoundEvents.ITEM_CROP_PLANT,
+						SoundCategory.BLOCKS);
+				Hand hand = context.getHand();
+				PlayerEntity player = context.getPlayer();
+				ItemStack stack = player.getStackInHand(hand);
+				stack.increment(-1);
+				player.setStackInHand(hand, stack);
+			}
+		}
+		return ActionResult.SUCCESS;
+	}
+}

src/main/java/de/jottyfan/minecraft/world/ModConfiguredFeatures.java

@@ -0,0 +1,21 @@
+package de.jottyfan.minecraft.world;
+
+import de.jottyfan.minecraft.Gtamfmd;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.util.Identifier;
+import net.minecraft.world.gen.feature.ConfiguredFeature;
+
+/**
+ *
+ * @author jotty
+ *
+ */
+public class ModConfiguredFeatures {
+	public static final RegistryKey<ConfiguredFeature<?, ?>> RUBY_ORE_CF = registerKey("ruby_ore_cf");
+
+	private static RegistryKey<ConfiguredFeature<?, ?>> registerKey(String name) {
+		return RegistryKey.of(RegistryKeys.CONFIGURED_FEATURE, Identifier.of(Gtamfmd.MOD_ID, name));
+	}
+
+}

src/main/java/de/jottyfan/minecraft/world/ModPlacedFeatures.java

@@ -0,0 +1,20 @@
+package de.jottyfan.minecraft.world;
+
+import de.jottyfan.minecraft.Gtamfmd;
+import net.minecraft.registry.RegistryKey;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.util.Identifier;
+import net.minecraft.world.gen.feature.PlacedFeature;
+
+/**
+ *
+ * @author jotty
+ *
+ */
+public class ModPlacedFeatures {
+	public static final RegistryKey<PlacedFeature> RUBY_ORE_PF = registerKey("ruby_ore_pf");
+
+	private static RegistryKey<PlacedFeature> registerKey(String name) {
+		return RegistryKey.of(RegistryKeys.PLACED_FEATURE, Identifier.of(Gtamfmd.MOD_ID, name));
+	}
+}

src/main/java/de/jottyfan/minecraft/world/gen/ModOreGeneration.java

@@ -0,0 +1,14 @@
+package de.jottyfan.minecraft.world.gen;
+
+import de.jottyfan.minecraft.world.ModPlacedFeatures;
+import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
+import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
+import net.minecraft.world.gen.GenerationStep;
+
+public class ModOreGeneration {
+	public static void generateOres() {
+		BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(),
+				GenerationStep.Feature.UNDERGROUND_ORES,
+				ModPlacedFeatures.RUBY_ORE_PF);
+	}
+}

src/main/resources/assets/gtamfmd/blockstates/christmastree.json

@@ -0,0 +1,9 @@
+{
+  "variants": {
+    "age=0": { "model": "gtamfmd:block/christmastree0" },
+    "age=1": { "model": "gtamfmd:block/christmastree1" },
+    "age=2": { "model": "gtamfmd:block/christmastree2" },
+    "age=3": { "model": "gtamfmd:block/christmastree3" }
+  }
+}
+

src/main/resources/assets/gtamfmd/blockstates/ruby_deepslate_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "gtamfmd:block/ruby_deepslate_ore"
+    }
+  }
+}

src/main/resources/assets/gtamfmd/blockstates/ruby_ore.json

@@ -0,0 +1,8 @@
+{
+	"variants": {
+		"": {
+			"model": "gtamfmd:block/ruby_ore"
+		}
+	}
+}
+

src/main/resources/assets/gtamfmd/equipment/ruby.json

@@ -0,0 +1,14 @@
+{
+  "layers": {
+    "humanoid": [
+      {
+        "texture": "gtamfmd:ruby"
+      }
+    ],
+    "humanoid_leggings": [
+      {
+        "texture": "gtamfmd:ruby"
+      }
+    ]
+  }
+}

src/main/resources/assets/gtamfmd/items/gingerbread.json

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

src/main/resources/assets/gtamfmd/items/ruby_boots.json

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

src/main/resources/assets/gtamfmd/items/ruby_chestplate.json

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

src/main/resources/assets/gtamfmd/items/ruby_deepslate_ore.json

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

src/main/resources/assets/gtamfmd/items/ruby_helmet.json

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

src/main/resources/assets/gtamfmd/items/ruby_leggings.json

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

src/main/resources/assets/gtamfmd/items/ruby_ore.json

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

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

@@ -1,5 +1,13 @@
 {
+  "item.gtamfmd.gingerbread": "Lebkuchen",
 	"item.gtamfmd.stub": "Stummel",
 	"item.gtamfmd.ruby": "Rubin",
-  "item.gtamfmd.ruby_block": "Rubinblock"
+  "item.gtamfmd.ruby_block": "Rubinblock",
+  "item.gtamfmd.ruby_ore": "Rubinerz",
+  "item.gtamfmd.christmastree": "Weihnachtsbaum",
+  "item.gtamfmd.ruby_helmet": "Rubinhelm",
+  "item.gtamfmd.ruby_chestplate": "Rubinbrustpanzer",
+  "item.gtamfmd.ruby_leggings": "Rubinhose",
+  "item.gtamfmd.ruby_boots": "Rubinschuhe",
+  "item.gtamfmd.ruby_deepslate_ore": "Rubinerzklumpen"
 }

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

@@ -1,5 +1,13 @@
 {
+  "item.gtamfmd.gingerbread": "Gingerbread",
 	"item.gtamfmd.stub": "Stub",
 	"item.gtamfmd.ruby": "Ruby",
-  "item.gtamfmd.ruby_block": "Ruby block"
+  "item.gtamfmd.ruby_block": "Ruby block",
+  "item.gtamfmd.ruby_ore": "Ruby ore",
+  "item.gtamfmd.christmastree": "Christmas tree",
+  "item.gtamfmd.ruby_helmet": "ruby helmet",
+  "item.gtamfmd.ruby_chestplate": "ruby chestplate",
+  "item.gtamfmd.ruby_leggings": "ruby leggings",
+  "item.gtamfmd.ruby_boots": "ruby boots",
+  "item.gtamfmd.ruby_deepslate_ore": "ruby deepslate ore"
 }

src/main/resources/assets/gtamfmd/models/block/christmastree0.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "gtamfmd:block/christmastree0"
+  }
+}

src/main/resources/assets/gtamfmd/models/block/christmastree1.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "gtamfmd:block/christmastree1"
+  }
+}

src/main/resources/assets/gtamfmd/models/block/christmastree2.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "gtamfmd:block/christmastree2"
+  }
+}

src/main/resources/assets/gtamfmd/models/block/christmastree3.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cross",
+  "textures": {
+    "cross": "gtamfmd:block/christmastree3"
+  }
+}

src/main/resources/assets/gtamfmd/models/block/ruby_deepslate_ore.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "gtamfmd:block/ruby_deepslate_ore"
+  }
+}

src/main/resources/assets/gtamfmd/models/block/ruby_ore.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:block/cube_all",
+  "textures": {
+    "all": "gtamfmd:block/ruby_ore"
+  }
+}

src/main/resources/assets/gtamfmd/models/item/gingerbread.json

@@ -0,0 +1,6 @@
+{
+	"parent": "minecraft:item/generated",
+	"textures": {
+		"layer0": "gtamfmd:item/gingerbread"
+	}
+}

src/main/resources/assets/gtamfmd/models/item/ruby_boots.json

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

src/main/resources/assets/gtamfmd/models/item/ruby_chestplate.json

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

src/main/resources/assets/gtamfmd/models/item/ruby_deepslate_ore.json

@@ -0,0 +1,3 @@
+{
+  "parent": "gtamfmd:block/ruby_deepslate_ore"
+}

src/main/resources/assets/gtamfmd/models/item/ruby_helmet.json

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

src/main/resources/assets/gtamfmd/models/item/ruby_leggings.json

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

src/main/resources/assets/gtamfmd/models/item/ruby_ore.json

@@ -0,0 +1,3 @@
+{
+  "parent": "gtamfmd:block/ruby_ore"
+}

src/main/resources/data/gtamfmd/loot_table/blocks/ruby_block.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "gtamfmd:ruby"
+        }
+      ],
+      "rolls": 9.0
+    }
+  ]
+}

src/main/resources/data/gtamfmd/loot_table/blocks/ruby_deepslate_ore.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "gtamfmd:ruby_ore"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/resources/data/gtamfmd/loot_table/blocks/ruby_ore.json

@@ -0,0 +1,20 @@
+{
+  "type": "minecraft:block",
+  "pools": [
+    {
+      "bonus_rolls": 0.0,
+      "conditions": [
+        {
+          "condition": "minecraft:survives_explosion"
+        }
+      ],
+      "entries": [
+        {
+          "type": "minecraft:item",
+          "name": "gtamfmd:ruby"
+        }
+      ],
+      "rolls": 1.0
+    }
+  ]
+}

src/main/resources/data/gtamfmd/recipe/blasting_ruby_from_rubyore.json

@@ -0,0 +1,9 @@
+{
+  "type": "minecraft:blasting",
+  "ingredient": "gtamfmd:ruby_ore",
+  "result": {
+    "id": "gtamfmd:ruby"
+  },
+  "experience": 0.1,
+  "cookingtime": 200
+}

src/main/resources/data/gtamfmd/recipe/campfire_torch_from_stub.json

@@ -0,0 +1,9 @@
+{
+	"type": "minecraft:campfire_cooking",
+	"ingredient": "gtamfmd:stub",
+	"result": {
+	  "id": "minecraft:torch"
+	},
+	"experience": 0.1,
+	"cookingtime": 20
+}

src/main/resources/data/gtamfmd/recipe/shaped_gingerbread_from_wheat.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "# #",
+    "###",
+    " # "
+  ],
+  "key": {
+    "#": "minecraft:wheat"
+  },
+  "result": {
+    "id": "gtamfmd:gingerbread",
+    "count": 1
+  }
+}

src/main/resources/data/gtamfmd/recipe/shaped_ruby_boots.json

@@ -0,0 +1,14 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"t t",
+		"t t"
+	],
+	"key": {
+		"t": "gtamfmd:ruby"
+	},
+	"result": {
+		"id": "gtamfmd:ruby_boots",
+		"count": 1
+	}
+}

src/main/resources/data/gtamfmd/recipe/shaped_ruby_chestplate.json

@@ -0,0 +1,16 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"t t",
+		"ttt",
+		"ttt"
+	],
+	"key": {
+		"t": "gtamfmd:ruby"
+	},
+	"result": {
+		"id": "gtamfmd:ruby_chestplate",
+		"count": 1
+	}
+}
+

src/main/resources/data/gtamfmd/recipe/shaped_ruby_helmet.json

@@ -0,0 +1,14 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"ttt",
+		"t t"
+	],
+	"key": {
+		"t": "gtamfmd:ruby"
+	},
+	"result": {
+		"id": "gtamfmd:ruby_helmet",
+		"count": 1
+	}
+}

src/main/resources/data/gtamfmd/recipe/shaped_ruby_leggings.json

@@ -0,0 +1,15 @@
+{
+	"type": "minecraft:crafting_shaped",
+	"pattern": [
+		"ttt",
+		"t t",
+		"t t"
+	],
+	"key": {
+		"t": "gtamfmd:ruby"
+	},
+	"result": {
+		"id": "gtamfmd:ruby_leggings",
+		"count": 1
+	}
+}

src/main/resources/data/gtamfmd/recipe/shaped_rubyblock_from_ruby.json

@@ -0,0 +1,15 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "###",
+    "###",
+    "###"
+  ],
+  "key": {
+    "#": "gtamfmd:ruby"
+  },
+  "result": {
+    "id": "gtamfmd:ruby_block",
+    "count": 1
+  }
+}

src/main/resources/data/gtamfmd/recipe/shapeless_ruby_from_rubyblock.json

@@ -0,0 +1,10 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    "gtamfmd:ruby_block"
+  ],
+  "result": {
+    "id": "gtamfmd:ruby",
+    "count": 9
+  }
+}

src/main/resources/data/gtamfmd/recipe/shapeless_stub_from_stick.json

@@ -0,0 +1,10 @@
+{
+  "type": "minecraft:crafting_shapeless",
+  "ingredients": [
+    "minecraft:stick"
+  ],
+  "result": {
+    "id": "gtamfmd:stub",
+    "count": 4
+  }
+}

src/main/resources/data/gtamfmd/worldgen/configured_feature/ruby_ore_cf.json

@@ -0,0 +1,21 @@
+{ "type": "minecraft:ore",
+  "config": {
+    "discard_chance_on_air_exposure": 0.0,
+    "size": 20,
+    "targets": [
+      {
+        "state": { "Name": "gtamfmd:ruby_ore" },
+        "target": {
+          "predicate_type": "minecraft:tag_match",
+          "tag": "minecraft:stone_ore_replaceables"
+        }
+      }, {
+        "state": { "Name": "gtamfmd:ruby_deepslate_ore" },
+        "target": {
+          "predicate_type": "minecraft:tag_match",
+          "tag": "minecraft:deepslate_ore_replaceables"
+        }
+      }
+    ]
+  }
+}

src/main/resources/data/gtamfmd/worldgen/placed_feature/ruby_ore_pf.json

@@ -0,0 +1,27 @@
+{
+  "feature": "gtamfmd:ruby_ore_cf",
+  "placement": [
+    {
+      "type": "minecraft:count",
+      "count": 16
+    },
+    {
+    	"type": "minecraft:in_square"
+    },
+    {
+      "type": "minecraft:height_range",
+      "height": {
+        "type": "minecraft:trapezoid",
+        "max_inclusive": {
+          "absolute": 80
+        },
+        "min_inclusive": {
+          "absolute": -80
+        }
+      }
+    },
+    {
+      "type": "minecraft:biome"
+    }
+  ]
+}

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

@@ -0,0 +1,8 @@
+{
+  "replace": false,
+  "values": [
+    "gtamfmd:ruby_block",
+    "gtamfmd:ruby_ore",
+    "gtamfmd:ruby_deepslate_ore"
+  ]
+}

src/main/resources/data/minecraft/tags/block/need_iron_tool.json

@@ -0,0 +1,8 @@
+{
+  "replace": false,
+  "values": [
+    "gtamfmd:ruby_block",
+    "gtamfmd:ruby_ore",
+    "gtamfmd:ruby_deepslate_ore"
+  ]
+}

src/main/resources/fabric.mod.json

@@ -26,8 +26,8 @@
 		"gtamfmd.mixins.json"
 	],
 	"depends": {
-		"fabricloader": ">=0.17.2",
+		"fabricloader": ">=0.18.4",
-		"minecraft": "~1.21.9",
+		"minecraft": "~1.21.11",
 		"java": ">=21",
 		"fabric-api": "*"
 	},