Port to 1.21.1

covers1624 · covers1624 · commit d897ee86fe9d · 2025-01-02T15:27:18.000+10:30
diff --git a/build.gradle b/build.gradle
@@ -4,12 +4,12 @@ plugins {
     id 'java'
     id 'maven-publish'
     id 'signing'
-    id 'net.neoforged.gradle.userdev' version '7.0.97'
+    id 'net.neoforged.gradle.userdev' version '7.0.165'
 }
 
 java {
     toolchain {
-        languageVersion = JavaLanguageVersion.of(17)
+        languageVersion = JavaLanguageVersion.of(21)
     }
     withSourcesJar()
     withJavadocJar()
@@ -40,7 +40,7 @@ runs {
     }
     data {
         workingDirectory file('run')
-        programArguments.addAll '--mod', 'chickenchunks', '--all', '--output', file("src/main/generated"), '--existing', file("src/main/resources")
+        arguments.addAll '--mod', 'chickenchunks', '--all', '--output', file("src/main/generated").absolutePath, '--existing', file("src/main/resources").absolutePath
     }
 }
 
@@ -59,7 +59,7 @@ processResources {
     inputs.property 'mc_version', mc_version
     inputs.property 'ccl_version', ccl_version
 
-    filesMatching('META-INF/mods.toml') {
+    filesMatching('META-INF/neoforge.mods.toml') {
         expand 'file': ['jarVersion': mod_version],
                 'mc_version': mc_version,
                 'forge_version': forge_version,
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-mc_version=1.20.4
-forge_version=20.4.237
-ccl_version=4.5.0.+
+mc_version=1.21.1
+forge_version=21.1.72
+ccl_version=4.6.0.+
 ccl_version_max=5.0.0
-mod_version=2.11.0
+mod_version=2.12.0
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
diff --git a/src/main/generated/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/main/generated/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
@@ -1,3 +1,3 @@
-// 1.20.4	2024-09-16T23:06:57.079605247	Loot Tables
-be448cbe0592e10c135784c67e12d5d500a3bdf9 data/chickenchunks/loot_tables/blocks/chunk_loader.json
-0c2b040b41a4376e3acac56f2b1a70ee72e66ee1 data/chickenchunks/loot_tables/blocks/spot_loader.json
+// 1.21.1	2024-10-29T17:38:31.743587148	Loot Tables
+be448cbe0592e10c135784c67e12d5d500a3bdf9 data/chickenchunks/loot_table/blocks/chunk_loader.json
+0c2b040b41a4376e3acac56f2b1a70ee72e66ee1 data/chickenchunks/loot_table/blocks/spot_loader.json
diff --git a/src/main/generated/.cache/b4cab054368280aacc94927aaf9bf7196225db74 b/src/main/generated/.cache/b4cab054368280aacc94927aaf9bf7196225db74
@@ -1,2 +1,2 @@
-// 1.20.4	2024-09-16T23:01:05.469873921	Tags for minecraft:block mod id chickenchunks
-2d9f11d46a1c0686fd002e9b3538a730a463089c data/minecraft/tags/blocks/mineable/pickaxe.json
+// 1.21.1	2024-10-29T17:38:31.743986012	Tags for minecraft:block mod id chickenchunks
+2d9f11d46a1c0686fd002e9b3538a730a463089c data/minecraft/tags/block/mineable/pickaxe.json
diff --git a/src/main/generated/.cache/c185ecef3e956052ff2908d70598387db6f5b151 b/src/main/generated/.cache/c185ecef3e956052ff2908d70598387db6f5b151
@@ -1,3 +1,3 @@
-// 1.20.4	2024-09-16T23:01:05.469722559	chickenchunks Item models.
+// 1.21.1	2024-10-29T17:38:31.743861491	chickenchunks Item models.
 5a01bad7c94dd100e930ef46c581f91dab435216 assets/chickenchunks/models/item/chunk_loader.json
 005b69c42e46cb5f76bf561ed78163ba8c5fafff assets/chickenchunks/models/item/spot_loader.json
diff --git a/src/main/generated/.cache/c3147af95e5ad8a1a62e87344b076363fc15c6e0 b/src/main/generated/.cache/c3147af95e5ad8a1a62e87344b076363fc15c6e0
@@ -1,3 +1,3 @@
-// 1.20.4	2024-09-16T23:01:05.46861763	chickenchunks Recipes.
-c282158c611b4b88c059ea77287d3ff6b1a890a6 data/chickenchunks/recipes/chunk_loader.json
-513ef64e02d9c8d80417db1b0fac7875db480c46 data/chickenchunks/recipes/spot_loader.json
+// 1.21.1	2024-10-29T17:38:31.743186525	chickenchunks Recipes.
+0583a949165f582a185960787cd4f21fb73ee9ff data/chickenchunks/recipe/chunk_loader.json
+fb53a274c9d5440d934be20616a6b617e503bb17 data/chickenchunks/recipe/spot_loader.json
diff --git a/src/main/generated/.cache/dd2ddb1171d92f10f06261f7c4355b6b7fc0ec50 b/src/main/generated/.cache/dd2ddb1171d92f10f06261f7c4355b6b7fc0ec50
@@ -1,4 +1,4 @@
-// 1.20.4	2024-09-16T23:01:05.469558048	Block States: chickenchunks
+// 1.21.1	2024-10-29T17:38:31.7437236	Block States: chickenchunks
 5dcc990fb00b87287cb570124cfd578361ecfe0c assets/chickenchunks/blockstates/chunk_loader.json
 5bee8ffa6e06c7d09d260d8722a517b2e64a317b assets/chickenchunks/blockstates/spot_loader.json
 b479a52b551849c8c9a1171633135a7fb8630aea assets/chickenchunks/models/block/chunk_loader.json
diff --git a/src/main/generated/data/chickenchunks/loot_table/blocks/chunk_loader.json b/src/main/generated/data/chickenchunks/loot_table/blocks/chunk_loader.json
diff --git a/src/main/generated/data/chickenchunks/loot_table/blocks/spot_loader.json b/src/main/generated/data/chickenchunks/loot_table/blocks/spot_loader.json
diff --git a/src/main/generated/data/chickenchunks/recipe/chunk_loader.json b/src/main/generated/data/chickenchunks/recipe/chunk_loader.json
@@ -6,10 +6,10 @@
       "item": "minecraft:enchanting_table"
     },
     "G": {
-      "tag": "forge:ingots/gold"
+      "tag": "c:ingots/gold"
     },
     "P": {
-      "tag": "forge:ender_pearls"
+      "tag": "c:ender_pearls"
     }
   },
   "pattern": [
@@ -18,6 +18,7 @@
     "GEG"
   ],
   "result": {
-    "item": "chickenchunks:chunk_loader"
+    "count": 1,
+    "id": "chickenchunks:chunk_loader"
   }
 }
