update to 1.21.10

Kaupenjoe · Kaupenjoe · commit 220f62006111 · 2025-10-12T14:15:39.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.10-SNAPSHOT'
+	id 'fabric-loom' version '1.11-SNAPSHOT'
 	id 'maven-publish'
 }
 
diff --git a/gradle.properties b/gradle.properties
@@ -4,14 +4,14 @@ org.gradle.parallel=true
 
 # 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.10
+yarn_mappings=1.21.10+build.2
+loader_version=0.17.3
 
 # Mod Properties
 mod_version=1.0.0
 maven_group=net.kaupenjoe.tutorialmod
 archives_base_name=tutorialmod
 
 # Fabric API
-fabric_version=0.127.0+1.21.6
+fabric_version=0.135.0+1.21.10
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/block/custom/GrowthChamberBlock.java b/src/main/java/net/kaupenjoe/tutorialmod/block/custom/GrowthChamberBlock.java
@@ -47,7 +47,7 @@ protected BlockRenderType getRenderType(BlockState state) {
     @Override
     protected ActionResult onUseWithItem(ItemStack stack, BlockState state, World world, BlockPos pos,
                                          PlayerEntity player, Hand hand, BlockHitResult hit) {
-        if (!world.isClient) {
+        if (!world.isClient()) {
             NamedScreenHandlerFactory screenHandlerFactory = ((GrowthChamberBlockEntity) world.getBlockEntity(pos));
             if (screenHandlerFactory != null) {
                 player.openHandledScreen(screenHandlerFactory);
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/block/entity/renderer/PedestalBlockEntityRenderState.java b/src/main/java/net/kaupenjoe/tutorialmod/block/entity/renderer/PedestalBlockEntityRenderState.java
@@ -0,0 +1,14 @@
+package net.kaupenjoe.tutorialmod.block.entity.renderer;
+
+import net.minecraft.client.render.block.entity.state.BlockEntityRenderState;
+import net.minecraft.client.render.item.ItemRenderState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public class PedestalBlockEntityRenderState extends BlockEntityRenderState {
+    public BlockPos lightPosition;
+    public World blockEntityWorld;
+    public float rotation;
+
+    final ItemRenderState itemRenderState = new ItemRenderState();
+}
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/block/entity/renderer/PedestalBlockEntityRenderer.java b/src/main/java/net/kaupenjoe/tutorialmod/block/entity/renderer/PedestalBlockEntityRenderer.java
@@ -2,12 +2,16 @@
 
 import net.kaupenjoe.tutorialmod.block.entity.custom.PedestalBlockEntity;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.item.ItemModelManager;
 import net.minecraft.client.render.LightmapTextureManager;
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.block.entity.BlockEntityRenderer;
 import net.minecraft.client.render.block.entity.BlockEntityRendererFactory;
+import net.minecraft.client.render.command.ModelCommandRenderer;
+import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.item.ItemRenderer;
+import net.minecraft.client.render.state.CameraRenderState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemDisplayContext;
 import net.minecraft.item.ItemStack;
@@ -16,25 +20,43 @@
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.LightType;
 import net.minecraft.world.World;
+import org.jetbrains.annotations.Nullable;
+
+public class PedestalBlockEntityRenderer implements BlockEntityRenderer<PedestalBlockEntity, PedestalBlockEntityRenderState> {
+    private final ItemModelManager itemModelManager;
 
-public class PedestalBlockEntityRenderer implements BlockEntityRenderer<PedestalBlockEntity> {
     public PedestalBlockEntityRenderer(BlockEntityRendererFactory.Context context) {
+        itemModelManager = context.itemModelManager();
+    }
 
+    @Override
+    public PedestalBlockEntityRenderState createRenderState() {
+        return new PedestalBlockEntityRenderState();
     }
 
     @Override
-    public void render(PedestalBlockEntity entity, float tickDelta, MatrixStack matrices,
-                       VertexConsumerProvider vertexConsumers, int light, int overlay, Vec3d cameraPos) {
-        ItemRenderer itemRenderer = MinecraftClient.getInstance().getItemRenderer();
-        ItemStack stack = entity.getStack(0);
+    public void updateRenderState(PedestalBlockEntity blockEntity, PedestalBlockEntityRenderState state, float tickProgress,
+                                  Vec3d cameraPos, @Nullable ModelCommandRenderer.CrumblingOverlayCommand crumblingOverlay) {
+        BlockEntityRenderer.super.updateRenderState(blockEntity, state, tickProgress, cameraPos, crumblingOverlay);
 
+        state.lightPosition = blockEntity.getPos();
+        state.blockEntityWorld = blockEntity.getWorld();
+        state.rotation = blockEntity.getRenderingRotation();
+
+        itemModelManager.clearAndUpdate(state.itemRenderState,
+                blockEntity.getStack(0), ItemDisplayContext.FIXED, blockEntity.getWorld(), null, 0);
+    }
+
+    @Override
+    public void render(PedestalBlockEntityRenderState state, MatrixStack matrices, OrderedRenderCommandQueue queue, CameraRenderState cameraState) {
         matrices.push();
+
         matrices.translate(0.5f, 1.15f, 0.5f);
         matrices.scale(0.5f, 0.5f, 0.5f);
-        matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(entity.getRenderingRotation()));
+        matrices.multiply(RotationAxis.POSITIVE_Y.rotationDegrees(state.rotation));
+
+        state.itemRenderState.render(matrices, queue, getLightLevel(state.blockEntityWorld, state.pos), OverlayTexture.DEFAULT_UV, 0);
 
-        itemRenderer.renderItem(stack, ItemDisplayContext.GUI, getLightLevel(entity.getWorld(),
-                entity.getPos()), OverlayTexture.DEFAULT_UV, matrices, vertexConsumers, entity.getWorld(), 1);
         matrices.pop();
     }
 
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/datagen/ModModelProvider.java b/src/main/java/net/kaupenjoe/tutorialmod/datagen/ModModelProvider.java
@@ -69,7 +69,7 @@ public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGen
         blockStateModelGenerator.registerSingleton(ModBlocks.DRIFTWOOD_LEAVES, TexturedModel.LEAVES);
         blockStateModelGenerator.registerTintableCrossBlockState(ModBlocks.DRIFTWOOD_SAPLING, BlockStateModelGenerator.CrossType.NOT_TINTED);
 
-        blockStateModelGenerator.registerNorthDefaultHorizontalRotation(ModBlocks.CHAIR);
+        blockStateModelGenerator.registerNorthDefaultHorizontalRotatable(ModBlocks.CHAIR);
 
         blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.GROWTH_CHAMBER);
     }
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/entity/client/MantisRenderer.java b/src/main/java/net/kaupenjoe/tutorialmod/entity/client/MantisRenderer.java
@@ -5,8 +5,10 @@
 import net.kaupenjoe.tutorialmod.entity.custom.MantisEntity;
 import net.kaupenjoe.tutorialmod.entity.custom.MantisVariant;
 import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.MobEntityRenderer;
+import net.minecraft.client.render.state.CameraRenderState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Util;
@@ -33,14 +35,14 @@ public Identifier getTexture(MantisRenderState state) {
 
     @Override
     public void render(MantisRenderState state, MatrixStack matrixStack,
-                       VertexConsumerProvider vertexConsumerProvider, int i) {
+                       OrderedRenderCommandQueue orderedRenderCommandQueue, CameraRenderState cameraRenderState) {
         if(state.baby) {
             matrixStack.scale(0.5f, 0.5f, 0.5f);
         } else {
             matrixStack.scale(1f, 1f, 1f);
         }
 
-        super.render(state, matrixStack, vertexConsumerProvider, i);
+        super.render(state, matrixStack, orderedRenderCommandQueue, cameraRenderState);
     }
 
     @Override
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/entity/client/TomahawkProjectileRenderer.java b/src/main/java/net/kaupenjoe/tutorialmod/entity/client/TomahawkProjectileRenderer.java
@@ -5,10 +5,12 @@
 import net.minecraft.client.render.OverlayTexture;
 import net.minecraft.client.render.VertexConsumer;
 import net.minecraft.client.render.VertexConsumerProvider;
+import net.minecraft.client.render.command.OrderedRenderCommandQueue;
 import net.minecraft.client.render.entity.EntityRenderer;
 import net.minecraft.client.render.entity.EntityRendererFactory;
 import net.minecraft.client.render.entity.state.EntityRenderState;
 import net.minecraft.client.render.item.ItemRenderer;
+import net.minecraft.client.render.state.CameraRenderState;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.MathHelper;
@@ -23,16 +25,16 @@ public TomahawkProjectileRenderer(EntityRendererFactory.Context ctx) {
     }
 
     @Override
-    public void render(EntityRenderState state, MatrixStack matrices,
-                       VertexConsumerProvider vertexConsumers, int light) {
-        matrices.push();
+    public void render(EntityRenderState renderState, MatrixStack matrices, OrderedRenderCommandQueue queue, CameraRenderState cameraState) {
+        // matrices.push();
+//
+        // VertexConsumer vertexconsumer = ItemRenderer.getItemGlintConsumer(vertexConsumers,
+        //         this.model.getLayer(Identifier.of(TutorialMod.MOD_ID, "textures/entity/tomahawk/tomahawk.png")), false, false);
+        // this.model.render(matrices, vertexconsumer, light, OverlayTexture.DEFAULT_UV);
+//
+        // matrices.pop();
 
-        VertexConsumer vertexconsumer = ItemRenderer.getItemGlintConsumer(vertexConsumers,
-                this.model.getLayer(Identifier.of(TutorialMod.MOD_ID, "textures/entity/tomahawk/tomahawk.png")), false, false);
-        this.model.render(matrices, vertexconsumer, light, OverlayTexture.DEFAULT_UV);
-
-        matrices.pop();
-        super.render(state, matrices, vertexConsumers, light);
+        super.render(renderState, matrices, queue, cameraState);
     }
 
     @Override
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/entity/custom/ChairEntity.java b/src/main/java/net/kaupenjoe/tutorialmod/entity/custom/ChairEntity.java
@@ -38,8 +38,8 @@ protected void writeCustomData(WriteView view) {
     @Override
     protected void removePassenger(Entity passenger) {
         super.removePassenger(passenger);
-        if(!this.getWorld().isClient()) {
-            this.kill(((ServerWorld) this.getWorld()));
+        if(!this.getEntityWorld().isClient()) {
+            this.kill(((ServerWorld) this.getEntityWorld()));
         }
     }
 }
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/entity/custom/MantisEntity.java b/src/main/java/net/kaupenjoe/tutorialmod/entity/custom/MantisEntity.java
@@ -85,7 +85,7 @@ private void setupAnimationStates() {
     public void tick() {
         super.tick();
 
-        if (this.getWorld().isClient()) {
+        if (this.getEntityWorld().isClient()) {
             this.setupAnimationStates();
         }
     }
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/entity/custom/TomahawkProjectileEntity.java b/src/main/java/net/kaupenjoe/tutorialmod/entity/custom/TomahawkProjectileEntity.java
@@ -44,10 +44,10 @@ protected void onEntityHit(EntityHitResult entityHitResult) {
         super.onEntityHit(entityHitResult);
         Entity entity = entityHitResult.getEntity();
 
-        if (!this.getWorld().isClient()) {
-            entity.damage(((ServerWorld) this.getWorld()), this.getDamageSources().thrown(this, this.getOwner()), 4);
+        if (!this.getEntityWorld().isClient()) {
+            entity.damage(((ServerWorld) this.getEntityWorld()), this.getDamageSources().thrown(this, this.getOwner()), 4);
 
-            this.getWorld().sendEntityStatus(this, (byte)3);
+            this.getEntityWorld().sendEntityStatus(this, (byte)3);
             this.discard();
         }
     }
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/item/ModItems.java b/src/main/java/net/kaupenjoe/tutorialmod/item/ModItems.java
@@ -82,7 +82,7 @@ public void appendTooltip(ItemStack stack, Item.TooltipContext context, TooltipD
             setting -> new BlockItem(ModBlocks.HONEY_BERRY_BUSH, setting.food(ModFoodComponents.HONEY_BERRIES)));
 
     public static final Item MANTIS_SPAWN_EGG = registerItem("mantis_spawn_egg",
-            setting -> new SpawnEggItem(ModEntities.MANTIS, setting));
+            setting -> new SpawnEggItem(setting.spawnEgg(ModEntities.MANTIS)));
 
     public static final Item TOMAHAWK = registerItem("tomahawk",
             setting -> new TomahawkItem(setting.maxCount(16)));
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/item/custom/ChiselItem.java b/src/main/java/net/kaupenjoe/tutorialmod/item/custom/ChiselItem.java
@@ -6,6 +6,7 @@
 import net.kaupenjoe.tutorialmod.sound.ModSounds;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.component.DataComponentTypes;
 import net.minecraft.component.type.LoreComponent;
@@ -84,7 +85,7 @@ public ActionResult useOnBlock(ItemUsageContext context) {
 
     @Override
     public void appendTooltip(ItemStack stack, TooltipContext context, TooltipDisplayComponent displayComponent, Consumer<Text> textConsumer, TooltipType type) {
-        if(Screen.hasShiftDown()) {
+        if(MinecraftClient.getInstance().isShiftPressed()) {
             textConsumer.accept(Text.translatable("tooltip.tutorialmod.chisel.shift_down"));
         } else {
             textConsumer.accept(Text.translatable("tooltip.tutorialmod.chisel"));
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/item/custom/TomahawkItem.java b/src/main/java/net/kaupenjoe/tutorialmod/item/custom/TomahawkItem.java
@@ -20,7 +20,7 @@ public TomahawkItem(Settings settings) {
     public ActionResult use(World world, PlayerEntity user, Hand hand) {
         ItemStack itemStack = user.getStackInHand(hand);
         world.playSound(null, user.getX(), user.getY(), user.getZ(), SoundEvents.ENTITY_SNOWBALL_THROW, SoundCategory.NEUTRAL, 0.5f, 0.4f / (world.getRandom().nextFloat() * 0.4f + 0.8f));
-        if (!world.isClient) {
+        if (!world.isClient()) {
             TomahawkProjectileEntity tomahawk = new TomahawkProjectileEntity(world, user);
             tomahawk.setVelocity(user, user.getPitch(), user.getYaw(), 0.0f, 1.5f, 0f);
             world.spawnEntity(tomahawk);
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/particle/PinkGarnetParticle.java b/src/main/java/net/kaupenjoe/tutorialmod/particle/PinkGarnetParticle.java
@@ -3,26 +3,26 @@
 import net.minecraft.client.particle.*;
 import net.minecraft.client.world.ClientWorld;
 import net.minecraft.particle.SimpleParticleType;
+import net.minecraft.util.math.random.Random;
 import org.jetbrains.annotations.Nullable;
 
-public class PinkGarnetParticle extends SpriteBillboardParticle {
+public class PinkGarnetParticle extends BillboardParticle {
     public PinkGarnetParticle(ClientWorld clientWorld, double x, double y, double z,
                               SpriteProvider spriteProvider, double xSpeed, double ySpeed, double zSpeed) {
-        super(clientWorld, x, y, z, xSpeed, ySpeed, zSpeed);
+        super(clientWorld, x, y, z, xSpeed, ySpeed, zSpeed, spriteProvider.getFirst());
 
         this.velocityMultiplier = 0.8f;
 
         this.maxAge = 40;
-        this.setSpriteForAge(spriteProvider);
 
         this.red = 1f;
         this.green = 1f;
         this.blue = 1f;
     }
 
     @Override
-    public ParticleTextureSheet getType() {
-        return ParticleTextureSheet.PARTICLE_SHEET_TRANSLUCENT;
+    protected RenderType getRenderType() {
+        return RenderType.PARTICLE_ATLAS_TRANSLUCENT;
     }
 
     public static class Factory implements ParticleFactory<SimpleParticleType> {
@@ -35,7 +35,7 @@ public Factory(SpriteProvider spriteProvider) {
         @Nullable
         @Override
         public Particle createParticle(SimpleParticleType parameters, ClientWorld world, double x, double y, double z,
-                                       double velocityX, double velocityY, double velocityZ) {
+                                       double velocityX, double velocityY, double velocityZ, Random random) {
             return new PinkGarnetParticle(world, x, y, z, this.spriteProvider, velocityX, velocityY, velocityZ);
         }
     }
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/screen/custom/GrowthChamberScreenHandler.java b/src/main/java/net/kaupenjoe/tutorialmod/screen/custom/GrowthChamberScreenHandler.java
@@ -19,7 +19,7 @@ public class GrowthChamberScreenHandler extends ScreenHandler {
     public final GrowthChamberBlockEntity blockEntity;
 
     public GrowthChamberScreenHandler(int syncId, PlayerInventory inventory, BlockPos pos) {
-        this(syncId, inventory, inventory.player.getWorld().getBlockEntity(pos), new ArrayPropertyDelegate(2));
+        this(syncId, inventory, inventory.player.getEntityWorld().getBlockEntity(pos), new ArrayPropertyDelegate(2));
     }
 
     public GrowthChamberScreenHandler(int syncId, PlayerInventory playerInventory,
diff --git a/src/main/java/net/kaupenjoe/tutorialmod/screen/custom/PedestalScreenHandler.java b/src/main/java/net/kaupenjoe/tutorialmod/screen/custom/PedestalScreenHandler.java
@@ -14,7 +14,7 @@ public class PedestalScreenHandler extends ScreenHandler {
     private final Inventory inventory;
 
     public PedestalScreenHandler(int syncId, PlayerInventory playerInventory, BlockPos pos) {
-        this(syncId, playerInventory, playerInventory.player.getWorld().getBlockEntity(pos));
+        this(syncId, playerInventory, playerInventory.player.getEntityWorld().getBlockEntity(pos));
     }
 
     public PedestalScreenHandler(int syncId, PlayerInventory playerInventory, BlockEntity blockEntity) {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`plugins {`
`2`		`- id 'fabric-loom' version '1.10-SNAPSHOT'`
	`2`	`+ id 'fabric-loom' version '1.11-SNAPSHOT'`
`3`	`3`	`id 'maven-publish'`
`4`	`4`	`}`
`5`	`5`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ public void generateBlockStateModels(BlockStateModelGenerator blockStateModelGen`
`69`	`69`	`blockStateModelGenerator.registerSingleton(ModBlocks.DRIFTWOOD_LEAVES, TexturedModel.LEAVES);`
`70`	`70`	`blockStateModelGenerator.registerTintableCrossBlockState(ModBlocks.DRIFTWOOD_SAPLING, BlockStateModelGenerator.CrossType.NOT_TINTED);`
`71`	`71`
`72`		`- blockStateModelGenerator.registerNorthDefaultHorizontalRotation(ModBlocks.CHAIR);`
	`72`	`+ blockStateModelGenerator.registerNorthDefaultHorizontalRotatable(ModBlocks.CHAIR);`
`73`	`73`
`74`	`74`	`blockStateModelGenerator.registerSimpleCubeAll(ModBlocks.GROWTH_CHAMBER);`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ protected void writeCustomData(WriteView view) {`
`38`	`38`	`@Override`
`39`	`39`	`protected void removePassenger(Entity passenger) {`
`40`	`40`	`super.removePassenger(passenger);`
`41`		`- if(!this.getWorld().isClient()) {`
`42`		`- this.kill(((ServerWorld) this.getWorld()));`
	`41`	`+ if(!this.getEntityWorld().isClient()) {`
	`42`	`+ this.kill(((ServerWorld) this.getEntityWorld()));`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`