From 62e1820a8209b17d2946cfb83c7df6a127f14c98 Mon Sep 17 00:00:00 2001 From: Sergeant Acoustic Date: Thu, 29 Jan 2026 22:06:50 +0000 Subject: [PATCH 1/3] Import mod assets from datapack --- .../assets/mc_rebalance/lang/en_us.json | 9 ++++++++- .../mc_rebalance/models/item/copper_nugget.json | 6 ++++++ .../mc_rebalance/models/item/diamond_paxel.json | 6 ++++++ .../mc_rebalance/models/item/golden_paxel.json | 6 ++++++ .../mc_rebalance/models/item/iron_paxel.json | 6 ++++++ .../models/item/netherite_paxel.json | 6 ++++++ .../mc_rebalance/models/item/stone_paxel.json | 6 ++++++ .../mc_rebalance/models/item/wooden_paxel.json | 6 ++++++ .../mc_rebalance/textures/item/copper_nugget.png | Bin 0 -> 138 bytes .../mc_rebalance/textures/item/diamond_paxel.png | Bin 0 -> 360 bytes .../mc_rebalance/textures/item/golden_paxel.png | Bin 0 -> 351 bytes .../mc_rebalance/textures/item/iron_paxel.png | Bin 0 -> 366 bytes .../textures/item/netherite_paxel.png | Bin 0 -> 376 bytes .../mc_rebalance/textures/item/stone_paxel.png | Bin 0 -> 1220 bytes .../mc_rebalance/textures/item/wooden_paxel.png | Bin 0 -> 371 bytes 15 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/mc_rebalance/models/item/copper_nugget.json create mode 100644 src/main/resources/assets/mc_rebalance/models/item/diamond_paxel.json create mode 100644 src/main/resources/assets/mc_rebalance/models/item/golden_paxel.json create mode 100644 src/main/resources/assets/mc_rebalance/models/item/iron_paxel.json create mode 100644 src/main/resources/assets/mc_rebalance/models/item/netherite_paxel.json create mode 100644 src/main/resources/assets/mc_rebalance/models/item/stone_paxel.json create mode 100644 src/main/resources/assets/mc_rebalance/models/item/wooden_paxel.json create mode 100644 src/main/resources/assets/mc_rebalance/textures/item/copper_nugget.png create mode 100644 src/main/resources/assets/mc_rebalance/textures/item/diamond_paxel.png create mode 100644 src/main/resources/assets/mc_rebalance/textures/item/golden_paxel.png create mode 100644 src/main/resources/assets/mc_rebalance/textures/item/iron_paxel.png create mode 100644 src/main/resources/assets/mc_rebalance/textures/item/netherite_paxel.png create mode 100644 src/main/resources/assets/mc_rebalance/textures/item/stone_paxel.png create mode 100644 src/main/resources/assets/mc_rebalance/textures/item/wooden_paxel.png 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 0000000000000000000000000000000000000000..a23070c002761374073d130d265b65afff5045d6 GIT binary patch literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`fu1goAr-fhC0I)siepUwHyhlX zHUD}`qhW{dwrBRnvk$OMSR}dT<@blV3R3TwCgs>kq<*XKo3F^xd~>H-*AYpEkd8%? mC)_XkY*93@nZ?J+%%C#M>)Y#vPjZ2VGkCiCxvXF>uz>m+rWShT!|IH&=SERA- zfI-8=iGn@#w$-f9Hg|9}zI<=~&gjnS%v6hlhq^QPnR^1Hv>yb7GTeTq@k4ZtWD3Xf zHlxFbADOkuZ;Az2jyG?l`}Y|& z<+!n1@G@kw-L$FyExaLZg@KJv0>f%XgR=&+7amGDuuzFV^&x}8*|{%Y{WpEGW8*TL zhy#ZXF&r(aF*|Icz#LF=m{D;yC({JCO{SCiB_tR$Qp?VI@V)K@1_XnrtDnm{r-UW| DD=dn< literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c5374a093f241924f268fa704280700fa4088b9e GIT binary patch literal 351 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en@QbI5V~B-+@&fLRF45oohXV968J2u}|KG^q zSQ>}$lw({DQme#O4ffnLng8(Z@AiN|rU(E3|4-oA{PU?>pv5;6;lJ}As<%Jl;t@A6 zGHUvGuiIXsCR*L#@6VU^ZLC*$c-Zy!uzpT#5cEoB{Z>_zaC?Wvjf1ls+cdH_8(KW6 zOSPzYDIB4H&wxRbDRbKN2PqrQ|2=jv?!77 zK?$RW@rh?YZ_hWlQ}IRgUFeq^2eKG^j5Q8SFl}zwu)t~ zvUDTUgtoi8%Z+8MN;)1sJ3BidFr*=o;ewKZ+ch30{rG(;34co_DjxRdJ1Q!{W?*F0 z^l_?o_<@?j!a{@EudhPey55=cur zsrc|nIzs=RLB+>MtjZpn_pqotSFI6`Fy?94!^u>^`@ux`@B0J|ma=cX?(vd`4d0TYe~CJaj?Q$GKB>wjR@!b2Yn8X4EH9WXhZ)5g`@xNDcylvd^jlk#P&|6iZ* z_}HvZ35?v_%p#XR-sHL5z~gX{m%SxNjl)6eFVdQ I&MBb@0OwALX8-^I literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4268f73f59c4c11d7a44c8c8ccfed690d5502cdf GIT binary patch literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1en1FxrxV~B-+@&fJ;mr8!{9}3XpN@%%c!RWEr zcY^ec+LXI`ZMoO^7raPpx)j0a^Z8`6^#KX#0|f{F{}-5Em2LSie6w-Fj{2`MGx(Wm zfrr>JR#FUWUY|?0QnBmOo3f>FhA-~=)TEtOi zcEVtSqQZIw<~eK)CemEo200eBa_?dU1jIzzHYqTyW>h$<^oe8k!b1rPYD#RW4;d8B zUYmC9eB#SUyih0u&YaGb1WMa~44$rjF6*2UngISBipl^0 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..dca2829ed66af9868d6c12f67adb5c8bca18f751 GIT binary patch literal 1220 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jPK-BC>eK@{Ea{HEjtmSN z`?>!lvI6-E$sR$z3=CCj3=9n|3=F@3LJcn%7)lKo7+xhXFj&oCU=S~uvn$XBD8ZKG z?d}4kf#9d}Zjfo51s;*b3=DjSK$uZf!>a*kgS4lMV~B+yqX5hM-ypTL2k|;G|3R26 zn?M@>%xnTkWwRlxMIhc6j=&5aojTzCuS!w5zg0~_rmBM7#QU5W*)8Dxl+yf{P7`jZU% zp1cR^#pwc&fgnX7&GHhQ3_%+YgEgaDgx3I1GtvJJhC*Ox-+1(u5o9wuz-a(TGsx!o z+n+FiG{ZE)!UV?0Y5+_#D8P_4gEUEsi^23_r$L%K)7AfL$Z?}Y7fdxQU}1c?(?A0F sY=&vTNfWXer$(3r$jP{z4O2rC+W%?lnKi}-FMjv*HQ$qTp*u8aKOKNO(HmC$m@g3)8~ z{$7b0dq1AgZkv4Fe!+{xrb`iwKA$g}+e_Z7|Hmup%4)&uaE*uQe%-%hfk&ySCq7Je z{>bIW9JlX3>$06U6us`%{yMrq#7H8!z`-!SvF%-fJQLD8uuhbOv! ze_F+dN751c_Y4>`nKGwMe~@yc`WtVv!Ub*v@xTB1KXS$~+njazZ!N*qIJfrk#qeXf z>h}z4{(cnK;%2nqWyoZ^X;c4OcthF>17>q}<0-6+5xfnVZ8v#D*_adU!Zf(q88YAb zg#TZ!c)Zv2=|LtjF*c25k2gy$W0W*7QqojRF?M9Q?qahBg2I literal 0 HcmV?d00001 From a0f6195a0aba24f3be7a3ba610ad0163cbf2110c Mon Sep 17 00:00:00 2001 From: Sergeant Acoustic Date: Thu, 29 Jan 2026 22:07:37 +0000 Subject: [PATCH 2/3] Bump version to 2.0.0 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From e8f22b83131a2af06088a4b8cc1792d1e7f9dfdb Mon Sep 17 00:00:00 2001 From: Sergeant Acoustic Date: Thu, 29 Jan 2026 22:09:45 +0000 Subject: [PATCH 3/3] Add copper nugget Also move paxels to relevant parts of the creative inventory --- .../patience/mc_rebalance/ModItems.java | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) 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 6ec2e89..e7cc0d8 100644 --- a/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModItems.java +++ b/src/main/java/xyz/nearmisses/patience/mc_rebalance/ModItems.java @@ -8,16 +8,19 @@ import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; 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 paxels 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)); + // Add items to creative tabs + 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.INGREDIENTS).register((itemGroup) -> itemGroup.addAfter(Items.COPPER_INGOT, ModItems.Copper_Nugget)); } public static Item register(String id, Item.Properties item) { @@ -35,4 +38,6 @@ public class ModItems { public static final Item Paxel_Gold = register("golden_paxel", new Item.Properties() ); public static final Item Paxel_Diamond = register("diamond_paxel", new Item.Properties() ); public static final Item Paxel_Dendrite = register("netherite_paxel", new Item.Properties() ); // As with copper + + public static final Item Copper_Nugget = register("copper_nugget", new Item.Properties()); } \ No newline at end of file