diff --git a/src/main/generated/data/chickenchunks/recipe/spot_loader.json b/src/main/generated/data/chickenchunks/recipe/spot_loader.json
@@ -6,7 +6,7 @@
       "item": "chickenchunks:chunk_loader"
     },
     "P": {
-      "tag": "forge:ender_pearls"
+      "tag": "c:ender_pearls"
     }
   },
   "pattern": [
@@ -15,6 +15,7 @@
     "PPP"
   ],
   "result": {
-    "item": "chickenchunks:spot_loader"
+    "count": 1,
+    "id": "chickenchunks:spot_loader"
   }
 }
diff --git a/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json b/src/main/generated/data/minecraft/tags/block/mineable/pickaxe.json
diff --git a/src/main/java/codechicken/chunkloader/block/BlockChunkLoader.java b/src/main/java/codechicken/chunkloader/block/BlockChunkLoader.java
@@ -9,7 +9,9 @@
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
+import net.minecraft.world.ItemInteractionResult;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -44,20 +46,20 @@ public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos,
     }
 
     @Override
-    public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) {
+    public ItemInteractionResult useItemOn(ItemStack stack, BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) {
         if (!world.isClientSide) {
-            if (!(world.getBlockEntity(pos) instanceof TileChunkLoader tile)) return InteractionResult.PASS;
+            if (!(world.getBlockEntity(pos) instanceof TileChunkLoader tile)) return ItemInteractionResult.PASS_TO_DEFAULT_BLOCK_INTERACTION;
             if (tile.owner == null) {
                 player.sendSystemMessage(Component.translatable("chickenchunks.brokentile"));
             } else if (tile.owner.equals(player.getUUID()) || ChickenChunksConfig.doesBypassLoaderAccess((ServerPlayer) player)) {
-                PacketCustom packet = new PacketCustom(NET_CHANNEL, C_OPEN_LOADER_GUI);
+                PacketCustom packet = new PacketCustom(NET_CHANNEL, C_OPEN_LOADER_GUI, world.registryAccess());
                 packet.writePos(pos);
                 packet.sendToPlayer((ServerPlayer) player);
             } else {
                 player.sendSystemMessage(Component.translatable("chickenchunks.accessdenied"));
             }
         }
-        return InteractionResult.SUCCESS;
+        return ItemInteractionResult.SUCCESS;
     }
 
     @Nullable
diff --git a/src/main/java/codechicken/chunkloader/block/BlockSpotLoader.java b/src/main/java/codechicken/chunkloader/block/BlockSpotLoader.java
@@ -36,11 +36,6 @@ public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos,
         return SHAPE;
     }
 
