Initial 1.21.9 Port (untested, some bugs)

Author: juancarloscp52

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'fabric-loom' version '1.11-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -1,20 +1,20 @@
 org.gradle.jvmargs=-Xmx2048m
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-	minecraft_version=1.21.6
-	yarn_mappings=1.21.6+build.1
-	loader_version=0.16.14
+	minecraft_version=1.21.9
+	yarn_mappings=1.21.9+build.1
+	loader_version=0.17.3
 
 # Mod Properties
 	mod_version = 1.11.2
 	maven_group = me.juancarloscp52
 	archives_base_name = bedrockify
 
 # Dependencies
-	fabric_version=0.127.0+1.21.6
-  	modmenu_version=15.0.0-beta.3
-	cloth_config_version=19.0.147
-	apple_skin=mc1.21.6-3.0.6
+	fabric_version=0.134.0+1.21.9
+  	modmenu_version=16.0.0-rc.1
+	cloth_config_version=20.0.148
+	apple_skin=mc1.21.9-3.0.7
 	dab_version=2.6.3+1.21.3-fabric
 	iris_version=1.7.1+1.21
 	sodium_version=mc1.20.1-0.5.10

src/main/java/me/juancarloscp52/bedrockify/client/BedrockifyClient.java

@@ -43,6 +43,8 @@
 
 public class BedrockifyClient implements ClientModInitializer {
 
+    private static final KeyBinding.Category BEDROCKIFY_CATEGORY = KeyBinding.Category.create(Identifier.of("bedrockify","bedrockify"));
+
     private static BedrockifyClient instance;
     public static final Logger LOGGER = LogManager.getLogger();
     public ReachAroundPlacement reachAroundPlacement;
@@ -75,7 +77,7 @@ public void onInitializeClient() {
         bedrockBlockShading = new BedrockBlockShading();
         bedrockSunGlareShading = new BedrockSunGlareShading();
         hudOpacity = new HudOpacity();
-        keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("bedrockIfy.key.settings", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_B, "BedrockIfy"));
+        keyBinding = KeyBindingHelper.registerKeyBinding(new KeyBinding("bedrockIfy.key.settings", InputUtil.Type.KEYSYM, GLFW.GLFW_KEY_B, BEDROCKIFY_CATEGORY));
 
         // Register 3D Bobber Entity.
         EntityModelLayerRegistry.registerModelLayer(FishingBobber3DModel.MODEL_LAYER, FishingBobber3DModel::generateModel);

src/main/java/me/juancarloscp52/bedrockify/client/features/bedrockShading/BedrockBlockShading.java

@@ -13,7 +13,7 @@ public float getBlockShade (Direction direction){
         MinecraftClient client = MinecraftClient.getInstance();
         return switch (direction) {
             case UP -> 1.0f;
-            case DOWN -> client.player.getWorld().getRegistryKey() == World.NETHER ? 0.9f : 0.87f;
+            case DOWN -> client.player.getEntityWorld().getRegistryKey() == World.NETHER ? 0.9f : 0.87f;
             case NORTH, SOUTH -> 0.95f;
             default -> 0.9f;
         };

src/main/java/me/juancarloscp52/bedrockify/client/gui/Overlay.java

@@ -6,6 +6,8 @@
 import me.juancarloscp52.bedrockify.client.features.savingOverlay.SavingOverlay;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
+import net.minecraft.client.gui.hud.DebugHud;
+import net.minecraft.client.gui.hud.InGameHud;
 import net.minecraft.text.MutableText;
 import net.minecraft.text.Text;
 import net.minecraft.util.math.BlockPos;
@@ -41,7 +43,7 @@ public void renderOverlay(DrawContext drawContext) {
      * Renders the text components for the player position and client fps.
      */
     private void renderText(DrawContext drawContext) {
-        fps = Text.translatable("bedrockify.hud.fps").append(" " + this.client.fpsDebugString.split(" fps")[0].trim());
+        fps = Text.translatable("bedrockify.hud.fps").append(String.valueOf(client.getCurrentFps()));
         renderPositionText(drawContext);
         renderFpsText(drawContext);
     }

src/main/java/me/juancarloscp52/bedrockify/common/block/ColoredWaterCauldronBlock.java

@@ -8,6 +8,7 @@
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.event.GameEvent;
@@ -40,7 +41,7 @@ public boolean isFull(BlockState state) {
     }
 
     @Override
-    public int getComparatorOutput(BlockState state, World world, BlockPos pos) {
+    public int getComparatorOutput(BlockState state, World world, BlockPos pos, Direction direction) {
         return (int) Math.ceil((float) state.get(LEVEL) / MAX_LEVEL * LeveledCauldronBlock.MAX_LEVEL);
     }
 

src/main/java/me/juancarloscp52/bedrockify/common/block/PotionCauldronBlock.java

@@ -7,11 +7,12 @@
 import me.juancarloscp52.bedrockify.common.features.cauldron.BedrockCauldronProperties;
 import net.minecraft.block.*;
 import net.minecraft.item.ItemStack;
-import net.minecraft.particle.EntityEffectParticleEffect;
 import net.minecraft.particle.ParticleTypes;
+import net.minecraft.particle.TintedParticleEffect;
 import net.minecraft.state.StateManager;
 import net.minecraft.state.property.IntProperty;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.random.Random;
 import net.minecraft.world.World;
@@ -55,7 +56,7 @@ public boolean isFull(BlockState state) {
     }
 
     @Override
-    public int getComparatorOutput(BlockState state, World world, BlockPos pos) {
+    public int getComparatorOutput(BlockState state, World world, BlockPos pos, Direction direction) {
         return (int) Math.ceil((float) state.get(LEVEL) / MAX_LEVEL * LeveledCauldronBlock.MAX_LEVEL);
     }
 
@@ -97,7 +98,7 @@ public void randomDisplayTick(BlockState state, World world, BlockPos pos, Rando
             final double x = pos.getX() + 0.45 + random.nextDouble() * 0.2;
             final double y = pos.getY() + offsetY;
             final double z = pos.getZ() + 0.45 + random.nextDouble() * 0.2;
-            world.addParticleClient(EntityEffectParticleEffect.create(ParticleTypes.ENTITY_EFFECT, red, green, blue), x, y, z, red, green, blue);
+            world.addParticleClient(TintedParticleEffect.create(ParticleTypes.ENTITY_EFFECT, red, green, blue), x, y, z, red, green, blue);
         });
     }
 
@@ -110,7 +111,7 @@ public void randomDisplayTick(BlockState state, World world, BlockPos pos, Rando
      * @return <code>true</code> if it can be taken out.
      */
     public static boolean tryPickFluid(BlockState state, World world, BlockPos pos) {
-        if (world.isClient) {
+        if (world.isClient()) {
             return false;
         }
 

src/main/java/me/juancarloscp52/bedrockify/common/block/cauldron/BedrockCauldronBehavior.java

@@ -61,7 +61,7 @@ public interface BedrockCauldronBehavior {
         }
 
         final WaterCauldronBlockEntity blockEntity = entity.get();
-        if (!world.isClient) {
+        if (!world.isClient()) {
             ColoredWaterCauldronBlock.decrementWhenDye(state, world, pos);
             player.incrementStat(Stats.USE_CAULDRON);
             player.setStackInHand(hand, ColorBlenderHelper.blendColors(stack, blockEntity.getTintColor()));
@@ -99,7 +99,7 @@ public interface BedrockCauldronBehavior {
             level = ColoredWaterCauldronBlock.getLevelFromWaterCauldronState(state);
         }
 
-        if (!world.isClient) {
+        if (!world.isClient()) {
             BlockState newState = BedrockCauldronBlocks.COLORED_WATER_CAULDRON.getDefaultState()
                     .with(ColoredWaterCauldronBlock.LEVEL, level);
             world.setBlockState(pos, newState);
@@ -144,7 +144,7 @@ public interface BedrockCauldronBehavior {
             nextLevel = Blocks.WATER_CAULDRON.getDefaultState().get(LeveledCauldronBlock.LEVEL);
         }
 
-        if (!world.isClient) {
+        if (!world.isClient()) {
             // Replace with Water Cauldron.
             player.incrementStat(Stats.USE_CAULDRON);
             player.incrementStat(Stats.USED.getOrCreateStat(stack.getItem()));
@@ -180,7 +180,7 @@ public interface BedrockCauldronBehavior {
         final Potion potion = optionalPotion.get();
         RegistryEntry<Potion> potionEntry = Registries.POTION.getEntry(potion);
         final Item potionType = blockEntity.getPotionType();
-        if (!world.isClient) {
+        if (!world.isClient()) {
             if (!PotionCauldronBlock.tryPickFluid(state, world, pos)) {
                 return ActionResult.SUCCESS_SERVER;
             }
@@ -260,7 +260,7 @@ public interface BedrockCauldronBehavior {
         }
 
         final ItemStack processing = stack.copy();
-        if (!world.isClient) {
+        if (!world.isClient()) {
             player.incrementStat(Stats.USE_CAULDRON);
             player.incrementStat(Stats.USED.getOrCreateStat(stack.getItem()));
             player.setStackInHand(hand, ItemUsage.exchangeStack(stack, player, new ItemStack(Items.GLASS_BOTTLE)));
@@ -303,7 +303,7 @@ public interface BedrockCauldronBehavior {
 
         final Potion potion = optionalPotion.get();
         RegistryEntry<Potion> potionEntry = Registries.POTION.getEntry(potion);
-        if (!world.isClient) {
+        if (!world.isClient()) {
             // Determine arrow count and fluid level to decrease.
             final int tippedArrowCount = PotionCauldronBlock.getMaxTippedArrowCount(stack, state);
             if (tippedArrowCount <= 0) {
@@ -353,7 +353,7 @@ public interface BedrockCauldronBehavior {
     };
 
     CauldronBehavior PICK_COLORED_WATER = (state, world, pos, player, hand, stack) -> {
-        if (!world.isClient) {
+        if (!world.isClient()) {
             if (!ColoredWaterCauldronBlock.tryPickFluid(state, world, pos)) {
                 return ActionResult.SUCCESS_SERVER;
             }
@@ -431,7 +431,7 @@ static void registerEvaporateBucketBehavior(Map<Item, CauldronBehavior> map) {
      * Empties the cauldron by spawning particles and sound.
      */
     static ActionResult evaporateCauldron(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, ItemStack current, ItemStack after) {
-        if (!world.isClient) {
+        if (!world.isClient()) {
             final Identifier particleId = Registries.PARTICLE_TYPE.getId(ParticleTypes.POOF);
             for (int i = 0; i < 10; ++i) {
                 CauldronParticlePayload particlePayload = new CauldronParticlePayload();
@@ -451,7 +451,7 @@ static ActionResult evaporateCauldron(BlockState state, World world, BlockPos po
      * Spawns particles after interacting with a potion.
      */
     static void addPotionParticle(BlockState state, World world, BlockPos pos, int color) {
-        if (world.isClient) {
+        if (world.isClient()) {
             return;
         }
 

src/main/java/me/juancarloscp52/bedrockify/common/features/animalEatingParticles/EatingParticlesUtil.java

@@ -12,7 +12,7 @@
 public class EatingParticlesUtil {
 
     public static void spawnItemParticles(PlayerEntity player, ItemStack stack, AnimalEntity entity) {
-        if (player.getWorld().isClient)
+        if (player.getEntityWorld().isClient())
             return;
         int count = 16;
         for (int i = 0; i < count; ++i) {
@@ -28,7 +28,7 @@ public static void spawnItemParticles(PlayerEntity player, ItemStack stack, Anim
             particlePayload.setPosition(vec3d2);
             particlePayload.setVelocity(vec3d);
             particlePayload.setItemStack(stack);
-            PlayerLookup.world((ServerWorld) player.getWorld()).forEach(serverPlayerEntity ->
+            PlayerLookup.world((ServerWorld) player.getEntityWorld()).forEach(serverPlayerEntity ->
                     ServerPlayNetworking.send(serverPlayerEntity, particlePayload));
         }
     }

src/main/java/me/juancarloscp52/bedrockify/common/payloads/CauldronParticlePayload.java

@@ -5,9 +5,9 @@
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.network.RegistryByteBuf;
 import net.minecraft.network.codec.PacketCodec;
-import net.minecraft.particle.EntityEffectParticleEffect;
 import net.minecraft.particle.ParticleEffect;
 import net.minecraft.particle.ParticleTypes;
+import net.minecraft.particle.TintedParticleEffect;
 import net.minecraft.registry.Registries;
 import net.minecraft.util.Identifier;
 
@@ -66,7 +66,7 @@ public void receive(CauldronParticlePayload payload, ClientPlayNetworking.Contex
                 } else if (particle.equals(ParticleTypes.ENTITY_EFFECT)) {
                     client.execute(() -> {
                         if (null != client.world) {
-                            client.world.addParticleClient(EntityEffectParticleEffect.create(ParticleTypes.ENTITY_EFFECT, vx, vy, vz), x, y, z, vx, vy, vz);
+                            client.world.addParticleClient(TintedParticleEffect.create(ParticleTypes.ENTITY_EFFECT, vx, vy, vz), x, y, z, vx, vy, vz);
                         }
                     });
                 }