From df4c9d783774cef2fbc398767d9c49a97b59a767 Mon Sep 17 00:00:00 2001 From: pietru Date: Sun, 15 Sep 2024 18:40:34 +0200 Subject: [PATCH] fix for 0.3.1 --- gradle.properties | 4 +- .../java/net/pietru/omni_power/OmniPower.java | 56 +++++++++++++++++- .../adapter/model_cable_adapter_blue.json | 19 ------ .../adapter/model_cable_adapter_red.json | 19 ------ .../models/blocks/model_cable_blue.json | 20 ------- .../models/blocks/model_cable_red.json | 20 ------- .../models/blocks/model_door_cube.json | 20 ------- .../blocks/model_door_cube_powered.json | 20 ------- .../models/blocks/model_lever_blue.json | 20 ------- .../blocks/model_lever_blue_powered.json | 20 ------- .../models/blocks/model_lever_red.json | 20 ------- .../blocks/model_lever_red_powered.json | 20 ------- .../adapter/cable_adapter_blue_off.json | 0 .../adapter/cable_adapter_blue_on.json | 0 .../adapter/cable_adapter_red_off.json | 0 .../adapter/cable_adapter_red_on.json | 0 .../block_events_cable_merger_off.json | 0 .../block_events_cable_merger_on.json | 0 .../block_events_cable_merger_slim_off.json | 0 .../block_events_cable_merger_slim_on.json | 0 .../block_events_door_cube_off.json | 2 +- .../block_events_door_cube_on.json | 2 +- .../block_events_lever_blue_off.json | 2 +- .../block_events_lever_blue_on.json | 2 +- .../block_events_lever_red_off.json | 2 +- .../block_events_lever_red_on.json | 2 +- .../blocks}/cable.json | 8 +-- .../blocks}/cable_adapter.json | 16 ++--- .../blocks}/cable_merger.json | 16 ++--- .../blocks}/door_cube.json | 10 ++-- .../blocks}/lever.json | 16 ++--- .../adapter/model_cable_adapter_blue.json | 19 ++++++ .../adapter/model_cable_adapter_red.json | 19 ++++++ .../models/blocks/model_cable_blue.json | 20 +++++++ .../models/blocks/model_cable_blue_slim.json | 6 +- .../models/blocks/model_cable_merger.json | 6 +- .../blocks/model_cable_merger_powered.json | 6 +- .../blocks/model_cable_merger_slim.json | 6 +- .../model_cable_merger_slim_powered.json | 6 +- .../models/blocks/model_cable_red.json | 20 +++++++ .../models/blocks/model_cable_red_slim.json | 6 +- .../models/blocks/model_door_cube.json | 20 +++++++ .../blocks/model_door_cube_powered.json | 20 +++++++ .../models/blocks/model_lever_blue.json | 20 +++++++ .../blocks/model_lever_blue_powered.json | 20 +++++++ .../models/blocks/model_lever_red.json | 20 +++++++ .../blocks/model_lever_red_powered.json | 20 +++++++ .../sounds/blocks/drop_004.ogg | Bin .../sounds/blocks/maximize_006.ogg | Bin .../sounds/blocks/minimize_006.ogg | Bin .../sounds/blocks/select_006.ogg | Bin .../sounds/blocks/switch_005.ogg | Bin .../sounds/blocks/switch_006.ogg | Bin .../textures/blocks/cable_adapter_blue.png | Bin .../textures/blocks/cable_adapter_red.png | Bin .../textures/blocks/cable_blue.png | Bin .../textures/blocks/cable_merger.png | Bin .../textures/blocks/cable_merger_2.png | Bin .../textures/blocks/cable_red.png | Bin .../{ => omni_power}/textures/blocks/door.png | Bin .../textures/blocks/door_powered.png | Bin .../textures/blocks/emergency.png | Bin .../{ => omni_power}/textures/blocks/flat.png | Bin .../textures/blocks/lever_off_blue.png | Bin .../textures/blocks/lever_off_red.png | Bin .../textures/blocks/lever_on_blue.png | Bin .../textures/blocks/lever_on_red.png | Bin 67 files changed, 311 insertions(+), 259 deletions(-) delete mode 100644 src/main/resources/models/blocks/adapter/model_cable_adapter_blue.json delete mode 100644 src/main/resources/models/blocks/adapter/model_cable_adapter_red.json delete mode 100644 src/main/resources/models/blocks/model_cable_blue.json delete mode 100644 src/main/resources/models/blocks/model_cable_red.json delete mode 100644 src/main/resources/models/blocks/model_door_cube.json delete mode 100644 src/main/resources/models/blocks/model_door_cube_powered.json delete mode 100644 src/main/resources/models/blocks/model_lever_blue.json delete mode 100644 src/main/resources/models/blocks/model_lever_blue_powered.json delete mode 100644 src/main/resources/models/blocks/model_lever_red.json delete mode 100644 src/main/resources/models/blocks/model_lever_red_powered.json rename src/main/resources/{ => omni_power}/block_events/adapter/cable_adapter_blue_off.json (100%) rename src/main/resources/{ => omni_power}/block_events/adapter/cable_adapter_blue_on.json (100%) rename src/main/resources/{ => omni_power}/block_events/adapter/cable_adapter_red_off.json (100%) rename src/main/resources/{ => omni_power}/block_events/adapter/cable_adapter_red_on.json (100%) rename src/main/resources/{ => omni_power}/block_events/block_events_cable_merger_off.json (100%) rename src/main/resources/{ => omni_power}/block_events/block_events_cable_merger_on.json (100%) rename src/main/resources/{ => omni_power}/block_events/block_events_cable_merger_slim_off.json (100%) rename src/main/resources/{ => omni_power}/block_events/block_events_cable_merger_slim_on.json (100%) rename src/main/resources/{ => omni_power}/block_events/block_events_door_cube_off.json (94%) rename src/main/resources/{ => omni_power}/block_events/block_events_door_cube_on.json (94%) rename src/main/resources/{ => omni_power}/block_events/block_events_lever_blue_off.json (94%) rename src/main/resources/{ => omni_power}/block_events/block_events_lever_blue_on.json (94%) rename src/main/resources/{ => omni_power}/block_events/block_events_lever_red_off.json (94%) rename src/main/resources/{ => omni_power}/block_events/block_events_lever_red_on.json (94%) rename src/main/resources/{blocks/omni_power => omni_power/blocks}/cable.json (75%) rename src/main/resources/{blocks/omni_power => omni_power/blocks}/cable_adapter.json (60%) rename src/main/resources/{blocks/omni_power => omni_power/blocks}/cable_merger.json (62%) rename src/main/resources/{blocks/omni_power => omni_power/blocks}/door_cube.json (66%) rename src/main/resources/{blocks/omni_power => omni_power/blocks}/lever.json (62%) create mode 100644 src/main/resources/omni_power/models/blocks/adapter/model_cable_adapter_blue.json create mode 100644 src/main/resources/omni_power/models/blocks/adapter/model_cable_adapter_red.json create mode 100644 src/main/resources/omni_power/models/blocks/model_cable_blue.json rename src/main/resources/{ => omni_power}/models/blocks/model_cable_blue_slim.json (96%) rename src/main/resources/{ => omni_power}/models/blocks/model_cable_merger.json (82%) rename src/main/resources/{ => omni_power}/models/blocks/model_cable_merger_powered.json (82%) rename src/main/resources/{ => omni_power}/models/blocks/model_cable_merger_slim.json (96%) rename src/main/resources/{ => omni_power}/models/blocks/model_cable_merger_slim_powered.json (96%) create mode 100644 src/main/resources/omni_power/models/blocks/model_cable_red.json rename src/main/resources/{ => omni_power}/models/blocks/model_cable_red_slim.json (96%) create mode 100644 src/main/resources/omni_power/models/blocks/model_door_cube.json create mode 100644 src/main/resources/omni_power/models/blocks/model_door_cube_powered.json create mode 100644 src/main/resources/omni_power/models/blocks/model_lever_blue.json create mode 100644 src/main/resources/omni_power/models/blocks/model_lever_blue_powered.json create mode 100644 src/main/resources/omni_power/models/blocks/model_lever_red.json create mode 100644 src/main/resources/omni_power/models/blocks/model_lever_red_powered.json rename src/main/resources/{ => omni_power}/sounds/blocks/drop_004.ogg (100%) rename src/main/resources/{ => omni_power}/sounds/blocks/maximize_006.ogg (100%) rename src/main/resources/{ => omni_power}/sounds/blocks/minimize_006.ogg (100%) rename src/main/resources/{ => omni_power}/sounds/blocks/select_006.ogg (100%) rename src/main/resources/{ => omni_power}/sounds/blocks/switch_005.ogg (100%) rename src/main/resources/{ => omni_power}/sounds/blocks/switch_006.ogg (100%) rename src/main/resources/{ => omni_power}/textures/blocks/cable_adapter_blue.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/cable_adapter_red.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/cable_blue.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/cable_merger.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/cable_merger_2.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/cable_red.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/door.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/door_powered.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/emergency.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/flat.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/lever_off_blue.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/lever_off_red.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/lever_on_blue.png (100%) rename src/main/resources/{ => omni_power}/textures/blocks/lever_on_red.png (100%) diff --git a/gradle.properties b/gradle.properties index 9e0950a..ea41c3d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,12 +4,12 @@ org.gradle.parallel=true org.gradle.caching=false # Project Info -version=1.6.4 +version=1.7.0 group=net.pietru id=omni_power # Dependency Versions -cosmic_reach_version=0.2.0 +cosmic_reach_version=0.3.1 cosmic_quilt_version=2.0.2 #fluxapi_version=0.6.0 \ No newline at end of file diff --git a/src/main/java/net/pietru/omni_power/OmniPower.java b/src/main/java/net/pietru/omni_power/OmniPower.java index 3fb2165..00029cb 100644 --- a/src/main/java/net/pietru/omni_power/OmniPower.java +++ b/src/main/java/net/pietru/omni_power/OmniPower.java @@ -1,11 +1,20 @@ package net.pietru.omni_power; +import com.badlogic.gdx.Gdx; +import finalforeach.cosmicreach.GameAssetLoader; import finalforeach.cosmicreach.blockevents.BlockEvents; import finalforeach.cosmicreach.blocks.Block; import net.pietru.omni_power.blockevents.Power; import dev.crmodders.cosmicquilt.api.entrypoint.ModInitializer; import org.quiltmc.loader.api.ModContainer; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.List; + public class OmniPower implements ModInitializer { public static final String MOD_ID = "omni_power"; public static boolean block_entities = false; @@ -24,11 +33,25 @@ public class OmniPower implements ModInitializer { load_power_event(); block_entities=true; - System.out.println("Registered OmniPower Events"); + + try { + for (String path : getResourceFiles("omni_power/block_events")){ + System.out.println("Loading "+path); + BlockEvents.loadBlockEventsFromAsset(Gdx.files.classpath(path)); + } + } catch (IOException e) { + throw new RuntimeException(e); + } + + System.out.println("Registered OmniPower Events"); for (String block:blocks) { System.out.println(block); - Block.getInstance("omni_power/"+block); + try { + Block.loadBlock(GameAssetLoader.loadAsset("omni_power:blocks/"+block+".json")); + } catch (Exception var3) { + throw new RuntimeException("Error parsing block: " + block, var3); + } } System.out.println("Registered OmniPower Blocks"); @@ -42,5 +65,34 @@ public class OmniPower implements ModInitializer { System.out.println("If msg above says something Duplicate block event action key it might be intended behaviour..."); } } + + public List getResourceFiles(String path) throws IOException { + List filenames = new ArrayList<>(); + + try ( + InputStream in = getResourceAsStream(path); + BufferedReader br = new BufferedReader(new InputStreamReader(in))) { + String resource; + + while ((resource = br.readLine()) != null) { + if (resource.endsWith(".json")) + filenames.add(path+"/"+resource); + else + filenames.addAll(getResourceFiles(path+"/"+resource)); + } + } + + return filenames; + } + + private InputStream getResourceAsStream(String resource) { + final InputStream in = getContextClassLoader().getResourceAsStream(resource); + + return in == null ? getClass().getResourceAsStream(resource) : in; + } + + private ClassLoader getContextClassLoader() { + return Thread.currentThread().getContextClassLoader(); + } } diff --git a/src/main/resources/models/blocks/adapter/model_cable_adapter_blue.json b/src/main/resources/models/blocks/adapter/model_cable_adapter_blue.json deleted file mode 100644 index 4a41bfd..0000000 --- a/src/main/resources/models/blocks/adapter/model_cable_adapter_blue.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "cable_adapter_blue.png" - }, - "bottom": - { - "fileName": "cable_adapter_blue.png" - }, - "side": - { - "fileName": "cable_adapter_blue.png" - } - } -} \ No newline at end of file diff --git a/src/main/resources/models/blocks/adapter/model_cable_adapter_red.json b/src/main/resources/models/blocks/adapter/model_cable_adapter_red.json deleted file mode 100644 index d18c828..0000000 --- a/src/main/resources/models/blocks/adapter/model_cable_adapter_red.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "cable_adapter_red.png" - }, - "bottom": - { - "fileName": "cable_adapter_red.png" - }, - "side": - { - "fileName": "cable_adapter_red.png" - } - } -} \ No newline at end of file diff --git a/src/main/resources/models/blocks/model_cable_blue.json b/src/main/resources/models/blocks/model_cable_blue.json deleted file mode 100644 index 522aacb..0000000 --- a/src/main/resources/models/blocks/model_cable_blue.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "cable_blue.png" - }, - "bottom": - { - "fileName": "cable_blue.png" - }, - "side": - { - "fileName": "cable_blue.png" - } - } - -} \ No newline at end of file diff --git a/src/main/resources/models/blocks/model_cable_red.json b/src/main/resources/models/blocks/model_cable_red.json deleted file mode 100644 index 9f87b1b..0000000 --- a/src/main/resources/models/blocks/model_cable_red.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "cable_red.png" - }, - "bottom": - { - "fileName": "cable_red.png" - }, - "side": - { - "fileName": "cable_red.png" - } - } - -} \ No newline at end of file diff --git a/src/main/resources/models/blocks/model_door_cube.json b/src/main/resources/models/blocks/model_door_cube.json deleted file mode 100644 index ba94f68..0000000 --- a/src/main/resources/models/blocks/model_door_cube.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "door.png" - }, - "bottom": - { - "fileName": "door.png" - }, - "side": - { - "fileName": "door.png" - } - } - -} \ No newline at end of file diff --git a/src/main/resources/models/blocks/model_door_cube_powered.json b/src/main/resources/models/blocks/model_door_cube_powered.json deleted file mode 100644 index ff90494..0000000 --- a/src/main/resources/models/blocks/model_door_cube_powered.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "door_powered.png" - }, - "bottom": - { - "fileName": "door_powered.png" - }, - "side": - { - "fileName": "door_powered.png" - } - } - -} \ No newline at end of file diff --git a/src/main/resources/models/blocks/model_lever_blue.json b/src/main/resources/models/blocks/model_lever_blue.json deleted file mode 100644 index f5151c5..0000000 --- a/src/main/resources/models/blocks/model_lever_blue.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "lever_off_blue.png" - }, - "bottom": - { - "fileName": "lever_off_blue.png" - }, - "side": - { - "fileName": "lever_off_blue.png" - } - } - -} \ No newline at end of file diff --git a/src/main/resources/models/blocks/model_lever_blue_powered.json b/src/main/resources/models/blocks/model_lever_blue_powered.json deleted file mode 100644 index 4f080d6..0000000 --- a/src/main/resources/models/blocks/model_lever_blue_powered.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "lever_on_blue.png" - }, - "bottom": - { - "fileName": "lever_on_blue.png" - }, - "side": - { - "fileName": "lever_on_blue.png" - } - } - -} \ No newline at end of file diff --git a/src/main/resources/models/blocks/model_lever_red.json b/src/main/resources/models/blocks/model_lever_red.json deleted file mode 100644 index 2c7a6fe..0000000 --- a/src/main/resources/models/blocks/model_lever_red.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "lever_off_red.png" - }, - "bottom": - { - "fileName": "lever_off_red.png" - }, - "side": - { - "fileName": "lever_off_red.png" - } - } - -} \ No newline at end of file diff --git a/src/main/resources/models/blocks/model_lever_red_powered.json b/src/main/resources/models/blocks/model_lever_red_powered.json deleted file mode 100644 index 2f1d3fa..0000000 --- a/src/main/resources/models/blocks/model_lever_red_powered.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "lever_on_red.png" - }, - "bottom": - { - "fileName": "lever_on_red.png" - }, - "side": - { - "fileName": "lever_on_red.png" - } - } - -} \ No newline at end of file diff --git a/src/main/resources/block_events/adapter/cable_adapter_blue_off.json b/src/main/resources/omni_power/block_events/adapter/cable_adapter_blue_off.json similarity index 100% rename from src/main/resources/block_events/adapter/cable_adapter_blue_off.json rename to src/main/resources/omni_power/block_events/adapter/cable_adapter_blue_off.json diff --git a/src/main/resources/block_events/adapter/cable_adapter_blue_on.json b/src/main/resources/omni_power/block_events/adapter/cable_adapter_blue_on.json similarity index 100% rename from src/main/resources/block_events/adapter/cable_adapter_blue_on.json rename to src/main/resources/omni_power/block_events/adapter/cable_adapter_blue_on.json diff --git a/src/main/resources/block_events/adapter/cable_adapter_red_off.json b/src/main/resources/omni_power/block_events/adapter/cable_adapter_red_off.json similarity index 100% rename from src/main/resources/block_events/adapter/cable_adapter_red_off.json rename to src/main/resources/omni_power/block_events/adapter/cable_adapter_red_off.json diff --git a/src/main/resources/block_events/adapter/cable_adapter_red_on.json b/src/main/resources/omni_power/block_events/adapter/cable_adapter_red_on.json similarity index 100% rename from src/main/resources/block_events/adapter/cable_adapter_red_on.json rename to src/main/resources/omni_power/block_events/adapter/cable_adapter_red_on.json diff --git a/src/main/resources/block_events/block_events_cable_merger_off.json b/src/main/resources/omni_power/block_events/block_events_cable_merger_off.json similarity index 100% rename from src/main/resources/block_events/block_events_cable_merger_off.json rename to src/main/resources/omni_power/block_events/block_events_cable_merger_off.json diff --git a/src/main/resources/block_events/block_events_cable_merger_on.json b/src/main/resources/omni_power/block_events/block_events_cable_merger_on.json similarity index 100% rename from src/main/resources/block_events/block_events_cable_merger_on.json rename to src/main/resources/omni_power/block_events/block_events_cable_merger_on.json diff --git a/src/main/resources/block_events/block_events_cable_merger_slim_off.json b/src/main/resources/omni_power/block_events/block_events_cable_merger_slim_off.json similarity index 100% rename from src/main/resources/block_events/block_events_cable_merger_slim_off.json rename to src/main/resources/omni_power/block_events/block_events_cable_merger_slim_off.json diff --git a/src/main/resources/block_events/block_events_cable_merger_slim_on.json b/src/main/resources/omni_power/block_events/block_events_cable_merger_slim_on.json similarity index 100% rename from src/main/resources/block_events/block_events_cable_merger_slim_on.json rename to src/main/resources/omni_power/block_events/block_events_cable_merger_slim_on.json diff --git a/src/main/resources/block_events/block_events_door_cube_off.json b/src/main/resources/omni_power/block_events/block_events_door_cube_off.json similarity index 94% rename from src/main/resources/block_events/block_events_door_cube_off.json rename to src/main/resources/omni_power/block_events/block_events_door_cube_off.json index b89af0f..4dac886 100644 --- a/src/main/resources/block_events/block_events_door_cube_off.json +++ b/src/main/resources/omni_power/block_events/block_events_door_cube_off.json @@ -31,7 +31,7 @@ "actionId": "base:play_sound_2d", "parameters": { - "sound": "switch_006.ogg", + "sound": "omni_power:sounds/blocks/switch_006.ogg", "volume": 1, "pitch": 1, "pan": 0 diff --git a/src/main/resources/block_events/block_events_door_cube_on.json b/src/main/resources/omni_power/block_events/block_events_door_cube_on.json similarity index 94% rename from src/main/resources/block_events/block_events_door_cube_on.json rename to src/main/resources/omni_power/block_events/block_events_door_cube_on.json index 9ba8aa0..1f49375 100644 --- a/src/main/resources/block_events/block_events_door_cube_on.json +++ b/src/main/resources/omni_power/block_events/block_events_door_cube_on.json @@ -31,7 +31,7 @@ "actionId": "base:play_sound_2d", "parameters": { - "sound": "switch_005.ogg", + "sound": "omni_power:sounds/blocks/switch_005.ogg", "volume": 1, "pitch": 1, "pan": 0 diff --git a/src/main/resources/block_events/block_events_lever_blue_off.json b/src/main/resources/omni_power/block_events/block_events_lever_blue_off.json similarity index 94% rename from src/main/resources/block_events/block_events_lever_blue_off.json rename to src/main/resources/omni_power/block_events/block_events_lever_blue_off.json index ba519be..2a60e30 100644 --- a/src/main/resources/block_events/block_events_lever_blue_off.json +++ b/src/main/resources/omni_power/block_events/block_events_lever_blue_off.json @@ -20,7 +20,7 @@ "actionId": "base:play_sound_2d", "parameters": { - "sound": "maximize_006.ogg", + "sound": "omni_power:sounds/blocks/maximize_006.ogg", "volume": 1, "pitch": 1, "pan": 0 diff --git a/src/main/resources/block_events/block_events_lever_blue_on.json b/src/main/resources/omni_power/block_events/block_events_lever_blue_on.json similarity index 94% rename from src/main/resources/block_events/block_events_lever_blue_on.json rename to src/main/resources/omni_power/block_events/block_events_lever_blue_on.json index 25fdbeb..776e670 100644 --- a/src/main/resources/block_events/block_events_lever_blue_on.json +++ b/src/main/resources/omni_power/block_events/block_events_lever_blue_on.json @@ -20,7 +20,7 @@ "actionId": "base:play_sound_2d", "parameters": { - "sound": "minimize_006.ogg", + "sound": "omni_power:sounds/blocks/minimize_006.ogg", "volume": 1, "pitch": 1, "pan": 0 diff --git a/src/main/resources/block_events/block_events_lever_red_off.json b/src/main/resources/omni_power/block_events/block_events_lever_red_off.json similarity index 94% rename from src/main/resources/block_events/block_events_lever_red_off.json rename to src/main/resources/omni_power/block_events/block_events_lever_red_off.json index edb165f..37f329f 100644 --- a/src/main/resources/block_events/block_events_lever_red_off.json +++ b/src/main/resources/omni_power/block_events/block_events_lever_red_off.json @@ -20,7 +20,7 @@ "actionId": "base:play_sound_2d", "parameters": { - "sound": "maximize_006.ogg", + "sound": "omni_power:sounds/blocks/maximize_006.ogg", "volume": 1, "pitch": 1, "pan": 0 diff --git a/src/main/resources/block_events/block_events_lever_red_on.json b/src/main/resources/omni_power/block_events/block_events_lever_red_on.json similarity index 94% rename from src/main/resources/block_events/block_events_lever_red_on.json rename to src/main/resources/omni_power/block_events/block_events_lever_red_on.json index 3a5ba28..976c120 100644 --- a/src/main/resources/block_events/block_events_lever_red_on.json +++ b/src/main/resources/omni_power/block_events/block_events_lever_red_on.json @@ -20,7 +20,7 @@ "actionId": "base:play_sound_2d", "parameters": { - "sound": "minimize_006.ogg", + "sound": "omni_power:sounds/blocks/minimize_006.ogg", "volume": 1, "pitch": 1, "pan": 0 diff --git a/src/main/resources/blocks/omni_power/cable.json b/src/main/resources/omni_power/blocks/cable.json similarity index 75% rename from src/main/resources/blocks/omni_power/cable.json rename to src/main/resources/omni_power/blocks/cable.json index 3691033..ac823d5 100644 --- a/src/main/resources/blocks/omni_power/cable.json +++ b/src/main/resources/omni_power/blocks/cable.json @@ -4,7 +4,7 @@ { "default,cable_red": { - "modelName": "model_cable_red", + "modelName": "omni_power:models/blocks/model_cable_red.json", "isTransparent": false, "isOpaque": true, "lightLevelRed": 0, @@ -13,7 +13,7 @@ }, "default,cable_red,slim": { - "modelName": "model_cable_red_slim", + "modelName": "omni_power:models/blocks/model_cable_red_slim.json", "isTransparent": false, "isOpaque": false, "lightLevelRed": 0, @@ -24,7 +24,7 @@ "default,cable_blue": { - "modelName": "model_cable_blue", + "modelName": "omni_power:models/blocks/model_cable_blue.json", "isTransparent": false, "isOpaque": true, "lightLevelRed": 0, @@ -33,7 +33,7 @@ }, "default,cable_blue,slim": { - "modelName": "model_cable_blue_slim", + "modelName": "omni_power:models/blocks/model_cable_blue_slim.json", "isTransparent": false, "isOpaque": false, "lightLevelRed": 0, diff --git a/src/main/resources/blocks/omni_power/cable_adapter.json b/src/main/resources/omni_power/blocks/cable_adapter.json similarity index 60% rename from src/main/resources/blocks/omni_power/cable_adapter.json rename to src/main/resources/omni_power/blocks/cable_adapter.json index ca89944..c1512d5 100644 --- a/src/main/resources/blocks/omni_power/cable_adapter.json +++ b/src/main/resources/omni_power/blocks/cable_adapter.json @@ -4,8 +4,8 @@ { "default,cable_red": { - "modelName": "adapter/model_cable_adapter_red", - "blockEventsId": "adapter/cable_adapter_red_off", + "modelName": "omni_power:models/blocks/adapter/model_cable_adapter_red.json", + "blockEventsId": "omni_power:adapter/cable_adapter_red_off", "isTransparent": false, "isOpaque": true, "lightLevelRed": 0, @@ -14,8 +14,8 @@ }, "powered,cable_red": { - "modelName": "adapter/model_cable_adapter_red", - "blockEventsId": "adapter/cable_adapter_red_on", + "modelName": "omni_power:models/blocks/adapter/model_cable_adapter_red.json", + "blockEventsId": "omni_power:adapter/cable_adapter_red_on", "isTransparent": false, "isOpaque": true, "lightLevelRed": 0, @@ -26,8 +26,8 @@ "default,cable_blue": { - "modelName": "adapter/model_cable_adapter_blue", - "blockEventsId": "adapter/cable_adapter_blue_off", + "modelName": "omni_power:models/blocks/adapter/model_cable_adapter_blue.json", + "blockEventsId": "omni_power:adapter/cable_adapter_blue_off", "isTransparent": false, "isOpaque": true, "lightLevelRed": 0, @@ -36,8 +36,8 @@ }, "powered,cable_blue": { - "modelName": "adapter/model_cable_adapter_blue", - "blockEventsId": "adapter/cable_adapter_blue_on", + "modelName": "omni_power:models/blocks/adapter/model_cable_adapter_blue.json", + "blockEventsId": "omni_power:adapter/cable_adapter_blue_on", "isTransparent": false, "isOpaque": true, "lightLevelRed": 0, diff --git a/src/main/resources/blocks/omni_power/cable_merger.json b/src/main/resources/omni_power/blocks/cable_merger.json similarity index 62% rename from src/main/resources/blocks/omni_power/cable_merger.json rename to src/main/resources/omni_power/blocks/cable_merger.json index d48e317..854be96 100644 --- a/src/main/resources/blocks/omni_power/cable_merger.json +++ b/src/main/resources/omni_power/blocks/cable_merger.json @@ -4,8 +4,8 @@ { "default,cable_red,cable_blue": { - "modelName": "model_cable_merger", - "blockEventsId": "block_events_cable_merger_off", + "modelName": "omni_power:models/blocks/model_cable_merger.json", + "blockEventsId": "omni_power:block_events_cable_merger_off", "isTransparent": false, "isOpaque": true, "lightLevelRed": 0, @@ -14,8 +14,8 @@ }, "powered,cable_red,cable_blue": { - "modelName": "model_cable_merger_powered", - "blockEventsId": "block_events_cable_merger_on", + "modelName": "omni_power:models/blocks/model_cable_merger_powered.json", + "blockEventsId": "omni_power:block_events_cable_merger_on", "isTransparent": false, "isOpaque": true, "lightLevelRed": 0, @@ -26,8 +26,8 @@ "default,cable_red,cable_blue,slim": { - "modelName": "model_cable_merger_slim", - "blockEventsId": "block_events_cable_merger_slim_off", + "modelName": "omni_power:models/blocks/model_cable_merger_slim.json", + "blockEventsId": "omni_power:block_events_cable_merger_slim_off", "isTransparent": false, "isOpaque": false, "lightLevelRed": 0, @@ -36,8 +36,8 @@ }, "powered,cable_red,cable_blue,slim": { - "modelName": "model_cable_merger_slim_powered", - "blockEventsId": "block_events_cable_merger_slim_on", + "modelName": "omni_power:models/blocks/model_cable_merger_slim_powered.json", + "blockEventsId": "omni_power:block_events_cable_merger_slim_on", "isTransparent": false, "isOpaque": false, "lightLevelRed": 0, diff --git a/src/main/resources/blocks/omni_power/door_cube.json b/src/main/resources/omni_power/blocks/door_cube.json similarity index 66% rename from src/main/resources/blocks/omni_power/door_cube.json rename to src/main/resources/omni_power/blocks/door_cube.json index 2da2d91..0d953fc 100644 --- a/src/main/resources/blocks/omni_power/door_cube.json +++ b/src/main/resources/omni_power/blocks/door_cube.json @@ -4,8 +4,8 @@ { "default,cable_red,cable_blue": { - "modelName": "model_door_cube", - "blockEventsId": "block_events_door_cube_off", + "modelName": "omni_power:models/blocks/model_door_cube.json", + "blockEventsId": "omni_power:block_events_door_cube_off", "isTransparent": true, "isOpaque": true, "lightLevelRed": 0, @@ -14,10 +14,10 @@ }, "powered,cable_red,cable_blue": { - "modelName": "model_door_cube_powered", - "blockEventsId": "block_events_door_cube_on", + "modelName": "omni_power:models/blocks/model_door_cube_powered.json", + "blockEventsId": "omni_power:block_events_door_cube_on", "isTransparent": true, - "isOpaque": false, + "isOpaque": true, "lightLevelRed": 0, "lightLevelGreen": 0, "lightLevelBlue": 0, diff --git a/src/main/resources/blocks/omni_power/lever.json b/src/main/resources/omni_power/blocks/lever.json similarity index 62% rename from src/main/resources/blocks/omni_power/lever.json rename to src/main/resources/omni_power/blocks/lever.json index 7d01a51..495067a 100644 --- a/src/main/resources/blocks/omni_power/lever.json +++ b/src/main/resources/omni_power/blocks/lever.json @@ -4,8 +4,8 @@ { "default,cable_red": { - "modelName": "model_lever_red", - "blockEventsId": "block_events_lever_red_off", + "modelName": "omni_power:models/blocks/model_lever_red.json", + "blockEventsId": "omni_power:block_events_lever_red_off", "isTransparent": false, "isOpaque": true, "lightLevelRed": 0, @@ -14,8 +14,8 @@ }, "powered,cable_red": { - "modelName": "model_lever_red_powered", - "blockEventsId": "block_events_lever_red_on", + "modelName": "omni_power:models/blocks/model_lever_red_powered.json", + "blockEventsId": "omni_power:block_events_lever_red_on", "isTransparent": false, "isOpaque": true, "lightLevelRed": 0, @@ -27,8 +27,8 @@ "default,cable_blue": { - "modelName": "model_lever_blue", - "blockEventsId": "block_events_lever_blue_off", + "modelName": "omni_power:models/blocks/model_lever_blue.json", + "blockEventsId": "omni_power:block_events_lever_blue_off", "isTransparent": false, "isOpaque": true, "lightLevelRed": 0, @@ -37,8 +37,8 @@ }, "powered,cable_blue": { - "modelName": "model_lever_blue_powered", - "blockEventsId": "block_events_lever_blue_on", + "modelName": "omni_power:models/blocks/model_lever_blue_powered.json", + "blockEventsId": "omni_power:block_events_lever_blue_on", "isTransparent": false, "isOpaque": true, "lightLevelRed": 0, diff --git a/src/main/resources/omni_power/models/blocks/adapter/model_cable_adapter_blue.json b/src/main/resources/omni_power/models/blocks/adapter/model_cable_adapter_blue.json new file mode 100644 index 0000000..b6fc0b7 --- /dev/null +++ b/src/main/resources/omni_power/models/blocks/adapter/model_cable_adapter_blue.json @@ -0,0 +1,19 @@ +{ + "parent": "base:models/blocks/cube.json", + + "textures": + { + "top": + { + "fileName": "omni_power:textures/blocks/cable_adapter_blue.png" + }, + "bottom": + { + "fileName": "omni_power:textures/blocks/cable_adapter_blue.png" + }, + "side": + { + "fileName": "omni_power:textures/blocks/cable_adapter_blue.png" + } + } +} \ No newline at end of file diff --git a/src/main/resources/omni_power/models/blocks/adapter/model_cable_adapter_red.json b/src/main/resources/omni_power/models/blocks/adapter/model_cable_adapter_red.json new file mode 100644 index 0000000..06280d8 --- /dev/null +++ b/src/main/resources/omni_power/models/blocks/adapter/model_cable_adapter_red.json @@ -0,0 +1,19 @@ +{ + "parent": "base:models/blocks/cube.json", + + "textures": + { + "top": + { + "fileName": "omni_power:textures/blocks/cable_adapter_red.png" + }, + "bottom": + { + "fileName": "omni_power:textures/blocks/cable_adapter_red.png" + }, + "side": + { + "fileName": "omni_power:textures/blocks/cable_adapter_red.png" + } + } +} \ No newline at end of file diff --git a/src/main/resources/omni_power/models/blocks/model_cable_blue.json b/src/main/resources/omni_power/models/blocks/model_cable_blue.json new file mode 100644 index 0000000..18e1ceb --- /dev/null +++ b/src/main/resources/omni_power/models/blocks/model_cable_blue.json @@ -0,0 +1,20 @@ +{ + "parent": "base:models/blocks/cube.json", + + "textures": + { + "top": + { + "fileName": "omni_power:textures/blocks/cable_blue.png" + }, + "bottom": + { + "fileName": "omni_power:textures/blocks/cable_blue.png" + }, + "side": + { + "fileName": "omni_power:textures/blocks/cable_blue.png" + } + } + +} \ No newline at end of file diff --git a/src/main/resources/models/blocks/model_cable_blue_slim.json b/src/main/resources/omni_power/models/blocks/model_cable_blue_slim.json similarity index 96% rename from src/main/resources/models/blocks/model_cable_blue_slim.json rename to src/main/resources/omni_power/models/blocks/model_cable_blue_slim.json index 8e0b302..2d39615 100644 --- a/src/main/resources/models/blocks/model_cable_blue_slim.json +++ b/src/main/resources/omni_power/models/blocks/model_cable_blue_slim.json @@ -4,15 +4,15 @@ { "top": { - "fileName": "cable_blue.png" + "fileName": "omni_power:textures/blocks/cable_blue.png" }, "bottom": { - "fileName": "cable_blue.png" + "fileName": "omni_power:textures/blocks/cable_blue.png" }, "side": { - "fileName": "cable_blue.png" + "fileName": "omni_power:textures/blocks/cable_blue.png" } }, diff --git a/src/main/resources/models/blocks/model_cable_merger.json b/src/main/resources/omni_power/models/blocks/model_cable_merger.json similarity index 82% rename from src/main/resources/models/blocks/model_cable_merger.json rename to src/main/resources/omni_power/models/blocks/model_cable_merger.json index f85eb44..dbf2c71 100644 --- a/src/main/resources/models/blocks/model_cable_merger.json +++ b/src/main/resources/omni_power/models/blocks/model_cable_merger.json @@ -3,15 +3,15 @@ { "top": { - "fileName": "cable_merger.png" + "fileName": "omni_power:textures/blocks/cable_merger.png" }, "bottom": { - "fileName": "cable_merger.png" + "fileName": "omni_power:textures/blocks/cable_merger.png" }, "side": { - "fileName": "cable_merger.png" + "fileName": "omni_power:textures/blocks/cable_merger.png" } }, diff --git a/src/main/resources/models/blocks/model_cable_merger_powered.json b/src/main/resources/omni_power/models/blocks/model_cable_merger_powered.json similarity index 82% rename from src/main/resources/models/blocks/model_cable_merger_powered.json rename to src/main/resources/omni_power/models/blocks/model_cable_merger_powered.json index 12b0ae7..da991b7 100644 --- a/src/main/resources/models/blocks/model_cable_merger_powered.json +++ b/src/main/resources/omni_power/models/blocks/model_cable_merger_powered.json @@ -3,15 +3,15 @@ { "top": { - "fileName": "cable_merger_2.png" + "fileName": "omni_power:textures/blocks/cable_merger_2.png" }, "bottom": { - "fileName": "cable_merger_2.png" + "fileName": "omni_power:textures/blocks/cable_merger_2.png" }, "side": { - "fileName": "cable_merger_2.png" + "fileName": "omni_power:textures/blocks/cable_merger_2.png" } }, diff --git a/src/main/resources/models/blocks/model_cable_merger_slim.json b/src/main/resources/omni_power/models/blocks/model_cable_merger_slim.json similarity index 96% rename from src/main/resources/models/blocks/model_cable_merger_slim.json rename to src/main/resources/omni_power/models/blocks/model_cable_merger_slim.json index 047f008..a4206d7 100644 --- a/src/main/resources/models/blocks/model_cable_merger_slim.json +++ b/src/main/resources/omni_power/models/blocks/model_cable_merger_slim.json @@ -4,15 +4,15 @@ { "top": { - "fileName": "cable_merger.png" + "fileName": "omni_power:textures/blocks/cable_merger.png" }, "bottom": { - "fileName": "cable_merger.png" + "fileName": "omni_power:textures/blocks/cable_merger.png" }, "side": { - "fileName": "cable_merger.png" + "fileName": "omni_power:textures/blocks/cable_merger.png" } }, diff --git a/src/main/resources/models/blocks/model_cable_merger_slim_powered.json b/src/main/resources/omni_power/models/blocks/model_cable_merger_slim_powered.json similarity index 96% rename from src/main/resources/models/blocks/model_cable_merger_slim_powered.json rename to src/main/resources/omni_power/models/blocks/model_cable_merger_slim_powered.json index 5ada36f..6d269fe 100644 --- a/src/main/resources/models/blocks/model_cable_merger_slim_powered.json +++ b/src/main/resources/omni_power/models/blocks/model_cable_merger_slim_powered.json @@ -4,15 +4,15 @@ { "top": { - "fileName": "cable_merger_2.png" + "fileName": "omni_power:textures/blocks/cable_merger_2.png" }, "bottom": { - "fileName": "cable_merger_2.png" + "fileName": "omni_power:textures/blocks/cable_merger_2.png" }, "side": { - "fileName": "cable_merger_2.png" + "fileName": "omni_power:textures/blocks/cable_merger_2.png" } }, diff --git a/src/main/resources/omni_power/models/blocks/model_cable_red.json b/src/main/resources/omni_power/models/blocks/model_cable_red.json new file mode 100644 index 0000000..cf9c4a5 --- /dev/null +++ b/src/main/resources/omni_power/models/blocks/model_cable_red.json @@ -0,0 +1,20 @@ +{ + "parent": "base:models/blocks/cube.json", + + "textures": + { + "top": + { + "fileName": "omni_power:textures/blocks/cable_red.png" + }, + "bottom": + { + "fileName": "omni_power:textures/blocks/cable_red.png" + }, + "side": + { + "fileName": "omni_power:textures/blocks/cable_red.png" + } + } + +} \ No newline at end of file diff --git a/src/main/resources/models/blocks/model_cable_red_slim.json b/src/main/resources/omni_power/models/blocks/model_cable_red_slim.json similarity index 96% rename from src/main/resources/models/blocks/model_cable_red_slim.json rename to src/main/resources/omni_power/models/blocks/model_cable_red_slim.json index c0d6874..2ad552e 100644 --- a/src/main/resources/models/blocks/model_cable_red_slim.json +++ b/src/main/resources/omni_power/models/blocks/model_cable_red_slim.json @@ -4,15 +4,15 @@ { "top": { - "fileName": "cable_red.png" + "fileName": "omni_power:textures/blocks/cable_red.png" }, "bottom": { - "fileName": "cable_red.png" + "fileName": "omni_power:textures/blocks/cable_red.png" }, "side": { - "fileName": "cable_red.png" + "fileName": "omni_power:textures/blocks/cable_red.png" } }, diff --git a/src/main/resources/omni_power/models/blocks/model_door_cube.json b/src/main/resources/omni_power/models/blocks/model_door_cube.json new file mode 100644 index 0000000..19751ae --- /dev/null +++ b/src/main/resources/omni_power/models/blocks/model_door_cube.json @@ -0,0 +1,20 @@ +{ + "parent": "base:models/blocks/cube.json", + + "textures": + { + "top": + { + "fileName": "omni_power:textures/blocks/door.png" + }, + "bottom": + { + "fileName": "omni_power:textures/blocks/door.png" + }, + "side": + { + "fileName": "omni_power:textures/blocks/door.png" + } + } + +} \ No newline at end of file diff --git a/src/main/resources/omni_power/models/blocks/model_door_cube_powered.json b/src/main/resources/omni_power/models/blocks/model_door_cube_powered.json new file mode 100644 index 0000000..be25dd9 --- /dev/null +++ b/src/main/resources/omni_power/models/blocks/model_door_cube_powered.json @@ -0,0 +1,20 @@ +{ + "parent": "base:models/blocks/cube.json", + + "textures": + { + "top": + { + "fileName": "omni_power:textures/blocks/door_powered.png" + }, + "bottom": + { + "fileName": "omni_power:textures/blocks/door_powered.png" + }, + "side": + { + "fileName": "omni_power:textures/blocks/door_powered.png" + } + } + +} \ No newline at end of file diff --git a/src/main/resources/omni_power/models/blocks/model_lever_blue.json b/src/main/resources/omni_power/models/blocks/model_lever_blue.json new file mode 100644 index 0000000..8d119d4 --- /dev/null +++ b/src/main/resources/omni_power/models/blocks/model_lever_blue.json @@ -0,0 +1,20 @@ +{ + "parent": "base:models/blocks/cube.json", + + "textures": + { + "top": + { + "fileName": "omni_power:textures/blocks/lever_off_blue.png" + }, + "bottom": + { + "fileName": "omni_power:textures/blocks/lever_off_blue.png" + }, + "side": + { + "fileName": "omni_power:textures/blocks/lever_off_blue.png" + } + } + +} \ No newline at end of file diff --git a/src/main/resources/omni_power/models/blocks/model_lever_blue_powered.json b/src/main/resources/omni_power/models/blocks/model_lever_blue_powered.json new file mode 100644 index 0000000..11a5a5a --- /dev/null +++ b/src/main/resources/omni_power/models/blocks/model_lever_blue_powered.json @@ -0,0 +1,20 @@ +{ + "parent": "base:models/blocks/cube.json", + + "textures": + { + "top": + { + "fileName": "omni_power:textures/blocks/lever_on_blue.png" + }, + "bottom": + { + "fileName": "omni_power:textures/blocks/lever_on_blue.png" + }, + "side": + { + "fileName": "omni_power:textures/blocks/lever_on_blue.png" + } + } + +} \ No newline at end of file diff --git a/src/main/resources/omni_power/models/blocks/model_lever_red.json b/src/main/resources/omni_power/models/blocks/model_lever_red.json new file mode 100644 index 0000000..a09197a --- /dev/null +++ b/src/main/resources/omni_power/models/blocks/model_lever_red.json @@ -0,0 +1,20 @@ +{ + "parent": "base:models/blocks/cube.json", + + "textures": + { + "top": + { + "fileName": "omni_power:textures/blocks/lever_off_red.png" + }, + "bottom": + { + "fileName": "omni_power:textures/blocks/lever_off_red.png" + }, + "side": + { + "fileName": "omni_power:textures/blocks/lever_off_red.png" + } + } + +} \ No newline at end of file diff --git a/src/main/resources/omni_power/models/blocks/model_lever_red_powered.json b/src/main/resources/omni_power/models/blocks/model_lever_red_powered.json new file mode 100644 index 0000000..b5c14e7 --- /dev/null +++ b/src/main/resources/omni_power/models/blocks/model_lever_red_powered.json @@ -0,0 +1,20 @@ +{ + "parent": "base:models/blocks/cube.json", + + "textures": + { + "top": + { + "fileName": "omni_power:textures/blocks/lever_on_red.png" + }, + "bottom": + { + "fileName": "omni_power:textures/blocks/lever_on_red.png" + }, + "side": + { + "fileName": "omni_power:textures/blocks/lever_on_red.png" + } + } + +} \ No newline at end of file diff --git a/src/main/resources/sounds/blocks/drop_004.ogg b/src/main/resources/omni_power/sounds/blocks/drop_004.ogg similarity index 100% rename from src/main/resources/sounds/blocks/drop_004.ogg rename to src/main/resources/omni_power/sounds/blocks/drop_004.ogg diff --git a/src/main/resources/sounds/blocks/maximize_006.ogg b/src/main/resources/omni_power/sounds/blocks/maximize_006.ogg similarity index 100% rename from src/main/resources/sounds/blocks/maximize_006.ogg rename to src/main/resources/omni_power/sounds/blocks/maximize_006.ogg diff --git a/src/main/resources/sounds/blocks/minimize_006.ogg b/src/main/resources/omni_power/sounds/blocks/minimize_006.ogg similarity index 100% rename from src/main/resources/sounds/blocks/minimize_006.ogg rename to src/main/resources/omni_power/sounds/blocks/minimize_006.ogg diff --git a/src/main/resources/sounds/blocks/select_006.ogg b/src/main/resources/omni_power/sounds/blocks/select_006.ogg similarity index 100% rename from src/main/resources/sounds/blocks/select_006.ogg rename to src/main/resources/omni_power/sounds/blocks/select_006.ogg diff --git a/src/main/resources/sounds/blocks/switch_005.ogg b/src/main/resources/omni_power/sounds/blocks/switch_005.ogg similarity index 100% rename from src/main/resources/sounds/blocks/switch_005.ogg rename to src/main/resources/omni_power/sounds/blocks/switch_005.ogg diff --git a/src/main/resources/sounds/blocks/switch_006.ogg b/src/main/resources/omni_power/sounds/blocks/switch_006.ogg similarity index 100% rename from src/main/resources/sounds/blocks/switch_006.ogg rename to src/main/resources/omni_power/sounds/blocks/switch_006.ogg diff --git a/src/main/resources/textures/blocks/cable_adapter_blue.png b/src/main/resources/omni_power/textures/blocks/cable_adapter_blue.png similarity index 100% rename from src/main/resources/textures/blocks/cable_adapter_blue.png rename to src/main/resources/omni_power/textures/blocks/cable_adapter_blue.png diff --git a/src/main/resources/textures/blocks/cable_adapter_red.png b/src/main/resources/omni_power/textures/blocks/cable_adapter_red.png similarity index 100% rename from src/main/resources/textures/blocks/cable_adapter_red.png rename to src/main/resources/omni_power/textures/blocks/cable_adapter_red.png diff --git a/src/main/resources/textures/blocks/cable_blue.png b/src/main/resources/omni_power/textures/blocks/cable_blue.png similarity index 100% rename from src/main/resources/textures/blocks/cable_blue.png rename to src/main/resources/omni_power/textures/blocks/cable_blue.png diff --git a/src/main/resources/textures/blocks/cable_merger.png b/src/main/resources/omni_power/textures/blocks/cable_merger.png similarity index 100% rename from src/main/resources/textures/blocks/cable_merger.png rename to src/main/resources/omni_power/textures/blocks/cable_merger.png diff --git a/src/main/resources/textures/blocks/cable_merger_2.png b/src/main/resources/omni_power/textures/blocks/cable_merger_2.png similarity index 100% rename from src/main/resources/textures/blocks/cable_merger_2.png rename to src/main/resources/omni_power/textures/blocks/cable_merger_2.png diff --git a/src/main/resources/textures/blocks/cable_red.png b/src/main/resources/omni_power/textures/blocks/cable_red.png similarity index 100% rename from src/main/resources/textures/blocks/cable_red.png rename to src/main/resources/omni_power/textures/blocks/cable_red.png diff --git a/src/main/resources/textures/blocks/door.png b/src/main/resources/omni_power/textures/blocks/door.png similarity index 100% rename from src/main/resources/textures/blocks/door.png rename to src/main/resources/omni_power/textures/blocks/door.png diff --git a/src/main/resources/textures/blocks/door_powered.png b/src/main/resources/omni_power/textures/blocks/door_powered.png similarity index 100% rename from src/main/resources/textures/blocks/door_powered.png rename to src/main/resources/omni_power/textures/blocks/door_powered.png diff --git a/src/main/resources/textures/blocks/emergency.png b/src/main/resources/omni_power/textures/blocks/emergency.png similarity index 100% rename from src/main/resources/textures/blocks/emergency.png rename to src/main/resources/omni_power/textures/blocks/emergency.png diff --git a/src/main/resources/textures/blocks/flat.png b/src/main/resources/omni_power/textures/blocks/flat.png similarity index 100% rename from src/main/resources/textures/blocks/flat.png rename to src/main/resources/omni_power/textures/blocks/flat.png diff --git a/src/main/resources/textures/blocks/lever_off_blue.png b/src/main/resources/omni_power/textures/blocks/lever_off_blue.png similarity index 100% rename from src/main/resources/textures/blocks/lever_off_blue.png rename to src/main/resources/omni_power/textures/blocks/lever_off_blue.png diff --git a/src/main/resources/textures/blocks/lever_off_red.png b/src/main/resources/omni_power/textures/blocks/lever_off_red.png similarity index 100% rename from src/main/resources/textures/blocks/lever_off_red.png rename to src/main/resources/omni_power/textures/blocks/lever_off_red.png diff --git a/src/main/resources/textures/blocks/lever_on_blue.png b/src/main/resources/omni_power/textures/blocks/lever_on_blue.png similarity index 100% rename from src/main/resources/textures/blocks/lever_on_blue.png rename to src/main/resources/omni_power/textures/blocks/lever_on_blue.png diff --git a/src/main/resources/textures/blocks/lever_on_red.png b/src/main/resources/omni_power/textures/blocks/lever_on_red.png similarity index 100% rename from src/main/resources/textures/blocks/lever_on_red.png rename to src/main/resources/omni_power/textures/blocks/lever_on_red.png