From f06566808a48ba1f46b81fa90981c7863e7bf6f0 Mon Sep 17 00:00:00 2001 From: UnRealDinnerbone Date: Thu, 13 Jun 2024 14:26:50 -0500 Subject: [PATCH] 1.21 --- .github/workflows/snapshot.yml | 1 + CHANGELOG.md | 4 +- build.gradle | 39 ++++++------------- .../enter_mining_dimension.json | 0 .../transportation/end_portal_block.json | 0 .../transportation/nether_portal_block.json | 0 .../recipes/transportation/portal_block.json | 0 .../blocks/end_portal.json | 0 .../blocks/nether_portal.json | 0 .../blocks/portal_block.json | 0 .../{recipes => recipe}/end_portal_block.json | 0 .../nether_portal_block.json | 0 .../{recipes => recipe}/portal_block.json | 0 .../{blocks => block}/mineable/pickaxe.json | 0 .../java/com/unrealdinnerbone/jamd/JAMD.java | 8 ++++ .../com/unrealdinnerbone/jamd/WorldType.java | 7 ++-- .../jamd/api/FeatureTypeRegistry.java | 3 +- .../jamd/util/OreRegistry.java | 2 +- .../jamd/util/TelerportUtils.java | 5 +-- .../jamd/data/AdvancementProvider.java | 5 ++- .../jamd/data/RecipeProvider.java | 7 ++-- forge/build.gradle | 11 ------ .../jamd/forge/JAMDForge.java | 32 --------------- .../resources/META-INF/accesstransformer.cfg | 7 ---- forge/src/main/resources/META-INF/mods.toml | 29 -------------- gradle.properties | 18 ++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- .../jamd/neo/compact/IECompact.java | 2 +- settings.gradle | 18 ++++++--- 29 files changed, 60 insertions(+), 140 deletions(-) rename common/src/generated/resources/data/jamd/{advancements => advancement}/enter_mining_dimension.json (100%) rename common/src/generated/resources/data/jamd/{advancements => advancement}/recipes/transportation/end_portal_block.json (100%) rename common/src/generated/resources/data/jamd/{advancements => advancement}/recipes/transportation/nether_portal_block.json (100%) rename common/src/generated/resources/data/jamd/{advancements => advancement}/recipes/transportation/portal_block.json (100%) rename common/src/generated/resources/data/jamd/{loot_tables => loot_table}/blocks/end_portal.json (100%) rename common/src/generated/resources/data/jamd/{loot_tables => loot_table}/blocks/nether_portal.json (100%) rename common/src/generated/resources/data/jamd/{loot_tables => loot_table}/blocks/portal_block.json (100%) rename common/src/generated/resources/data/jamd/{recipes => recipe}/end_portal_block.json (100%) rename common/src/generated/resources/data/jamd/{recipes => recipe}/nether_portal_block.json (100%) rename common/src/generated/resources/data/jamd/{recipes => recipe}/portal_block.json (100%) rename common/src/generated/resources/data/minecraft/tags/{blocks => block}/mineable/pickaxe.json (100%) delete mode 100644 forge/build.gradle delete mode 100644 forge/src/main/java/com/unrealdinnerbone/jamd/forge/JAMDForge.java delete mode 100644 forge/src/main/resources/META-INF/accesstransformer.cfg delete mode 100644 forge/src/main/resources/META-INF/mods.toml diff --git a/.github/workflows/snapshot.yml b/.github/workflows/snapshot.yml index c7b676f..1895fb5 100644 --- a/.github/workflows/snapshot.yml +++ b/.github/workflows/snapshot.yml @@ -13,5 +13,6 @@ jobs: secrets: nanite-token: ${{ secrets.NANITE_DEPLOY }} with: + java-version: 21 use-snapshots: true gradle-tasks: build publish \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index ea18ef0..dd683d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ -### 5.0.0 +### 6.0.0 -- Updated to 1.20.5 \ No newline at end of file +- Updated to 1.21 \ No newline at end of file diff --git a/build.gradle b/build.gradle index 9e9505d..775054a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,8 @@ plugins { - id("dev.nanite.mlp") version("0.1.8") + id("dev.nanite.mlp") version("0.1.10") id("java-library") id("maven-publish") id("me.modmuss50.mod-publish-plugin") version "0.3.0" -// id 'org.jetbrains.gradle.plugin.idea-ext' version '1.0' - } @@ -14,8 +12,8 @@ multiLoader.root() { minecraftVersion.set(project.property("minecraft_version")) modID.set(project.property("mod_id")) splitSources.set(true) - convertAccessWidener.set(true) accessWidenerFile.set(project(":common").file("src/main/resources/${mod_id}.accesswidener")) + dataGen { useFabric.set(project(":common").file("src/generated/resources")) } @@ -27,15 +25,8 @@ allprojects { setArchivesBaseName("${mod_name}-${project.name}".toLowerCase()) group = "com.unrealdinnerbone" -// -// idea { -// module { -// downloadSources = true -// downloadJavadoc = true -// } -// } -} +} subprojects { @@ -55,22 +46,26 @@ subprojects { } repositories { maven { - name = "Creeperhost" - url = uri("https://maven.creeperhost.net/") + name = "NeoForge" + url = "https://maven.neoforged.net/" } maven { - name = "Nanite" - url = "https://maven.nanite.dev/releases" + name = "Fabric" + url = "https://maven.fabricmc.net/" } maven { name = "Nanite" - url = "https://maven.blamejared.com/" + url = "https://maven.nanite.dev/releases" } } tasks.withType(ProcessResources).configureEach { outputs.upToDateWhen { false } } + test { + enabled = false + } + publishing { repositories { if (providers.environmentVariable("NANITE_TOKEN").isPresent()) { @@ -108,12 +103,6 @@ publishMods { modLoaders.add("fabric") } -// def forgeOptions = publishOptions { -// file = project.provider { project(":forge").tasks.jar }.flatMap { it.archiveFile } -// displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}" -// modLoaders.add("forge") -// } - def neoOptions = publishOptions { file = project.provider { project(":neo").tasks.jar }.flatMap { it.archiveFile } displayName = "${project.name} Neo ${mod_version}+mc${minecraft_version}" @@ -137,10 +126,6 @@ publishMods { } } -// curseforge("curseforgeForge") { -// from(curseForgeOptions, forgeOptions) -// } - curseforge("curseforgeNeoForge") { from(curseForgeOptions, neoOptions) } diff --git a/common/src/generated/resources/data/jamd/advancements/enter_mining_dimension.json b/common/src/generated/resources/data/jamd/advancement/enter_mining_dimension.json similarity index 100% rename from common/src/generated/resources/data/jamd/advancements/enter_mining_dimension.json rename to common/src/generated/resources/data/jamd/advancement/enter_mining_dimension.json diff --git a/common/src/generated/resources/data/jamd/advancements/recipes/transportation/end_portal_block.json b/common/src/generated/resources/data/jamd/advancement/recipes/transportation/end_portal_block.json similarity index 100% rename from common/src/generated/resources/data/jamd/advancements/recipes/transportation/end_portal_block.json rename to common/src/generated/resources/data/jamd/advancement/recipes/transportation/end_portal_block.json diff --git a/common/src/generated/resources/data/jamd/advancements/recipes/transportation/nether_portal_block.json b/common/src/generated/resources/data/jamd/advancement/recipes/transportation/nether_portal_block.json similarity index 100% rename from common/src/generated/resources/data/jamd/advancements/recipes/transportation/nether_portal_block.json rename to common/src/generated/resources/data/jamd/advancement/recipes/transportation/nether_portal_block.json diff --git a/common/src/generated/resources/data/jamd/advancements/recipes/transportation/portal_block.json b/common/src/generated/resources/data/jamd/advancement/recipes/transportation/portal_block.json similarity index 100% rename from common/src/generated/resources/data/jamd/advancements/recipes/transportation/portal_block.json rename to common/src/generated/resources/data/jamd/advancement/recipes/transportation/portal_block.json diff --git a/common/src/generated/resources/data/jamd/loot_tables/blocks/end_portal.json b/common/src/generated/resources/data/jamd/loot_table/blocks/end_portal.json similarity index 100% rename from common/src/generated/resources/data/jamd/loot_tables/blocks/end_portal.json rename to common/src/generated/resources/data/jamd/loot_table/blocks/end_portal.json diff --git a/common/src/generated/resources/data/jamd/loot_tables/blocks/nether_portal.json b/common/src/generated/resources/data/jamd/loot_table/blocks/nether_portal.json similarity index 100% rename from common/src/generated/resources/data/jamd/loot_tables/blocks/nether_portal.json rename to common/src/generated/resources/data/jamd/loot_table/blocks/nether_portal.json diff --git a/common/src/generated/resources/data/jamd/loot_tables/blocks/portal_block.json b/common/src/generated/resources/data/jamd/loot_table/blocks/portal_block.json similarity index 100% rename from common/src/generated/resources/data/jamd/loot_tables/blocks/portal_block.json rename to common/src/generated/resources/data/jamd/loot_table/blocks/portal_block.json diff --git a/common/src/generated/resources/data/jamd/recipes/end_portal_block.json b/common/src/generated/resources/data/jamd/recipe/end_portal_block.json similarity index 100% rename from common/src/generated/resources/data/jamd/recipes/end_portal_block.json rename to common/src/generated/resources/data/jamd/recipe/end_portal_block.json diff --git a/common/src/generated/resources/data/jamd/recipes/nether_portal_block.json b/common/src/generated/resources/data/jamd/recipe/nether_portal_block.json similarity index 100% rename from common/src/generated/resources/data/jamd/recipes/nether_portal_block.json rename to common/src/generated/resources/data/jamd/recipe/nether_portal_block.json diff --git a/common/src/generated/resources/data/jamd/recipes/portal_block.json b/common/src/generated/resources/data/jamd/recipe/portal_block.json similarity index 100% rename from common/src/generated/resources/data/jamd/recipes/portal_block.json rename to common/src/generated/resources/data/jamd/recipe/portal_block.json diff --git a/common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json b/common/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json similarity index 100% rename from common/src/generated/resources/data/minecraft/tags/blocks/mineable/pickaxe.json rename to common/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/JAMD.java b/common/src/main/java/com/unrealdinnerbone/jamd/JAMD.java index 9022be4..4c3fa3a 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/JAMD.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/JAMD.java @@ -5,6 +5,8 @@ import com.unrealdinnerbone.jamd.compact.minecraft.MinecraftOreCompact; import com.unrealdinnerbone.jamd.util.OreRegistry; import com.unrealdinnerbone.trenzalore.api.platform.Services; +import com.unrealdinnerbone.trenzalore.lib.RLUtils; +import net.minecraft.resources.ResourceLocation; import net.minecraft.server.MinecraftServer; import org.slf4j.Logger; @@ -33,4 +35,10 @@ public static void onServerStart(MinecraftServer server) { } } + + public static ResourceLocation rl(String value) { + return RLUtils.rl(MOD_ID, value); + } + + } \ No newline at end of file diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/WorldType.java b/common/src/main/java/com/unrealdinnerbone/jamd/WorldType.java index 9449143..badd65a 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/WorldType.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/WorldType.java @@ -6,6 +6,7 @@ import com.unrealdinnerbone.jamd.api.FeatureTypeRegistry; import com.unrealdinnerbone.jamd.block.base.PortalTileEntity; import com.unrealdinnerbone.trenzalore.api.registry.RegistryEntry; +import com.unrealdinnerbone.trenzalore.lib.RLUtils; import net.minecraft.core.Holder; import net.minecraft.core.HolderLookup; import net.minecraft.core.RegistryAccess; @@ -53,13 +54,13 @@ public class WorldType { public WorldType(String name, RegistryEntry block, RegistryEntry item, RegistryEntry> blockEntity, TagKey biomeTag) { this.name = name; - this.key = KeySet.of(new ResourceLocation(JAMD.MOD_ID, name)); + this.key = KeySet.of(RLUtils.rl(JAMD.MOD_ID, name)); this.block = block; this.item = item; this.blockEntity = blockEntity; this.biomeTag = biomeTag; - this.ingoredConfigFeatures = TagKey.create(Registries.CONFIGURED_FEATURE, new ResourceLocation(JAMD.MOD_ID, name)); - this.ingoredPlaceFeatures = TagKey.create(Registries.PLACED_FEATURE, new ResourceLocation(JAMD.MOD_ID, name)); + this.ingoredConfigFeatures = TagKey.create(Registries.CONFIGURED_FEATURE, RLUtils.rl(JAMD.MOD_ID, name)); + this.ingoredPlaceFeatures = TagKey.create(Registries.PLACED_FEATURE, RLUtils.rl(JAMD.MOD_ID, name)); this.configPath = JAMD.CONFIG_FOLDER.resolve(name + ".json"); TYPES.add(this); } diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/api/FeatureTypeRegistry.java b/common/src/main/java/com/unrealdinnerbone/jamd/api/FeatureTypeRegistry.java index eaf3d2b..2d639be 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/api/FeatureTypeRegistry.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/api/FeatureTypeRegistry.java @@ -1,6 +1,7 @@ package com.unrealdinnerbone.jamd.api; import com.unrealdinnerbone.trenzalore.api.platform.Services; +import com.unrealdinnerbone.trenzalore.lib.RLUtils; import net.minecraft.resources.ResourceLocation; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -13,7 +14,7 @@ public class FeatureTypeRegistry { public static final Map> FEATURES = new HashMap<>(); public static void register(String modId, String id, Supplier> featureTypeCompact) { - register(modId, new ResourceLocation(modId, id), featureTypeCompact); + register(modId, RLUtils.rl(modId, id), featureTypeCompact); } public static void register(String modId, ResourceLocation id, Supplier> featureTypeCompact) { if (Services.PLATFORM.isModLoaded(modId)) { diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/util/OreRegistry.java b/common/src/main/java/com/unrealdinnerbone/jamd/util/OreRegistry.java index b45f074..c8a148e 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/util/OreRegistry.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/util/OreRegistry.java @@ -43,7 +43,7 @@ public static List getFeatures(WorldType type) { JsonElement parse = new JsonParser().parse(jsonString); DataResult data = ConfigCodec.CODEC.parse(JsonOps.INSTANCE, parse); if (data.error().isPresent()) { - LOGGER.error("Failed to parse config: {}", data.error().get().message()); + LOGGER.error("Failed to parse ConfigCodec json: {}", data.error().get().message()); return Collections.emptyList(); } Optional result = data.result(); diff --git a/common/src/main/java/com/unrealdinnerbone/jamd/util/TelerportUtils.java b/common/src/main/java/com/unrealdinnerbone/jamd/util/TelerportUtils.java index 7a74e8c..4191611 100644 --- a/common/src/main/java/com/unrealdinnerbone/jamd/util/TelerportUtils.java +++ b/common/src/main/java/com/unrealdinnerbone/jamd/util/TelerportUtils.java @@ -12,10 +12,10 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.levelgen.Heightmap; -import net.minecraft.world.level.portal.PortalInfo; import net.minecraft.world.phys.Vec3; import java.util.Collection; +import java.util.Collections; import java.util.Optional; public class TelerportUtils { @@ -26,8 +26,7 @@ public static void teleport(Player playerEntity, ResourceKey toWorldKey, if (toWorld.getBlockState(portalLocation).isAir()) { toWorld.setBlockAndUpdate(portalLocation, registrySet.getBlock().get().defaultBlockState()); } - Vec3 portalLocationVec = new Vec3(portalLocation.getX() + 0.5, portalLocation.getY() + 1, portalLocation.getZ() + 0.5); - Services.PLATFORM.teleport(playerEntity, toWorld, new PortalInfo(portalLocationVec, playerEntity.getDeltaMovement(), playerEntity.getYRot(), playerEntity.getXRot())); + playerEntity.teleportTo(toWorld, portalLocation.getX() + 0.5, portalLocation.getY() + 1, portalLocation.getZ() + 0.5, Collections.emptySet(), playerEntity.getYRot(), playerEntity.getXRot()); }, () -> playerEntity.displayClientMessage(Component.translatable(JAMD.MOD_ID + ".invalid.pos"), true)); diff --git a/fabric/src/main/java/com/unrealdinnerbone/jamd/data/AdvancementProvider.java b/fabric/src/main/java/com/unrealdinnerbone/jamd/data/AdvancementProvider.java index 96cb9a4..42875a6 100644 --- a/fabric/src/main/java/com/unrealdinnerbone/jamd/data/AdvancementProvider.java +++ b/fabric/src/main/java/com/unrealdinnerbone/jamd/data/AdvancementProvider.java @@ -2,6 +2,7 @@ import com.unrealdinnerbone.jamd.JAMD; import com.unrealdinnerbone.jamd.JAMDRegistry; +import com.unrealdinnerbone.trenzalore.lib.RLUtils; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.api.datagen.v1.provider.FabricAdvancementProvider; import net.minecraft.advancements.Advancement; @@ -25,7 +26,7 @@ protected AdvancementProvider(FabricDataOutput output, CompletableFuture consumer) { consumer.accept(Advancement.Builder.advancement() - .parent(new ResourceLocation("minecraft", "story/mine_diamond")) + .parent(RLUtils.rl("minecraft", "story/mine_diamond")) .display( JAMDRegistry.OVERWORLD.getItem().get(), Component.translatable(JAMDRegistry.OVERWORLD.getAdvancementTitleKey()), @@ -37,6 +38,6 @@ public void generateAdvancement(HolderLookup.Provider lookup, Consumer(Lnet/minecraft/world/level/levelgen/structure/templatesystem/RuleTest;Lnet/minecraft/world/level/block/state/BlockState;)V -public net.minecraft.world.level.levelgen.placement.HeightRangePlacement f_191674_ -public net.minecraft.world.level.levelgen.placement.CountPlacement f_191624_ -public net.minecraft.world.level.levelgen.heightproviders.ConstantHeight f_161947_ -public net.minecraft.world.level.biome.BiomeGenerationSettings f_186648_ -public net.minecraft.data.worldgen.biome.OverworldBiomes m_194843_(F)I 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 372468c..0000000 --- a/forge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,29 +0,0 @@ -modLoader = "javafml" -loaderVersion = "[44,)" -license = "All Rights Reserved unless stated otherwise. Distribution permission is given to FeedTheBeast and CurseForge for use in modpacks" -[[mods]] -modId = "jamd" -version = "${mod_version}" -displayName = "Just Another Mining Dimension" -logoFile = "assets/jamd/logo.png" -credits = "" -authors = "UnRealDinnerbone" -description = "Adds a mining dimension to the game." -[[dependencies.jamd]] -modId = "forge" -mandatory = true -versionRange = "[44,)" -ordering = "NONE" -side = "BOTH" -[[dependencies.jamd]] -modId = "minecraft" -mandatory = true -versionRange = "[${minecraft_version}]" -ordering = "NONE" -side = "BOTH" -[[dependencies.jamd]] -modId = "trenzalore" -mandatory = true -versionRange = "[${trenzalore_version},)" -ordering = "NONE" -side = "BOTH" \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 68d6138..fab5305 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,23 +8,19 @@ mod_id=jamd # Common -minecraft_version=1.20.5 +minecraft_version=1.21 # Forge -#forge_version=49.0.30 +#forge_version=49.0.13 -neo_version=20.5.0-beta +neo_version=21.0.0-beta -fabric_version=0.97.6+1.20.5 -fabric_loader_version=0.15.10 +fabric_version=0.100.1+1.21 +fabric_loader_version=0.15.11 # Other -trenzalore_version=5.0.1 +trenzalore_version=6.0.0 # Gradle org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false - -#Compact -#mekanism_version=1.20.4-10.5.0.22 -#immersive_engineering_version=1.20.4-10.0.1-pre.177 +org.gradle.daemon=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 48c0a02..0d18421 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/neo/src/main/java/com/unrealdinnerbone/jamd/neo/compact/IECompact.java b/neo/src/main/java/com/unrealdinnerbone/jamd/neo/compact/IECompact.java index 5d15f90..cc99023 100644 --- a/neo/src/main/java/com/unrealdinnerbone/jamd/neo/compact/IECompact.java +++ b/neo/src/main/java/com/unrealdinnerbone/jamd/neo/compact/IECompact.java @@ -11,7 +11,7 @@ // //public class IECompact implements IFeatureTypeCompact { // -// public static final ResourceLocation ID = new ResourceLocation("immersiveengineering", "ie_ore"); +// public static final ResourceLocation ID = RLUtils.rl("immersiveengineering", "ie_ore"); // // @Override // public OresCodec parse(IEOreFeature.IEOreFeatureConfig value, List placementModifiers) { diff --git a/settings.gradle b/settings.gradle index 483400a..b534184 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,20 +1,26 @@ pluginManagement { repositories { + mavenLocal() gradlePluginPortal() - maven { - name = 'Neo' - url = 'https://maven.neoforged.net/releases' - } maven { name = 'Creeperhost' url = 'https://maven.creeperhost.net/' } + maven { + name = 'Sponge Snapshots' + url = 'https://repo.spongepowered.org/repository/maven-public/' + } } -} + plugins { id "org.jetbrains.gradle.plugin.idea-ext" version "1.1.7" apply(false) - id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0' } +} + + + + include("common", "neo", "fabric") \ No newline at end of file