Merge pull request #940 from skippyall/1.21.1-computercraft

mrh0 · web-flow · commit 7fc83a4e1d78 · 2025-04-19T11:57:06.000+02:00
Reenable Computercraft Compat
diff --git a/build.gradle b/build.gradle
@@ -153,7 +153,7 @@ dependencies {
     if (cc_tweaked_enable.toBoolean()) {
         compileOnly("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-core-api:${cc_tweaked_version}")
         compileOnly("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-forge-api:${cc_tweaked_version}")
-        //runtimeOnly("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-forge:${cc_tweaked_version}")
+        runtimeOnly("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-forge:${cc_tweaked_version}")
     }
     // Example optional mod dependency with JEI
     // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime
diff --git a/gradle.properties b/gradle.properties
@@ -24,7 +24,7 @@ librarian_version = 1.+
 
 cc_tweaked_enable = true
 cc_tweaked_minecraft_version = 1.21.1
-cc_tweaked_version = 1.114.2
+cc_tweaked_version = 1.115.1
 
 #read more on this at https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#better-minecraft-parameter-names--javadoc-parchment
 # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
diff --git a/src/main/java/com/mrh0/createaddition/blocks/digital_adapter/DigitalAdapterBlockEntity.java b/src/main/java/com/mrh0/createaddition/blocks/digital_adapter/DigitalAdapterBlockEntity.java
@@ -148,14 +148,12 @@ public SpeedGaugeBlockEntity getSpeedGauge(Direction dir) {
     public void setTargetSpeed(Direction dir, int speed) {
         SpeedControllerBlockEntity scte = getSpeedController(dir);
         if(scte == null) return;
-        ISpeedControllerAdapter sts = (ISpeedControllerAdapter) scte;
-        sts.setTargetSpeed(speed);
+        scte.targetSpeed.setValue(speed);
     }
 
     public int getTargetSpeed(Direction dir) {
         SpeedControllerBlockEntity scte = getSpeedController(dir);
         if(scte == null) return 0;
-        ISpeedControllerAdapter sts = (ISpeedControllerAdapter) scte;
-        return sts.getTargetSpeed();
+        return scte.targetSpeed.getValue();
     }
 }
diff --git a/src/main/java/com/mrh0/createaddition/blocks/digital_adapter/ISpeedControllerAdapter.java b/src/main/java/com/mrh0/createaddition/blocks/digital_adapter/ISpeedControllerAdapter.java
diff --git a/src/main/java/com/mrh0/createaddition/compat/computercraft/ElectricMotorPeripheral.java b/src/main/java/com/mrh0/createaddition/compat/computercraft/ElectricMotorPeripheral.java
@@ -110,12 +110,12 @@ public final float translate(double dist, Optional<Double> rpm) throws LuaExcept
     }
 
     @LuaFunction(mainThread = true)
