feat: ported to 1.21

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Just Hammers Changelog
 
+## [21.0.0]
+
+### Changed
+
+- Ported to 1.21
+
+### Fixed
+
+- The hammers block outline would select fluids...
+
 ## [20.6.0]
 
 ### Changed

build.gradle

@@ -2,6 +2,7 @@ plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
     id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
     id "me.modmuss50.mod-publish-plugin" version "0.5.1"
+    id 'pro.mikey.plugins.insaniam' version "0.1-SNAPSHOT"
 }
 
 architectury {
@@ -58,27 +59,28 @@ allprojects {
     }
 }
 
+def changelogData = insaniamUtils.createChangelog {
+    file = file('CHANGELOG.md')
+    versionPattern = ~/## \[[^]]+]/
+    fallbackValue = "No changelog provided"
+    version = project.mod_version
+}
+
 publishMods {
     dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
-    changelog = file("./CHANGELOG.md").text.replace("# Just Hammers Changelog", "").trim()
+    changelog = changelogData.replace("# Just Hammers Changelog", "").trim()
     version = "${mod_version}"
     type = STABLE
 
     def fabricOptions = publishOptions {
         file = project.provider { project(":fabric").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[FABRIC][${minecraft_version}] ${project.name} ${mod_version}"
+        displayName = "[FABRIC] Just Hammers ${mod_version}"
         modLoaders.add("fabric")
     }
 
-//    def forgeOptions = publishOptions {
-//        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
-//        displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}"
-//        modLoaders.add("forge")
-//    }
-
     def neoForge = publishOptions {
         file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
-        displayName = "[NEOFORGE][${minecraft_version}] ${project.name} ${mod_version}"
+        displayName = "[NEOFORGE] Just Hammers ${mod_version}"
         modLoaders.add("neoforge")
     }
 
@@ -101,13 +103,6 @@ publishMods {
         requires("fabric-api")
     }
 
-//    curseforge("curseforgeForge") {
-//        from(curseForgeOptions, forgeOptions)
-//        requires {
-//            slug = "architectury-api"
-//        }
-//    }
-
     curseforge("curseforgeNeoForge") {
         from(curseForgeOptions, neoForge)
         requires("architectury-api")
@@ -119,13 +114,6 @@ publishMods {
         requires("fabric-api")
     }
 
-//    modrinth("modrinthForge") {
-//        from(modrinthOptions, forgeOptions)
-//        requires {
-//            slug = "architectury-api"
-//        }
-//    }
-
     modrinth("modrinthNeoforge") {
         from(modrinthOptions, neoForge)
         requires("architectury-api")

common/build.gradle

@@ -9,7 +9,7 @@ loom {
 dependencies {
     modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
     modApi "dev.architectury:architectury:${rootProject.architectury_version}"
-    modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${rootProject.rei_version}"
+//    modCompileOnly "me.shedaniel:RoughlyEnoughItems-api:${rootProject.rei_version}"
 }
 
 publishing {

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

@@ -6,5 +6,5 @@
 import net.minecraft.world.level.block.Block;
 
 public interface HammerTags {
-    TagKey<Block> HAMMER_NO_SMASHY = TagKey.create(Registries.BLOCK, new ResourceLocation(Hammers.MOD_ID, "hammer_no_smashy"));
+    TagKey<Block> HAMMER_NO_SMASHY = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(Hammers.MOD_ID, "hammer_no_smashy"));
 }

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

@@ -2,10 +2,13 @@
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Camera;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.*;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.shapes.Shapes;
@@ -17,7 +20,7 @@
 
 public class SelectionOutlineRender {
 
-    public static void render(ClientLevel world, Camera camera, float v, PoseStack poseStack, MultiBufferSource consumers, GameRenderer gameRenderer, Matrix4f matrix4f, LightTexture lightTexture, LevelRenderer levelRenderer) {
+    public static void render(ClientLevel world, Camera camera, DeltaTracker v, PoseStack poseStack, MultiBufferSource consumers, GameRenderer gameRenderer, Matrix4f matrix4f, LightTexture lightTexture, LevelRenderer levelRenderer) {
         // Get the player
         if (world == null) {
             return;
@@ -78,7 +81,9 @@ public static void render(ClientLevel world, Camera camera, float v, PoseStack p
                 continue;
             }
 
-            if (world.getBlockState(pos).isAir()) {
+            BlockState blockState = world.getBlockState(pos);
+            FluidState fluidState = blockState.getFluidState();
+            if (blockState.isAir() || (!fluidState.isEmpty())) {
                 continue;
             }
 

fabric/build.gradle

@@ -29,7 +29,7 @@ dependencies {
     // Remove the next line if you don't want to depend on the API
     modApi "dev.architectury:architectury-fabric:${rootProject.architectury_version}"
 
-    modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${rootProject.rei_version}"
+//    modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-fabric:${rootProject.rei_version}"
 
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowCommon(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }

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

@@ -12,7 +12,7 @@ public void onInitializeClient() {
     }
 
     private boolean renderSelectionOutline(WorldRenderContext worldRenderContext, WorldRenderContext.BlockOutlineContext blockOutlineContext) {
-        SelectionOutlineRender.render(worldRenderContext.world(), worldRenderContext.camera(), worldRenderContext.tickDelta(), worldRenderContext.matrixStack(), worldRenderContext.consumers(), worldRenderContext.gameRenderer(), worldRenderContext.projectionMatrix(), worldRenderContext.lightmapTextureManager(), worldRenderContext.worldRenderer());
+        SelectionOutlineRender.render(worldRenderContext.world(), worldRenderContext.camera(), worldRenderContext.tickCounter(), worldRenderContext.matrixStack(), worldRenderContext.consumers(), worldRenderContext.gameRenderer(), worldRenderContext.projectionMatrix(), worldRenderContext.lightmapTextureManager(), worldRenderContext.worldRenderer());
         return true;
     }
 }

fabric/src/main/resources/fabric.mod.json

@@ -8,8 +8,8 @@
     "ErrorMikey"
   ],
   "contact": {
-    "homepage": "https://github.com/ErrorMikey/JustHammers",
-    "sources": "https://github.com/ErrorMikey/JustHammers"
+    "homepage": "https://github.com/nanite/JustHammers",
+    "sources": "https://github.com/nanite/JustHammers"
   },
   "license": "GPL3",
   "environment": "*",
@@ -30,7 +30,7 @@
   ],
   "depends": {
     "fabric-api": ">=0.91.0",
-    "minecraft": ">=1.20.4",
-    "architectury": ">=11.0.9"
+    "minecraft": ">=1.21",
+    "architectury": ">=13.0.0"
   }
 }