feat: port to 1.21.10

Author: MichaelHillcox

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Just Hammers Changelog
 
+## [21.10.0]
+
+### Changed
+
+- Updated to Minecraft 1.21.9/10
+
 ## [21.8.3]
 
 ### Fixed

build.gradle

@@ -128,17 +128,13 @@ publishMods {
         accessToken = providers.environmentVariable("CURSE_TOKEN")
         projectId = "${curseforge_id}"
         minecraftVersions.add("${minecraft_version}")
-        minecraftVersions.add("1.21.7")
-        minecraftVersions.add("1.21.6")
         javaVersions.add(JavaVersion.VERSION_21)
     }
 
     def modrinthOptions = modrinthOptions {
         accessToken = providers.environmentVariable("MODRINTH_TOKEN")
         projectId = "${modrinth_id}"
         minecraftVersions.add("${minecraft_version}")
-        minecraftVersions.add("1.21.7")
-        minecraftVersions.add("1.21.6")
     }
 
     curseforge("curseforgeFabric") {

common/src/main/java/pro/mikey/justhammers/HammerItem.java

@@ -135,7 +135,7 @@ public float getDestroySpeed(ItemStack itemStack, BlockState blockState) {
     public void causeAoe(Level level, BlockPos pos, BlockState state, ItemStack hammer, LivingEntity livingEntity) {
         if (!(livingEntity instanceof ServerPlayer)) return;
 
-        if (level.isClientSide || state.getDestroySpeed(level, pos) == 0.0F) {
+        if (level.isClientSide() || state.getDestroySpeed(level, pos) == 0.0F) {
             return;
         }
 

common/src/main/java/pro/mikey/justhammers/client/SelectionOutlineRender.java

@@ -23,7 +23,7 @@
 
 public class SelectionOutlineRender {
 
-    public static void render(ClientLevel world, Camera camera, DeltaTracker v, PoseStack poseStack, MultiBufferSource consumers, GameRenderer gameRenderer, Matrix4f matrix4f, LightTexture lightTexture, LevelRenderer levelRenderer) {
+    public static void render(ClientLevel world, Camera camera, PoseStack poseStack, MultiBufferSource consumers) {
         // Get the player
         if (world == null) {
             return;
@@ -34,7 +34,7 @@ public static void render(ClientLevel world, Camera camera, DeltaTracker v, Pose
             return;
         }
 
-        if (player.isCrouching()) {
+        if (player.isShiftKeyDown()) {
             return;
         }
 

fabric/src/main/java/pro/mikey/justhammers/fabric/HammersFabricClient.java

@@ -1,18 +1,25 @@
 package pro.mikey.justhammers.fabric;
 
 import net.fabricmc.api.ClientModInitializer;
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
+
+import net.fabricmc.fabric.api.client.rendering.v1.world.WorldRenderEvents;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
 import pro.mikey.justhammers.client.SelectionOutlineRender;
 
 public class HammersFabricClient implements ClientModInitializer {
     @Override
     public void onInitializeClient() {
-        WorldRenderEvents.BLOCK_OUTLINE.register(this::renderSelectionOutline);
-    }
+        WorldRenderEvents.BEFORE_BLOCK_OUTLINE.register((context, outlineRenderState) -> {
+            ClientLevel world = Minecraft.getInstance().level;
+            SelectionOutlineRender.render(
+                    world,
+                    Minecraft.getInstance().gameRenderer.getMainCamera(),
+                    context.matrices(),
+                    context.consumers()
+            );
 
-    private boolean renderSelectionOutline(WorldRenderContext worldRenderContext, WorldRenderContext.BlockOutlineContext blockOutlineContext) {
-        SelectionOutlineRender.render(worldRenderContext.world(), worldRenderContext.camera(), worldRenderContext.tickCounter(), worldRenderContext.matrixStack(), worldRenderContext.consumers(), worldRenderContext.gameRenderer(), worldRenderContext.projectionMatrix(), worldRenderContext.gameRenderer().lightTexture(), worldRenderContext.worldRenderer());
-        return true;
+            return true;
+        });
     }
 }

gradle.properties

@@ -2,17 +2,17 @@ org.gradle.jvmargs=-Xmx2048M
 
 mod_id=justhammers
 
-minecraft_version=1.21.8
-minecraft_version_range=[%base%,1.21.10)
+minecraft_version=1.21.10
+minecraft_version_range=[%base%,1.21.11)
 
 archives_base_name=just-hammers
-mod_version=21.8.3
+mod_version=21.10.0
 
-fabric_loader_version=0.17.0
-fabric_api_version=0.131.0+1.21.8
+fabric_loader_version=0.17.3
+fabric_api_version=0.138.3+1.21.10
 
-neoforge_version=21.8.26
-neoforge_version_range=[21.8.0,21.10.0)
+neoforge_version=21.10.52-beta
+neoforge_version_range=[21.10.0,22.0)
 
 # Publishing
 modrinth_id=edU0NbZZ

neoforge/src/main/java/pro/mikey/justhammers/neoforge/HammersClientEvents.java

@@ -11,18 +11,12 @@
 public class HammersClientEvents {
     @SubscribeEvent
     public static void onWorldRenderLast(RenderLevelStageEvent.AfterTranslucentBlocks event) {
-
         Minecraft instance = Minecraft.getInstance();
         SelectionOutlineRender.render(
                 instance.level,
-                event.getCamera(),
-                event.getPartialTick(),
+                Minecraft.getInstance().gameRenderer.getMainCamera(),
                 event.getPoseStack(),
-                instance.renderBuffers().bufferSource(),
-                instance.gameRenderer,
-                event.getModelViewMatrix(),
-                instance.gameRenderer.lightTexture(),
-                instance.levelRenderer
+                instance.renderBuffers().bufferSource()
          );
     }
 }

neoforge/src/main/java/pro/mikey/justhammers/neoforge/mixin/ServerPlayerGameModeMixinNeoForge.java

@@ -27,7 +27,7 @@ public class ServerPlayerGameModeMixinNeoForge {
     /**
      * This is used when we're in creative mode, and we're trying to mine a block
      */
-    @Inject(method = "destroyBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayerGameMode;removeBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)Z", ordinal = 0, shift = At.Shift.BEFORE))
+    @Inject(method = "destroyBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayerGameMode;removeBlock(Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;ZLnet/minecraft/world/item/ItemStack;)Z", ordinal = 0, shift = At.Shift.BEFORE))
     public void justhammers$beforeRemoveBlock(BlockPos blockPos, CallbackInfoReturnable<Boolean> cir) {
         this.hammerMineBlock(blockPos);
     }