remove flux from dependencies

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 {

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
+#fluxapi_version=0.6.0

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);
 		}
 	}
 }

src/main/resources/assets/omni_power/models/blocks/adapter/model_cable_adapter_blue.json

@@ -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"
-        }
-    }
-}

src/main/resources/assets/omni_power/models/blocks/adapter/model_cable_adapter_red.json

@@ -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"
-        }
-    }
-}

src/main/resources/assets/omni_power/models/blocks/model_lever_blue.json

@@ -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"
-        }
-    }
-    
-}

src/main/resources/assets/omni_power/models/blocks/model_lever_blue_powered.json

@@ -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"
-        }
-    }
-    
-}

src/main/resources/assets/omni_power/models/blocks/model_lever_red.json

@@ -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"
-        }
-    }
-    
-}

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

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

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

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

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

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

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,

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,

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,

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,

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,

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"
+        }
+    }
+}

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"
+        }
+    }
+}

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"
         }
     }
     

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"
         }
     },
 

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"
         }
     },
 

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"
         }
     },
 

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"
         }
     },
 

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"
         }
     },
 

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"
         }
     }
     

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"
         }
     },
 

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"
         }
     }
     

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"
         }
     }
     

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"
+        }
+    }
+    
+}

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"
+        }
+    }
+    
+}

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"
+        }
+    }
+    
+}

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"
         }
     }
     

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"
       }
     ]
   },