diff --git a/build.gradle b/build.gradle index 1d6c8aa..6bd8d32 100644 --- a/build.gradle +++ b/build.gradle @@ -65,7 +65,7 @@ dependencies { quiltMod "org.codeberg.CRModders:cosmic-quilt:${cosmic_quilt_version}" //quiltMod "quilt-mod:resource-loader:1.0.2" - quiltMod "com.github.CRModders:FluxAPI:0.5.3" + quiltMod "com.github.CRModders:FluxAPI:0.5.4" quiltMod "com.github.ForwarD-NerN:BlockEntityPrototype:fe52c5a" } diff --git a/gradle.properties b/gradle.properties index a6156b1..ccad6ec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.caching=false # Project Info - version=1.3.1 + version=1.3.2 group=net.pietru id=omni_power diff --git a/readme.md b/readme.md index 9924546..14ac623 100644 --- a/readme.md +++ b/readme.md @@ -5,7 +5,7 @@ Based on the example mod for the [Cosmic Quilt](https://codeberg.org/CRModders/c ## Mod requires - Cosmic Reach (0.1.17+) - Cosmic Quilt (1.2.4+) -- Flux API (0.5.2+) +- Flux API (0.5.4+)

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 1dc013d..0e1329d 100644 --- a/src/main/java/net/pietru/omni_power/blockevents/Power.java +++ b/src/main/java/net/pietru/omni_power/blockevents/Power.java @@ -3,7 +3,6 @@ package net.pietru.omni_power.blockevents; import com.badlogic.gdx.utils.Array; import com.badlogic.gdx.utils.OrderedMap; import finalforeach.cosmicreach.blocks.BlockPosition; -import finalforeach.cosmicreach.world.World; import finalforeach.cosmicreach.blockevents.BlockEventTrigger; import finalforeach.cosmicreach.blockevents.IBlockEventAction; import finalforeach.cosmicreach.blocks.BlockState; @@ -93,13 +92,10 @@ public class Power implements IBlockEventAction { return; } - Map args = new HashMap(); + Map args = new HashMap<>(); args.put("blockPos", triggerPos); - BlockEventTrigger[] var8 = customTrigger; - int var9 = customTrigger.length; - for(int var10 = 0; var10 < var9; ++var10) { - BlockEventTrigger t = var8[var10]; + for (BlockEventTrigger t : customTrigger) { t.act(targetBlockState, zone, args); } } @@ -148,7 +144,7 @@ public class Power implements IBlockEventAction { BlockState state = pos.getBlockState(); if (state==null) return false; - return state.stringId.contains(dir) || !( + return state.stringId.contains(dir) || state.stringId.contains("any_in_power") || !( state.stringId.contains("xp_power")|| state.stringId.contains("xm_power")|| state.stringId.contains("yp_power")|| diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json index b0fa471..dd56086 100644 --- a/src/main/resources/quilt.mod.json +++ b/src/main/resources/quilt.mod.json @@ -39,7 +39,7 @@ }, { "id": "fluxapi", - "versions": ">=0.5.2" + "versions": ">=0.5.4" } ],