-    public int getMaxInsert() {
+    public final int getMaxInsert() {
         return CommonConfig.ELECTRIC_MOTOR_MAX_INPUT.get();
     }
 
     @LuaFunction(mainThread = true)
-    public int getMaxExtract() {
+    public final int getMaxExtract() {
         return 0;
     }
 }
diff --git a/src/main/java/com/mrh0/createaddition/compat/computercraft/ModularAccumulatorPeripheral.java b/src/main/java/com/mrh0/createaddition/compat/computercraft/ModularAccumulatorPeripheral.java
@@ -52,22 +52,22 @@ public final float getPercent() {
     }
 
     @LuaFunction(mainThread = true)
-    public int getMaxInsert() {
+    public final int getMaxInsert() {
         return CommonConfig.ACCUMULATOR_MAX_INPUT.get();
     }
 
     @LuaFunction(mainThread = true)
-    public int getMaxExtract() {
+    public final int getMaxExtract() {
         return CommonConfig.ACCUMULATOR_MAX_OUTPUT.get();
     }
 
     @LuaFunction(mainThread = true)
-    public int getHeight() {
+    public final int getHeight() {
         return this.tileEntity.getHeight();
     }
 
     @LuaFunction(mainThread = true)
-    public int getWidth() {
+    public final int getWidth() {
         return this.tileEntity.getWidth();
     }
 }
diff --git a/src/main/java/com/mrh0/createaddition/compat/computercraft/Peripherals.java b/src/main/java/com/mrh0/createaddition/compat/computercraft/Peripherals.java
@@ -6,12 +6,42 @@
 import com.mrh0.createaddition.blocks.redstone_relay.RedstoneRelayBlockEntity;
 
 import com.mrh0.createaddition.blocks.electric_motor.ElectricMotorBlockEntity;
-import net.neoforged.neoforge.capabilities.Capabilities;
+import com.mrh0.createaddition.index.CABlockEntities;
+import dan200.computercraft.api.peripheral.PeripheralCapability;
+import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 
 public class Peripherals {
-	/*public static boolean isPeripheral(Capability<?> cap) {
-		return cap == CAPABILITY_PERIPHERAL;
-	}*/
+	public static void registerPeripheralCapabilities(RegisterCapabilitiesEvent event) {
+		event.registerBlockEntity(
+				PeripheralCapability.get(),
+				CABlockEntities.ELECTRIC_MOTOR.get(),
+				(be, dir) -> createElectricMotorPeripheral(be)
+		);
+
+		event.registerBlockEntity(
+				PeripheralCapability.get(),
+				CABlockEntities.PORTABLE_ENERGY_INTERFACE.get(),
+				(be, dir) -> createPortableEnergyInterfacePeripheral(be)
+		);
+
+		event.registerBlockEntity(
+				PeripheralCapability.get(),
+				CABlockEntities.MODULAR_ACCUMULATOR.get(),
+				(be, dir) -> createModularAccumulatorPeripheral(be)
+		);
+
+		event.registerBlockEntity(
+				PeripheralCapability.get(),
+				CABlockEntities.REDSTONE_RELAY.get(),
+				(be, dir) -> createRedstoneRelayPeripheral(be)
+		);
+
+		event.registerBlockEntity(
+				PeripheralCapability.get(),
+				CABlockEntities.DIGITAL_ADAPTER.get(),
+				(be, dir) -> createDigitalAdapterPeripheral(be)
+		);
+	}
 	
 	public static ElectricMotorPeripheral createElectricMotorPeripheral(ElectricMotorBlockEntity te) {
 		return new ElectricMotorPeripheral("electric_motor", te);
diff --git a/src/main/java/com/mrh0/createaddition/compat/computercraft/PortableEnergyInterfacePeripheral.java b/src/main/java/com/mrh0/createaddition/compat/computercraft/PortableEnergyInterfacePeripheral.java
@@ -44,17 +44,17 @@ public final int getCapacity() {
 	}
 
 	@LuaFunction(mainThread = true)
-	public boolean isConnected() {
+	public final boolean isConnected() {
 		return this.tileEntity.isConnected();
 	}
 
 	@LuaFunction(mainThread = true)
-	public int getMaxInsert() {
+	public final int getMaxInsert() {
 		return CommonConfig.PEI_MAX_INPUT.get();
 	}
 
 	@LuaFunction(mainThread = true)
-	public int getMaxExtract() {
+	public final int getMaxExtract() {
 		return CommonConfig.PEI_MAX_OUTPUT.get();
 	}
 }
diff --git a/src/main/java/com/mrh0/createaddition/compat/computercraft/RedstoneRelayPeripheral.java b/src/main/java/com/mrh0/createaddition/compat/computercraft/RedstoneRelayPeripheral.java
@@ -35,22 +35,22 @@ public Object getTarget() {
     }
 
     @LuaFunction(mainThread = true)
-    public int getMaxInsert() {
+    public final int getMaxInsert() {
         return CommonConfig.SMALL_CONNECTOR_MAX_INPUT.get();
     }
 
     @LuaFunction(mainThread = true)
-    public int getMaxExtract() {
+    public final int getMaxExtract() {
         return CommonConfig.SMALL_CONNECTOR_MAX_OUTPUT.get();
     }
 
     @LuaFunction(mainThread = true)
-    public int getThroughput() {
+    public final int getThroughput() {
         return this.tileEntity.getThroughput();
     }
 
     @LuaFunction(mainThread = true)
-    public boolean isPowered() {
+    public final boolean isPowered() {
         return this.tileEntity.getBlockState().getValue(RedstoneRelayBlock.POWERED);
     }
 }
diff --git a/src/main/java/com/mrh0/createaddition/index/CACapabilities.java b/src/main/java/com/mrh0/createaddition/index/CACapabilities.java
@@ -1,5 +1,6 @@
 package com.mrh0.createaddition.index;
 
+import com.mrh0.createaddition.CreateAddition;
 import com.mrh0.createaddition.blocks.alternator.AlternatorBlockEntity;
 import com.mrh0.createaddition.blocks.connector.LargeConnectorBlockEntity;
 import com.mrh0.createaddition.blocks.connector.SmallConnectorBlockEntity;
@@ -11,6 +12,7 @@
 import com.mrh0.createaddition.blocks.portable_energy_interface.PortableEnergyInterfaceBlockEntity;
 import com.mrh0.createaddition.blocks.rolling_mill.RollingMillBlockEntity;
 import com.mrh0.createaddition.blocks.tesla_coil.TeslaCoilBlockEntity;
+import com.mrh0.createaddition.compat.computercraft.Peripherals;
 import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
 
 public class CACapabilities {
@@ -26,5 +28,9 @@ public static void register(RegisterCapabilitiesEvent event) {
         TeslaCoilBlockEntity.registerCapabilities(event);
         RollingMillBlockEntity.registerCapabilities(event);
         LiquidBlazeBurnerBlockEntity.registerCapability(event);
+
+        if(CreateAddition.CC_ACTIVE) {
+            Peripherals.registerPeripheralCapabilities(event);
+        }
     }
 }
diff --git a/src/main/java/com/mrh0/createaddition/mixin/SpeedControllerTileEntityMixin.java b/src/main/java/com/mrh0/createaddition/mixin/SpeedControllerTileEntityMixin.java
diff --git a/src/main/resources/createaddition.mixins.json b/src/main/resources/createaddition.mixins.json
@@ -5,8 +5,7 @@
 	"compatibilityLevel": "JAVA_17",
 	"mixins": [
 		"BlockMovementChecksMixin",
-		"ContraptionMixin",
-		"SpeedControllerTileEntityMixin"
+		"ContraptionMixin"
 	],
 	"minVersion": "0.8.5"
 }

Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ dependencies {`
`153`	`153`	`if (cc_tweaked_enable.toBoolean()) {`
`154`	`154`	`compileOnly("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-core-api:${cc_tweaked_version}")`
`155`	`155`	`compileOnly("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-forge-api:${cc_tweaked_version}")`
`156`		`- //runtimeOnly("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-forge:${cc_tweaked_version}")`
	`156`	`+ runtimeOnly("cc.tweaked:cc-tweaked-${cc_tweaked_minecraft_version}-forge:${cc_tweaked_version}")`
`157`	`157`	`}`
`158`	`158`	`// Example optional mod dependency with JEI`
`159`	`159`	`// The JEI API is declared for compile time use, while the full JEI artifact is used at runtime`
Original file line number	Diff line number	Diff line change
`@@ -148,14 +148,12 @@ public SpeedGaugeBlockEntity getSpeedGauge(Direction dir) {`
`148`	`148`	`public void setTargetSpeed(Direction dir, int speed) {`
`149`	`149`	`SpeedControllerBlockEntity scte = getSpeedController(dir);`
`150`	`150`	`if(scte == null) return;`
`151`		`- ISpeedControllerAdapter sts = (ISpeedControllerAdapter) scte;`
`152`		`- sts.setTargetSpeed(speed);`
	`151`	`+ scte.targetSpeed.setValue(speed);`
`153`	`152`	`}`
`154`	`153`
`155`	`154`	`public int getTargetSpeed(Direction dir) {`
`156`	`155`	`SpeedControllerBlockEntity scte = getSpeedController(dir);`
`157`	`156`	`if(scte == null) return 0;`
`158`		`- ISpeedControllerAdapter sts = (ISpeedControllerAdapter) scte;`
`159`		`- return sts.getTargetSpeed();`
	`157`	`+ return scte.targetSpeed.getValue();`
`160`	`158`	`}`
`161`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -110,12 +110,12 @@ public final float translate(double dist, Optional<Double> rpm) throws LuaExcept`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`@LuaFunction(mainThread = true)`
`113`		`- public int getMaxInsert() {`
	`113`	`+ public final int getMaxInsert() {`
`114`	`114`	`return CommonConfig.ELECTRIC_MOTOR_MAX_INPUT.get();`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`@LuaFunction(mainThread = true)`
`118`		`- public int getMaxExtract() {`
	`118`	`+ public final int getMaxExtract() {`
`119`	`119`	`return 0;`
`120`	`120`	`}`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,22 +52,22 @@ public final float getPercent() {`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`@LuaFunction(mainThread = true)`
`55`		`- public int getMaxInsert() {`
	`55`	`+ public final int getMaxInsert() {`
`56`	`56`	`return CommonConfig.ACCUMULATOR_MAX_INPUT.get();`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`@LuaFunction(mainThread = true)`
`60`		`- public int getMaxExtract() {`
	`60`	`+ public final int getMaxExtract() {`
`61`	`61`	`return CommonConfig.ACCUMULATOR_MAX_OUTPUT.get();`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@LuaFunction(mainThread = true)`
`65`		`- public int getHeight() {`
	`65`	`+ public final int getHeight() {`
`66`	`66`	`return this.tileEntity.getHeight();`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@LuaFunction(mainThread = true)`
`70`		`- public int getWidth() {`
	`70`	`+ public final int getWidth() {`
`71`	`71`	`return this.tileEntity.getWidth();`
`72`	`72`	`}`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,17 +44,17 @@ public final int getCapacity() {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`@LuaFunction(mainThread = true)`
`47`		`- public boolean isConnected() {`
	`47`	`+ public final boolean isConnected() {`
`48`	`48`	`return this.tileEntity.isConnected();`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`@LuaFunction(mainThread = true)`
`52`		`- public int getMaxInsert() {`
	`52`	`+ public final int getMaxInsert() {`
`53`	`53`	`return CommonConfig.PEI_MAX_INPUT.get();`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`@LuaFunction(mainThread = true)`
`57`		`- public int getMaxExtract() {`
	`57`	`+ public final int getMaxExtract() {`
`58`	`58`	`return CommonConfig.PEI_MAX_OUTPUT.get();`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,22 +35,22 @@ public Object getTarget() {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`@LuaFunction(mainThread = true)`
`38`		`- public int getMaxInsert() {`
	`38`	`+ public final int getMaxInsert() {`
`39`	`39`	`return CommonConfig.SMALL_CONNECTOR_MAX_INPUT.get();`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@LuaFunction(mainThread = true)`
`43`		`- public int getMaxExtract() {`
	`43`	`+ public final int getMaxExtract() {`
`44`	`44`	`return CommonConfig.SMALL_CONNECTOR_MAX_OUTPUT.get();`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`@LuaFunction(mainThread = true)`
`48`		`- public int getThroughput() {`
	`48`	`+ public final int getThroughput() {`
`49`	`49`	`return this.tileEntity.getThroughput();`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@LuaFunction(mainThread = true)`
`53`		`- public boolean isPowered() {`
	`53`	`+ public final boolean isPowered() {`
`54`	`54`	`return this.tileEntity.getBlockState().getValue(RedstoneRelayBlock.POWERED);`
`55`	`55`	`}`
`56`	`56`	`}`