1.19.3

gradle.properties

@@ -3,31 +3,31 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-    minecraft_base_version=1.19
-    minecraft_version=1.19.2
-    yarn_mappings=1.19.2+build.9
-    loader_version=0.14.9
+    minecraft_base_version=1.19.3
+    minecraft_version=1.19.3
+    yarn_mappings=1.19.3+build.3
+    loader_version=0.14.11
 
 # Mod Properties
     mod_version=0.2.6
     maven_group=com.glisco
     archives_base_name=numismatic-overhaul
 
 # Dependencies
-# check this on https://modmuss50.me/fabric.html
-    fabric_version=0.60.0+1.19.2
+# check this on https://fabricmc.net/develop
+    fabric_version=fabric_version=0.69.1+1.19.3
 
     # https://github.com/OnyxStudios/Cardinal-Components-API/releases
-    cca_version=5.0.2
+    cca_version=5.1.0
 
     # https://maven.shedaniel.me/me/shedaniel/RoughlyEnoughItems-fabric/
-    rei_version=9.1.530
+    rei_version=10.0.578
 
     # https://maven.wispforest.io/io/wispforest/owo-lib/
-    owo_version=0.9.3+1.19
+    owo_version=0.9.3+1.19.3
 
     # https://www.curseforge.com/minecraft/mc-mods/modmenu/files
-    modmenu_version=4.0.6
+    modmenu_version=5.0.2
 
     # https://storage.googleapis.com/devan-maven/
-    stacc_version=1.3.3
+    stacc_version=1.3.5

src/main/java/com/glisco/numismaticoverhaul/NumismaticOverhaul.java

@@ -4,13 +4,16 @@
 import com.glisco.numismaticoverhaul.block.PiggyBankScreenHandler;
 import com.glisco.numismaticoverhaul.block.ShopScreenHandler;
 import com.glisco.numismaticoverhaul.currency.MoneyBagLootEntry;
+import com.glisco.numismaticoverhaul.item.MoneyBagItem;
 import com.glisco.numismaticoverhaul.item.NumismaticOverhaulItems;
 import com.glisco.numismaticoverhaul.network.RequestPurseActionC2SPacket;
 import com.glisco.numismaticoverhaul.network.ShopScreenHandlerRequestC2SPacket;
 import com.glisco.numismaticoverhaul.network.UpdateShopScreenS2CPacket;
 import com.glisco.numismaticoverhaul.villagers.data.VillagerTradesResourceListener;
 import com.glisco.numismaticoverhaul.villagers.json.VillagerTradesHandler;
+import io.wispforest.owo.itemgroup.Icon;
 import io.wispforest.owo.itemgroup.OwoItemGroup;
+import io.wispforest.owo.itemgroup.gui.ItemGroupButton;
 import io.wispforest.owo.network.OwoNetChannel;
 import io.wispforest.owo.ops.LootOps;
 import io.wispforest.owo.particles.ClientParticles;
@@ -32,13 +35,15 @@
 import net.minecraft.loot.entry.LootPoolEntryType;
 import net.minecraft.particle.BlockStateParticleEffect;
 import net.minecraft.particle.ParticleTypes;
+import net.minecraft.registry.Registries;
+import net.minecraft.registry.Registry;
+import net.minecraft.registry.RegistryKeys;
+import net.minecraft.registry.tag.TagKey;
 import net.minecraft.resource.ResourceType;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.sound.SoundEvent;
-import net.minecraft.tag.TagKey;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.registry.Registry;
 import net.minecraft.world.GameRules;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -62,16 +67,24 @@ world, new BlockPos(pos), .75
     public static final ScreenHandlerType<ShopScreenHandler> SHOP_SCREEN_HANDLER_TYPE = new ScreenHandlerType<>(ShopScreenHandler::new);
     public static final ScreenHandlerType<PiggyBankScreenHandler> PIGGY_BANK_SCREEN_HANDLER_TYPE = new ScreenHandlerType<>(PiggyBankScreenHandler::new);
 
