Compare commits

..

No commits in common. 'e9c074f037596b96afc0630de73c5cc1c6ff3349' and '3d12817b9ac9c899113cae62f345071a18c0e95c' have entirely different histories.

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

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

@ -2,8 +2,6 @@ package net.herobane.learning.item;
import net.herobane.learning.Learning; import net.herobane.learning.Learning;
import net.minecraft.world.item.Item; 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.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister; import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries; 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> RUBY = ITEMS.register("ruby", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> SAPPHIRE = ITEMS.register("sapphire", () -> 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) { public static void register(IEventBus eventBus) {
ITEMS.register(eventBus); ITEMS.register(eventBus);
} }

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

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

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

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 808 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 816 B

Loading…
Cancel
Save