gradle.properties

@@ -37,7 +37,7 @@ mapping_channel=parchment
 # The mapping version to query from the mapping channel.
 # This must match the format required by the mapping channel.
 # mapping_version=1.20.1
-mapping_version=2023.09.03-1.20.1
+mapping_version=2023.06.26-1.20.1
 
 
 ## Mod Properties

src/main/java/net/herobane/learning/Learning.java

@@ -45,11 +45,6 @@ public class Learning {
             event.accept(ModItems.RUBY);
             event.accept(ModItems.SAPPHIRE);
         }
-
-        if(event.getTabKey() == CreativeModeTabs.COMBAT) {
-            event.accept(ModItems.RUBY_SWORD);
-            event.accept(ModItems.SAPPHIRE_SWORD);
-        }
             
     }
 

src/main/java/net/herobane/learning/item/ModItems.java

@@ -2,8 +2,6 @@ package net.herobane.learning.item;
 
 import net.herobane.learning.Learning;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.item.SwordItem;
-import net.minecraft.world.item.Tiers;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
@@ -17,11 +15,6 @@ public class ModItems {
     public static final RegistryObject<Item> RUBY = ITEMS.register("ruby", () -> new Item(new Item.Properties()));
     public static final RegistryObject<Item> SAPPHIRE = ITEMS.register("sapphire", () -> new Item(new Item.Properties()));
 
-    // Tools and weapons
-    public static final RegistryObject<Item> RUBY_SWORD = ITEMS.register("ruby_sword", () -> new SwordItem(Tiers.DIAMOND, 3, -2.4f, new Item.Properties()));
-    public static final RegistryObject<Item> SAPPHIRE_SWORD = ITEMS.register("sapphire_sword", () -> new SwordItem(Tiers.DIAMOND, 3, -2.4f, new Item.Properties()));
-    
-
     public static void register(IEventBus eventBus) {
         ITEMS.register(eventBus);
     }

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

@@ -1,7 +1,4 @@
 {
     "item.learning.ruby": "Ruby",
-    "item.learning.sapphire": "Sapphire",
-
-    "item.learning.ruby_sword": "Ruby Sword",
-    "item.learning.sapphire_sword": "Sapphire Sword"
+    "item.learning.sapphire": "Sapphire"
 }

src/main/resources/assets/learning/lang/fr_fr.json

@@ -1,7 +1,4 @@
 {
     "item.learning.ruby": "Rubis",
-    "item.learning.sapphire": "Saphir",
-
-    "item.learning.ruby_sword": "Epee de Rubis",
-    "item.learning.sapphire_sword": "Epee de Saphir"
+    "item.learning.sapphire": "Saphir"
 }

src/main/resources/assets/learning/models/item/ruby_sword.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "learning:item/ruby_sword"
-    }
-}

src/main/resources/assets/learning/models/item/sapphire_sword.json

@@ -1,6 +0,0 @@
-{
-    "parent": "item/generated",
-    "textures": {
-        "layer0": "learning:item/sapphire_sword"
-    }
-}