-    public static final SoundEvent PIGGY_BANK_BREAK = new SoundEvent(id("piggy_bank_break"));
+    public static final SoundEvent PIGGY_BANK_BREAK = SoundEvent.of(id("piggy_bank_break"));
     public static final LootPoolEntryType MONEY_BAG_ENTRY = new LootPoolEntryType(new MoneyBagLootEntry.Serializer());
 
-    public static final TagKey<EntityType<?>> THE_BOURGEOISIE = TagKey.of(Registry.ENTITY_TYPE_KEY, id("the_bourgeoisie"));
-    public static final TagKey<Block> VERY_HEAVY_BLOCKS = TagKey.of(Registry.BLOCK_KEY, id("very_heavy_blocks"));
+    public static final TagKey<EntityType<?>> THE_BOURGEOISIE = TagKey.of(RegistryKeys.ENTITY_TYPE, id("the_bourgeoisie"));
+    public static final TagKey<Block> VERY_HEAVY_BLOCKS = TagKey.of(RegistryKeys.BLOCK, id("very_heavy_blocks"));
 
     public static final GameRules.Key<GameRules.IntRule> MONEY_DROP_PERCENTAGE
             = GameRuleRegistry.register("moneyDropPercentage", GameRules.Category.PLAYER, GameRuleFactory.createIntRule(10, 0, 100));
 
-    public static final OwoItemGroup NUMISMATIC_GROUP = new NumismaticOverhaulItemGroup();
+    public static final OwoItemGroup NUMISMATIC_GROUP = OwoItemGroup.builder(
+                    NumismaticOverhaul.id("main"),
+                    () -> Icon.of(MoneyBagItem.createCombined(new long[]{0, 1, 0})))
+            .initializer(group -> {
+                group.addButton(ItemGroupButton.modrinth(group, "https://modrinth.com/mod/numismatic-overhaul"));
+                group.addButton(ItemGroupButton.curseforge(group, "https://www.curseforge.com/minecraft/mc-mods/numismatic-overhaul"));
+                group.addButton(ItemGroupButton.github(group, "https://github.com/wisp-forest/numismatic-overhaul"));
+                group.addButton(ItemGroupButton.discord(group, "https://discord.gg/xrwHKktV2d"));
+            }).build();
 
     public static final com.glisco.numismaticoverhaul.NumismaticOverhaulConfig CONFIG = com.glisco.numismaticoverhaul.NumismaticOverhaulConfig.createAndLoad();
 
