Merge pull request 'Item schwertwerfer hinzugefuegt' (#4) from Moritz into main

Reviewed-on: #4

.gitignore

@@ -41,10 +41,6 @@ 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/ModItems.java

@@ -14,23 +14,23 @@ import net.minecraft.world.item.Item.Properties;
 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 Item SCHWERTWERFER = registerItem("schwertwerfer");
 
 	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);
+		registeredItems.add(SCHWERTWERFER);
 		return registeredItems;
 	}
 }

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

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

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

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

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

@@ -3,9 +3,9 @@
   "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",
-  "tab.mfmd2627": "Mfmd2627"
+  "tab.mfmd2627": "Mfmd2627",
+  "item.mfmd2627.schwertwerfer": "Schwertwerfer"
 }

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

@@ -3,9 +3,9 @@
   "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",
-  "tab.mfmd2627": "Mfmd2627"
+  "tab.mfmd2627": "Mfmd2627",
+  "item.mfmd2627.schwertwerfer": "Sword Thrower"
 }

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

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

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

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