mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2025-04-15 23:33:16 +00:00
Code Issues Releases Wiki Activity

Update Create dependency to 6.0.0 (#2117)

Browse Source
This commit is contained in:
ellellie 2025-03-02 08:56:43 +13:00 committed by GitHub
parent 16324e1eac
commit 6660966320
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gradle/libs.versions.toml
View File

@ -46,7 +46,7 @@ oculus = "1.2.5"
rei = "12.0.626"
rubidium = "0.6.1"
sodium = "mc1.20-0.4.10"
create-forge = "0.5.1.f-33"
create-forge = "6.0.0-9"
create-fabric = "0.5.1-f-build.1467+mc1.20.1"
# Testing

1
projects/common/build.gradle.kts
View File

@ -37,7 +37,6 @@ dependencies {
clientApi(clientClasses(project(":common-api")))
compileOnly(libs.bundles.externalMods.common)
compileOnly(variantOf(libs.create.forge) { classifier("slim") }) { isTransitive = false }
clientCompileOnly(variantOf(libs.emi) { classifier("api") })
annotationProcessorEverywhere(libs.autoService)

4
projects/common/src/main/java/dan200/computercraft/shared/integration/ExternalModTags.java
View File

@ -27,9 +27,9 @@ public final class ExternalModTags {
/**
* Create's "brittle" tag, used to determine if this block needs to be moved before its neighbours.
*
* @see com.simibubi.create.content.contraptions.BlockMovementChecks#isBrittle(BlockState)
* @see com.simibubi.create.api.contraption.BlockMovementChecks#isBrittle(BlockState)
*/
public static final TagKey<Block> CREATE_BRITTLE = make(CreateIntegration.ID, "brittle");
public static final TagKey<Block> CREATE_BRITTLE = make("create", "brittle");
private static TagKey<Block> make(String mod, String name) {
return TagKey.create(Registries.BLOCK, new ResourceLocation(mod, name));

0
projects/common/src/main/java/dan200/computercraft/shared/integration/CreateIntegration.java → projects/fabric/src/main/java/dan200/computercraft/shared/integration/CreateIntegration.java
View File

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

@ -155,7 +155,7 @@ dependencies {
clientCompileOnly(variantOf(libs.emi) { classifier("api") })
modCompileOnly(libs.bundles.externalMods.forge.compile)
modRuntimeOnly(libs.bundles.externalMods.forge.runtime)
modCompileOnly(variantOf(libs.create.forge) { classifier("slim") })
modCompileOnly(variantOf(libs.create.forge) { classifier("slim") }) { isTransitive = false }
// Depend on our other projects.
"localImplementation"(project(":core"))

34
projects/forge/src/main/java/dan200/computercraft/shared/integration/CreateIntegration.java Normal file
View File

@ -0,0 +1,34 @@
// SPDX-FileCopyrightText: 2024 The CC: Tweaked Developers
//
// SPDX-License-Identifier: MPL-2.0
package dan200.computercraft.shared.integration;
import com.simibubi.create.api.contraption.BlockMovementChecks;
import com.simibubi.create.api.contraption.BlockMovementChecks.CheckResult;
import dan200.computercraft.shared.peripheral.modem.wired.CableBlock;
import dan200.computercraft.shared.peripheral.modem.wireless.WirelessModemBlock;
/**
* Integration with Create.
*/
public final class CreateIntegration {
public static final String ID = "create";
private CreateIntegration() {
}
public static void setup() {
// Allow modems to be treated as "attached" to their adjacent block.
BlockMovementChecks.registerAttachedCheck((state, world, pos, direction) -> {
var block = state.getBlock();
if (block instanceof WirelessModemBlock) {
return CheckResult.of(state.getValue(WirelessModemBlock.FACING) == direction);
} else if (block instanceof CableBlock) {
return CheckResult.of(state.getValue(CableBlock.MODEM).getFacing() == direction);
} else {
return CheckResult.PASS;
}
});
}
}