diff --git a/gradle.properties b/gradle.properties index 16fc5ec..a6aacab 100644 --- a/gradle.properties +++ b/gradle.properties @@ -12,9 +12,9 @@ loader_version=0.18.4 loom_version=1.15-SNAPSHOT # Mod Properties -mod_version=1.0.0 +mod_version=2.0.0 maven_group=xyz.nearmisses.patience.mc_rebalance archives_base_name=mc_rebalance # Dependencies -fabric_api_version=0.116.8+1.21.1 \ No newline at end of file +fabric_api_version=0.116.8+1.21.1 diff --git a/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModItems.java b/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModItems.java index 462afd1..0f97b28 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModItems.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModItems.java @@ -9,20 +9,22 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.ArmorItem; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; +import net.minecraft.world.item.Items; public class ModItems { public static void init(){ // Add items to creative tabs - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.accept(ModItems.Paxel_Wood)); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.accept(ModItems.Paxel_Copper)); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.accept(ModItems.Paxel_Iron)); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.accept(ModItems.Paxel_Gold)); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.accept(ModItems.Paxel_Diamond)); - ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.accept(ModItems.Paxel_Dendrite)); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.WOODEN_HOE, ModItems.Paxel_Wood)); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.STONE_HOE, ModItems.Paxel_Copper)); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.IRON_HOE, ModItems.Paxel_Iron)); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.GOLDEN_HOE, ModItems.Paxel_Gold)); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.DIAMOND_HOE, ModItems.Paxel_Diamond)); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.TOOLS_AND_UTILITIES).register((itemGroup) -> itemGroup.addAfter(Items.NETHERITE_HOE, ModItems.Paxel_Dendrite)); ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COMBAT).register((itemGroup) -> itemGroup.accept(ModItems.Armour_Copper_Helm)); ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COMBAT).register((itemGroup) -> itemGroup.accept(ModItems.Armour_Copper_Chest)); ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COMBAT).register((itemGroup) -> itemGroup.accept(ModItems.Armour_Copper_Legs)); ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.COMBAT).register((itemGroup) -> itemGroup.accept(ModItems.Armour_Copper_Boots)); + ItemGroupEvents.modifyEntriesEvent(CreativeModeTabs.INGREDIENTS).register((itemGroup) -> itemGroup.addAfter(Items.COPPER_INGOT, ModItems.Copper_Nugget)); } public static Item register(String id, Item.Properties item) { @@ -46,4 +48,5 @@ public class ModItems { public static final Item Armour_Copper_Chest = register("copper_chestplate", new ArmorItem(ModArmourMats.Copper, ArmorItem.Type.CHESTPLATE, new Item.Properties().durability(ArmorItem.Type.CHESTPLATE.getDurability(10))) ); public static final Item Armour_Copper_Legs = register("copper_leggings", new ArmorItem(ModArmourMats.Copper, ArmorItem.Type.LEGGINGS, new Item.Properties().durability(ArmorItem.Type.LEGGINGS.getDurability(10))) ); public static final Item Armour_Copper_Boots = register("copper_boots", new ArmorItem(ModArmourMats.Copper, ArmorItem.Type.BOOTS, new Item.Properties().durability(ArmorItem.Type.BOOTS.getDurability(10))) ); + public static final Item Copper_Nugget = register("copper_nugget", new Item.Properties()); } \ No newline at end of file diff --git a/src/main/resources/assets/mc_rebalance/lang/en_us.json b/src/main/resources/assets/mc_rebalance/lang/en_us.json index dbcc9a5..4f4c098 100644 --- a/src/main/resources/assets/mc_rebalance/lang/en_us.json +++ b/src/main/resources/assets/mc_rebalance/lang/en_us.json @@ -6,5 +6,12 @@ "advancements.end.thanks_sarge.title":"Proof of Thanks", "advancements.end.thanks_sarge.description":"Earn a developer item for your hard work", "advancements.nether.thanks_emerald.title":"Thank You and Farewell", - "advancements.nether.thanks_emerald.description":"Kill the Wither and earn a developer item" + "advancements.nether.thanks_emerald.description":"Kill the Wither and earn a developer item", + "item.mc_rebalance.wooden_paxel": "Wooden Paxel", + "item.mc_rebalance.stone_paxel": "Copper Paxel", + "item.mc_rebalance.iron_paxel": "Iron Paxel", + "item.mc_rebalance.golden_paxel": "Golden Paxel", + "item.mc_rebalance.diamond_paxel": "Diamond Paxel", + "item.mc_rebalance.netherite_paxel": "Dendrite Paxel", + "item.mc_rebalance.copper_nugget": "Copper Nugget" } diff --git a/src/main/resources/assets/mc_rebalance/models/item/copper_nugget.json b/src/main/resources/assets/mc_rebalance/models/item/copper_nugget.json new file mode 100644 index 0000000..81996ba --- /dev/null +++ b/src/main/resources/assets/mc_rebalance/models/item/copper_nugget.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "mc_rebalance:item/copper_nugget" + } +} diff --git a/src/main/resources/assets/mc_rebalance/models/item/diamond_paxel.json b/src/main/resources/assets/mc_rebalance/models/item/diamond_paxel.json new file mode 100644 index 0000000..b6d85a7 --- /dev/null +++ b/src/main/resources/assets/mc_rebalance/models/item/diamond_paxel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "mc_rebalance:item/diamond_paxel" + } +} diff --git a/src/main/resources/assets/mc_rebalance/models/item/golden_paxel.json b/src/main/resources/assets/mc_rebalance/models/item/golden_paxel.json new file mode 100644 index 0000000..6962671 --- /dev/null +++ b/src/main/resources/assets/mc_rebalance/models/item/golden_paxel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "mc_rebalance:item/golden_paxel" + } +} diff --git a/src/main/resources/assets/mc_rebalance/models/item/iron_paxel.json b/src/main/resources/assets/mc_rebalance/models/item/iron_paxel.json new file mode 100644 index 0000000..bdf716f --- /dev/null +++ b/src/main/resources/assets/mc_rebalance/models/item/iron_paxel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "mc_rebalance:item/iron_paxel" + } +} diff --git a/src/main/resources/assets/mc_rebalance/models/item/netherite_paxel.json b/src/main/resources/assets/mc_rebalance/models/item/netherite_paxel.json new file mode 100644 index 0000000..143b521 --- /dev/null +++ b/src/main/resources/assets/mc_rebalance/models/item/netherite_paxel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "mc_rebalance:item/netherite_paxel" + } +} diff --git a/src/main/resources/assets/mc_rebalance/models/item/stone_paxel.json b/src/main/resources/assets/mc_rebalance/models/item/stone_paxel.json new file mode 100644 index 0000000..95e6535 --- /dev/null +++ b/src/main/resources/assets/mc_rebalance/models/item/stone_paxel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "mc_rebalance:item/stone_paxel" + } +} diff --git a/src/main/resources/assets/mc_rebalance/models/item/wooden_paxel.json b/src/main/resources/assets/mc_rebalance/models/item/wooden_paxel.json new file mode 100644 index 0000000..325557b --- /dev/null +++ b/src/main/resources/assets/mc_rebalance/models/item/wooden_paxel.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/handheld", + "textures": { + "layer0": "mc_rebalance:item/wooden_paxel" + } +} diff --git a/src/main/resources/assets/mc_rebalance/textures/item/copper_nugget.png b/src/main/resources/assets/mc_rebalance/textures/item/copper_nugget.png new file mode 100644 index 0000000..a23070c Binary files /dev/null and b/src/main/resources/assets/mc_rebalance/textures/item/copper_nugget.png differ diff --git a/src/main/resources/assets/mc_rebalance/textures/item/diamond_paxel.png b/src/main/resources/assets/mc_rebalance/textures/item/diamond_paxel.png new file mode 100644 index 0000000..4eb92bc Binary files /dev/null and b/src/main/resources/assets/mc_rebalance/textures/item/diamond_paxel.png differ diff --git a/src/main/resources/assets/mc_rebalance/textures/item/golden_paxel.png b/src/main/resources/assets/mc_rebalance/textures/item/golden_paxel.png new file mode 100644 index 0000000..c5374a0 Binary files /dev/null and b/src/main/resources/assets/mc_rebalance/textures/item/golden_paxel.png differ diff --git a/src/main/resources/assets/mc_rebalance/textures/item/iron_paxel.png b/src/main/resources/assets/mc_rebalance/textures/item/iron_paxel.png new file mode 100644 index 0000000..4f50f21 Binary files /dev/null and b/src/main/resources/assets/mc_rebalance/textures/item/iron_paxel.png differ diff --git a/src/main/resources/assets/mc_rebalance/textures/item/netherite_paxel.png b/src/main/resources/assets/mc_rebalance/textures/item/netherite_paxel.png new file mode 100644 index 0000000..4268f73 Binary files /dev/null and b/src/main/resources/assets/mc_rebalance/textures/item/netherite_paxel.png differ diff --git a/src/main/resources/assets/mc_rebalance/textures/item/stone_paxel.png b/src/main/resources/assets/mc_rebalance/textures/item/stone_paxel.png new file mode 100644 index 0000000..dca2829 Binary files /dev/null and b/src/main/resources/assets/mc_rebalance/textures/item/stone_paxel.png differ diff --git a/src/main/resources/assets/mc_rebalance/textures/item/wooden_paxel.png b/src/main/resources/assets/mc_rebalance/textures/item/wooden_paxel.png new file mode 100644 index 0000000..9e8c6fc Binary files /dev/null and b/src/main/resources/assets/mc_rebalance/textures/item/wooden_paxel.png differ