diff --git a/dependencies.gradle b/dependencies.gradle index 3287bdaea81..4abf902af90 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -96,7 +96,7 @@ dependencies { modExtraLocalRuntime(forge.trenzalore) modExtraLocalRuntime(forge.curios) // modExtraLocalRuntime(forge.worldstripper) -// modExtraLocalRuntime(forge.cc.tweaked.forge.impl) for some reason this breaks create + modExtraLocalRuntime(forge.cc.tweaked.forge.impl) modExtraLocalRuntime(forge.bundles.kjs) diff --git a/gradle/forge.versions.toml b/gradle/forge.versions.toml index 8cc8154749d..c33ba8ce42b 100644 --- a/gradle/forge.versions.toml +++ b/gradle/forge.versions.toml @@ -21,7 +21,7 @@ ftblibrary = "2001.2.4" ftbteams = "2001.3.0" ftbquests = "2001.4.11" ftbchunks = "2001.3.4" -ccTweaked = "1.114.3" +ccTweaked = "1.120.0" create = "6.0.6-150" ponder = "1.0.80" flywheel = "1.0.4" diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FusionReactorMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FusionReactorMachine.java index 31517e494e4..03f9a86f18b 100644 --- a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FusionReactorMachine.java +++ b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/electric/FusionReactorMachine.java @@ -69,6 +69,7 @@ public class FusionReactorMachine extends WorkableElectricMultiblockMachine impl private final int tier; @Nullable protected EnergyContainerList inputEnergyContainers; + @Getter @SaveField protected long heat = 0; @SaveField diff --git a/src/main/java/com/gregtechceu/gtceu/integration/cctweaked/CCTweakedPlugin.java b/src/main/java/com/gregtechceu/gtceu/integration/cctweaked/CCTweakedPlugin.java index 2c08434169a..0be0f8ee958 100644 --- a/src/main/java/com/gregtechceu/gtceu/integration/cctweaked/CCTweakedPlugin.java +++ b/src/main/java/com/gregtechceu/gtceu/integration/cctweaked/CCTweakedPlugin.java @@ -20,6 +20,7 @@ public static void init() { ComputerCraftAPI.registerGenericSource(new WorkablePeripheral()); ComputerCraftAPI.registerGenericSource(new CoverHolderPeripheral()); ComputerCraftAPI.registerGenericSource(new CentralMonitorPeripheral()); + ComputerCraftAPI.registerGenericSource(new FusionReactorMachinePeripheral()); ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_CONTROLLABLE); ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_ENERGY_INFO_PROVIDER); ForgeComputerCraftAPI.registerGenericCapability(GTCapability.CAPABILITY_WORKABLE); diff --git a/src/main/java/com/gregtechceu/gtceu/integration/cctweaked/peripherals/FusionReactorMachinePeripheral.java b/src/main/java/com/gregtechceu/gtceu/integration/cctweaked/peripherals/FusionReactorMachinePeripheral.java new file mode 100644 index 00000000000..e9074a13318 --- /dev/null +++ b/src/main/java/com/gregtechceu/gtceu/integration/cctweaked/peripherals/FusionReactorMachinePeripheral.java @@ -0,0 +1,17 @@ +package com.gregtechceu.gtceu.integration.cctweaked.peripherals; + +import com.gregtechceu.gtceu.common.machine.multiblock.electric.FusionReactorMachine; +import dan200.computercraft.api.lua.LuaFunction; +import dan200.computercraft.api.lua.MethodResult; +import dan200.computercraft.api.peripheral.GenericPeripheral; + +public class FusionReactorMachinePeripheral implements GenericPeripheral { + + public String id() { return "gtceu:fusion_reactor"; } + + @LuaFunction + public static MethodResult getHeat(FusionReactorMachine reactor) { + return MethodResult.of(reactor.getHeat()); + } + +}