From ce167c55b5757f82f28f09d1706389e7746cc4af Mon Sep 17 00:00:00 2001 From: woodiertexas Date: Mon, 1 Apr 2024 23:49:26 -0700 Subject: [PATCH] update to 1.20.4 and update dependencies --- build.gradle | 4 ++-- gradle/libs.versions.toml | 10 +++++----- .../ArchitectureExtensions.java | 12 ++++++------ .../TypedGroupedBlockItem.java | 5 +++++ .../blocks/ArchExRodBlock.java | 6 ++++++ .../architecture_extensions/blocks/CurveBlock.java | 6 ++++++ .../architecture_extensions/blocks/FacadeBlock.java | 8 +++++++- .../architecture_extensions/blocks/JoistBlock.java | 6 ++++++ .../architecture_extensions/blocks/LatticeBlock.java | 6 ++++++ .../blocks/RoundArchBlock.java | 6 ++++++ .../architecture_extensions/blocks/TransomBlock.java | 6 ++++++ .../blocks/WallColumnBlock.java | 6 ++++++ .../client/ArchitectureExtensionsClient.java | 8 ++++---- src/main/resources/quilt.mod.json | 8 ++++---- 14 files changed, 75 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 8313ab8..bd8e4c2 100644 --- a/build.gradle +++ b/build.gradle @@ -31,8 +31,8 @@ dependencies { modImplementation libs.quilted.fabric.api - modImplementation include("maven.modrinth:static-data:1.0.1+1.20") - modImplementation include("maven.modrinth:suspicious-shapes:1.0.4+1.20.1") + modImplementation include("maven.modrinth:static-data:1.1.0+1.20.4") + modImplementation include("maven.modrinth:suspicious-shapes:1.0.5+1.20.4") } processResources { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 23931c9..2d83709 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,9 +1,9 @@ [versions] # The latest versions are available at https://lambdaurora.dev/tools/import_quilt.html -minecraft = "1.20.1" -quilt_mappings = "1.20.1+build.23" -quilt_loader = "0.20.1" -quilted_fabric_api = "7.1.2+0.87.0-1.20.1" +minecraft = "1.20.4" +quilt_mappings = "1.20.4+build.3" +quilt_loader = "0.24.0" +quilted_fabric_api = "9.0.0-alpha.5+0.96.11-1.20.4" [libraries] minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" } @@ -12,5 +12,5 @@ quilt_loader = { module = "org.quiltmc:quilt-loader", version.ref = "quilt_loade quilted_fabric_api = { module = "org.quiltmc.quilted-fabric-api:quilted-fabric-api", version.ref = "quilted_fabric_api" } [plugins] -quilt_loom = { id = "org.quiltmc.loom", version = "1.0.+" } +quilt_loom = { id = "org.quiltmc.loom", version = "1.6.+" } minotaur = { id = "com.modrinth.minotaur", version = "2.+" } diff --git a/src/main/java/io/github/debuggyteam/architecture_extensions/ArchitectureExtensions.java b/src/main/java/io/github/debuggyteam/architecture_extensions/ArchitectureExtensions.java index 2b7831e..5dc933e 100644 --- a/src/main/java/io/github/debuggyteam/architecture_extensions/ArchitectureExtensions.java +++ b/src/main/java/io/github/debuggyteam/architecture_extensions/ArchitectureExtensions.java @@ -24,9 +24,9 @@ import org.quiltmc.loader.api.QuiltLoader; import org.quiltmc.loader.api.entrypoint.EntrypointContainer; import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; -import org.quiltmc.qsl.resource.loader.api.InMemoryResourcePack; +import org.quiltmc.qsl.resource.loader.api.InMemoryPack; import org.quiltmc.qsl.resource.loader.api.ResourceLoader; -import org.quiltmc.qsl.resource.loader.api.ResourcePackRegistrationContext; +import org.quiltmc.qsl.resource.loader.api.PackRegistrationContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +36,7 @@ import gay.debuggy.staticdata.api.StaticData; import gay.debuggy.staticdata.api.StaticDataItem; -public class ArchitectureExtensions implements ModInitializer, ResourcePackRegistrationContext.Callback { +public class ArchitectureExtensions implements ModInitializer, PackRegistrationContext.Callback { public static final Logger LOGGER = LoggerFactory.getLogger("Architecture Extensions"); // This should probably be fine being public and mutable @@ -48,7 +48,7 @@ public class ArchitectureExtensions implements ModInitializer, ResourcePackRegis public static final BlockCreationCallback CALLBACK_ADD_TO_ITEM_GROUP = (group, blockType, baseBlock, derivedBlock) -> ItemGroupUtil.pull(ArchitectureExtensions.ITEM_GROUP, blockType, baseBlock, derivedBlock.asItem()); - public static final InMemoryResourcePack RESOURCE_PACK = new InMemoryResourcePack.Named("Architecture Extensions"); + public static final InMemoryPack RESOURCE_PACK = new InMemoryPack.Named("Architecture Extensions"); @Override public void onInitialize(ModContainer mod) { @@ -101,11 +101,11 @@ public void onInitialize(ModContainer mod) { ItemGroupUtil.push(); - ResourceLoader.get(ResourceType.SERVER_DATA).getRegisterDefaultResourcePackEvent().register(this); + ResourceLoader.get(ResourceType.SERVER_DATA).getRegisterDefaultPackEvent().register(this); } @Override - public void onRegisterPack(@NotNull ResourcePackRegistrationContext context) { + public void onRegisterPack(@NotNull PackRegistrationContext context) { DataGeneration.generate(ResourceType.SERVER_DATA); context.addResourcePack(RESOURCE_PACK); } diff --git a/src/main/java/io/github/debuggyteam/architecture_extensions/TypedGroupedBlockItem.java b/src/main/java/io/github/debuggyteam/architecture_extensions/TypedGroupedBlockItem.java index be283d7..c963b7c 100644 --- a/src/main/java/io/github/debuggyteam/architecture_extensions/TypedGroupedBlockItem.java +++ b/src/main/java/io/github/debuggyteam/architecture_extensions/TypedGroupedBlockItem.java @@ -43,12 +43,17 @@ private Text getBaseTranslationKey() { //This hover never actually displays since the tooltip is already a hover. //But this keeps the Null tradition alive and prevents the tooltip from becoming gigantic. + /* return Text.literal("Missing") .styled(it -> it.withHoverEvent( HoverEvent.Action.SHOW_TEXT.buildHoverEvent(Text.translatable(MISSING_LOCALIZATION_KEY, Text.literal(ideal))) ) .withItalic(true) .withColor(TextColor.fromFormatting(Formatting.GRAY))); + + */ + + return Text.literal("NULL"); } @Override diff --git a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/ArchExRodBlock.java b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/ArchExRodBlock.java index 059bac3..b48ea48 100644 --- a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/ArchExRodBlock.java +++ b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/ArchExRodBlock.java @@ -1,5 +1,6 @@ package io.github.debuggyteam.architecture_extensions.blocks; +import com.mojang.serialization.MapCodec; import io.github.debuggyteam.architecture_extensions.api.BlockType.TypedGroupedBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -66,4 +67,9 @@ public TypedGroupedBlock getTypedGroupedBlock() { public MutableText getName() { return getServerTranslation(); } + + @Override + protected MapCodec getCodec() { + return null; + } } diff --git a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/CurveBlock.java b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/CurveBlock.java index 899fdd7..b1de383 100644 --- a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/CurveBlock.java +++ b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/CurveBlock.java @@ -1,5 +1,6 @@ package io.github.debuggyteam.architecture_extensions.blocks; +import com.mojang.serialization.MapCodec; import io.github.debuggyteam.architecture_extensions.api.BlockType.TypedGroupedBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -70,4 +71,9 @@ public TypedGroupedBlock getTypedGroupedBlock() { public MutableText getName() { return getServerTranslation(); } + + @Override + protected MapCodec getCodec() { + return null; + } } diff --git a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/FacadeBlock.java b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/FacadeBlock.java index d71f238..a8d17e8 100644 --- a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/FacadeBlock.java +++ b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/FacadeBlock.java @@ -1,5 +1,6 @@ package io.github.debuggyteam.architecture_extensions.blocks; +import com.mojang.serialization.MapCodec; import io.github.debuggyteam.architecture_extensions.api.BlockType.TypedGroupedBlock; import net.minecraft.block.AbstractLichenBlock; import net.minecraft.block.Block; @@ -65,7 +66,12 @@ public BlockState getStateForNeighborUpdate(BlockState state, Direction directio return state; } - + + @Override + protected MapCodec getCodec() { + return null; + } + @Override protected void appendProperties(StateManager.Builder builder) { super.appendProperties(builder); diff --git a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/JoistBlock.java b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/JoistBlock.java index 4a5faa3..ec2ad94 100644 --- a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/JoistBlock.java +++ b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/JoistBlock.java @@ -1,5 +1,6 @@ package io.github.debuggyteam.architecture_extensions.blocks; +import com.mojang.serialization.MapCodec; import io.github.debuggyteam.architecture_extensions.api.BlockType.TypedGroupedBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -86,4 +87,9 @@ public TypedGroupedBlock getTypedGroupedBlock() { public MutableText getName() { return getServerTranslation(); } + + @Override + protected MapCodec getCodec() { + return null; + } } diff --git a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/LatticeBlock.java b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/LatticeBlock.java index 34f6abf..d8bdae6 100644 --- a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/LatticeBlock.java +++ b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/LatticeBlock.java @@ -1,5 +1,6 @@ package io.github.debuggyteam.architecture_extensions.blocks; +import com.mojang.serialization.MapCodec; import io.github.debuggyteam.architecture_extensions.api.BlockType.TypedGroupedBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -84,4 +85,9 @@ public TypedGroupedBlock getTypedGroupedBlock() { public MutableText getName() { return getServerTranslation(); } + + @Override + protected MapCodec getCodec() { + return null; + } } diff --git a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/RoundArchBlock.java b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/RoundArchBlock.java index 8a70ac7..bc22ccb 100644 --- a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/RoundArchBlock.java +++ b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/RoundArchBlock.java @@ -1,5 +1,6 @@ package io.github.debuggyteam.architecture_extensions.blocks; +import com.mojang.serialization.MapCodec; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.block.HorizontalFacingBlock; @@ -84,4 +85,9 @@ public TypedGroupedBlock getTypedGroupedBlock() { public MutableText getName() { return getServerTranslation(); } + + @Override + protected MapCodec getCodec() { + return null; + } } diff --git a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/TransomBlock.java b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/TransomBlock.java index 2b45a3c..bf88c5e 100644 --- a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/TransomBlock.java +++ b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/TransomBlock.java @@ -1,5 +1,6 @@ package io.github.debuggyteam.architecture_extensions.blocks; +import com.mojang.serialization.MapCodec; import io.github.debuggyteam.architecture_extensions.api.BlockType.TypedGroupedBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -73,4 +74,9 @@ public TypedGroupedBlock getTypedGroupedBlock() { public MutableText getName() { return getServerTranslation(); } + + @Override + protected MapCodec getCodec() { + return null; + } } diff --git a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/WallColumnBlock.java b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/WallColumnBlock.java index bc46958..caafec5 100644 --- a/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/WallColumnBlock.java +++ b/src/main/java/io/github/debuggyteam/architecture_extensions/blocks/WallColumnBlock.java @@ -1,5 +1,6 @@ package io.github.debuggyteam.architecture_extensions.blocks; +import com.mojang.serialization.MapCodec; import io.github.debuggyteam.architecture_extensions.api.BlockType.TypedGroupedBlock; import net.minecraft.block.Block; import net.minecraft.block.BlockState; @@ -93,4 +94,9 @@ public TypedGroupedBlock getTypedGroupedBlock() { public MutableText getName() { return getServerTranslation(); } + + @Override + protected MapCodec getCodec() { + return null; + } } diff --git a/src/main/java/io/github/debuggyteam/architecture_extensions/client/ArchitectureExtensionsClient.java b/src/main/java/io/github/debuggyteam/architecture_extensions/client/ArchitectureExtensionsClient.java index 72694cc..ee91c16 100644 --- a/src/main/java/io/github/debuggyteam/architecture_extensions/client/ArchitectureExtensionsClient.java +++ b/src/main/java/io/github/debuggyteam/architecture_extensions/client/ArchitectureExtensionsClient.java @@ -10,9 +10,9 @@ import org.quiltmc.qsl.base.api.entrypoint.client.ClientModInitializer; import org.quiltmc.qsl.block.extensions.api.client.BlockRenderLayerMap; import org.quiltmc.qsl.resource.loader.api.ResourceLoader; -import org.quiltmc.qsl.resource.loader.api.ResourcePackRegistrationContext; +import org.quiltmc.qsl.resource.loader.api.PackRegistrationContext; -public class ArchitectureExtensionsClient implements ClientModInitializer, ResourcePackRegistrationContext.Callback { +public class ArchitectureExtensionsClient implements ClientModInitializer, PackRegistrationContext.Callback { @Override public void onInitializeClient(ModContainer mod) { DataGeneration.BLOCKS.forEach(block -> { @@ -25,11 +25,11 @@ public void onInitializeClient(ModContainer mod) { } }); - ResourceLoader.get(ResourceType.CLIENT_RESOURCES).getRegisterDefaultResourcePackEvent().register(this); + ResourceLoader.get(ResourceType.CLIENT_RESOURCES).getRegisterDefaultPackEvent().register(this); } @Override - public void onRegisterPack(@NotNull ResourcePackRegistrationContext context) { + public void onRegisterPack(@NotNull PackRegistrationContext context) { DataGeneration.generate(ResourceType.CLIENT_RESOURCES); context.addResourcePack(ArchitectureExtensions.RESOURCE_PACK); } diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json index 40a8165..c85509a 100644 --- a/src/main/resources/quilt.mod.json +++ b/src/main/resources/quilt.mod.json @@ -32,7 +32,7 @@ "depends": [ { "id": "quilt_loader", - "versions": ">=0.19.0" + "versions": ">=0.24.0" }, { "id": "quilted_fabric_api", @@ -40,15 +40,15 @@ }, { "id": "minecraft", - "versions": ">=1.20 <1.21" + "versions": ">=1.20.4" }, { "id": "staticdata", - "versions": ">=1.0.1+1.20" + "versions": ">=1.1.0+1.20.4" }, { "id": "suspicious_shapes", - "versions": ">=1.0.4+1.20.1" + "versions": ">=1.0.5+1.20.4" } ] },