1.20.4

Author: gliscowo

gradle.properties

@@ -2,37 +2,37 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-minecraft_base_version=1.20.2
-minecraft_version=1.20.2
-yarn_mappings=1.20.2+build.2
-loader_version=0.14.22
+minecraft_base_version=1.20.3
+minecraft_version=1.20.4
+yarn_mappings=1.20.4+build.3
+loader_version=0.15.3
 # Mod Properties
 mod_version=0.3.3
 maven_group=com.glisco
 archives_base_name=things
 # Dependencies
-fabric_version=0.89.3+1.20.2
+fabric_version=0.92.0+1.20.4
 
 # https://maven.terraformersmc.com/releases/dev/emi/trinkets
 trinkets_version=3.8.0
 
 # https://maven.wispforest.io/io/wispforest/lavender/
-lavender_version=0.1.0-pre.19+1.20.2
+lavender_version=0.1.0-pre.20+1.20.2
 
 # https://github.com/OnyxStudios/Cardinal-Components-API/releases
-cca_version=5.3.0
+cca_version=5.4.0
 
 # https://maven.shedaniel.me/me/shedaniel/RoughlyEnoughItems-fabric/
-rei_version=13.0.666
+rei_version=14.0.688
 
 # https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu
-modmenu_version=8.0.0
+modmenu_version=9.0.0
 
 # https://maven.wispforest.io/io/wispforest/owo-lib/
-owo_version=0.11.3+1.20.2
+owo_version=0.12.0+1.20.3
 
 # https://github.com/CrimsonDawn45/Fabric-Shield-Lib/releases
-fabric_shield_lib_version=v1.7.1-1.20.2
+fabric_shield_lib_version=v1.7.2-1.20.4
 
 # https://github.com/JamiesWhiteShirt/reach-entity-attributes/blob/1.20/gradle.properties#L12
-reach_entity_attrs_version=2.4.0
+reach_entity_attrs_version=2.5.0-wf_pre.1

src/main/java/com/glisco/things/blocks/DiamondPressurePlateBlock.java

@@ -17,9 +17,8 @@
 public class DiamondPressurePlateBlock extends PressurePlateBlock {
 
     protected DiamondPressurePlateBlock() {
-        super(ActivationRule.MOBS,
-                FabricBlockSettings.copyOf(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE).sounds(BlockSoundGroup.METAL).mapColor(MapColor.DIAMOND_BLUE),
-                BlockSetType.IRON);
+        super(BlockSetType.IRON,
+                FabricBlockSettings.copyOf(Blocks.HEAVY_WEIGHTED_PRESSURE_PLATE).sounds(BlockSoundGroup.METAL).mapColor(MapColor.DIAMOND_BLUE));
     }
 
     @Override

src/main/java/com/glisco/things/blocks/GlowstoneFixtureBlock.java

@@ -1,5 +1,6 @@
 package com.glisco.things.blocks;
 
+import com.mojang.serialization.MapCodec;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
 import net.minecraft.fluid.FluidState;
@@ -110,4 +111,8 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio
         return direction == state.get(FACING) && !state.canPlaceAt(world, pos) ? Blocks.AIR.getDefaultState() : state;
     }
 
+    @Override
+    protected MapCodec<? extends FacingBlock> getCodec() {
+        return null;
+    }
 }

src/main/java/com/glisco/things/blocks/PlacedItemBlock.java

@@ -1,5 +1,6 @@
 package com.glisco.things.blocks;
 
+import com.mojang.serialization.MapCodec;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.*;
 import net.minecraft.block.entity.BlockEntity;
@@ -107,11 +108,16 @@ public void onStateReplaced(BlockState state, World world, BlockPos pos, BlockSt
     }
 
     @Override
-    public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) {
+    public ItemStack getPickStack(WorldView world, BlockPos pos, BlockState state) {
         if (world.getBlockEntity(pos) instanceof PlacedItemBlockEntity placedItem) {
             return placedItem.getItem().copy();
         } else {
             return super.getPickStack(world, pos, state);
         }
     }
+
+    @Override
+    protected MapCodec<? extends BlockWithEntity> getCodec() {
+        return null;
+    }
 }

src/main/java/com/glisco/things/blocks/ThingsBlocks.java

