Get everything compiling

Game tests are running but not passing. Well, on Fabric, there's some
fun classpath issues on NF. Classic.

 - Update NF to use new transfer code. Generic peripherals don't work
   yet, as the capabilities aren't wired up correctly. Suspect we're
   gonna have to tear out that code.

Author: SquidDev

buildSrc/src/main/kotlin/cc-tweaked.fabric.gradle.kts

@@ -68,5 +68,5 @@ tasks.ideaSyncTask {
 tasks.named("checkDependencyConsistency", DependencyCheck::class.java) {
     val libs = project.extensions.getByType<VersionCatalogsExtension>().named("libs")
     // Minecraft depends on asm, but Fabric forces it to a more recent version
-    override(libs.findLibrary("asm").get(), "9.8")
+    override(libs.findLibrary("asm").get(), "9.9")
 }

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

@@ -21,9 +21,9 @@
 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.client.resources.model.AtlasIds;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.RegistrySetBuilder;
+import net.minecraft.data.AtlasIds;
 import net.minecraft.data.DataProvider;
 import net.minecraft.data.PackOutput;
 import net.minecraft.data.registries.RegistryPatchGenerator;

projects/common/src/datagen/java/dan200/computercraft/data/LootTableProvider.java

@@ -23,6 +23,7 @@
 import net.minecraft.world.level.storage.loot.functions.CopyComponentsFunction;
 import net.minecraft.world.level.storage.loot.functions.CopyNameFunction;
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
+import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
 import net.minecraft.world.level.storage.loot.predicates.AnyOfCondition;
 import net.minecraft.world.level.storage.loot.predicates.ExplosionCondition;
 import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition;
@@ -92,15 +93,15 @@ private static void selfDrop(BiConsumer<ResourceKey<LootTable>, LootTable.Builde
     private static void namedBlockDrop(BiConsumer<ResourceKey<LootTable>, LootTable.Builder> add, Supplier<? extends Block> wrapper) {
         blockDrop(
             add, wrapper,
-            LootItem.lootTableItem(wrapper.get()).apply(CopyNameFunction.copyName(CopyNameFunction.NameSource.BLOCK_ENTITY)),
+            LootItem.lootTableItem(wrapper.get()).apply(CopyNameFunction.copyName(new CopyNameFunction.Source(LootContextParams.BLOCK_ENTITY))),
             ExplosionCondition.survivesExplosion()
         );
     }
 
     private static void computerDrop(BiConsumer<ResourceKey<LootTable>, LootTable.Builder> add, Supplier<? extends Block> block) {
         blockDrop(
             add, block,
-            LootItem.lootTableItem(block.get()).apply(CopyComponentsFunction.copyComponents(CopyComponentsFunction.Source.BLOCK_ENTITY)),
+            LootItem.lootTableItem(block.get()).apply(CopyComponentsFunction.copyComponentsFromBlockEntity(LootContextParams.BLOCK_ENTITY)),
             AnyOfCondition.anyOf(
                 BlockNamedEntityLootCondition.BUILDER,
                 HasComputerIdLootCondition.BUILDER,

projects/common/src/datagen/java/dan200/computercraft/data/RecipeProvider.java

@@ -447,7 +447,7 @@ private ItemPredicate itemPredicate(TagKey<Item> item) {
     }
 
     private static ItemStack playerHead(String name, String uuid) {
-        return DataComponentUtil.createStack(Items.PLAYER_HEAD, DataComponents.PROFILE, new ResolvableProfile(new GameProfile(UUID.fromString(uuid), name)));
+        return DataComponentUtil.createStack(Items.PLAYER_HEAD, DataComponents.PROFILE, ResolvableProfile.createResolved(new GameProfile(UUID.fromString(uuid), name)));
     }
 
     private ShapedSpecBuilder customShaped(RecipeCategory category, ItemStack result) {

projects/common/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/AbstractEnergyMethods.java

@@ -40,7 +40,7 @@ public final String id() {
      * @return The energy stored in this block, in FE.
      */
     @LuaFunction(mainThread = true)
-    public abstract int getEnergy(T energy);
+    public abstract long getEnergy(T energy);
 
     /**
      * Get the maximum amount of energy this block can store.
@@ -49,5 +49,5 @@ public final String id() {
      * @return The energy capacity of this block.
      */
     @LuaFunction(mainThread = true)
-    public abstract int getEnergyCapacity(T energy);
+    public abstract long getEnergyCapacity(T energy);
 }

projects/common/src/testFixtures/java/dan200/computercraft/test/shared/WithMinecraft.java

@@ -31,8 +31,8 @@ public void beforeAll(ExtensionContext context) {
         }
 
         public static void bootstrap() {
-            SharedConstants.tryDetectVersion();
             ServiceLoader.load(SetupHook.class, SetupHook.class.getClassLoader()).forEach(SetupHook::run);
+            SharedConstants.tryDetectVersion();
             Bootstrap.bootStrap();
         }
     }

projects/common/src/testMod/java/dan200/computercraft/mixin/gametest/GameTestServerMixin.java

@@ -10,7 +10,7 @@
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.Services;
 import net.minecraft.server.WorldStem;
-import net.minecraft.server.level.progress.ChunkProgressListenerFactory;
+import net.minecraft.server.level.progress.LevelLoadListener;
 import net.minecraft.server.packs.repository.PackRepository;
 import net.minecraft.world.level.storage.LevelStorageSource;
 import org.spongepowered.asm.mixin.Mixin;
@@ -22,7 +22,10 @@
 
 @Mixin(GameTestServer.class)
 abstract class GameTestServerMixin extends MinecraftServer {
-    GameTestServerMixin(Thread serverThread, LevelStorageSource.LevelStorageAccess storageSource, PackRepository packRepository, WorldStem worldStem, Proxy proxy, DataFixer fixerUpper, Services services, ChunkProgressListenerFactory progressListenerFactory) {
+    GameTestServerMixin(
+        Thread serverThread, LevelStorageSource.LevelStorageAccess storageSource, PackRepository packRepository,
+        WorldStem worldStem, Proxy proxy, DataFixer fixerUpper, Services services, LevelLoadListener progressListenerFactory
+    ) {
         super(serverThread, storageSource, packRepository, worldStem, proxy, fixerUpper, services, progressListenerFactory);
     }
 

projects/common/src/testMod/kotlin/dan200/computercraft/gametest/Computer_Test.kt

@@ -13,6 +13,7 @@ import dan200.computercraft.gametest.api.*
 import dan200.computercraft.shared.ModRegistry
 import dan200.computercraft.test.core.assertArrayEquals
 import dan200.computercraft.test.core.computer.getApi
+import net.minecraft.client.input.KeyEvent
 import net.minecraft.core.BlockPos
 import net.minecraft.core.Direction
 import net.minecraft.gametest.framework.GameTestHelper
@@ -155,8 +156,8 @@ class Computer_Test {
         // Press a key on the client
         thenOnClient {
             val screen = minecraft.screen as AbstractComputerScreen<*>
-            screen.keyPressed(GLFW.GLFW_KEY_A, 0, 0)
-            screen.keyReleased(GLFW.GLFW_KEY_A, 0, 0)
+            screen.keyPressed(KeyEvent(GLFW.GLFW_KEY_A, 0, 0))
+            screen.keyReleased(KeyEvent(GLFW.GLFW_KEY_A, 0, 0))
         }
         // And assert it is handled and sent back to the client
         thenIdle(2)

projects/common/src/testMod/kotlin/dan200/computercraft/gametest/Disk_Drive_Test.kt

@@ -122,7 +122,7 @@ class Disk_Drive_Test {
         thenWaitUntil {
             val drive = helper.getBlockEntity(drivePos, DiskDriveBlockEntity::class.java)
             if (!drive.getItem(0).has(ModRegistry.DataComponents.DISK_ID.get())) {
-                helper.fail("Disk has no item", drivePos)
+                helper.abort("Disk has no item", drivePos)
             }
         }
     }

projects/common/src/testMod/kotlin/dan200/computercraft/gametest/Monitor_Test.kt

@@ -45,7 +45,7 @@ class Monitor_Test {
             val tile = context.getBlockEntity(pos, MonitorBlockEntity::class.java)
 
             if (tile.width != 1 || tile.height != 1) {
-                context.fail("Tile has width and height of ${tile.width}x${tile.height}, but should be 1x1", pos)
+                context.abort("Tile has width and height of ${tile.width}x${tile.height}, but should be 1x1", pos)
             }
         }
     }