mirror of
https://github.com/SquidDev-CC/CC-Tweaked
synced 2025-06-26 07:02:55 +00:00
Update Create dependency to 6.0.0 (#2117)
This commit is contained in:
parent
16324e1eac
commit
6660966320
@ -46,7 +46,7 @@ oculus = "1.2.5"
|
|||||||
rei = "12.0.626"
|
rei = "12.0.626"
|
||||||
rubidium = "0.6.1"
|
rubidium = "0.6.1"
|
||||||
sodium = "mc1.20-0.4.10"
|
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"
|
create-fabric = "0.5.1-f-build.1467+mc1.20.1"
|
||||||
|
|
||||||
# Testing
|
# Testing
|
||||||
|
@ -37,7 +37,6 @@ dependencies {
|
|||||||
clientApi(clientClasses(project(":common-api")))
|
clientApi(clientClasses(project(":common-api")))
|
||||||
|
|
||||||
compileOnly(libs.bundles.externalMods.common)
|
compileOnly(libs.bundles.externalMods.common)
|
||||||
compileOnly(variantOf(libs.create.forge) { classifier("slim") }) { isTransitive = false }
|
|
||||||
clientCompileOnly(variantOf(libs.emi) { classifier("api") })
|
clientCompileOnly(variantOf(libs.emi) { classifier("api") })
|
||||||
|
|
||||||
annotationProcessorEverywhere(libs.autoService)
|
annotationProcessorEverywhere(libs.autoService)
|
||||||
|
@ -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.
|
* 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) {
|
private static TagKey<Block> make(String mod, String name) {
|
||||||
return TagKey.create(Registries.BLOCK, new ResourceLocation(mod, name));
|
return TagKey.create(Registries.BLOCK, new ResourceLocation(mod, name));
|
||||||
|
@ -155,7 +155,7 @@ dependencies {
|
|||||||
clientCompileOnly(variantOf(libs.emi) { classifier("api") })
|
clientCompileOnly(variantOf(libs.emi) { classifier("api") })
|
||||||
modCompileOnly(libs.bundles.externalMods.forge.compile)
|
modCompileOnly(libs.bundles.externalMods.forge.compile)
|
||||||
modRuntimeOnly(libs.bundles.externalMods.forge.runtime)
|
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.
|
// Depend on our other projects.
|
||||||
"localImplementation"(project(":core"))
|
"localImplementation"(project(":core"))
|
||||||
|
@ -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;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user