From 5a90374b8465e5e96ed6df27a9a7081a883cc428 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sat, 15 Jun 2024 23:58:21 +0100 Subject: [PATCH] feat: ported to 1.21 --- CHANGELOG.md | 10 ++ build.gradle | 34 ++---- common/build.gradle | 2 +- .../pro/mikey/justhammers/HammerTags.java | 2 +- .../client/SelectionOutlineRender.java | 9 +- fabric/build.gradle | 2 +- .../fabric/HammersFabricClient.java | 2 +- fabric/src/main/resources/fabric.mod.json | 8 +- forge/build.gradle | 103 ------------------ forge/gradle.properties | 1 - .../forge/HammersClientEvents.java | 31 ------ .../mikey/justhammers/forge/HammersForge.java | 14 --- .../forge/HammersPlatformImpl.java | 15 --- .../mixin/ServerPlayerGameModeMixinForge.java | 50 --------- forge/src/main/resources/META-INF/mods.toml | 35 ------ .../main/resources/justhammers.mixins.json | 14 --- forge/src/main/resources/pack.mcmeta | 6 - gradle.properties | 13 +-- neoforge/build.gradle | 4 +- .../resources/META-INF/neoforge.mods.toml | 10 +- settings.gradle | 3 +- 21 files changed, 51 insertions(+), 317 deletions(-) delete mode 100644 forge/build.gradle delete mode 100644 forge/gradle.properties delete mode 100644 forge/src/main/java/pro/mikey/justhammers/forge/HammersClientEvents.java delete mode 100644 forge/src/main/java/pro/mikey/justhammers/forge/HammersForge.java delete mode 100644 forge/src/main/java/pro/mikey/justhammers/forge/HammersPlatformImpl.java delete mode 100644 forge/src/main/java/pro/mikey/justhammers/forge/mixin/ServerPlayerGameModeMixinForge.java delete mode 100644 forge/src/main/resources/META-INF/mods.toml delete mode 100644 forge/src/main/resources/justhammers.mixins.json delete mode 100644 forge/src/main/resources/pack.mcmeta diff --git a/CHANGELOG.md b/CHANGELOG.md index 4614eb1..7de59a6 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/build.gradle b/build.gradle index 66ee3e8..1961889 100644 --- a/build.gradle +++ b/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") diff --git a/common/build.gradle b/common/build.gradle index ce2cdda..8cfc1a9 100644 --- a/common/build.gradle +++ b/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 { diff --git a/common/src/main/java/pro/mikey/justhammers/HammerTags.java b/common/src/main/java/pro/mikey/justhammers/HammerTags.java index a326b43..e7f527d 100644 --- a/common/src/main/java/pro/mikey/justhammers/HammerTags.java +++ b/common/src/main/java/pro/mikey/justhammers/HammerTags.java @@ -6,5 +6,5 @@ import net.minecraft.world.level.block.Block; public interface HammerTags { - TagKey HAMMER_NO_SMASHY = TagKey.create(Registries.BLOCK, new ResourceLocation(Hammers.MOD_ID, "hammer_no_smashy")); + TagKey HAMMER_NO_SMASHY = TagKey.create(Registries.BLOCK, ResourceLocation.fromNamespaceAndPath(Hammers.MOD_ID, "hammer_no_smashy")); } diff --git a/common/src/main/java/pro/mikey/justhammers/client/SelectionOutlineRender.java b/common/src/main/java/pro/mikey/justhammers/client/SelectionOutlineRender.java index 255731d..e8ad902 100644 --- a/common/src/main/java/pro/mikey/justhammers/client/SelectionOutlineRender.java +++ b/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; } diff --git a/fabric/build.gradle b/fabric/build.gradle index 3753488..16dfcac 100644 --- a/fabric/build.gradle +++ b/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 } diff --git a/fabric/src/main/java/pro/mikey/justhammers/fabric/HammersFabricClient.java b/fabric/src/main/java/pro/mikey/justhammers/fabric/HammersFabricClient.java index e00de04..5bc6572 100644 --- a/fabric/src/main/java/pro/mikey/justhammers/fabric/HammersFabricClient.java +++ b/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; } } diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index ffb6032..77de90d 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/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" } } diff --git a/forge/build.gradle b/forge/build.gradle deleted file mode 100644 index 3eef4de..0000000 --- a/forge/build.gradle +++ /dev/null @@ -1,103 +0,0 @@ -plugins { - id "com.github.johnrengelman.shadow" version "7.1.2" -} - -architectury { - platformSetupLoomIde() - forge() -} - -repositories { - maven { - url "https://maven.minecraftforge.net/releases" - } -} - -loom { - accessWidenerPath = project(":common").loom.accessWidenerPath - - runs { - data { - data() - programArgs "--all", "--mod", "justhammers" - programArgs "--existing", file("../common/src/main/resources").absolutePath - programArgs "--output", file("../common/src/generated/resources").absolutePath - } - } - - forge { - convertAccessWideners = true - extraAccessWideners.add loom.accessWidenerPath.get().asFile.name - - mixinConfig "justhammers-common.mixins.json" - mixinConfig "justhammers.mixins.json" - } -} - -configurations { - common - shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this. - compileClasspath.extendsFrom common - runtimeClasspath.extendsFrom common - developmentForge.extendsFrom common -} - -dependencies { - forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}" - // Remove the next line if you don't want to depend on the API - modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}" - - modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-forge:${rootProject.rei_version}" - - common(project(path: ":common", configuration: "namedElements")) { transitive false } - shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false } -} - -processResources { - duplicatesStrategy(DuplicatesStrategy.EXCLUDE) - inputs.property "version", project.version - - filesMatching("META-INF/mods.toml") { - expand "version": project.version - } -} - -shadowJar { - exclude "fabric.mod.json" - exclude "architectury.common.json" - - configurations = [project.configurations.shadowCommon] - setArchiveClassifier "dev-shadow" -} - -remapJar { - input.set shadowJar.archiveFile - dependsOn shadowJar - setArchiveClassifier null - setArchivesBaseName("${rootProject.archivesBaseName}-${project.name}") // adds fabric to the maven and curse name -} - -jar { - setArchiveClassifier "dev" -} - -sourcesJar { - def commonSources = project(":common").sourcesJar - dependsOn commonSources - from commonSources.archiveFile.map { zipTree(it) } -} - -components.java { - withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) { - skip() - } -} - -publishing { - publications { - mavenForge(MavenPublication) { - artifactId = "${rootProject.archivesBaseName}-${project.name}" - from components.java - } - } -} diff --git a/forge/gradle.properties b/forge/gradle.properties deleted file mode 100644 index 32f842a..0000000 --- a/forge/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -loom.platform=forge \ No newline at end of file diff --git a/forge/src/main/java/pro/mikey/justhammers/forge/HammersClientEvents.java b/forge/src/main/java/pro/mikey/justhammers/forge/HammersClientEvents.java deleted file mode 100644 index b25c9c0..0000000 --- a/forge/src/main/java/pro/mikey/justhammers/forge/HammersClientEvents.java +++ /dev/null @@ -1,31 +0,0 @@ -package pro.mikey.justhammers.forge; - -import net.minecraft.client.Minecraft; -import net.minecraftforge.api.distmarker.Dist; -import net.minecraftforge.client.event.RenderLevelStageEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; -import pro.mikey.justhammers.client.SelectionOutlineRender; - -@Mod.EventBusSubscriber(value = Dist.CLIENT) -public class HammersClientEvents { - @SubscribeEvent - public static void onWorldRenderLast(RenderLevelStageEvent event) { - if (event.getStage() != RenderLevelStageEvent.Stage.AFTER_CUTOUT_BLOCKS) { - return; - } - - Minecraft instance = Minecraft.getInstance(); - SelectionOutlineRender.render( - instance.level, - event.getCamera(), - event.getPartialTick(), - event.getPoseStack(), - instance.renderBuffers().bufferSource(), - instance.gameRenderer, - event.getProjectionMatrix(), - instance.gameRenderer.lightTexture(), - instance.levelRenderer - ); - } -} diff --git a/forge/src/main/java/pro/mikey/justhammers/forge/HammersForge.java b/forge/src/main/java/pro/mikey/justhammers/forge/HammersForge.java deleted file mode 100644 index ccbab67..0000000 --- a/forge/src/main/java/pro/mikey/justhammers/forge/HammersForge.java +++ /dev/null @@ -1,14 +0,0 @@ -package pro.mikey.justhammers.forge; - -import dev.architectury.platform.forge.EventBuses; -import pro.mikey.justhammers.Hammers; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; - -@Mod(Hammers.MOD_ID) -public class HammersForge { - public HammersForge() { - EventBuses.registerModEventBus(Hammers.MOD_ID, FMLJavaModLoadingContext.get().getModEventBus()); - Hammers.init(); - } -} diff --git a/forge/src/main/java/pro/mikey/justhammers/forge/HammersPlatformImpl.java b/forge/src/main/java/pro/mikey/justhammers/forge/HammersPlatformImpl.java deleted file mode 100644 index ab3e86a..0000000 --- a/forge/src/main/java/pro/mikey/justhammers/forge/HammersPlatformImpl.java +++ /dev/null @@ -1,15 +0,0 @@ -package pro.mikey.justhammers.forge; - -import pro.mikey.justhammers.HammersPlatform; -import net.minecraftforge.fml.loading.FMLPaths; - -import java.nio.file.Path; - -public class HammersPlatformImpl { - /** - * This is our actual method to {@link HammersPlatform#getConfigDirectory()}. - */ - public static Path getConfigDirectory() { - return FMLPaths.CONFIGDIR.get(); - } -} diff --git a/forge/src/main/java/pro/mikey/justhammers/forge/mixin/ServerPlayerGameModeMixinForge.java b/forge/src/main/java/pro/mikey/justhammers/forge/mixin/ServerPlayerGameModeMixinForge.java deleted file mode 100644 index b1eefcd..0000000 --- a/forge/src/main/java/pro/mikey/justhammers/forge/mixin/ServerPlayerGameModeMixinForge.java +++ /dev/null @@ -1,50 +0,0 @@ -package pro.mikey.justhammers.forge.mixin; - -import net.minecraft.core.BlockPos; -import net.minecraft.server.level.ServerLevel; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.level.ServerPlayerGameMode; -import net.minecraft.world.item.ItemStack; -import net.minecraft.world.level.block.state.BlockState; -import org.spongepowered.asm.mixin.Debug; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; -import pro.mikey.justhammers.HammerItem; - -/** - * Forge and fabric seem to have different source sets so this is required... Fun - */ -@Mixin(ServerPlayerGameMode.class) -public class ServerPlayerGameModeMixinForge { - @Shadow @Final protected ServerPlayer player; - - @Shadow protected ServerLevel level; - - /** - * 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;Z)Z", ordinal = 0, shift = At.Shift.BEFORE)) - public void justhammers$beforeRemoveBlock(BlockPos blockPos, CallbackInfoReturnable cir) { - this.hammerMineBlock(blockPos); - } - - /** - * This is used when we're in survival mode, and we're trying to mine a block - */ - @Inject(method = "destroyBlock", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/item/ItemStack;mineBlock(Lnet/minecraft/world/level/Level;Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/player/Player;)V", ordinal = 0, shift = At.Shift.BEFORE)) - public void justhammers$beforeMineBlock(BlockPos blockPos, CallbackInfoReturnable cir) { - this.hammerMineBlock(blockPos); - } - - private void hammerMineBlock(BlockPos blockPos) { - ItemStack itemStack = this.player.getMainHandItem(); - if (itemStack.getItem() instanceof HammerItem hammerItem) { - BlockState blockState = this.level.getBlockState(blockPos); - hammerItem.causeAoe(this.level, blockPos, blockState, itemStack, this.player); - } - } -} diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml deleted file mode 100644 index d729fa7..0000000 --- a/forge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,35 +0,0 @@ -modLoader = "javafml" -loaderVersion = "[48,)" -#issueTrackerURL = "" -license = "GPL3" - -[[mods]] -modId = "justhammers" -version = "${version}" -displayName = "Just Hammers" -authors = "ErrorMikey" -description = ''' -Add hammers to the game that are able to mine in a 3x3, 3x3x3, 5x5x3 and finally a 5x5x5! They're pretty awesome. -''' -#logoFile = "" - -[[dependencies.justhammers]] -modId = "forge" -mandatory = true -versionRange = "[49,)" -ordering = "NONE" -side = "BOTH" - -[[dependencies.justhammers]] -modId = "minecraft" -mandatory = true -versionRange = "[1.20.4,)" -ordering = "NONE" -side = "BOTH" - -[[dependencies.justhammers]] -modId = "architectury" -mandatory = true -versionRange = "[11.0.9,)" -ordering = "AFTER" -side = "BOTH" diff --git a/forge/src/main/resources/justhammers.mixins.json b/forge/src/main/resources/justhammers.mixins.json deleted file mode 100644 index 177ff86..0000000 --- a/forge/src/main/resources/justhammers.mixins.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "required": true, - "package": "pro.mikey.justhammers.forge.mixin", - "compatibilityLevel": "JAVA_17", - "minVersion": "0.8", - "client": [ - ], - "mixins": [ - "ServerPlayerGameModeMixinForge" - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta deleted file mode 100644 index 3503e95..0000000 --- a/forge/src/main/resources/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "description": "justhammers", - "pack_format": 8 - } -} diff --git a/gradle.properties b/gradle.properties index d4e4dfa..23b900c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,19 +1,18 @@ org.gradle.jvmargs=-Xmx2048M -minecraft_version=1.20.6 -#enabled_platforms=fabric,forge,neoforge +minecraft_version=1.21 enabled_platforms=fabric,neoforge archives_base_name=just-hammers -mod_version=20.6.0 +mod_version=21.0.0 maven_group=pro.mikey.mods -architectury_version=12.1.3 +architectury_version=13.0.1 fabric_loader_version=0.15.11 -fabric_api_version=0.100.0+1.20.6 -forge_version=50.1.3 -neo_forge=20.6.113-beta +fabric_api_version=0.100.1+1.21 + +neoforge_version=21.0.10-beta rei_version=15.0.728 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 9b18b0e..fe726ac 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -30,11 +30,11 @@ configurations { } dependencies { - neoForge "net.neoforged:neoforge:${rootProject.neo_forge}" + neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}" // Remove the next line if you don't want to depend on the API modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}" - modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${rootProject.rei_version}" +// modRuntimeOnly "me.shedaniel:RoughlyEnoughItems-neoforge:${rootProject.rei_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false } diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index f9ae837..4c70ae2 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -1,6 +1,6 @@ modLoader = "javafml" loaderVersion = "[2,)" -#issueTrackerURL = "" +issueTrackerURL = "https://github.com/nanite/JustHammers/issues" license = "GPL3" @@ -12,26 +12,26 @@ authors = "ErrorMikey" description = ''' Add hammers to the game that are able to mine in a 3x3, 3x3x3, 5x5x3 and finally a 5x5x5! They\'re pretty awesome. ''' -#logoFile = "" +displayURL = "https://github.com/nanite/JustHammers" [[dependencies.justhammers]] modId = "neoforge" required = true -versionRange = "[20.6,)" +versionRange = "[21.0,)" ordering = "NONE" side = "BOTH" [[dependencies.justhammers]] modId = "minecraft" required = true -versionRange = "[1.20.6,)" +versionRange = "[1.21,)" ordering = "NONE" side = "BOTH" [[dependencies.justhammers]] modId = "architectury" required = true -versionRange = "[11.0.9,)" +versionRange = "[13.0.0,)" ordering = "AFTER" side = "BOTH" diff --git a/settings.gradle b/settings.gradle index 83e4530..60fad09 100644 --- a/settings.gradle +++ b/settings.gradle @@ -4,11 +4,12 @@ pluginManagement { maven { url "https://maven.fabricmc.net/" } maven { url "https://maven.architectury.dev/" } maven { url "https://maven.minecraftforge.net/" } + maven { url "https://maven.saps.dev/releases" } + maven { url "https://maven.saps.dev/snapshots" } gradlePluginPortal() } } -//include "common", "forge", "neoforge", "fabric" include "common", "neoforge", "fabric" rootProject.name = "just-hammers"