@@ -82,11 +95,11 @@ public void onInitialize() {
         FieldRegistrationHandler.register(NumismaticOverhaulBlocks.class, MOD_ID, false);
         FieldRegistrationHandler.register(NumismaticOverhaulBlocks.Entities.class, MOD_ID, false);
 
-        Registry.register(Registry.SOUND_EVENT, PIGGY_BANK_BREAK.getId(), PIGGY_BANK_BREAK);
-        Registry.register(Registry.LOOT_POOL_ENTRY_TYPE, id("money_bag"), MONEY_BAG_ENTRY);
+        Registry.register(Registries.SOUND_EVENT, PIGGY_BANK_BREAK.getId(), PIGGY_BANK_BREAK);
+        Registry.register(Registries.LOOT_POOL_ENTRY_TYPE, id("money_bag"), MONEY_BAG_ENTRY);
 
-        Registry.register(Registry.SCREEN_HANDLER, id("shop"), SHOP_SCREEN_HANDLER_TYPE);
-        Registry.register(Registry.SCREEN_HANDLER, id("piggy_bank"), PIGGY_BANK_SCREEN_HANDLER_TYPE);
+        Registry.register(Registries.SCREEN_HANDLER, id("shop"), SHOP_SCREEN_HANDLER_TYPE);
+        Registry.register(Registries.SCREEN_HANDLER, id("piggy_bank"), PIGGY_BANK_SCREEN_HANDLER_TYPE);
 
         CHANNEL.registerServerbound(RequestPurseActionC2SPacket.class, RequestPurseActionC2SPacket::handle);
         CHANNEL.registerServerbound(ShopScreenHandlerRequestC2SPacket.class, ShopScreenHandlerRequestC2SPacket::handle);

src/main/java/com/glisco/numismaticoverhaul/block/NumismaticOverhaulBlocks.java

@@ -2,7 +2,9 @@
 
 import com.glisco.numismaticoverhaul.NumismaticOverhaul;
 import com.glisco.numismaticoverhaul.item.CurrencyTooltipData;
+import io.wispforest.owo.itemgroup.OwoItemSettings;
 import io.wispforest.owo.registration.reflect.AutoRegistryContainer;
+import io.wispforest.owo.registration.reflect.BlockEntityRegistryContainer;
 import io.wispforest.owo.registration.reflect.BlockRegistryContainer;
 import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
 import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
@@ -19,7 +21,7 @@
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Rarity;
 import net.minecraft.util.collection.DefaultedList;
-import net.minecraft.util.registry.Registry;
+import net.minecraft.registry.Registry;
 import net.minecraft.world.World;
 import org.jetbrains.annotations.Nullable;
 
@@ -35,14 +37,14 @@ public class NumismaticOverhaulBlocks implements BlockRegistryContainer {
     @Override
     public BlockItem createBlockItem(Block block, String identifier) {
         if (block == INEXHAUSTIBLE_SHOP) {
-            return new BlockItem(block, new Item.Settings().group(NumismaticOverhaul.NUMISMATIC_GROUP).rarity(Rarity.EPIC)) {
+            return new BlockItem(block, new OwoItemSettings().group(NumismaticOverhaul.NUMISMATIC_GROUP).rarity(Rarity.EPIC)) {
                 @Override
                 public void appendTooltip(ItemStack stack, @Nullable World world, List<Text> tooltip, TooltipContext context) {
                     tooltip.add(Text.translatable(stack.getTranslationKey() + ".tooltip").formatted(Formatting.GRAY));
                 }
             };
         } else if (block == PIGGY_BANK) {
-            return new BlockItem(block, new FabricItemSettings().group(NumismaticOverhaul.NUMISMATIC_GROUP).equipmentSlot(stack -> EquipmentSlot.HEAD)) {
+            return new BlockItem(block, new OwoItemSettings().group(NumismaticOverhaul.NUMISMATIC_GROUP).equipmentSlot(stack -> EquipmentSlot.HEAD)) {
                 @Override
                 public Optional<TooltipData> getTooltipData(ItemStack stack) {
                     if (stack.hasNbt() && stack.getNbt().contains("BlockEntityTag")) {
@@ -58,26 +60,15 @@ public Optional<TooltipData> getTooltipData(ItemStack stack) {
             };
         }
 
-        return new BlockItem(block, new Item.Settings().group(NumismaticOverhaul.NUMISMATIC_GROUP));
+        return new BlockItem(block, new OwoItemSettings().group(NumismaticOverhaul.NUMISMATIC_GROUP));
     }
 
-    public static final class Entities implements AutoRegistryContainer<BlockEntityType<?>> {
+    public static final class Entities implements BlockEntityRegistryContainer {
 
         public static final BlockEntityType<ShopBlockEntity> SHOP =
                 FabricBlockEntityTypeBuilder.create(ShopBlockEntity::new, NumismaticOverhaulBlocks.SHOP, NumismaticOverhaulBlocks.INEXHAUSTIBLE_SHOP).build();
 
         public static final BlockEntityType<PiggyBankBlockEntity> PIGGY_BANK =
                 FabricBlockEntityTypeBuilder.create(PiggyBankBlockEntity::new, NumismaticOverhaulBlocks.PIGGY_BANK).build();
-
-        @Override
-        public Registry<BlockEntityType<?>> getRegistry() {
-            return Registry.BLOCK_ENTITY_TYPE;
-        }
-
-        @Override
-        public Class<BlockEntityType<?>> getTargetFieldType() {
-            //noinspection unchecked
-            return (Class<BlockEntityType<?>>) (Object) BlockEntityType.class;
-        }
     }
 }

src/main/java/com/glisco/numismaticoverhaul/block/PiggyBankScreenHandler.java

@@ -33,7 +33,7 @@ public PiggyBankScreenHandler(int syncId, PlayerInventory playerInventory, Scree
     }
 
     @Override
-    public ItemStack transferSlot(PlayerEntity player, int index) {
+    public ItemStack quickMove(PlayerEntity player, int index) {
         return ScreenUtils.handleSlotTransfer(this, index, 3);
     }
 

src/main/java/com/glisco/numismaticoverhaul/block/ShopScreenHandler.java

@@ -168,7 +168,7 @@ public ItemStack getBufferStack() {
     }
 
     @Override
-    public ItemStack transferSlot(PlayerEntity player, int invSlot) {
+    public ItemStack quickMove(PlayerEntity player, int invSlot) {
         return ScreenUtils.handleSlotTransfer(this, invSlot, this.shopInventory.size());
     }
 

src/main/java/com/glisco/numismaticoverhaul/client/ShopBlockEntityRender.java

@@ -11,7 +11,7 @@
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.Vec3f;
+import net.minecraft.util.math.RotationAxis;
 
 public class ShopBlockEntityRender implements BlockEntityRenderer<ShopBlockEntity> {
 
@@ -37,7 +37,7 @@ public void render(ShopBlockEntity entity, float tickDelta, MatrixStack matrices
         float scale = isBlockItem ? 0.95f : 0.85f;
         matrices.scale(scale, scale, scale);
 
-        matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion((float) (System.currentTimeMillis() / 20d % 360d)));
+        matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees((float) (System.currentTimeMillis() / 20d % 360d)));
 
         client.getItemRenderer().renderItem(toRender, ModelTransformation.Mode.GROUND, lightAbove, OverlayTexture.DEFAULT_UV, matrices, vertexConsumers, 0);
 

src/main/java/com/glisco/numismaticoverhaul/client/gui/CurrencyTooltipComponent.java

@@ -15,7 +15,7 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.math.Matrix4f;
+import org.joml.Matrix4f;
 
 import java.util.ArrayList;
 import java.util.Comparator;

src/main/java/com/glisco/numismaticoverhaul/client/gui/ShopScreen.java

@@ -22,9 +22,10 @@
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
+import net.minecraft.registry.Registries;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
-import net.minecraft.util.registry.Registry;
+import net.minecraft.registry.Registry;
 import org.lwjgl.glfw.GLFW;
 
 import java.util.ArrayList;
@@ -199,7 +200,7 @@ private void swapBackgroundTexture(Identifier newTexture) {
     }
 
     private FlowLayout makeTabButton(Item icon, boolean active, Consumer<ButtonComponent> onPress) {
-        var buttonContainer = this.model.expandTemplate(FlowLayout.class, "tab-button", Map.of("icon-item", Registry.ITEM.getId(icon).toString()));
+        var buttonContainer = this.model.expandTemplate(FlowLayout.class, "tab-button", Map.of("icon-item", Registries.ITEM.getId(icon).toString()));
 
         final var button = buttonContainer.childById(ButtonComponent.class, "tab-button");
         this.tabButtons.add(button);

src/main/java/com/glisco/numismaticoverhaul/client/gui/purse/AlwaysOnTopTexturedButtonWidget.java

@@ -36,7 +36,6 @@ public void renderButton(MatrixStack matrices, int mouseX, int mouseY, float del
 
         RenderSystem.disableDepthTest();
 
-        drawTexture(matrices, this.x, this.y, this.u, i, this.width, this.height);
-        if (this.isHovered()) this.renderTooltip(matrices, mouseX, mouseY);
+        drawTexture(matrices, this.getX(), this.getY(), this.u, i, this.width, this.height);
     }
 }

src/main/java/com/glisco/numismaticoverhaul/client/gui/purse/PurseButton.java

@@ -6,6 +6,7 @@
 import com.glisco.numismaticoverhaul.currency.CurrencyComponent;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.TexturedButtonWidget;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerEntity;
@@ -27,17 +28,21 @@ public PurseButton(int x, int y, PressAction pressAction, PlayerEntity player, S
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
-        if (MinecraftClient.getInstance().player.isSpectator()) return false;
-        return super.mouseClicked(mouseX, mouseY, button);
+    public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) {
+        super.render(matrices, mouseX, mouseY, delta);
+        if (this.hovered) {
+            CurrencyTooltipRenderer.renderTooltip(
+                    currencyStorage.getValue(),
+                    matrices, parent,
+                    TOOLTIP_TITLE,
+                    this.getX() + 14, this.getY() + 5
+            );
+        }
     }
 
     @Override
-    public void renderTooltip(MatrixStack matrices, int mouseX, int mouseY) {
-        CurrencyTooltipRenderer.renderTooltip(
-                currencyStorage.getValue(),
-                matrices, parent,
-                TOOLTIP_TITLE,
-                x + 14, y + 5);
+    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        if (MinecraftClient.getInstance().player.isSpectator()) return false;
+        return super.mouseClicked(mouseX, mouseY, button);
     }
 }

src/main/java/com/glisco/numismaticoverhaul/item/CoinItem.java

@@ -3,6 +3,7 @@
 import com.glisco.numismaticoverhaul.ModComponents;
 import com.glisco.numismaticoverhaul.NumismaticOverhaul;
 import com.glisco.numismaticoverhaul.currency.Currency;
+import io.wispforest.owo.itemgroup.OwoItemSettings;
 import net.minecraft.client.item.TooltipData;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.inventory.StackReference;
@@ -26,7 +27,7 @@ public class CoinItem extends Item implements CurrencyItem {
     public final Style NAME_STYLE;
 
     public CoinItem(Currency currency) {
-        super(new Settings().group(NumismaticOverhaul.NUMISMATIC_GROUP).maxCount(99));
+        super(new OwoItemSettings().group(NumismaticOverhaul.NUMISMATIC_GROUP).maxCount(99));
         this.currency = currency;
         this.NAME_STYLE = Style.EMPTY.withColor(TextColor.fromRgb(currency.getNameColor()));
     }

src/main/java/com/glisco/numismaticoverhaul/mixin/NOMixinPlugin.java

@@ -10,9 +10,7 @@
 
 public class NOMixinPlugin implements IMixinConfigPlugin {
     @Override
-    public void onLoad(String mixinPackage) {
-
-    }
+    public void onLoad(String mixinPackage) {}
 
     @Override
     public String getRefMapperConfig() {
@@ -27,22 +25,16 @@ public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
     }
 
     @Override
-    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
-
-    }
+    public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {}
 
     @Override
     public List<String> getMixins() {
         return null;
     }
 
     @Override
-    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-
-    }
+    public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {}
 
     @Override
-    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
-
-    }
+    public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {}
 }

src/main/java/com/glisco/numismaticoverhaul/mixin/TradeOfferInternalsMixin.java

@@ -47,6 +47,5 @@ public static synchronized void registerWanderingTraderOffers(int level, Consume
      * @author glisco
      */
     @Overwrite(remap = false)
-    private static void registerOffers(Int2ObjectMap<TradeOffers.Factory[]> leveledTradeMap, int level, Consumer<List<TradeOffers.Factory>> factory) {
-    }
+    private static void registerOffers(Int2ObjectMap<TradeOffers.Factory[]> leveledTradeMap, int level, Consumer<List<TradeOffers.Factory>> factory) {}
 }