Port to 1.19.4

PlatinPython · PlatinPython · commit 51db23d3541e · 2023-06-08T22:13:39.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -13,7 +13,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
-    mappings channel: 'parchment', version: '2023.02.05-1.19.3'
+    mappings channel: 'parchment', version: '1.19.3-2023.03.12-1.19.4'
 
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
 
@@ -76,9 +76,9 @@ repositories {
 }
 
 dependencies {
-    minecraft 'net.minecraftforge:forge:1.19.3-44.1.20'
+    minecraft 'net.minecraftforge:forge:1.19.4-45.1.0'
 
-    implementation fg.deobf("curse.maven:top-245211:4159743")
+    implementation fg.deobf("curse.maven:the-one-probe-245211:4442439")
 }
 
 jar {
diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,5 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 #version info
-minecraft_version=1.19.3
+minecraft_version=1.19.4
 mod_version=1.1.6.2
diff --git a/src/main/java/platinpython/rgbblocks/RGBBlocks.java b/src/main/java/platinpython/rgbblocks/RGBBlocks.java
@@ -77,7 +77,7 @@ public static void rgbBlocksTab(CreativeModeTabEvent.Register event) {
                 ItemStack stack = new ItemStack(ItemRegistry.PAINT_BUCKET.get());
                 stack.getOrCreateTag().putInt("color", -1);
                 return stack;
-            }).displayItems((enabledFeatures, output, displayOperatorCreativeTab) -> {
+            }).displayItems((displayParameters, output) -> {
                 List<ItemStack> items = new ArrayList<>(
                         RegistryHandler.ITEMS.getEntries()
                                              .stream()
diff --git a/src/main/java/platinpython/rgbblocks/block/RGBConcretePowderBlock.java b/src/main/java/platinpython/rgbblocks/block/RGBConcretePowderBlock.java
@@ -14,6 +14,7 @@
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.phys.HitResult;
 import platinpython.rgbblocks.entity.RGBFallingBlockEntity;
 import platinpython.rgbblocks.tileentity.RGBTileEntity;
@@ -46,13 +47,20 @@ public void tick(BlockState state, ServerLevel worldIn, BlockPos pos, RandomSour
             BlockEntity tileEntity = worldIn.getBlockEntity(pos);
             RGBFallingBlockEntity fallingBlockEntity = new RGBFallingBlockEntity(worldIn, (double) pos.getX() + 0.5D,
                                                                                  pos.getY(), (double) pos.getZ() + 0.5D,
+                                                                                 state.hasProperty(
+                                                                                         BlockStateProperties.WATERLOGGED) ?
+                                                                                 state.setValue(
+                                                                                         BlockStateProperties.WATERLOGGED,
+                                                                                         Boolean.valueOf(false)
+                                                                                 ) :
                                                                                  state,
                                                                                  tileEntity instanceof RGBTileEntity ?
                                                                                  ((RGBTileEntity) tileEntity).getColor() :
                                                                                  0
             );
-            this.falling(fallingBlockEntity);
+            worldIn.setBlock(pos, state.getFluidState().createLegacyBlock(), 3);
             worldIn.addFreshEntity(fallingBlockEntity);
+            this.falling(fallingBlockEntity);
         }
     }
 
diff --git a/src/main/java/platinpython/rgbblocks/client/gui/ScreenUtils.java b/src/main/java/platinpython/rgbblocks/client/gui/ScreenUtils.java
@@ -10,19 +10,15 @@
 import org.joml.Matrix4f;
 
 public class ScreenUtils {
-    public static void fillGradient(PoseStack pPoseStack, int x1, int y1, int x2, int y2, int colorFrom, int colorTo,
-                                    int blitOffset) {
-        RenderSystem.disableTexture();
+    public static void fillGradient(PoseStack pPoseStack, int x1, int y1, int x2, int y2, int colorFrom, int colorTo) {
         RenderSystem.enableBlend();
-        RenderSystem.defaultBlendFunc();
         RenderSystem.setShader(GameRenderer::getPositionColorShader);
         Tesselator tesselator = Tesselator.getInstance();
         BufferBuilder bufferbuilder = tesselator.getBuilder();
         bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
-        fillGradient(pPoseStack.last().pose(), bufferbuilder, x1, y1, x2, y2, blitOffset, colorFrom, colorTo);
+        fillGradient(pPoseStack.last().pose(), bufferbuilder, x1, y1, x2, y2, 0, colorFrom, colorTo);
         tesselator.end();
         RenderSystem.disableBlend();
-        RenderSystem.enableTexture();
     }
 
     private static void fillGradient(Matrix4f matrix4f, BufferBuilder builder, int x1, int y1, int x2, int y2, int z,
diff --git a/src/main/java/platinpython/rgbblocks/client/gui/screen/ColorSelectScreen.java b/src/main/java/platinpython/rgbblocks/client/gui/screen/ColorSelectScreen.java
@@ -40,9 +40,9 @@ public class ColorSelectScreen extends Screen {
     public ColorSelectScreen(int colorIn, boolean isRGBSelected) {
         super(Component.empty());
         Color color = new Color(colorIn);
-        this.red = (double) color.getRed();
-        this.green = (double) color.getGreen();
-        this.blue = (double) color.getBlue();
+        this.red = color.getRed();
+        this.green = color.getGreen();
+        this.blue = color.getBlue();
 
         float[] hsb = Color.RGBtoHSB((int) red, (int) green, (int) blue);
         this.hue = hsb[0] * MAX_VALUE_HUE;
diff --git a/src/main/java/platinpython/rgbblocks/client/gui/widget/ColorSlider.java b/src/main/java/platinpython/rgbblocks/client/gui/widget/ColorSlider.java
@@ -1,5 +1,6 @@
 package platinpython.rgbblocks.client.gui.widget;
 
+import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.AbstractSliderButton;
@@ -63,63 +64,70 @@ public void setValueInt(int value) {
     }
 
     @Override
-    public void renderButton(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) {
+    public void renderWidget(PoseStack poseStack, int mouseX, int mouseY, float partialTicks) {
         if (this.visible) {
             Minecraft minecraft = Minecraft.getInstance();
-            fill(matrixStack, this.getX(), this.getY(), this.getX() + this.width, this.getY() + this.height, 0xFF000000);
+            fill(poseStack, this.getX(), this.getY(), this.getX() + this.width, this.getY() + this.height, 0xFF000000);
             if (minecraft.screen instanceof ColorSelectScreen) {
                 ColorSelectScreen screen = (ColorSelectScreen) minecraft.screen;
                 switch (type) {
                     case RED:
-                        renderRedBackground(matrixStack, screen);
+                        renderRedBackground(poseStack, screen);
                         break;
                     case GREEN:
-                        renderGreenBackground(matrixStack, screen);
+                        renderGreenBackground(poseStack, screen);
                         break;
                     case BLUE:
-                        renderBlueBackground(matrixStack, screen);
+                        renderBlueBackground(poseStack, screen);
                         break;
                     case HUE:
-                        renderHueBackground(matrixStack, screen);
+                        renderHueBackground(poseStack, screen);
                         break;
                     case SATURATION:
-                        renderSaturationBackground(matrixStack, screen);
+                        renderSaturationBackground(poseStack, screen);
                         break;
                     case BRIGHTNESS:
-                        renderBrightnessBackground(matrixStack, screen);
+                        renderBrightnessBackground(poseStack, screen);
                         break;
                 }
             }
 
-            this.renderBg(matrixStack, minecraft, mouseX, mouseY);
+            RenderSystem.setShaderTexture(0, SLIDER_LOCATION);
+            RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
+            RenderSystem.enableBlend();
+            RenderSystem.defaultBlendFunc();
+            RenderSystem.enableDepthTest();
+            AbstractSliderButton.blitNineSliced(poseStack, this.getX() + (int) (this.value * (double) (this.width - 8)),
+                                                this.getY(), 8, 20, 20, 4, 200, 20, 0, this.getHandleTextureY()
+            );
 
-            drawCenteredString(matrixStack, minecraft.font, this.getMessage(), this.getX() + this.width / 2,
-                               this.getY() - (this.height) / 10 * 7, getFGColor()
+            drawCenteredString(poseStack, minecraft.font, this.getMessage(), this.getX() + this.width / 2,
+                               this.getY() - this.height / 10 * 7, getFGColor()
             );
         }
     }
 
     private void renderRedBackground(PoseStack matrixStack, ColorSelectScreen screen) {
         int leftColor = new Color(0x00, screen.greenSlider.getValueInt(), screen.blueSlider.getValueInt()).getRGB();
         int rightColor = new Color(0xFF, screen.greenSlider.getValueInt(), screen.blueSlider.getValueInt()).getRGB();
-        ScreenUtils.fillGradient(matrixStack, this.getX() + 1, this.getY() + 1, this.getX() + this.width - 1, this.getY() + this.height - 1,
-                                 leftColor, rightColor, this.getBlitOffset()
+        ScreenUtils.fillGradient(matrixStack, this.getX() + 1, this.getY() + 1, this.getX() + this.width - 1,
+                                 this.getY() + this.height - 1, leftColor, rightColor
         );
     }
 
     private void renderGreenBackground(PoseStack matrixStack, ColorSelectScreen screen) {
         int leftColor = new Color(screen.redSlider.getValueInt(), 0x00, screen.blueSlider.getValueInt()).getRGB();
         int rightColor = new Color(screen.redSlider.getValueInt(), 0xFF, screen.blueSlider.getValueInt()).getRGB();
-        ScreenUtils.fillGradient(matrixStack, this.getX() + 1, this.getY() + 1, this.getX() + this.width - 1, this.getY() + this.height - 1,
-                                 leftColor, rightColor, this.getBlitOffset()
+        ScreenUtils.fillGradient(matrixStack, this.getX() + 1, this.getY() + 1, this.getX() + this.width - 1,
+                                 this.getY() + this.height - 1, leftColor, rightColor
         );
     }
 
     private void renderBlueBackground(PoseStack matrixStack, ColorSelectScreen screen) {
         int leftColor = new Color(screen.redSlider.getValueInt(), screen.greenSlider.getValueInt(), 0x00).getRGB();
         int rightColor = new Color(screen.redSlider.getValueInt(), screen.greenSlider.getValueInt(), 0xFF).getRGB();
-        ScreenUtils.fillGradient(matrixStack, this.getX() + 1, this.getY() + 1, this.getX() + this.width - 1, this.getY() + this.height - 1,
-                                 leftColor, rightColor, this.getBlitOffset()
+        ScreenUtils.fillGradient(matrixStack, this.getX() + 1, this.getY() + 1, this.getX() + this.width - 1,
+                                 this.getY() + this.height - 1, leftColor, rightColor
         );
     }
 
@@ -130,23 +138,23 @@ private void renderHueBackground(PoseStack matrixStack, ColorSelectScreen screen
                                                                    (float) (screen.saturationSlider.getValueInt() / ColorSelectScreen.MAX_VALUE_SB),
                                                                    (float) (screen.brightnessSlider.getValueInt() / ColorSelectScreen.MAX_VALUE_SB)
         );
-        ScreenUtils.fillGradient(matrixStack, lerp.apply(0), this.getY() + 1, lerp.apply(17), this.getY() + this.height - 1,
-                                 color.apply(0), color.apply(17), this.getBlitOffset()
+        ScreenUtils.fillGradient(matrixStack, lerp.apply(0), this.getY() + 1, lerp.apply(17),
+                                 this.getY() + this.height - 1, color.apply(0), color.apply(17)
         );
-        ScreenUtils.fillGradient(matrixStack, lerp.apply(17), this.getY() + 1, lerp.apply(34), this.getY() + this.height - 1,
-                                 color.apply(17), color.apply(34), this.getBlitOffset()
+        ScreenUtils.fillGradient(matrixStack, lerp.apply(17), this.getY() + 1, lerp.apply(34),
+                                 this.getY() + this.height - 1, color.apply(17), color.apply(34)
         );
-        ScreenUtils.fillGradient(matrixStack, lerp.apply(34), this.getY() + 1, lerp.apply(50), this.getY() + this.height - 1,
-                                 color.apply(34), color.apply(50), this.getBlitOffset()
+        ScreenUtils.fillGradient(matrixStack, lerp.apply(34), this.getY() + 1, lerp.apply(50),
+                                 this.getY() + this.height - 1, color.apply(34), color.apply(50)
         );
-        ScreenUtils.fillGradient(matrixStack, lerp.apply(50), this.getY() + 1, lerp.apply(66), this.getY() + this.height - 1,
-                                 color.apply(50), color.apply(66), this.getBlitOffset()
+        ScreenUtils.fillGradient(matrixStack, lerp.apply(50), this.getY() + 1, lerp.apply(66),
+                                 this.getY() + this.height - 1, color.apply(50), color.apply(66)
         );
-        ScreenUtils.fillGradient(matrixStack, lerp.apply(66), this.getY() + 1, lerp.apply(82), this.getY() + this.height - 1,
-                                 color.apply(66), color.apply(82), this.getBlitOffset()
+        ScreenUtils.fillGradient(matrixStack, lerp.apply(66), this.getY() + 1, lerp.apply(82),
+                                 this.getY() + this.height - 1, color.apply(66), color.apply(82)
         );
-        ScreenUtils.fillGradient(matrixStack, lerp.apply(82), this.getY() + 1, lerp.apply(100), this.getY() + this.height - 1,
-                                 color.apply(82), color.apply(100), this.getBlitOffset()
+        ScreenUtils.fillGradient(matrixStack, lerp.apply(82), this.getY() + 1, lerp.apply(100),
+                                 this.getY() + this.height - 1, color.apply(82), color.apply(100)
         );
     }
 
@@ -157,8 +165,8 @@ private void renderSaturationBackground(PoseStack matrixStack, ColorSelectScreen
         int rightColor = Color.HSBtoRGB((float) (screen.hueSlider.getValue() / ColorSelectScreen.MAX_VALUE_HUE), 1.0f,
                                         (float) (screen.brightnessSlider.getValue() / ColorSelectScreen.MAX_VALUE_SB)
         );
-        ScreenUtils.fillGradient(matrixStack, this.getX() + 1, this.getY() + 1, this.getX() + this.width - 1, this.getY() + this.height - 1,
-                                 leftColor, rightColor, this.getBlitOffset()
+        ScreenUtils.fillGradient(matrixStack, this.getX() + 1, this.getY() + 1, this.getX() + this.width - 1,
+                                 this.getY() + this.height - 1, leftColor, rightColor
         );
     }
 
@@ -171,8 +179,8 @@ private void renderBrightnessBackground(PoseStack matrixStack, ColorSelectScreen
                                         (float) (screen.saturationSlider.getValue() / ColorSelectScreen.MAX_VALUE_SB),
                                         1.0f
         );
-        ScreenUtils.fillGradient(matrixStack, this.getX() + 1, this.getY() + 1, this.getX() + this.width - 1, this.getY() + this.height - 1,
-                                 leftColor, rightColor, this.getBlitOffset()
+        ScreenUtils.fillGradient(matrixStack, this.getX() + 1, this.getY() + 1, this.getX() + this.width - 1,
+                                 this.getY() + this.height - 1, leftColor, rightColor
         );
     }
 }
diff --git a/src/main/java/platinpython/rgbblocks/client/renderer/entity/RGBFallingBlockRenderer.java b/src/main/java/platinpython/rgbblocks/client/renderer/entity/RGBFallingBlockRenderer.java
@@ -2,12 +2,12 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.block.model.ItemTransforms.TransformType;
 import net.minecraft.client.renderer.entity.EntityRenderer;
 import net.minecraft.client.renderer.entity.EntityRendererProvider.Context;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import platinpython.rgbblocks.RGBBlocks;
 import platinpython.rgbblocks.entity.RGBFallingBlockEntity;
@@ -28,8 +28,8 @@ public void render(RGBFallingBlockEntity fallingBlockEntity, float entityYaw, fl
         poseStack.translate(0.0D, 0.5D, 0.0D);
         ItemStack stack = new ItemStack(fallingBlockEntity.getBlockState().getBlock());
         stack.getOrCreateTag().putInt("color", fallingBlockEntity.getColor());
-        itemRenderer.renderStatic(stack, TransformType.NONE, packedLight, OverlayTexture.NO_OVERLAY, poseStack, buffer,
-                                  fallingBlockEntity.getId()
+        itemRenderer.renderStatic(stack, ItemDisplayContext.NONE, packedLight, OverlayTexture.NO_OVERLAY, poseStack,
+                                  buffer, null, fallingBlockEntity.getId()
         );
         poseStack.popPose();
     }
diff --git a/src/main/java/platinpython/rgbblocks/entity/RGBFallingBlockEntity.java b/src/main/java/platinpython/rgbblocks/entity/RGBFallingBlockEntity.java
@@ -54,13 +54,13 @@ protected void readAdditionalSaveData(CompoundTag compound) {
     @Override
     public void writeSpawnData(FriendlyByteBuf buffer) {
         buffer.writeInt(color);
-        buffer.writeWithCodec(BlockState.CODEC, blockState);
+        buffer.writeJsonWithCodec(BlockState.CODEC, blockState);
     }
 
     @Override
     public void readSpawnData(FriendlyByteBuf additionalData) {
         color = additionalData.readInt();
-        blockState = additionalData.readWithCodec(BlockState.CODEC);
+        blockState = additionalData.readJsonWithCodec(BlockState.CODEC);
     }
 
     @Override
diff --git a/src/main/java/platinpython/rgbblocks/item/crafting/ShapelessDurabilityAwarePaintBucketRecipe.java b/src/main/java/platinpython/rgbblocks/item/crafting/ShapelessDurabilityAwarePaintBucketRecipe.java
@@ -4,6 +4,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import net.minecraft.core.NonNullList;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
@@ -64,15 +65,15 @@ public NonNullList<ItemStack> getRemainingItems(CraftingContainer craftingInvent
     }
 
     @Override
-    public ItemStack assemble(CraftingContainer craftingInventory) {
+    public ItemStack assemble(CraftingContainer craftingInventory, RegistryAccess registryAccess) {
         int color = 0;
         for (int i = 0; i < craftingInventory.getContainerSize(); i++) {
             if (craftingInventory.getItem(i).getItem() instanceof PaintBucketItem) {
                 color = craftingInventory.getItem(i).getOrCreateTag().getInt("color");
                 break;
             }
         }
-        ItemStack result = super.assemble(craftingInventory);
+        ItemStack result = super.assemble(craftingInventory, registryAccess);
         result.getOrCreateTag().putInt("color", color);
         return result;
     }
@@ -129,7 +130,7 @@ public void toNetwork(FriendlyByteBuf buffer, ShapelessDurabilityAwarePaintBucke
                 ingredient.toNetwork(buffer);
             }
 
-            buffer.writeItem(recipe.getResultItem());
+            buffer.writeItem(recipe.getResultItem(RegistryAccess.EMPTY));
         }
     }
 }
diff --git a/src/main/java/platinpython/rgbblocks/item/crafting/ShapelessNoReturnRecipe.java b/src/main/java/platinpython/rgbblocks/item/crafting/ShapelessNoReturnRecipe.java
@@ -4,6 +4,7 @@
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import net.minecraft.core.NonNullList;
+import net.minecraft.core.RegistryAccess;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.util.GsonHelper;
@@ -82,7 +83,7 @@ public void toNetwork(FriendlyByteBuf buffer, ShapelessNoReturnRecipe recipe) {
                 ingredient.toNetwork(buffer);
             }
 
-            buffer.writeItem(recipe.getResultItem());
+            buffer.writeItem(recipe.getResultItem(RegistryAccess.EMPTY));
         }
     }
 }
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
@@ -1,5 +1,5 @@
 modLoader="javafml"
-loaderVersion="[44,)"
+loaderVersion="[45,)"
 license="MIT"
 issueTrackerURL="https://github.com/PlatinPython/RGBBlocks/issues"
 
@@ -17,13 +17,13 @@ issueTrackerURL="https://github.com/PlatinPython/RGBBlocks/issues"
 [[dependencies.rgbblocks]]
   modId="forge"
   mandatory=true
-  versionRange="[44,)"
+  versionRange="[45,)"
   ordering="NONE"
   side="BOTH"
 
 [[dependencies.rgbblocks]]
   modId="minecraft"
   mandatory=true
-  versionRange="[1.19.3,1.19.4)"
+  versionRange="1.19.4"
   ordering="NONE"
   side="BOTH"
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ java.toolchain.languageVersion = JavaLanguageVersion.of(17)`
`13`	`13`
`14`	`14`	`println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"`
`15`	`15`	`minecraft {`
`16`		`- mappings channel: 'parchment', version: '2023.02.05-1.19.3'`
	`16`	`+ mappings channel: 'parchment', version: '1.19.3-2023.03.12-1.19.4'`
`17`	`17`
`18`	`18`	`accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')`
`19`	`19`
`@@ -76,9 +76,9 @@ repositories {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`dependencies {`
`79`		`- minecraft 'net.minecraftforge:forge:1.19.3-44.1.20'`
	`79`	`+ minecraft 'net.minecraftforge:forge:1.19.4-45.1.0'`
`80`	`80`
`81`		`- implementation fg.deobf("curse.maven:top-245211:4159743")`
	`81`	`+ implementation fg.deobf("curse.maven:the-one-probe-245211:4442439")`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`jar {`
Original file line number	Diff line number	Diff line change
`@@ -54,13 +54,13 @@ protected void readAdditionalSaveData(CompoundTag compound) {`
`54`	`54`	`@Override`
`55`	`55`	`public void writeSpawnData(FriendlyByteBuf buffer) {`
`56`	`56`	`buffer.writeInt(color);`
`57`		`- buffer.writeWithCodec(BlockState.CODEC, blockState);`
	`57`	`+ buffer.writeJsonWithCodec(BlockState.CODEC, blockState);`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`@Override`
`61`	`61`	`public void readSpawnData(FriendlyByteBuf additionalData) {`
`62`	`62`	`color = additionalData.readInt();`
`63`		`- blockState = additionalData.readWithCodec(BlockState.CODEC);`
	`63`	`+ blockState = additionalData.readJsonWithCodec(BlockState.CODEC);`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`import com.google.gson.JsonObject;`
`5`	`5`	`import com.google.gson.JsonParseException;`
`6`	`6`	`import net.minecraft.core.NonNullList;`
	`7`	`+import net.minecraft.core.RegistryAccess;`
`7`	`8`	`import net.minecraft.network.FriendlyByteBuf;`
`8`	`9`	`import net.minecraft.resources.ResourceLocation;`
`9`	`10`	`import net.minecraft.util.GsonHelper;`
`@@ -64,15 +65,15 @@ public NonNullList<ItemStack> getRemainingItems(CraftingContainer craftingInvent`
`64`	`65`	`}`
`65`	`66`
`66`	`67`	`@Override`
`67`		`- public ItemStack assemble(CraftingContainer craftingInventory) {`
	`68`	`+ public ItemStack assemble(CraftingContainer craftingInventory, RegistryAccess registryAccess) {`
`68`	`69`	`int color = 0;`
`69`	`70`	`for (int i = 0; i < craftingInventory.getContainerSize(); i++) {`
`70`	`71`	`if (craftingInventory.getItem(i).getItem() instanceof PaintBucketItem) {`
`71`	`72`	`color = craftingInventory.getItem(i).getOrCreateTag().getInt("color");`
`72`	`73`	`break;`
`73`	`74`	`}`
`74`	`75`	`}`
`75`		`- ItemStack result = super.assemble(craftingInventory);`
	`76`	`+ ItemStack result = super.assemble(craftingInventory, registryAccess);`
`76`	`77`	`result.getOrCreateTag().putInt("color", color);`
`77`	`78`	`return result;`
`78`	`79`	`}`
`@@ -129,7 +130,7 @@ public void toNetwork(FriendlyByteBuf buffer, ShapelessDurabilityAwarePaintBucke`
`129`	`130`	`ingredient.toNetwork(buffer);`
`130`	`131`	`}`
`131`	`132`
`132`		`- buffer.writeItem(recipe.getResultItem());`
	`133`	`+ buffer.writeItem(recipe.getResultItem(RegistryAccess.EMPTY));`
`133`	`134`	`}`
`134`	`135`	`}`
`135`	`136`	`}`