@@ -28,8 +28,8 @@ public class ThingsBlocks implements BlockRegistryContainer {
     public static final Block QUARTZ_GLOWSTONE_FIXTURE = new GlowstoneFixtureBlock();
     public static final Block DEEPSLATE_GLOWSTONE_FIXTURE = new GlowstoneFixtureBlock();
 
-    public static final Block GLEAMING_ORE = new ExperienceDroppingBlock(FabricBlockSettings.copyOf(Blocks.DIAMOND_ORE).luminance(5).requiresTool(), UniformIntProvider.create(3, 7));
-    public static final Block DEEPSLATE_GLEAMING_ORE = new ExperienceDroppingBlock(FabricBlockSettings.copyOf(Blocks.DEEPSLATE_DIAMOND_ORE).luminance(5).requiresTool(), UniformIntProvider.create(3, 7));
+    public static final Block GLEAMING_ORE = new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), FabricBlockSettings.copyOf(Blocks.DIAMOND_ORE).luminance(5).requiresTool());
+    public static final Block DEEPSLATE_GLEAMING_ORE = new ExperienceDroppingBlock(UniformIntProvider.create(3, 7), FabricBlockSettings.copyOf(Blocks.DEEPSLATE_DIAMOND_ORE).luminance(5).requiresTool());
 
     public static final Block DIAMOND_PRESSURE_PLATE = new DiamondPressurePlateBlock();
     public static final BlockItem DIAMOND_PRESSURE_PLATE_ITEM = new BlockItem(ThingsBlocks.DIAMOND_PRESSURE_PLATE, new OwoItemSettings().group(Things.THINGS_GROUP)) {

src/main/java/com/glisco/things/client/DisplacementTomeScreen.java

@@ -56,7 +56,7 @@ protected void build(FlowLayout rootComponent) {
         var targets = new HashSet<String>();
 
         var newButton = rootComponent.childById(ButtonComponent.class, "new-button");
-        newButton.active = inventory.containsAny(Set.of(ThingsItems.DISPLACEMENT_PAGE)) && bookNbt.get(DisplacementTomeItem.TARGETS).getSize() < 8;
+        newButton.active = inventory.containsAny(Set.of(ThingsItems.DISPLACEMENT_PAGE)) && bookNbt.get(DisplacementTomeItem.TARGETS).size() < 8;
         if (!newButton.active) newButton.tooltip(Text.translatable("gui.things.displacement_tome.no_pages"));
 
         newButton.onPress((ButtonComponent button) -> {
@@ -80,7 +80,7 @@ protected void build(FlowLayout rootComponent) {
         });
 
         if (bookNbt.has(DisplacementTomeItem.TARGETS)) {
-            for (var target : bookNbt.get(DisplacementTomeItem.TARGETS).getKeys()) {
+            for (var target : bookNbt.get(DisplacementTomeItem.TARGETS).keySet()) {
                 targets.add(target);
 
                 var teleportComponent = this.model.expandTemplate(FlowLayout.class, "teleport-button", Map.of());

src/main/java/com/glisco/things/client/ThingsClient.java

@@ -53,7 +53,7 @@ public void onInitializeClient() {
         HandledScreens.register(Things.DISPLACEMENT_TOME_SCREEN_HANDLER, DisplacementTomeScreen::new);
 
         ModelPredicateProviderRegistry.register(ThingsItems.DISPLACEMENT_TOME, new Identifier("pages"), new DisplacementTomeItem.PredicateProvider());
-        ModelPredicateProviderRegistry.register(ThingsItems.SOCKS, new Identifier("jumpy"), (stack, world, entity, seed) -> stack.getOr(SocksItem.JUMPY_KEY, false) ? 1 : 0);
+        ModelPredicateProviderRegistry.register(ThingsItems.SOCKS, new Identifier("jumpy"), (stack, world, entity, seed) -> stack.get(SocksItem.JUMPY_KEY) ? 1 : 0);
 
         TrinketRendererRegistry.registerRenderer(Items.APPLE, new AppleTrinket.Renderer());
 

src/main/java/com/glisco/things/items/ExtendableTooltipProvider.java

@@ -1,5 +1,6 @@
 package com.glisco.things.items;
 
+import com.mojang.serialization.MapCodec;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.minecraft.client.MinecraftClient;
@@ -44,6 +45,9 @@ default void appendWrapped(List<Text> tooltip, Text toAppend) {
     }
 
     record VisitableTextContent(StringVisitable content) implements TextContent {
+
+        private static final Type<VisitableTextContent> DUMMY_TYPE = new Type<>(MapCodec.unit(new VisitableTextContent(StringVisitable.EMPTY)), "idwtialsimmoedm:visitable_text");
+
         @Override
         public <T> Optional<T> visit(StringVisitable.StyledVisitor<T> visitor, Style style) {
             return this.content.visit(visitor, style);
@@ -53,5 +57,10 @@ public <T> Optional<T> visit(StringVisitable.StyledVisitor<T> visitor, Style sty
         public <T> Optional<T> visit(StringVisitable.Visitor<T> visitor) {
             return this.content.visit(visitor);
         }
+
+        @Override
+        public Type<?> getType() {
+            return DUMMY_TYPE;
+        }
     }
 }

src/main/java/com/glisco/things/items/generic/BaterWucketItem.java

@@ -32,7 +32,7 @@ public boolean hasGlint(ItemStack stack) {
     }
 
     public static void registerCauldronBehavior() {
-        CauldronBehavior.EMPTY_CAULDRON_BEHAVIOR.put(ThingsItems.BATER_WUCKET, (state, world, pos, player, hand, stack) -> {
+        CauldronBehavior.EMPTY_CAULDRON_BEHAVIOR.map().put(ThingsItems.BATER_WUCKET, (state, world, pos, player, hand, stack) -> {
             if (world.isClient) return ActionResult.SUCCESS;
 
             world.setBlockState(pos, Blocks.WATER_CAULDRON.getDefaultState().with(LeveledCauldronBlock.LEVEL, 3));

src/main/java/com/glisco/things/items/generic/ContainerKeyItem.java

@@ -5,7 +5,8 @@
 import com.glisco.things.mixin.access.ContainerLockAccessor;
 import com.glisco.things.mixin.access.LockableContainerBlockEntityAccessor;
 import io.wispforest.owo.itemgroup.OwoItemSettings;
-import io.wispforest.owo.nbt.NbtKey;
+import io.wispforest.owo.serialization.Endec;
+import io.wispforest.owo.serialization.endec.KeyedEndec;
 import net.minecraft.block.ChestBlock;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.ChestBlockEntity;
@@ -31,7 +32,7 @@
 
 public class ContainerKeyItem extends ItemWithExtendableTooltip {
 
-    private static final NbtKey<Integer> LOCK_KEY = new NbtKey<>("Lock", NbtKey.Type.INT);
+    private static final KeyedEndec<Integer> LOCK_KEY = Endec.INT.keyed("Lock", 0);
 
     public ContainerKeyItem() {
         super(new OwoItemSettings().group(Things.THINGS_GROUP).maxCount(1));