Merge branch 'mc-1.20.x' into mc-1.21.x

.github/workflows/main-ci.yml

@@ -30,6 +30,18 @@ jobs:
     - name: ⚒️ Build
       run: ./gradlew assemble || ./gradlew assemble
 
+    - name: 📦 Prepare Jars
+      run: |
+        # Find the main jar and append the git hash onto it.
+        mkdir -p jars
+        find projects/forge/build/libs projects/fabric/build/libs -type f -regex '.*[0-9.]+\(-SNAPSHOT\)?\.jar$' -exec bash -c 'cp {} "jars/$(basename {} .jar)-$(git rev-parse HEAD).jar"' \;
+
+    - name: 📤 Upload Jar
+      uses: actions/upload-artifact@v4
+      with:
+        name: CC-Tweaked
+        path: ./jars
+
     - name: Cache pre-commit
       uses: actions/cache@v4
       with:
@@ -54,18 +66,6 @@ jobs:
       run: ./tools/parse-reports.py
       if: ${{ failure() }}
 
-    - name: 📦 Prepare Jars
-      run: |
-        # Find the main jar and append the git hash onto it.
-        mkdir -p jars
-        find projects/forge/build/libs projects/fabric/build/libs -type f -regex '.*[0-9.]+\(-SNAPSHOT\)?\.jar$' -exec bash -c 'cp {} "jars/$(basename {} .jar)-$(git rev-parse HEAD).jar"' \;
-
-    - name: 📤 Upload Jar
-      uses: actions/upload-artifact@v4
-      with:
-        name: CC-Tweaked
-        path: ./jars
-
   build-core:
     strategy:
       fail-fast: false

REUSE.toml

