Merge remote-tracking branch 'origin/1.21' into 1.21

# Conflicts:
#	src/main/java/xyz/nearmisses/patience/mc_rebalance/ModItems.java

gradle.properties

@@ -12,7 +12,7 @@ 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
 

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());
 }

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"
 }

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}

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"
+  }
+}