Merge branch 'main' into Neuer_Branch_von_Mara

.gitignore

@@ -41,6 +41,7 @@ run/crash-reports
 run/xaero
 run/screenshots
 run/Xaero*
+run/command_history.txt
 
 # java
 

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

@@ -5,10 +5,12 @@ import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import de.jottyfan.minecraft.block.ModBlocks;
 import de.jottyfan.minecraft.item.ModItems;
 import de.jottyfan.minecraft.tab.ModTab;
 import net.fabricmc.api.ModInitializer;
 import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
 
 /**
  *
@@ -24,6 +26,7 @@ public class Mfmd2627 implements ModInitializer {
 	public void onInitialize() {
 		LOGGER.debug("initializing {}", MOD_ID);
 		List<Item> items = ModItems.registerItems();
-		ModTab.registerItemGroup(items);
+		List<Block> blocks = ModBlocks.registerBlocks();
+		ModTab.registerItemGroup(items, blocks);
 	}
 }

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

@@ -0,0 +1,17 @@
+package de.jottyfan.minecraft.block;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.world.level.block.Block;
+
+public class ModBlocks extends ModBlocksRegistrator {
+
+	public static final Block TIN_ORE = registerBlock("tin_ore");
+
+	public static final List<Block> registerBlocks() {
+		List<Block> registeredBlocks = new ArrayList<>();
+		registeredBlocks.add(TIN_ORE);
+		return registeredBlocks;
+	}
+}

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

@@ -0,0 +1,37 @@
+package de.jottyfan.minecraft.block;
+
+import java.util.function.Function;
+
+import de.jottyfan.minecraft.Mfmd2627;
+import net.minecraft.core.Registry;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.resources.Identifier;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockBehaviour;
+import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
+
+public class ModBlocksRegistrator {
+
+	public static final Block registerBlock(String name) {
+		return registerBlock(name, BlockBehaviour.Properties.of(), Block::new);
+	}
+
+	public static final Block registerBlock(String name, Properties properties,
+			Function<Block.Properties, Block> function) {
+		Identifier identifier = Identifier.fromNamespaceAndPath(Mfmd2627.MOD_ID, name);
+		Block block = function.apply(properties.setId(ResourceKey.create(Registries.BLOCK, identifier)));
+		Registry.register(BuiltInRegistries.BLOCK, identifier, block);
+		registerBlockItem(identifier, block, new Item.Properties());
+		return block;
+	}
+
+	private static final void registerBlockItem(Identifier identifier, Block block, Item.Properties properties) {
+		BlockItem blockItem = new BlockItem(block, new Item.Properties()
+				.setId(ResourceKey.create(Registries.ITEM, identifier)).modelId(identifier).useItemDescriptionPrefix());
+		Registry.register(BuiltInRegistries.ITEM, identifier, blockItem);
+	}
+}

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

@@ -11,13 +11,19 @@ import net.minecraft.world.item.Item;
  *
  */
 public class ModItems extends ModItemsRegistrator {
-	public static final Item STUB = registerItem("stub");
+	public static final Item RAW_TIN = registerItem("raw_tin");
 	public static final Item RUBY = registerItem("ruby");
+	public static final Item CHILI = registerItem("chili");
+	public static final Item STUB = registerItem("stub");
+	public static final Item TIN_INGOT = registerItem("tin_ingot");
 
 	public static final List<Item> registerItems() {
 		List<Item> registeredItems = new ArrayList<>();
 		registeredItems.add(STUB);
 		registeredItems.add(RUBY);
+		registeredItems.add(CHILI);
+		registeredItems.add(RAW_TIN);
+		registeredItems.add(TIN_INGOT);
 		return registeredItems;
 	}
 }

src/main/java/de/jottyfan/minecraft/tab/ModTab.java

@@ -14,6 +14,7 @@ import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.block.Block;
 
 /**
  *
@@ -27,7 +28,7 @@ public class ModTab {
 	 *
 	 * @param items the items
 	 */
-	public static final void registerItemGroup(List<Item> items) {
+	public static final void registerItemGroup(List<Item> items, List<Block> blocks) {
 		ResourceKey<CreativeModeTab> tabKey = ResourceKey.create(Registries.CREATIVE_MODE_TAB,
 				Identifier.fromNamespaceAndPath(Mfmd2627.MOD_ID, "itemgroup"));
 
@@ -36,6 +37,9 @@ public class ModTab {
 					for (Item item : items) {
 						output.accept(item);
 					}
+					for (Block block : blocks) {
+						output.accept(block.asItem());
+					}
 				}).build();
 
 		Registry.register(BuiltInRegistries.CREATIVE_MODE_TAB, tabKey, quicklyTab);

src/main/resources/assets/mfmd2627/blockstates/tin_ore.json

@@ -0,0 +1,7 @@
+{
+  "variants": {
+    "": {
+      "model": "mfmd2627:block/tin_ore"
+    }
+  }
+}

src/main/resources/assets/mfmd2627/items/chili.json

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

src/main/resources/assets/mfmd2627/items/raw_tin.json

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

src/main/resources/assets/mfmd2627/items/tin_ingot.json

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

src/main/resources/assets/mfmd2627/items/tin_ore.json

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

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

@@ -1,5 +1,8 @@
 {
   "item.mfmd2627.stub": "Stummel",
+  "item.mfmd2627.raw_tin": "Zinn",
   "item.mfmd2627.ruby": "Rubin",
+  "item.mfmd2627.tin_ingot": "Zinnbarren",
+  "item.mfmd2627.tin_ore": "Zinnerz",
   "tab.mfmd2627": "Mfmd2627"
 }

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

@@ -1,5 +1,8 @@
 {
   "item.mfmd2627.stub": "Stub",
+  "item.mfmd2627.raw_tin": "Tin",
   "item.mfmd2627.ruby": "Ruby",
+  "item.mfmd2627.tin_ingot": "Tin Ingot",
+  "item.mfmd2627.tin_ore": "Tin Ore",
   "tab.mfmd2627": "Mfmd2627"
 }

src/main/resources/assets/mfmd2627/models/block/tin_ore.json

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

src/main/resources/assets/mfmd2627/models/item/chili.json

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

src/main/resources/assets/mfmd2627/models/item/raw_tin.json

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

src/main/resources/assets/mfmd2627/models/item/tin_ingot.json

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

src/main/resources/assets/mfmd2627/models/item/tin_ore.json

@@ -0,0 +1,3 @@
+{
+  "parent": "minecraft:block/tin_ore"
+}