Merge remote-tracking branch 'origin/main' into Lios_Branch

.gitignore

@@ -41,6 +41,10 @@ run/crash-reports
 run/xaero
 run/screenshots
 run/Xaero*
+<<<<<<< HEAD
+run/serves*
+=======
+>>>>>>> refs/remotes/origin/main
 run/command_history.txt
 
 # java

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

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

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

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.world.item.Item;
+import net.minecraft.world.item.Item.Properties;
 
 /**
  *
@@ -13,19 +14,23 @@ import net.minecraft.world.item.Item;
 public class ModItems extends ModItemsRegistrator {
 	public static final Item RAW_TIN = registerItem("raw_tin");
 	public static final Item RUBY = registerItem("ruby");
+	public static final Item FUTURISTIC_CROSSBOW = registerItem("futuristic_crossbow");
 	public static final Item CHILI = registerItem("chili");
 	public static final Item STUB = registerItem("stub", StubItem::new);
 	public static final Item TIN_INGOT = registerItem("tin_ingot");
 	public static final Item TIN_DUST = registerItem("tin_dust");
+	public static final Item GINGERBREAD = registerItem("gingerbread", new Properties().food(Food.GINGERBREAD.get()));
 
 	public static final List<Item> registerItems() {
 		List<Item> registeredItems = new ArrayList<>();
 		registeredItems.add(STUB);
 		registeredItems.add(RUBY);
+		registeredItems.add(FUTURISTIC_CROSSBOW);
 		registeredItems.add(CHILI);
 		registeredItems.add(RAW_TIN);
 		registeredItems.add(TIN_INGOT);
 		registeredItems.add(TIN_DUST);
+		registeredItems.add(GINGERBREAD);
 		return registeredItems;
 	}
 }

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

@@ -32,7 +32,18 @@ public abstract class ModItemsRegistrator {
 	 * register a new item with the name and its item class
 	 *
 	 * @param name the name
-	 * @param function the item class
+	 * @param properties the properties; create it with <code style="color: gray">new Item.Properties();</code>
+	 * @return the registered item
+	 */
+	public static final Item registerItem(String name, Properties properties) {
+		return registerItem(name, properties, Item::new);
+	}
+
+	/**
+	 * register a new item with the name and its properties
+	 *
+	 * @param name the name
+	 * @param function the function; create it with <code style="color: gray">Item::new</code>
 	 * @return the registered item
 	 */
 	public static final Item registerItem(String name, Function<Item.Properties, Item> function) {
@@ -43,8 +54,8 @@ public abstract class ModItemsRegistrator {
 	 * register a new item with the name, the properties and the Item class reference
 	 *
 	 * @param name the name of the item
-	 * @param the properties; create it with <code style="color: gray">new Item.Properties();</code>
+	 * @param properties the properties; create it with <code style="color: gray">new Item.Properties();</code>
-	 * @param the function; create it with <code style="color: gray">Item::new</code>
+	 * @param function the function; create it with <code style="color: gray">Item::new</code>
 	 * @return the registered item
 	 */
 	public static final Item registerItem(String name, Properties properties, Function<Item.Properties, Item> function) {

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

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

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

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

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

@@ -1,7 +1,9 @@
 {
+  "item.mfmd2627.gingerbread": "Lebkuchen",
   "item.mfmd2627.stub": "Stummel",
   "item.mfmd2627.raw_tin": "Zinn",
   "item.mfmd2627.ruby": "Rubin",
+  "item.mfmd2627.futuristic_crossbow": "futuristische Armbrust",
   "item.mfmd2627.tin_dust": "Zinnpulver",
   "item.mfmd2627.tin_ingot": "Zinnbarren",
   "item.mfmd2627.tin_ore": "Zinnerz",

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

@@ -1,7 +1,9 @@
 {
+  "item.mfmd2627.gingerbread": "Gingerbread",
   "item.mfmd2627.stub": "Stub",
   "item.mfmd2627.raw_tin": "Tin",
   "item.mfmd2627.ruby": "Ruby",
+  "item.mfmd2627.futuristic_crossbow": "Futuristic Crossbow",
   "item.mfmd2627.tin_dust": "Tin Dust",
   "item.mfmd2627.tin_ingot": "Tin Ingot",
   "item.mfmd2627.tin_ore": "Tin Ore",

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

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

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

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

src/main/resources/data/minecraft/tags/item/pig_food.json

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