From 8373ad424672bce07c63345c3b44de7b76800de8 Mon Sep 17 00:00:00 2001 From: pietru Date: Sat, 25 May 2024 12:17:58 +0200 Subject: [PATCH] update for cr 0.1.31 and flux 0.5.10 --- build.gradle | 2 -- gradle.properties | 7 +++---- .../net/pietru/omni_power/api/IPowerProducer.java | 2 +- .../java/net/pietru/omni_power/blockevents/Power.java | 11 +++++------ 4 files changed, 9 insertions(+), 13 deletions(-) diff --git a/build.gradle b/build.gradle index 200c57a..c14d36c 100644 --- a/build.gradle +++ b/build.gradle @@ -71,8 +71,6 @@ dependencies { //quiltMod "quilt-mod:fluxapi:0.5.8r2" quiltMod "dev.crmodders:fluxapi:${fluxapi_version}"//0.5.5 - - quiltMod "com.github.ForwarD-NerN:BlockEntityPrototype:${becraft_version}" } processResources { diff --git a/gradle.properties b/gradle.properties index be50c43..3b93f53 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,13 +4,12 @@ org.gradle.parallel=true org.gradle.caching=false # Project Info -version=1.3.4 +version=1.4 group=net.pietru id=omni_power # Dependency Versions -cosmic_reach_version=0.1.24 +cosmic_reach_version=0.1.31 cosmic_quilt_version=2.0.2 -fluxapi_version=0.5.9 -becraft_version=f9f05f6 \ No newline at end of file +fluxapi_version=0.5.10 \ No newline at end of file diff --git a/src/main/java/net/pietru/omni_power/api/IPowerProducer.java b/src/main/java/net/pietru/omni_power/api/IPowerProducer.java index e7ec399..5211298 100644 --- a/src/main/java/net/pietru/omni_power/api/IPowerProducer.java +++ b/src/main/java/net/pietru/omni_power/api/IPowerProducer.java @@ -1,7 +1,7 @@ package net.pietru.omni_power.api; -import ru.nern.becraft.bed.api.BlockEntity; +import finalforeach.cosmicreach.blockentities.BlockEntity; public interface IPowerProducer{ void send_to_client(BlockEntity client); diff --git a/src/main/java/net/pietru/omni_power/blockevents/Power.java b/src/main/java/net/pietru/omni_power/blockevents/Power.java index 0e7cbce..ca96ad8 100644 --- a/src/main/java/net/pietru/omni_power/blockevents/Power.java +++ b/src/main/java/net/pietru/omni_power/blockevents/Power.java @@ -1,6 +1,7 @@ package net.pietru.omni_power.blockevents; import com.badlogic.gdx.utils.Array; +import finalforeach.cosmicreach.blockentities.BlockEntity; import finalforeach.cosmicreach.blockevents.actions.ActionId; import finalforeach.cosmicreach.blockevents.actions.IBlockAction; import finalforeach.cosmicreach.blocks.BlockPosition; @@ -10,8 +11,6 @@ import finalforeach.cosmicreach.world.Zone; import net.pietru.omni_power.OmniPower; import net.pietru.omni_power.api.IPowerClient; import net.pietru.omni_power.api.IPowerProducer; -import ru.nern.becraft.bed.utils.BEUtils; -import ru.nern.becraft.bed.api.BlockEntity; import java.util.HashMap; import java.util.Map; @@ -30,14 +29,14 @@ public class Power implements IBlockAction { @Override public void act(BlockState blockState, BlockEventTrigger blockEventTrigger, Zone zone, Map args) { - this.act(blockState, blockEventTrigger, zone, (BlockPosition)args.get("blockPos")); + this.act(zone, (BlockPosition)args.get("blockPos")); } - public void act(BlockState srcBlockState, BlockEventTrigger blockEventTrigger, Zone zone, BlockPosition sourcePos) { + public void act(Zone zone, BlockPosition sourcePos) { boolean source_be = false; BlockEntity source_entity = null; if (block_entities){ - source_entity = BEUtils.getBlockEntity(sourcePos); + source_entity = sourcePos.chunk.getBlockEntity(sourcePos.localX,sourcePos.localY,sourcePos.localZ); source_be = (source_entity instanceof IPowerProducer); //System.out.println("SourceEntityID: "+ source_entity.getType().getId() +" BE: "+source_be); } @@ -60,7 +59,7 @@ public class Power implements IBlockAction { runTrigger(this.triggerId,to_check,zone); } if (block_entities && source_be){ - BlockEntity target_entity = BEUtils.getBlockEntity(to_check); + BlockEntity target_entity = sourcePos.chunk.getBlockEntity(sourcePos.localX,sourcePos.localY,sourcePos.localZ); //if (target_entity!=null) // System.out.println("TargetEntityID: "+target_entity.getType().getId()+" IsPowerClient: "+(target_entity instanceof IPowerClient)); if (target_entity instanceof IPowerClient)