From 6ef46acfe7f4ceefca75238b962227f400882e55 Mon Sep 17 00:00:00 2001 From: pietru Date: Wed, 17 Jul 2024 01:06:27 +0200 Subject: [PATCH] remove flux from dependencies --- build.gradle | 2 +- gradle.properties | 6 ++--- .../java/net/pietru/omni_power/OmniPower.java | 21 ++---------------- .../adapter/model_cable_adapter_blue.json | 19 ---------------- .../adapter/model_cable_adapter_red.json | 19 ---------------- .../models/blocks/model_lever_blue.json | 20 ----------------- .../blocks/model_lever_blue_powered.json | 20 ----------------- .../models/blocks/model_lever_red.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 +- .../{assets/omni_power => }/blocks/cable.json | 8 +++---- .../omni_power => }/blocks/cable_adapter.json | 16 ++++++------- .../omni_power => }/blocks/cable_merger.json | 16 ++++++------- .../omni_power => }/blocks/door_cube.json | 8 +++---- .../{assets/omni_power => }/blocks/lever.json | 16 ++++++------- .../{assets/omni_power => }/icon.png | Bin .../adapter/model_cable_adapter_blue.json | 19 ++++++++++++++++ .../adapter/model_cable_adapter_red.json | 19 ++++++++++++++++ .../models/blocks/model_cable_blue.json | 6 ++--- .../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 | 6 ++--- .../models/blocks/model_cable_red_slim.json | 6 ++--- .../models/blocks/model_door_cube.json | 6 ++--- .../blocks/model_door_cube_powered.json | 6 ++--- .../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 | 6 ++--- src/main/resources/quilt.mod.json | 13 +---------- .../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 65 files changed, 176 insertions(+), 204 deletions(-) delete mode 100644 src/main/resources/assets/omni_power/models/blocks/adapter/model_cable_adapter_blue.json delete mode 100644 src/main/resources/assets/omni_power/models/blocks/adapter/model_cable_adapter_red.json delete mode 100644 src/main/resources/assets/omni_power/models/blocks/model_lever_blue.json delete mode 100644 src/main/resources/assets/omni_power/models/blocks/model_lever_blue_powered.json delete mode 100644 src/main/resources/assets/omni_power/models/blocks/model_lever_red.json rename src/main/resources/{assets/omni_power => }/block_events/adapter/cable_adapter_blue_off.json (100%) rename src/main/resources/{assets/omni_power => }/block_events/adapter/cable_adapter_blue_on.json (100%) rename src/main/resources/{assets/omni_power => }/block_events/adapter/cable_adapter_red_off.json (100%) rename src/main/resources/{assets/omni_power => }/block_events/adapter/cable_adapter_red_on.json (100%) rename src/main/resources/{assets/omni_power => }/block_events/block_events_cable_merger_off.json (100%) rename src/main/resources/{assets/omni_power => }/block_events/block_events_cable_merger_on.json (100%) rename src/main/resources/{assets/omni_power => }/block_events/block_events_cable_merger_slim_off.json (100%) rename src/main/resources/{assets/omni_power => }/block_events/block_events_cable_merger_slim_on.json (100%) rename src/main/resources/{assets/omni_power => }/block_events/block_events_door_cube_off.json (95%) rename src/main/resources/{assets/omni_power => }/block_events/block_events_door_cube_on.json (95%) rename src/main/resources/{assets/omni_power => }/block_events/block_events_lever_blue_off.json (95%) rename src/main/resources/{assets/omni_power => }/block_events/block_events_lever_blue_on.json (95%) rename src/main/resources/{assets/omni_power => }/block_events/block_events_lever_red_off.json (95%) rename src/main/resources/{assets/omni_power => }/block_events/block_events_lever_red_on.json (95%) rename src/main/resources/{assets/omni_power => }/blocks/cable.json (82%) rename src/main/resources/{assets/omni_power => }/blocks/cable_adapter.json (66%) rename src/main/resources/{assets/omni_power => }/blocks/cable_merger.json (68%) rename src/main/resources/{assets/omni_power => }/blocks/door_cube.json (74%) rename src/main/resources/{assets/omni_power => }/blocks/lever.json (68%) rename src/main/resources/{assets/omni_power => }/icon.png (100%) create mode 100644 src/main/resources/models/blocks/adapter/model_cable_adapter_blue.json create mode 100644 src/main/resources/models/blocks/adapter/model_cable_adapter_red.json rename src/main/resources/{assets/omni_power => }/models/blocks/model_cable_blue.json (52%) rename src/main/resources/{assets/omni_power => }/models/blocks/model_cable_blue_slim.json (97%) rename src/main/resources/{assets/omni_power => }/models/blocks/model_cable_merger.json (86%) rename src/main/resources/{assets/omni_power => }/models/blocks/model_cable_merger_powered.json (85%) rename src/main/resources/{assets/omni_power => }/models/blocks/model_cable_merger_slim.json (97%) rename src/main/resources/{assets/omni_power => }/models/blocks/model_cable_merger_slim_powered.json (97%) rename src/main/resources/{assets/omni_power => }/models/blocks/model_cable_red.json (52%) rename src/main/resources/{assets/omni_power => }/models/blocks/model_cable_red_slim.json (97%) rename src/main/resources/{assets/omni_power => }/models/blocks/model_door_cube.json (55%) rename src/main/resources/{assets/omni_power => }/models/blocks/model_door_cube_powered.json (51%) create mode 100644 src/main/resources/models/blocks/model_lever_blue.json create mode 100644 src/main/resources/models/blocks/model_lever_blue_powered.json create mode 100644 src/main/resources/models/blocks/model_lever_red.json rename src/main/resources/{assets/omni_power => }/models/blocks/model_lever_red_powered.json (51%) rename src/main/resources/{assets/omni_power => }/sounds/blocks/drop_004.ogg (100%) rename src/main/resources/{assets/omni_power => }/sounds/blocks/maximize_006.ogg (100%) rename src/main/resources/{assets/omni_power => }/sounds/blocks/minimize_006.ogg (100%) rename src/main/resources/{assets/omni_power => }/sounds/blocks/select_006.ogg (100%) rename src/main/resources/{assets/omni_power => }/sounds/blocks/switch_005.ogg (100%) rename src/main/resources/{assets/omni_power => }/sounds/blocks/switch_006.ogg (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/cable_adapter_blue.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/cable_adapter_red.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/cable_blue.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/cable_merger.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/cable_merger_2.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/cable_red.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/door.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/door_powered.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/emergency.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/flat.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/lever_off_blue.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/lever_off_red.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/lever_on_blue.png (100%) rename src/main/resources/{assets/omni_power => }/textures/blocks/lever_on_red.png (100%) diff --git a/build.gradle b/build.gradle index c14d36c..3a88546 100644 --- a/build.gradle +++ b/build.gradle @@ -70,7 +70,7 @@ dependencies { implementation "dev.crmodders:cosmicquilt:${cosmic_quilt_version}" //quiltMod "quilt-mod:fluxapi:0.5.8r2" - quiltMod "dev.crmodders:fluxapi:${fluxapi_version}"//0.5.5 + //quiltMod "dev.crmodders:fluxapi:${fluxapi_version}"//0.5.5 } processResources { diff --git a/gradle.properties b/gradle.properties index 85650b9..6466b44 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,12 +4,12 @@ org.gradle.parallel=true org.gradle.caching=false # Project Info -version=1.5.2 +version=1.6 group=net.pietru id=omni_power # Dependency Versions -cosmic_reach_version=0.1.31 +cosmic_reach_version=0.1.40 cosmic_quilt_version=2.0.2 -fluxapi_version=0.6.0 \ No newline at end of file +#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 2d1f2e5..eb07750 100644 --- a/src/main/java/net/pietru/omni_power/OmniPower.java +++ b/src/main/java/net/pietru/omni_power/OmniPower.java @@ -1,13 +1,9 @@ package net.pietru.omni_power; -import dev.crmodders.flux.FluxRegistries; -import dev.crmodders.flux.block.DataModBlock; -import dev.crmodders.flux.events.OnRegisterBlockEvent; -import dev.crmodders.flux.tags.ResourceLocation; 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.greenrobot.eventbus.Subscribe; import org.quiltmc.loader.api.ModContainer; public class OmniPower implements ModInitializer { @@ -26,21 +22,8 @@ public class OmniPower implements ModInitializer { block_entities=true; System.out.println("OmniPower Mod Initialized!"); BlockEvents.registerBlockEventAction(Power.class); -// for (String block:blocks) { -// //Block.getInstance(MOD_ID+":"+block); -// //BlockBuilderUtils.getBlockFromJson(new Identifier(MOD_ID, block)); -// FluxRegistries.BLOCKS.register( -// new Identifier(MOD_ID, block), -// new DataModBlock(block) -// ); -// } - FluxRegistries.EVENT_BUS.register(this); - } - - @Subscribe - public void onEvent(OnRegisterBlockEvent event) { for (String block:blocks) { - event.registerBlock(() -> new DataModBlock(block,new ResourceLocation(MOD_ID, "blocks/" + block + ".json"))); + Block.getInstance(block); } } } diff --git a/src/main/resources/assets/omni_power/models/blocks/adapter/model_cable_adapter_blue.json b/src/main/resources/assets/omni_power/models/blocks/adapter/model_cable_adapter_blue.json deleted file mode 100644 index e493392..0000000 --- a/src/main/resources/assets/omni_power/models/blocks/adapter/model_cable_adapter_blue.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "omni_power:cable_adapter_blue.png" - }, - "bottom": - { - "fileName": "omni_power:cable_adapter_blue.png" - }, - "side": - { - "fileName": "omni_power:cable_adapter_blue.png" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/omni_power/models/blocks/adapter/model_cable_adapter_red.json b/src/main/resources/assets/omni_power/models/blocks/adapter/model_cable_adapter_red.json deleted file mode 100644 index 27ee05e..0000000 --- a/src/main/resources/assets/omni_power/models/blocks/adapter/model_cable_adapter_red.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "omni_power:cable_adapter_red.png" - }, - "bottom": - { - "fileName": "omni_power:cable_adapter_red.png" - }, - "side": - { - "fileName": "omni_power:cable_adapter_red.png" - } - } -} \ No newline at end of file diff --git a/src/main/resources/assets/omni_power/models/blocks/model_lever_blue.json b/src/main/resources/assets/omni_power/models/blocks/model_lever_blue.json deleted file mode 100644 index 964179f..0000000 --- a/src/main/resources/assets/omni_power/models/blocks/model_lever_blue.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "omni_power:lever_off_blue.png" - }, - "bottom": - { - "fileName": "omni_power:lever_off_blue.png" - }, - "side": - { - "fileName": "omni_power:lever_off_blue.png" - } - } - -} \ No newline at end of file diff --git a/src/main/resources/assets/omni_power/models/blocks/model_lever_blue_powered.json b/src/main/resources/assets/omni_power/models/blocks/model_lever_blue_powered.json deleted file mode 100644 index e42de89..0000000 --- a/src/main/resources/assets/omni_power/models/blocks/model_lever_blue_powered.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "omni_power:lever_on_blue.png" - }, - "bottom": - { - "fileName": "omni_power:lever_on_blue.png" - }, - "side": - { - "fileName": "omni_power:lever_on_blue.png" - } - } - -} \ No newline at end of file diff --git a/src/main/resources/assets/omni_power/models/blocks/model_lever_red.json b/src/main/resources/assets/omni_power/models/blocks/model_lever_red.json deleted file mode 100644 index f0e4467..0000000 --- a/src/main/resources/assets/omni_power/models/blocks/model_lever_red.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "parent": "cube", - - "textures": - { - "top": - { - "fileName": "omni_power:lever_off_red.png" - }, - "bottom": - { - "fileName": "omni_power:lever_off_red.png" - }, - "side": - { - "fileName": "omni_power:lever_off_red.png" - } - } - -} \ No newline at end of file diff --git a/src/main/resources/assets/omni_power/block_events/adapter/cable_adapter_blue_off.json b/src/main/resources/block_events/adapter/cable_adapter_blue_off.json similarity index 100% rename from src/main/resources/assets/omni_power/block_events/adapter/cable_adapter_blue_off.json rename to src/main/resources/block_events/adapter/cable_adapter_blue_off.json diff --git a/src/main/resources/assets/omni_power/block_events/adapter/cable_adapter_blue_on.json b/src/main/resources/block_events/adapter/cable_adapter_blue_on.json similarity index 100% rename from src/main/resources/assets/omni_power/block_events/adapter/cable_adapter_blue_on.json rename to src/main/resources/block_events/adapter/cable_adapter_blue_on.json diff --git a/src/main/resources/assets/omni_power/block_events/adapter/cable_adapter_red_off.json b/src/main/resources/block_events/adapter/cable_adapter_red_off.json similarity index 100% rename from src/main/resources/assets/omni_power/block_events/adapter/cable_adapter_red_off.json rename to src/main/resources/block_events/adapter/cable_adapter_red_off.json diff --git a/src/main/resources/assets/omni_power/block_events/adapter/cable_adapter_red_on.json b/src/main/resources/block_events/adapter/cable_adapter_red_on.json similarity index 100% rename from src/main/resources/assets/omni_power/block_events/adapter/cable_adapter_red_on.json rename to src/main/resources/block_events/adapter/cable_adapter_red_on.json diff --git a/src/main/resources/assets/omni_power/block_events/block_events_cable_merger_off.json b/src/main/resources/block_events/block_events_cable_merger_off.json similarity index 100% rename from src/main/resources/assets/omni_power/block_events/block_events_cable_merger_off.json rename to src/main/resources/block_events/block_events_cable_merger_off.json diff --git a/src/main/resources/assets/omni_power/block_events/block_events_cable_merger_on.json b/src/main/resources/block_events/block_events_cable_merger_on.json similarity index 100% rename from src/main/resources/assets/omni_power/block_events/block_events_cable_merger_on.json rename to src/main/resources/block_events/block_events_cable_merger_on.json diff --git a/src/main/resources/assets/omni_power/block_events/block_events_cable_merger_slim_off.json b/src/main/resources/block_events/block_events_cable_merger_slim_off.json similarity index 100% rename from src/main/resources/assets/omni_power/block_events/block_events_cable_merger_slim_off.json rename to src/main/resources/block_events/block_events_cable_merger_slim_off.json diff --git a/src/main/resources/assets/omni_power/block_events/block_events_cable_merger_slim_on.json b/src/main/resources/block_events/block_events_cable_merger_slim_on.json similarity index 100% rename from src/main/resources/assets/omni_power/block_events/block_events_cable_merger_slim_on.json rename to src/main/resources/block_events/block_events_cable_merger_slim_on.json diff --git a/src/main/resources/assets/omni_power/block_events/block_events_door_cube_off.json b/src/main/resources/block_events/block_events_door_cube_off.json similarity index 95% rename from src/main/resources/assets/omni_power/block_events/block_events_door_cube_off.json rename to src/main/resources/block_events/block_events_door_cube_off.json index 0d4ddd7..b89af0f 100644 --- a/src/main/resources/assets/omni_power/block_events/block_events_door_cube_off.json +++ b/src/main/resources/block_events/block_events_door_cube_off.json @@ -31,7 +31,7 @@ "actionId": "base:play_sound_2d", "parameters": { - "sound": "omni_power:switch_006.ogg", + "sound": "switch_006.ogg", "volume": 1, "pitch": 1, "pan": 0 diff --git a/src/main/resources/assets/omni_power/block_events/block_events_door_cube_on.json b/src/main/resources/block_events/block_events_door_cube_on.json similarity index 95% rename from src/main/resources/assets/omni_power/block_events/block_events_door_cube_on.json rename to src/main/resources/block_events/block_events_door_cube_on.json index 631e580..9ba8aa0 100644 --- a/src/main/resources/assets/omni_power/block_events/block_events_door_cube_on.json +++ b/src/main/resources/block_events/block_events_door_cube_on.json @@ -31,7 +31,7 @@ "actionId": "base:play_sound_2d", "parameters": { - "sound": "omni_power:switch_005.ogg", + "sound": "switch_005.ogg", "volume": 1, "pitch": 1, "pan": 0 diff --git a/src/main/resources/assets/omni_power/block_events/block_events_lever_blue_off.json b/src/main/resources/block_events/block_events_lever_blue_off.json similarity index 95% rename from src/main/resources/assets/omni_power/block_events/block_events_lever_blue_off.json rename to src/main/resources/block_events/block_events_lever_blue_off.json index 0cb8114..ba519be 100644 --- a/src/main/resources/assets/omni_power/block_events/block_events_lever_blue_off.json +++ b/src/main/resources/block_events/block_events_lever_blue_off.json @@ -20,7 +20,7 @@ "actionId": "base:play_sound_2d", "parameters": { - "sound": "omni_power:maximize_006.ogg", + "sound": "maximize_006.ogg", "volume": 1, "pitch": 1, "pan": 0 diff --git a/src/main/resources/assets/omni_power/block_events/block_events_lever_blue_on.json b/src/main/resources/block_events/block_events_lever_blue_on.json similarity index 95% rename from src/main/resources/assets/omni_power/block_events/block_events_lever_blue_on.json rename to src/main/resources/block_events/block_events_lever_blue_on.json index 9bc7f0c..25fdbeb 100644 --- a/src/main/resources/assets/omni_power/block_events/block_events_lever_blue_on.json +++ b/src/main/resources/block_events/block_events_lever_blue_on.json @@ -20,7 +20,7 @@ "actionId": "base:play_sound_2d", "parameters": { - "sound": "omni_power:minimize_006.ogg", + "sound": "minimize_006.ogg", "volume": 1, "pitch": 1, "pan": 0 diff --git a/src/main/resources/assets/omni_power/block_events/block_events_lever_red_off.json b/src/main/resources/block_events/block_events_lever_red_off.json similarity index 95% rename from src/main/resources/assets/omni_power/block_events/block_events_lever_red_off.json rename to src/main/resources/block_events/block_events_lever_red_off.json index 1c4e350..edb165f 100644 --- a/src/main/resources/assets/omni_power/block_events/block_events_lever_red_off.json +++ b/src/main/resources/block_events/block_events_lever_red_off.json @@ -20,7 +20,7 @@ "actionId": "base:play_sound_2d", "parameters": { - "sound": "omni_power:maximize_006.ogg", + "sound": "maximize_006.ogg", "volume": 1, "pitch": 1, "pan": 0 diff --git a/src/main/resources/assets/omni_power/block_events/block_events_lever_red_on.json b/src/main/resources/block_events/block_events_lever_red_on.json similarity index 95% rename from src/main/resources/assets/omni_power/block_events/block_events_lever_red_on.json rename to src/main/resources/block_events/block_events_lever_red_on.json index 771ba06..3a5ba28 100644 --- a/src/main/resources/assets/omni_power/block_events/block_events_lever_red_on.json +++ b/src/main/resources/block_events/block_events_lever_red_on.json @@ -20,7 +20,7 @@ "actionId": "base:play_sound_2d", "parameters": { - "sound": "omni_power:minimize_006.ogg", + "sound": "minimize_006.ogg", "volume": 1, "pitch": 1, "pan": 0 diff --git a/src/main/resources/assets/omni_power/blocks/cable.json b/src/main/resources/blocks/cable.json similarity index 82% rename from src/main/resources/assets/omni_power/blocks/cable.json rename to src/main/resources/blocks/cable.json index 8e65608..ea388d9 100644 --- a/src/main/resources/assets/omni_power/blocks/cable.json +++ b/src/main/resources/blocks/cable.json @@ -4,7 +4,7 @@ { "default,cable_red": { - "modelName": "omni_power:model_cable_red", + "modelName": "model_cable_red", "isTransparent": false, "generateSlabs": false, "isOpaque": true, @@ -14,7 +14,7 @@ }, "default,cable_red,slim": { - "modelName": "omni_power:model_cable_red_slim", + "modelName": "model_cable_red_slim", "isTransparent": false, "generateSlabs": false, "isOpaque": false, @@ -26,7 +26,7 @@ "default,cable_blue": { - "modelName": "omni_power:model_cable_blue", + "modelName": "model_cable_blue", "isTransparent": false, "generateSlabs": false, "isOpaque": true, @@ -36,7 +36,7 @@ }, "default,cable_blue,slim": { - "modelName": "omni_power:model_cable_blue_slim", + "modelName": "model_cable_blue_slim", "isTransparent": false, "generateSlabs": false, "isOpaque": false, diff --git a/src/main/resources/assets/omni_power/blocks/cable_adapter.json b/src/main/resources/blocks/cable_adapter.json similarity index 66% rename from src/main/resources/assets/omni_power/blocks/cable_adapter.json rename to src/main/resources/blocks/cable_adapter.json index 8b98ada..a86f465 100644 --- a/src/main/resources/assets/omni_power/blocks/cable_adapter.json +++ b/src/main/resources/blocks/cable_adapter.json @@ -4,8 +4,8 @@ { "default,cable_red": { - "modelName": "omni_power:adapter/model_cable_adapter_red", - "blockEventsId": "omni_power:adapter/cable_adapter_red_off", + "modelName": "adapter/model_cable_adapter_red", + "blockEventsId": "adapter/cable_adapter_red_off", "isTransparent": false, "generateSlabs": false, "isOpaque": true, @@ -15,8 +15,8 @@ }, "powered,cable_red": { - "modelName": "omni_power:adapter/model_cable_adapter_red", - "blockEventsId": "omni_power:adapter/cable_adapter_red_on", + "modelName": "adapter/model_cable_adapter_red", + "blockEventsId": "adapter/cable_adapter_red_on", "isTransparent": false, "generateSlabs": false, "isOpaque": true, @@ -28,8 +28,8 @@ "default,cable_blue": { - "modelName": "omni_power:adapter/model_cable_adapter_blue", - "blockEventsId": "omni_power:adapter/cable_adapter_blue_off", + "modelName": "adapter/model_cable_adapter_blue", + "blockEventsId": "adapter/cable_adapter_blue_off", "isTransparent": false, "generateSlabs": false, "isOpaque": true, @@ -39,8 +39,8 @@ }, "powered,cable_blue": { - "modelName": "omni_power:adapter/model_cable_adapter_blue", - "blockEventsId": "omni_power:adapter/cable_adapter_blue_on", + "modelName": "adapter/model_cable_adapter_blue", + "blockEventsId": "adapter/cable_adapter_blue_on", "isTransparent": false, "generateSlabs": false, "isOpaque": true, diff --git a/src/main/resources/assets/omni_power/blocks/cable_merger.json b/src/main/resources/blocks/cable_merger.json similarity index 68% rename from src/main/resources/assets/omni_power/blocks/cable_merger.json rename to src/main/resources/blocks/cable_merger.json index b97050f..9f3e7a2 100644 --- a/src/main/resources/assets/omni_power/blocks/cable_merger.json +++ b/src/main/resources/blocks/cable_merger.json @@ -4,8 +4,8 @@ { "default,cable_red,cable_blue": { - "modelName": "omni_power:model_cable_merger", - "blockEventsId": "omni_power:block_events_cable_merger_off", + "modelName": "model_cable_merger", + "blockEventsId": "block_events_cable_merger_off", "isTransparent": false, "generateSlabs": false, "isOpaque": true, @@ -15,8 +15,8 @@ }, "powered,cable_red,cable_blue": { - "modelName": "omni_power:model_cable_merger_powered", - "blockEventsId": "omni_power:block_events_cable_merger_on", + "modelName": "model_cable_merger_powered", + "blockEventsId": "block_events_cable_merger_on", "isTransparent": false, "generateSlabs": false, "isOpaque": true, @@ -28,8 +28,8 @@ "default,cable_red,cable_blue,slim": { - "modelName": "omni_power:model_cable_merger_slim", - "blockEventsId": "omni_power:block_events_cable_merger_slim_off", + "modelName": "model_cable_merger_slim", + "blockEventsId": "block_events_cable_merger_slim_off", "isTransparent": false, "generateSlabs": false, "isOpaque": false, @@ -39,8 +39,8 @@ }, "powered,cable_red,cable_blue,slim": { - "modelName": "omni_power:model_cable_merger_slim_powered", - "blockEventsId": "omni_power:block_events_cable_merger_slim_on", + "modelName": "model_cable_merger_slim_powered", + "blockEventsId": "block_events_cable_merger_slim_on", "isTransparent": false, "generateSlabs": false, "isOpaque": false, diff --git a/src/main/resources/assets/omni_power/blocks/door_cube.json b/src/main/resources/blocks/door_cube.json similarity index 74% rename from src/main/resources/assets/omni_power/blocks/door_cube.json rename to src/main/resources/blocks/door_cube.json index 5dc0a0e..dbb0580 100644 --- a/src/main/resources/assets/omni_power/blocks/door_cube.json +++ b/src/main/resources/blocks/door_cube.json @@ -4,8 +4,8 @@ { "default,cable_red,cable_blue": { - "modelName": "omni_power:model_door_cube", - "blockEventsId": "omni_power:block_events_door_cube_off", + "modelName": "model_door_cube", + "blockEventsId": "block_events_door_cube_off", "isTransparent": true, "generateSlabs": false, "isOpaque": true, @@ -15,8 +15,8 @@ }, "powered,cable_red,cable_blue": { - "modelName": "omni_power:model_door_cube_powered", - "blockEventsId": "omni_power:block_events_door_cube_on", + "modelName": "model_door_cube_powered", + "blockEventsId": "block_events_door_cube_on", "isTransparent": true, "generateSlabs": false, "isOpaque": false, diff --git a/src/main/resources/assets/omni_power/blocks/lever.json b/src/main/resources/blocks/lever.json similarity index 68% rename from src/main/resources/assets/omni_power/blocks/lever.json rename to src/main/resources/blocks/lever.json index 007999b..a133a2e 100644 --- a/src/main/resources/assets/omni_power/blocks/lever.json +++ b/src/main/resources/blocks/lever.json @@ -4,8 +4,8 @@ { "default,cable_red": { - "modelName": "omni_power:model_lever_red", - "blockEventsId": "omni_power:block_events_lever_red_off", + "modelName": "model_lever_red", + "blockEventsId": "block_events_lever_red_off", "isTransparent": false, "generateSlabs": false, "isOpaque": true, @@ -15,8 +15,8 @@ }, "powered,cable_red": { - "modelName": "omni_power:model_lever_red_powered", - "blockEventsId": "omni_power:block_events_lever_red_on", + "modelName": "model_lever_red_powered", + "blockEventsId": "block_events_lever_red_on", "isTransparent": false, "generateSlabs": false, "isOpaque": true, @@ -29,8 +29,8 @@ "default,cable_blue": { - "modelName": "omni_power:model_lever_blue", - "blockEventsId": "omni_power:block_events_lever_blue_off", + "modelName": "model_lever_blue", + "blockEventsId": "block_events_lever_blue_off", "isTransparent": false, "generateSlabs": false, "isOpaque": true, @@ -40,8 +40,8 @@ }, "powered,cable_blue": { - "modelName": "omni_power:model_lever_blue_powered", - "blockEventsId": "omni_power:block_events_lever_blue_on", + "modelName": "model_lever_blue_powered", + "blockEventsId": "block_events_lever_blue_on", "isTransparent": false, "generateSlabs": false, "isOpaque": true, diff --git a/src/main/resources/assets/omni_power/icon.png b/src/main/resources/icon.png similarity index 100% rename from src/main/resources/assets/omni_power/icon.png rename to src/main/resources/icon.png 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 new file mode 100644 index 0000000..4a41bfd --- /dev/null +++ b/src/main/resources/models/blocks/adapter/model_cable_adapter_blue.json @@ -0,0 +1,19 @@ +{ + "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 new file mode 100644 index 0000000..d18c828 --- /dev/null +++ b/src/main/resources/models/blocks/adapter/model_cable_adapter_red.json @@ -0,0 +1,19 @@ +{ + "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/assets/omni_power/models/blocks/model_cable_blue.json b/src/main/resources/models/blocks/model_cable_blue.json similarity index 52% rename from src/main/resources/assets/omni_power/models/blocks/model_cable_blue.json rename to src/main/resources/models/blocks/model_cable_blue.json index 0671171..522aacb 100644 --- a/src/main/resources/assets/omni_power/models/blocks/model_cable_blue.json +++ b/src/main/resources/models/blocks/model_cable_blue.json @@ -5,15 +5,15 @@ { "top": { - "fileName": "omni_power:cable_blue.png" + "fileName": "cable_blue.png" }, "bottom": { - "fileName": "omni_power:cable_blue.png" + "fileName": "cable_blue.png" }, "side": { - "fileName": "omni_power:cable_blue.png" + "fileName": "cable_blue.png" } } diff --git a/src/main/resources/assets/omni_power/models/blocks/model_cable_blue_slim.json b/src/main/resources/models/blocks/model_cable_blue_slim.json similarity index 97% rename from src/main/resources/assets/omni_power/models/blocks/model_cable_blue_slim.json rename to src/main/resources/models/blocks/model_cable_blue_slim.json index 991d601..8e0b302 100644 --- a/src/main/resources/assets/omni_power/models/blocks/model_cable_blue_slim.json +++ b/src/main/resources/models/blocks/model_cable_blue_slim.json @@ -4,15 +4,15 @@ { "top": { - "fileName": "omni_power:cable_blue.png" + "fileName": "cable_blue.png" }, "bottom": { - "fileName": "omni_power:cable_blue.png" + "fileName": "cable_blue.png" }, "side": { - "fileName": "omni_power:cable_blue.png" + "fileName": "cable_blue.png" } }, diff --git a/src/main/resources/assets/omni_power/models/blocks/model_cable_merger.json b/src/main/resources/models/blocks/model_cable_merger.json similarity index 86% rename from src/main/resources/assets/omni_power/models/blocks/model_cable_merger.json rename to src/main/resources/models/blocks/model_cable_merger.json index 2659275..f85eb44 100644 --- a/src/main/resources/assets/omni_power/models/blocks/model_cable_merger.json +++ b/src/main/resources/models/blocks/model_cable_merger.json @@ -3,15 +3,15 @@ { "top": { - "fileName": "omni_power:cable_merger.png" + "fileName": "cable_merger.png" }, "bottom": { - "fileName": "omni_power:cable_merger.png" + "fileName": "cable_merger.png" }, "side": { - "fileName": "omni_power:cable_merger.png" + "fileName": "cable_merger.png" } }, diff --git a/src/main/resources/assets/omni_power/models/blocks/model_cable_merger_powered.json b/src/main/resources/models/blocks/model_cable_merger_powered.json similarity index 85% rename from src/main/resources/assets/omni_power/models/blocks/model_cable_merger_powered.json rename to src/main/resources/models/blocks/model_cable_merger_powered.json index 1e8efa0..12b0ae7 100644 --- a/src/main/resources/assets/omni_power/models/blocks/model_cable_merger_powered.json +++ b/src/main/resources/models/blocks/model_cable_merger_powered.json @@ -3,15 +3,15 @@ { "top": { - "fileName": "omni_power:cable_merger_2.png" + "fileName": "cable_merger_2.png" }, "bottom": { - "fileName": "omni_power:cable_merger_2.png" + "fileName": "cable_merger_2.png" }, "side": { - "fileName": "omni_power:cable_merger_2.png" + "fileName": "cable_merger_2.png" } }, diff --git a/src/main/resources/assets/omni_power/models/blocks/model_cable_merger_slim.json b/src/main/resources/models/blocks/model_cable_merger_slim.json similarity index 97% rename from src/main/resources/assets/omni_power/models/blocks/model_cable_merger_slim.json rename to src/main/resources/models/blocks/model_cable_merger_slim.json index c1ea805..047f008 100644 --- a/src/main/resources/assets/omni_power/models/blocks/model_cable_merger_slim.json +++ b/src/main/resources/models/blocks/model_cable_merger_slim.json @@ -4,15 +4,15 @@ { "top": { - "fileName": "omni_power:cable_merger.png" + "fileName": "cable_merger.png" }, "bottom": { - "fileName": "omni_power:cable_merger.png" + "fileName": "cable_merger.png" }, "side": { - "fileName": "omni_power:cable_merger.png" + "fileName": "cable_merger.png" } }, diff --git a/src/main/resources/assets/omni_power/models/blocks/model_cable_merger_slim_powered.json b/src/main/resources/models/blocks/model_cable_merger_slim_powered.json similarity index 97% rename from src/main/resources/assets/omni_power/models/blocks/model_cable_merger_slim_powered.json rename to src/main/resources/models/blocks/model_cable_merger_slim_powered.json index 1af3aae..5ada36f 100644 --- a/src/main/resources/assets/omni_power/models/blocks/model_cable_merger_slim_powered.json +++ b/src/main/resources/models/blocks/model_cable_merger_slim_powered.json @@ -4,15 +4,15 @@ { "top": { - "fileName": "omni_power:cable_merger_2.png" + "fileName": "cable_merger_2.png" }, "bottom": { - "fileName": "omni_power:cable_merger_2.png" + "fileName": "cable_merger_2.png" }, "side": { - "fileName": "omni_power:cable_merger_2.png" + "fileName": "cable_merger_2.png" } }, diff --git a/src/main/resources/assets/omni_power/models/blocks/model_cable_red.json b/src/main/resources/models/blocks/model_cable_red.json similarity index 52% rename from src/main/resources/assets/omni_power/models/blocks/model_cable_red.json rename to src/main/resources/models/blocks/model_cable_red.json index e0448be..9f87b1b 100644 --- a/src/main/resources/assets/omni_power/models/blocks/model_cable_red.json +++ b/src/main/resources/models/blocks/model_cable_red.json @@ -5,15 +5,15 @@ { "top": { - "fileName": "omni_power:cable_red.png" + "fileName": "cable_red.png" }, "bottom": { - "fileName": "omni_power:cable_red.png" + "fileName": "cable_red.png" }, "side": { - "fileName": "omni_power:cable_red.png" + "fileName": "cable_red.png" } } diff --git a/src/main/resources/assets/omni_power/models/blocks/model_cable_red_slim.json b/src/main/resources/models/blocks/model_cable_red_slim.json similarity index 97% rename from src/main/resources/assets/omni_power/models/blocks/model_cable_red_slim.json rename to src/main/resources/models/blocks/model_cable_red_slim.json index 1193d65..c0d6874 100644 --- a/src/main/resources/assets/omni_power/models/blocks/model_cable_red_slim.json +++ b/src/main/resources/models/blocks/model_cable_red_slim.json @@ -4,15 +4,15 @@ { "top": { - "fileName": "omni_power:cable_red.png" + "fileName": "cable_red.png" }, "bottom": { - "fileName": "omni_power:cable_red.png" + "fileName": "cable_red.png" }, "side": { - "fileName": "omni_power:cable_red.png" + "fileName": "cable_red.png" } }, diff --git a/src/main/resources/assets/omni_power/models/blocks/model_door_cube.json b/src/main/resources/models/blocks/model_door_cube.json similarity index 55% rename from src/main/resources/assets/omni_power/models/blocks/model_door_cube.json rename to src/main/resources/models/blocks/model_door_cube.json index 32a94d3..ba94f68 100644 --- a/src/main/resources/assets/omni_power/models/blocks/model_door_cube.json +++ b/src/main/resources/models/blocks/model_door_cube.json @@ -5,15 +5,15 @@ { "top": { - "fileName": "omni_power:door.png" + "fileName": "door.png" }, "bottom": { - "fileName": "omni_power:door.png" + "fileName": "door.png" }, "side": { - "fileName": "omni_power:door.png" + "fileName": "door.png" } } diff --git a/src/main/resources/assets/omni_power/models/blocks/model_door_cube_powered.json b/src/main/resources/models/blocks/model_door_cube_powered.json similarity index 51% rename from src/main/resources/assets/omni_power/models/blocks/model_door_cube_powered.json rename to src/main/resources/models/blocks/model_door_cube_powered.json index 1a25f4c..ff90494 100644 --- a/src/main/resources/assets/omni_power/models/blocks/model_door_cube_powered.json +++ b/src/main/resources/models/blocks/model_door_cube_powered.json @@ -5,15 +5,15 @@ { "top": { - "fileName": "omni_power:door_powered.png" + "fileName": "door_powered.png" }, "bottom": { - "fileName": "omni_power:door_powered.png" + "fileName": "door_powered.png" }, "side": { - "fileName": "omni_power:door_powered.png" + "fileName": "door_powered.png" } } diff --git a/src/main/resources/models/blocks/model_lever_blue.json b/src/main/resources/models/blocks/model_lever_blue.json new file mode 100644 index 0000000..f5151c5 --- /dev/null +++ b/src/main/resources/models/blocks/model_lever_blue.json @@ -0,0 +1,20 @@ +{ + "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 new file mode 100644 index 0000000..4f080d6 --- /dev/null +++ b/src/main/resources/models/blocks/model_lever_blue_powered.json @@ -0,0 +1,20 @@ +{ + "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 new file mode 100644 index 0000000..2c7a6fe --- /dev/null +++ b/src/main/resources/models/blocks/model_lever_red.json @@ -0,0 +1,20 @@ +{ + "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/assets/omni_power/models/blocks/model_lever_red_powered.json b/src/main/resources/models/blocks/model_lever_red_powered.json similarity index 51% rename from src/main/resources/assets/omni_power/models/blocks/model_lever_red_powered.json rename to src/main/resources/models/blocks/model_lever_red_powered.json index bf4d990..2f1d3fa 100644 --- a/src/main/resources/assets/omni_power/models/blocks/model_lever_red_powered.json +++ b/src/main/resources/models/blocks/model_lever_red_powered.json @@ -5,15 +5,15 @@ { "top": { - "fileName": "omni_power:lever_on_red.png" + "fileName": "lever_on_red.png" }, "bottom": { - "fileName": "omni_power:lever_on_red.png" + "fileName": "lever_on_red.png" }, "side": { - "fileName": "omni_power:lever_on_red.png" + "fileName": "lever_on_red.png" } } diff --git a/src/main/resources/quilt.mod.json b/src/main/resources/quilt.mod.json index e7e1234..cb42e39 100644 --- a/src/main/resources/quilt.mod.json +++ b/src/main/resources/quilt.mod.json @@ -21,7 +21,7 @@ "sources": "https://example.com/" }, - "icon": "assets/pop_structures/icon.png" + "icon": "icon.png" }, "entrypoints": { @@ -36,17 +36,6 @@ { "id": "cosmic_reach", "versions": ">=0.1.24" - }, - { - "id": "fluxapi", - "versions": ">=0.5.9" - } - ], - - "suggests": [ - { - "id": "becraft", - "versions": ">=1.2.1" } ] }, diff --git a/src/main/resources/assets/omni_power/sounds/blocks/drop_004.ogg b/src/main/resources/sounds/blocks/drop_004.ogg similarity index 100% rename from src/main/resources/assets/omni_power/sounds/blocks/drop_004.ogg rename to src/main/resources/sounds/blocks/drop_004.ogg diff --git a/src/main/resources/assets/omni_power/sounds/blocks/maximize_006.ogg b/src/main/resources/sounds/blocks/maximize_006.ogg similarity index 100% rename from src/main/resources/assets/omni_power/sounds/blocks/maximize_006.ogg rename to src/main/resources/sounds/blocks/maximize_006.ogg diff --git a/src/main/resources/assets/omni_power/sounds/blocks/minimize_006.ogg b/src/main/resources/sounds/blocks/minimize_006.ogg similarity index 100% rename from src/main/resources/assets/omni_power/sounds/blocks/minimize_006.ogg rename to src/main/resources/sounds/blocks/minimize_006.ogg diff --git a/src/main/resources/assets/omni_power/sounds/blocks/select_006.ogg b/src/main/resources/sounds/blocks/select_006.ogg similarity index 100% rename from src/main/resources/assets/omni_power/sounds/blocks/select_006.ogg rename to src/main/resources/sounds/blocks/select_006.ogg diff --git a/src/main/resources/assets/omni_power/sounds/blocks/switch_005.ogg b/src/main/resources/sounds/blocks/switch_005.ogg similarity index 100% rename from src/main/resources/assets/omni_power/sounds/blocks/switch_005.ogg rename to src/main/resources/sounds/blocks/switch_005.ogg diff --git a/src/main/resources/assets/omni_power/sounds/blocks/switch_006.ogg b/src/main/resources/sounds/blocks/switch_006.ogg similarity index 100% rename from src/main/resources/assets/omni_power/sounds/blocks/switch_006.ogg rename to src/main/resources/sounds/blocks/switch_006.ogg diff --git a/src/main/resources/assets/omni_power/textures/blocks/cable_adapter_blue.png b/src/main/resources/textures/blocks/cable_adapter_blue.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/cable_adapter_blue.png rename to src/main/resources/textures/blocks/cable_adapter_blue.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/cable_adapter_red.png b/src/main/resources/textures/blocks/cable_adapter_red.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/cable_adapter_red.png rename to src/main/resources/textures/blocks/cable_adapter_red.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/cable_blue.png b/src/main/resources/textures/blocks/cable_blue.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/cable_blue.png rename to src/main/resources/textures/blocks/cable_blue.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/cable_merger.png b/src/main/resources/textures/blocks/cable_merger.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/cable_merger.png rename to src/main/resources/textures/blocks/cable_merger.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/cable_merger_2.png b/src/main/resources/textures/blocks/cable_merger_2.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/cable_merger_2.png rename to src/main/resources/textures/blocks/cable_merger_2.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/cable_red.png b/src/main/resources/textures/blocks/cable_red.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/cable_red.png rename to src/main/resources/textures/blocks/cable_red.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/door.png b/src/main/resources/textures/blocks/door.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/door.png rename to src/main/resources/textures/blocks/door.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/door_powered.png b/src/main/resources/textures/blocks/door_powered.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/door_powered.png rename to src/main/resources/textures/blocks/door_powered.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/emergency.png b/src/main/resources/textures/blocks/emergency.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/emergency.png rename to src/main/resources/textures/blocks/emergency.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/flat.png b/src/main/resources/textures/blocks/flat.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/flat.png rename to src/main/resources/textures/blocks/flat.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/lever_off_blue.png b/src/main/resources/textures/blocks/lever_off_blue.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/lever_off_blue.png rename to src/main/resources/textures/blocks/lever_off_blue.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/lever_off_red.png b/src/main/resources/textures/blocks/lever_off_red.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/lever_off_red.png rename to src/main/resources/textures/blocks/lever_off_red.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/lever_on_blue.png b/src/main/resources/textures/blocks/lever_on_blue.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/lever_on_blue.png rename to src/main/resources/textures/blocks/lever_on_blue.png diff --git a/src/main/resources/assets/omni_power/textures/blocks/lever_on_red.png b/src/main/resources/textures/blocks/lever_on_red.png similarity index 100% rename from src/main/resources/assets/omni_power/textures/blocks/lever_on_red.png rename to src/main/resources/textures/blocks/lever_on_red.png