mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-10-24 18:37:38 +00:00
Code Issues Releases Wiki Activity

Initial update to 1.21.10

Browse Source
This commit is contained in:
Jonathan Coates
2025-10-13 21:15:54 +01:00
parent 4cccf1817c
commit ef1923dd3e
65 changed files with 579 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
projects/forge/build.gradle.kts
View File

@@ -124,19 +124,6 @@ neoForge {
}
configurations {
additionalRuntimeClasspath { extendsFrom(jarJar.get()) }
val testAdditionalRuntimeClasspath by registering {
isCanBeResolved = true
isCanBeConsumed = false
// Prevent ending up with multiple versions of libraries on the classpath.
shouldResolveConsistentlyWith(additionalRuntimeClasspath.get())
}
for (testConfig in listOf("testClientAdditionalRuntimeClasspath", "gametestAdditionalRuntimeClasspath")) {
named(testConfig) { extendsFrom(testAdditionalRuntimeClasspath.get()) }
}
register("testWithIris") {
isCanBeConsumed = false
isCanBeResolved = true
@@ -169,11 +156,6 @@ dependencies {
jarJar(libs.cobalt)
jarJar(libs.jzlib)
// We don't jar-in-jar our additional netty dependencies (see the tasks.jarJar configuration), but still want them
// on the legacy classpath.
additionalRuntimeClasspath(libs.netty.http) { isTransitive = false }
additionalRuntimeClasspath(libs.netty.socks) { isTransitive = false }
additionalRuntimeClasspath(libs.netty.proxy) { isTransitive = false }
testFixturesApi(libs.bundles.test)
testFixturesApi(libs.bundles.kotlin)
@@ -186,10 +168,6 @@ dependencies {
testModImplementation(testFixtures(project(":core")))
testModImplementation(testFixtures(project(":forge")))
// Ensure our test fixture dependencies are on the classpath
"testAdditionalRuntimeClasspath"(libs.bundles.kotlin)
"testAdditionalRuntimeClasspath"(libs.bundles.test)
testFixturesImplementation(testFixtures(project(":core")))
"testWithIris"(libs.iris.forge)

16
projects/forge/src/main/java/dan200/computercraft/ComputerCraft.java
View File

@@ -51,13 +51,13 @@ import net.neoforged.neoforge.capabilities.Capabilities;
import net.neoforged.neoforge.capabilities.ItemCapability;
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent;
import net.neoforged.neoforge.items.wrapper.InvWrapper;
import net.neoforged.neoforge.items.wrapper.SidedInvWrapper;
import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;
import net.neoforged.neoforge.network.registration.PayloadRegistrar;
import net.neoforged.neoforge.registries.DataPackRegistryEvent;
import net.neoforged.neoforge.registries.NewRegistryEvent;
import net.neoforged.neoforge.registries.RegistryBuilder;
import net.neoforged.neoforge.transfer.item.VanillaContainerWrapper;
import net.neoforged.neoforge.transfer.item.WorldlyContainerWrapper;
import org.jspecify.annotations.Nullable;
import java.nio.file.Path;
@@ -112,9 +112,9 @@ public final class ComputerCraft {
ComputerCraftAPI.registerGenericSource(new FluidMethods());
ComputerCraftAPI.registerGenericSource(new EnergyMethods());
ForgeComputerCraftAPI.registerGenericCapability(Capabilities.ItemHandler.BLOCK);
ForgeComputerCraftAPI.registerGenericCapability(Capabilities.FluidHandler.BLOCK);
ForgeComputerCraftAPI.registerGenericCapability(Capabilities.EnergyStorage.BLOCK);
ForgeComputerCraftAPI.registerGenericCapability(Capabilities.Item.BLOCK);
ForgeComputerCraftAPI.registerGenericCapability(Capabilities.Fluid.BLOCK);
ForgeComputerCraftAPI.registerGenericCapability(Capabilities.Energy.BLOCK);
ForgeDetailRegistries.FLUID_STACK.addProvider(FluidData::fill);
@@ -155,12 +155,12 @@ public final class ComputerCraft {
ModRegistry.BlockEntities.DISK_DRIVE
);
for (var inv : unsidedContainers) {
event.registerBlockEntity(Capabilities.ItemHandler.BLOCK, inv.get(), (be, side) -> new InvWrapper(be));
event.registerBlockEntity(Capabilities.Item.BLOCK, inv.get(), (be, side) -> VanillaContainerWrapper.of(be));
}
event.registerBlockEntity(
Capabilities.ItemHandler.BLOCK, ModRegistry.BlockEntities.PRINTER.get(),
(be, side) -> side == null ? new InvWrapper(be) : new SidedInvWrapper(be, side)
Capabilities.Item.BLOCK, ModRegistry.BlockEntities.PRINTER.get(),
(be, side) -> side == null ? VanillaContainerWrapper.of(be) : new WorldlyContainerWrapper(be, side)
);
}

2
projects/forge/src/main/java/dan200/computercraft/shared/peripheral/generic/methods/InventoryMethods.java
View File

@@ -120,7 +120,7 @@ public final class InventoryMethods extends AbstractInventoryMethods<IItemHandle
var level = blockEntity.getLevel();
if (!(level instanceof ServerLevel serverLevel)) return null;
var result = CapabilityUtil.getCapability(serverLevel, Capabilities.ItemHandler.BLOCK, blockEntity.getBlockPos(), blockEntity.getBlockState(), blockEntity, direction);
var result = CapabilityUtil.getCapability(serverLevel, Capabilities.Item.BLOCK, blockEntity.getBlockPos(), blockEntity.getBlockState(), blockEntity, direction);
if (result != null) return result;
}