@@ -40,8 +40,8 @@ path = [
     "projects/core/src/main/resources/data/computercraft/lua/rom/modules/main/.ignoreme",
     "projects/core/src/main/resources/data/computercraft/lua/rom/modules/turtle/.ignoreme",
     "projects/core/src/main/resources/data/computercraft/lua/rom/motd.txt",
-    "projects/fabric-api/src/main/modJson/fabric.mod.json",
     "projects/fabric/src/client/resources/computercraft-client.fabric.mixins.json",
+    "projects/fabric/src/datagen/resources/fabric.mod.json",
     "projects/fabric/src/main/resources/computercraft.fabric.mixins.json",
     "projects/fabric/src/main/resources/fabric.mod.json",
     "projects/fabric/src/testMod/resources/computercraft-gametest.fabric.mixins.json",

buildSrc/src/main/kotlin/cc-tweaked.gametest.gradle.kts → buildSrc/src/main/kotlin/cc-tweaked.mod.gradle.kts

@@ -19,26 +19,32 @@ plugins {
 val main = sourceSets["main"]
 val client = sourceSets["client"]
 
-// Both testMod and testFixtures inherit from the main and client classpath, just so we have access to Minecraft classes.
+// datagen and testMod inherit from the main and client classpath, just so we have access to Minecraft classes.
+val datagen by sourceSets.creating {
+    compileClasspath += main.compileClasspath + client.compileClasspath
+    runtimeClasspath += main.runtimeClasspath + client.runtimeClasspath
+}
+
 val testMod by sourceSets.creating {
     compileClasspath += main.compileClasspath + client.compileClasspath
     runtimeClasspath += main.runtimeClasspath + client.runtimeClasspath
 }
 
-configurations {
-    named(testMod.compileClasspathConfigurationName) {
-        shouldResolveConsistentlyWith(compileClasspath.get())
-    }
+val extraConfigurations = listOf(datagen, testMod)
 
-    named(testMod.runtimeClasspathConfigurationName) {
-        shouldResolveConsistentlyWith(runtimeClasspath.get())
+configurations {
+    for (config in extraConfigurations) {
+        named(config.compileClasspathConfigurationName) { shouldResolveConsistentlyWith(compileClasspath.get()) }
+        named(config.runtimeClasspathConfigurationName) { shouldResolveConsistentlyWith(runtimeClasspath.get()) }
     }
 }
 
 // Like the main test configurations, we're safe to depend on source set outputs.
 dependencies {
-    add(testMod.implementationConfigurationName, main.output)
-    add(testMod.implementationConfigurationName, client.output)
+    for (config in extraConfigurations) {
+        add(config.implementationConfigurationName, main.output)
+        add(config.implementationConfigurationName, client.output)
+    }
 }
 
 // Similar to java-test-fixtures, but tries to avoid putting the obfuscated jar on the classpath.

buildSrc/src/main/kotlin/cc/tweaked/gradle/CCTweakedExtension.kt

@@ -109,14 +109,13 @@ abstract class CCTweakedExtension(
         val otherJava = otherProject.extensions.getByType(JavaPluginExtension::class.java)
         val main = otherJava.sourceSets.getByName("main")
         val client = otherJava.sourceSets.getByName("client")
-        val testMod = otherJava.sourceSets.findByName("testMod")
-        val testFixtures = otherJava.sourceSets.findByName("testFixtures")
 
         // Pull in sources from the other project.
         extendSourceSet(otherProject, main)
         extendSourceSet(otherProject, client)
-        if (testMod != null) extendSourceSet(otherProject, testMod)
-        if (testFixtures != null) extendSourceSet(otherProject, testFixtures)
+        for (sourceSet in listOf("datagen", "testMod", "testFixtures")) {
+            otherJava.sourceSets.findByName(sourceSet)?.let { extendSourceSet(otherProject, it) }
+        }
 
         // The extra source-processing tasks should include these files too.
         project.tasks.named(main.javadocTaskName, Javadoc::class.java) { source(main.allJava, client.allJava) }

doc/events/monitor_resize.md

@@ -8,7 +8,7 @@ SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
 SPDX-License-Identifier: MPL-2.0
 -->
 
-The [`monitor_resize`] event is fired when an adjacent or networked monitor's size is changed.
+The [`monitor_resize`] event is fired when an adjacent or networked [monitor's][`monitor`] size is changed.
 
 ## Return Values
 1. [`string`]: The event name.

doc/events/monitor_touch.md

@@ -8,7 +8,7 @@ SPDX-FileCopyrightText: 2021 The CC: Tweaked Developers
 SPDX-License-Identifier: MPL-2.0
 -->
 
-The [`monitor_touch`] event is fired when an adjacent or networked Advanced Monitor is right-clicked.
+The [`monitor_touch`] event is fired when an adjacent or networked [Advanced Monitor][`monitor`] is right-clicked.
 
 ## Return Values
 1. [`string`]: The event name.

projects/common/build.gradle.kts

@@ -6,8 +6,8 @@ import cc.tweaked.gradle.*
 
 plugins {
     id("cc-tweaked.vanilla")
-    id("cc-tweaked.gametest")
     id("cc-tweaked.illuaminate")
+    id("cc-tweaked.mod")
     id("cc-tweaked.publishing")
 }
 

projects/common/src/client/java/dan200/computercraft/client/gui/GuiSprites.java

@@ -6,7 +6,6 @@
 
 import dan200.computercraft.api.ComputerCraftAPI;
 import dan200.computercraft.client.render.ComputerBorderRenderer;
-import dan200.computercraft.data.client.ClientDataProviders;
 import dan200.computercraft.shared.computer.core.ComputerFamily;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureManager;
@@ -113,7 +112,6 @@ public Stream<ResourceLocation> textures() {
      * @param pocketBottom The texture for the bottom of a pocket computer.
      * @param sidebar      The texture for the computer sidebar.
      * @see ComputerBorderRenderer
-     * @see ClientDataProviders
      */
     public record ComputerTextures(
         ResourceLocation border,

projects/common/src/main/java/dan200/computercraft/data/DataProviders.java → projects/common/src/datagen/java/dan200/computercraft/data/DataProviders.java

@@ -7,8 +7,15 @@
 import com.mojang.serialization.Codec;
 import dan200.computercraft.api.pocket.IPocketUpgrade;
 import dan200.computercraft.api.turtle.ITurtleUpgrade;
+import dan200.computercraft.client.gui.GuiSprites;
+import dan200.computercraft.client.model.LecternPrintoutModel;
+import dan200.computercraft.data.client.ExtraModelsProvider;
 import dan200.computercraft.shared.turtle.TurtleOverlay;
+import dan200.computercraft.shared.turtle.inventory.UpgradeSlot;
 import net.minecraft.Util;
+import net.minecraft.client.renderer.texture.atlas.SpriteSource;
+import net.minecraft.client.renderer.texture.atlas.SpriteSources;
+import net.minecraft.client.renderer.texture.atlas.sources.SingleFile;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.RegistrySetBuilder;
 import net.minecraft.data.DataProvider;
@@ -20,10 +27,15 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.level.block.Block;
 
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Stream;
 
 /**
  * All data providers for ComputerCraft. We require a mod-loader abstraction {@link GeneratorSink} (instead of
@@ -55,15 +67,37 @@ public static void add(GeneratorSink generator) {
 
         generator.add(out -> new LanguageProvider(out, fullRegistries));
 
-        // Unfortunately we rely on some client-side classes in this code. We just load in the client side data provider
-        // and invoke that.
-        try {
-            Class.forName("dan200.computercraft.data.client.ClientDataProviders")
-                .getMethod("add", GeneratorSink.class, CompletableFuture.class)
-                .invoke(null, generator, fullRegistries);
-        } catch (ReflectiveOperationException e) {
-            throw new RuntimeException(e);
-        }
+        generator.addFromCodec("Block atlases", PackType.CLIENT_RESOURCES, "atlases", SpriteSources.FILE_CODEC, out -> {
+            out.accept(ResourceLocation.withDefaultNamespace("blocks"), makeSprites(Stream.of(
+                UpgradeSlot.LEFT_UPGRADE,
+                UpgradeSlot.RIGHT_UPGRADE,
+                LecternPrintoutModel.TEXTURE
+            )));
+            out.accept(GuiSprites.SPRITE_SHEET, makeSprites(
+                // Buttons
+                GuiSprites.TURNED_OFF.textures(),
+                GuiSprites.TURNED_ON.textures(),
+                GuiSprites.TERMINATE.textures(),
+                // Computers
+                GuiSprites.COMPUTER_NORMAL.textures(),
+                GuiSprites.COMPUTER_ADVANCED.textures(),
+                GuiSprites.COMPUTER_COMMAND.textures(),
+                GuiSprites.COMPUTER_COLOUR.textures()
+            ));
+        });
+
+        generator.add(pack -> new ExtraModelsProvider(pack, fullRegistries) {
+            @Override
+            public Stream<ResourceLocation> getModels(HolderLookup.Provider registries) {
+                return registries.lookupOrThrow(TurtleOverlay.REGISTRY).listElements().map(x -> x.value().model());
+            }
+        });
+    }
+
+    @SafeVarargs
+    @SuppressWarnings("varargs")
+    private static List<SpriteSource> makeSprites(final Stream<ResourceLocation>... files) {
+        return Arrays.stream(files).flatMap(Function.identity()).<SpriteSource>map(x -> new SingleFile(x, Optional.empty())).toList();
     }
 
     public interface GeneratorSink {

projects/common/src/main/java/dan200/computercraft/data/PrettyDataProvider.java → projects/common/src/datagen/java/dan200/computercraft/data/PrettyDataProvider.java

@@ -7,6 +7,7 @@
 import com.google.common.hash.HashCode;
 import com.google.common.hash.HashFunction;
 import com.google.common.hash.Hashing;
+import dan200.computercraft.shared.util.PrettyJsonWriter;
 import net.minecraft.data.CachedOutput;
 import net.minecraft.data.DataProvider;
 

projects/common/src/main/java/dan200/computercraft/data/TagProvider.java → projects/common/src/datagen/java/dan200/computercraft/data/TagProvider.java

@@ -148,7 +148,7 @@ public TagAppender<T> addTag(TagKey<T> tag) {
     /**
      * A wrapper over {@link ItemTagsProvider}.
      */
-    interface ItemTagConsumer extends TagConsumer<Item> {
+    public interface ItemTagConsumer extends TagConsumer<Item> {
         void copy(TagKey<Block> block, TagKey<Item> item);
     }
 }

projects/common/src/client/java/dan200/computercraft/data/client/ExtraModelsProvider.java → projects/common/src/datagen/java/dan200/computercraft/data/client/ExtraModelsProvider.java

@@ -19,11 +19,11 @@
 /**
  * A data provider to generate {@link ExtraModels}.
  */
-abstract class ExtraModelsProvider implements DataProvider {
+public abstract class ExtraModelsProvider implements DataProvider {
     private final Path path;
     private final CompletableFuture<HolderLookup.Provider> registries;
 
-    ExtraModelsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
+    public ExtraModelsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
         path = output.getOutputFolder(PackOutput.Target.RESOURCE_PACK).resolve(ExtraModels.PATH.getNamespace()).resolve(ExtraModels.PATH.getPath());
         this.registries = registries;
     }