-    @Override
-    public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand handIn, BlockHitResult hit) {
-        return InteractionResult.PASS;
-    }
-
     @Nullable
     @Override
     public <T extends BlockEntity> BlockEntityTicker<T> getTicker(Level level, BlockState state, BlockEntityType<T> actual) {
diff --git a/src/main/java/codechicken/chunkloader/client/ChunkLoaderItemModel.java b/src/main/java/codechicken/chunkloader/client/ChunkLoaderItemModel.java
@@ -49,10 +49,10 @@ public Geometry read(JsonObject jsonObject, JsonDeserializationContext deseriali
     public record Geometry(String childModel, boolean spotLoader) implements IUnbakedGeometry<Geometry> {
 
         @Override
-        public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation) {
+        public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function<Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides) {
             return new Model(
-                    Objects.requireNonNull(baker.getModel(new ResourceLocation(childModel))
-                            .bake(baker, spriteGetter, modelState, modelLocation)),
+                    Objects.requireNonNull(baker.getModel(ResourceLocation.parse(childModel))
+                            .bake(baker, spriteGetter, modelState)),
                     spotLoader
             );
         }
diff --git a/src/main/java/codechicken/chunkloader/client/TileChunkLoaderRenderer.java b/src/main/java/codechicken/chunkloader/client/TileChunkLoaderRenderer.java
@@ -31,13 +31,15 @@
 import java.awt.geom.Point2D;
 import java.util.Collection;
 
+import static codechicken.chunkloader.ChickenChunks.MOD_ID;
+
 public class TileChunkLoaderRenderer implements BlockEntityRenderer<TileChunkLoaderBase> {
 
     public static final RenderType laserType = RenderType.create("lasers", DefaultVertexFormat.POSITION_COLOR, VertexFormat.Mode.QUADS, 256, RenderType.CompositeState.builder()
             .setShaderState(RenderStateShard.ShaderStateShard.POSITION_COLOR_SHADER)
             .createCompositeState(false)
     );
-    public static final RenderType pearlType = CCModelLibrary.getIcos4RenderType(new ResourceLocation("chickenchunks:textures/hedronmap.png"));
+    public static final RenderType pearlType = CCModelLibrary.getIcos4RenderType(ResourceLocation.fromNamespaceAndPath(MOD_ID, "textures/hedronmap.png"));
 
     public TileChunkLoaderRenderer(BlockEntityRendererProvider.Context ctx) {
     }
@@ -93,7 +95,7 @@ public void render(TileChunkLoaderBase tile, float partialTicks, PoseStack mStac
 
     @Override
     public AABB getRenderBoundingBox(TileChunkLoaderBase blockEntity) {
-        return INFINITE_EXTENT_AABB;
+        return AABB.INFINITE;
     }
 
     public @Nullable Point2D.Double findIntersection(Line2D line1, Line2D line2) {
diff --git a/src/main/java/codechicken/chunkloader/gui/GuiChunkLoader.java b/src/main/java/codechicken/chunkloader/gui/GuiChunkLoader.java
@@ -11,6 +11,8 @@
 import net.minecraft.resources.ResourceLocation;
 import org.jetbrains.annotations.Nullable;
 
+import static codechicken.chunkloader.ChickenChunks.MOD_ID;
+
 public class GuiChunkLoader extends Screen {
 
     public @Nullable Button laserButton;
@@ -76,17 +78,18 @@ public void tick() {
     }
 
     @Override
-    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
-        ResourceLocation texture = new ResourceLocation("chickenchunks:textures/gui/gui_small.png");
-        renderBackground(graphics, mouseX, mouseY, partialTicks);
+    protected void renderMenuBackground(GuiGraphics graphics) {
+        ResourceLocation texture = ResourceLocation.fromNamespaceAndPath(MOD_ID, "textures/gui/gui_small.png");
         RenderSystem.setShaderColor(1F, 1F, 1F, 1F);
         RenderSystem.setShaderTexture(0, texture);
         int posx = width / 2 - 88;
         int posy = height / 2 - 83;
         graphics.blit(texture, posx, posy, 0, 0, 176, 166);
+    }
 
+    @Override
+    public void render(GuiGraphics graphics, int mouseX, int mouseY, float partialTicks) {
         super.render(graphics, mouseX, mouseY, partialTicks);//buttons
-
         drawCentered(graphics, Component.translatable("chickenchunks.gui.name"), width / 2 - 40, height / 2 - 74, 0x303030);
         if (tile.owner != null) {
             assert tile.ownerName != null;
diff --git a/src/main/java/codechicken/chunkloader/init/ClientInit.java b/src/main/java/codechicken/chunkloader/init/ClientInit.java
@@ -27,6 +27,6 @@ private static void onRegisterRenderers(EntityRenderersEvent.RegisterRenderers e
     }
 
     private static void onRegisterGeometryLoaders(ModelEvent.RegisterGeometryLoaders event) {
-        event.register(new ResourceLocation(MOD_ID, "chunk_loader"), new ChunkLoaderItemModel());
+        event.register(ResourceLocation.fromNamespaceAndPath(MOD_ID, "chunk_loader"), new ChunkLoaderItemModel());
     }
 }
diff --git a/src/main/java/codechicken/chunkloader/init/DataGenerators.java b/src/main/java/codechicken/chunkloader/init/DataGenerators.java
@@ -52,34 +52,35 @@ private static void gatherDataGenerators(GatherDataEvent event) {
         ExistingFileHelper files = event.getExistingFileHelper();
         CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
 
-        gen.addProvider(event.includeServer(), new LootTables(output));
+        gen.addProvider(event.includeServer(), new LootTables(output, lookupProvider));
         gen.addProvider(event.includeServer(), new BlockTags(output, lookupProvider, files));
-        gen.addProvider(event.includeServer(), new Recipes(output));
+        gen.addProvider(event.includeServer(), new Recipes(lookupProvider, output));
 
         gen.addProvider(event.includeClient(), new BlockStates(output, files));
         gen.addProvider(event.includeClient(), new ItemModels(output, files));
     }
 
     private static class LootTables extends LootTableProvider {
 
-        public LootTables(PackOutput output) {
+        public LootTables(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider) {
             super(
                     output,
                     Set.of(),
                     List.of(
                             new SubProviderEntry(BlockLoot::new, LootContextParamSets.BLOCK)
-                    )
+                    ),
+                    lookupProvider
             );
         }
     }
 
     private static class BlockLoot extends NoValidationBLockLootSubProvider {
 
-        public BlockLoot() {
+        public BlockLoot(HolderLookup.Provider registries) {
             super(Set.of(
                     CHUNK_LOADER_ITEM.get(),
                     SPOT_LOADER_ITEM.get()
-            ));
+            ), registries);
         }
 
         @Override
@@ -105,8 +106,8 @@ protected void addTags(HolderLookup.Provider provider) {
 
     private static class Recipes extends RecipeProvider {
 
-        public Recipes(PackOutput output) {
-            super(output, MOD_ID);
+        public Recipes(CompletableFuture<HolderLookup.Provider> lookupProvider, PackOutput output) {
+            super(lookupProvider, output, MOD_ID);
         }
 
         @Override
@@ -195,7 +196,7 @@ private static class ChunkLoaderItemModelLoaderBuilder extends ItemModelProvider
         private boolean isSpotLoader;
 
         public ChunkLoaderItemModelLoaderBuilder(ItemModelProvider.SimpleItemModelBuilder parent) {
-            super(new ResourceLocation(MOD_ID, "chunk_loader"), parent);
+            super(ResourceLocation.fromNamespaceAndPath(MOD_ID, "chunk_loader"), parent);
         }
 
         public ChunkLoaderItemModelLoaderBuilder childModel(String childModel) {
diff --git a/src/main/java/codechicken/chunkloader/network/ChickenChunksNetwork.java b/src/main/java/codechicken/chunkloader/network/ChickenChunksNetwork.java
@@ -5,12 +5,14 @@
 import net.minecraft.resources.ResourceLocation;
 import net.neoforged.bus.api.IEventBus;
 
+import static codechicken.chunkloader.ChickenChunks.MOD_ID;
+
 /**
  * Created by covers1624 on 1/11/19.
  */
 public class ChickenChunksNetwork {
 
-    public static final ResourceLocation NET_CHANNEL = new ResourceLocation("chickenchunks:network");
+    public static final ResourceLocation NET_CHANNEL = ResourceLocation.fromNamespaceAndPath(MOD_ID, "network");
     public static final PacketCustomChannel channel = new PacketCustomChannel(NET_CHANNEL)
             .versioned(ChickenChunks.container().getModInfo().getVersion().toString())
             .client(() -> ChunkLoaderCPH::new)
diff --git a/src/main/java/codechicken/chunkloader/network/ChunkLoaderCPH.java b/src/main/java/codechicken/chunkloader/network/ChunkLoaderCPH.java
@@ -40,7 +40,7 @@ public void handlePacket(PacketCustom packet, Minecraft mc) {
     public static void sendShapeChange(TileChunkLoader tile, ChunkLoaderShape shape, int radius) {
         if (radius < 0 || radius > 255) return;
 
-        PacketCustom packet = new PacketCustom(ChickenChunksNetwork.NET_CHANNEL, S_SET_SHAPE);
+        PacketCustom packet = new PacketCustom(ChickenChunksNetwork.NET_CHANNEL, S_SET_SHAPE, tile.getLevel().registryAccess());
         packet.writePos(tile.getBlockPos());
         packet.writeEnum(shape);
         packet.writeShort(radius);
diff --git a/src/main/java/codechicken/chunkloader/network/ChunkLoaderSPH.java b/src/main/java/codechicken/chunkloader/network/ChunkLoaderSPH.java
@@ -32,14 +32,14 @@ private void handleChunkLoaderChangePacket(Level world, ServerPlayer sender, Pac
 
     public static void sendStateUpdate(TileChunkLoaderBase tile) {
         if (tile.world().isClientSide) return;
-        PacketCustom packet = new PacketCustom(NET_CHANNEL, C_UPDATE_STATE);
+        PacketCustom packet = new PacketCustom(NET_CHANNEL, C_UPDATE_STATE, tile.getLevel().registryAccess());
         packet.writePos(tile.getBlockPos());
         tile.writeToPacket(packet);
         packet.sendToChunk(tile);
     }
 
     public static void sendGuiWarning(ServerPlayer player, Component component) {
-        PacketCustom packet = new PacketCustom(NET_CHANNEL, C_ADD_GUI_WARNING);
+        PacketCustom packet = new PacketCustom(NET_CHANNEL, C_ADD_GUI_WARNING, player.registryAccess());
         packet.writeTextComponent(component);
         packet.sendToPlayer(player);
     }
diff --git a/src/main/java/codechicken/chunkloader/tile/TileChunkLoader.java b/src/main/java/codechicken/chunkloader/tile/TileChunkLoader.java
diff --git a/src/main/java/codechicken/chunkloader/tile/TileChunkLoaderBase.java b/src/main/java/codechicken/chunkloader/tile/TileChunkLoaderBase.java
diff --git a/src/main/java/codechicken/chunkloader/world/ChunkLoaderHandler.java b/src/main/java/codechicken/chunkloader/world/ChunkLoaderHandler.java
diff --git a/src/main/java/codechicken/chunkloader/world/Organiser.java b/src/main/java/codechicken/chunkloader/world/Organiser.java
diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml

Original file line number	Diff line number	Diff line change
`@@ -4,12 +4,12 @@ plugins {`
`4`	`4`	`id 'java'`
`5`	`5`	`id 'maven-publish'`
`6`	`6`	`id 'signing'`
`7`		`- id 'net.neoforged.gradle.userdev' version '7.0.97'`
	`7`	`+ id 'net.neoforged.gradle.userdev' version '7.0.165'`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`java {`
`11`	`11`	`toolchain {`
`12`		`- languageVersion = JavaLanguageVersion.of(17)`
	`12`	`+ languageVersion = JavaLanguageVersion.of(21)`
`13`	`13`	`}`
`14`	`14`	`withSourcesJar()`
`15`	`15`	`withJavadocJar()`
`@@ -40,7 +40,7 @@ runs {`
`40`	`40`	`}`
`41`	`41`	`data {`
`42`	`42`	`workingDirectory file('run')`
`43`		`- programArguments.addAll '--mod', 'chickenchunks', '--all', '--output', file("src/main/generated"), '--existing', file("src/main/resources")`
	`43`	`+ arguments.addAll '--mod', 'chickenchunks', '--all', '--output', file("src/main/generated").absolutePath, '--existing', file("src/main/resources").absolutePath`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`@@ -59,7 +59,7 @@ processResources {`
`59`	`59`	`inputs.property 'mc_version', mc_version`
`60`	`60`	`inputs.property 'ccl_version', ccl_version`
`61`	`61`
`62`		`- filesMatching('META-INF/mods.toml') {`
	`62`	`+ filesMatching('META-INF/neoforge.mods.toml') {`
`63`	`63`	`expand 'file': ['jarVersion': mod_version],`
`64`	`64`	`'mc_version': mc_version,`
`65`	`65`	`'forge_version': forge_version,`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`# See the License for the specific language governing permissions and`
`16`	`16`	`# limitations under the License.`
`17`	`17`	`#`
	`18`	`+# SPDX-License-Identifier: Apache-2.0`
	`19`	`+#`
`18`	`20`
`19`	`21`	`##############################################################################`
`20`	`22`	`#`
`@@ -55,7 +57,7 @@`
`55`	`57`	`# Darwin, MinGW, and NonStop.`
`56`	`58`	`#`
`57`	`59`	`# (3) This script is generated from the Groovy template`
`58`		`-# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
	`60`	`+# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt`
`59`	`61`	`# within the Gradle project.`
`60`	`62`	`#`
`61`	`63`	`# You can find Gradle at https://github.com/gradle/gradle/.`
`@@ -84,7 +86,8 @@ done`
`84`	`86`	`# shellcheck disable=SC2034`
`85`	`87`	`APP_BASE_NAME=${0##*/}`
`86`	`88`	`# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)`
`87`		`-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) \|\| exit`
	`89`	`+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s`
	`90`	`+' "$PWD" ) \|\| exit`
`88`	`91`
`89`	`92`	`# Use the maximum available, or set MAX_FD != -1 to use that value.`
`90`	`93`	`MAX_FD=maximum`