diff --git a/gradle.properties b/gradle.properties index 0208f4d..4c8423d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.parallel=true org.gradle.caching=false # Project Info -version=1.6.2 +version=1.6.3 group=net.pietru id=omni_power diff --git a/src/main/java/net/pietru/omni_power/OmniPower.java b/src/main/java/net/pietru/omni_power/OmniPower.java index 40618a3..3fb2165 100644 --- a/src/main/java/net/pietru/omni_power/OmniPower.java +++ b/src/main/java/net/pietru/omni_power/OmniPower.java @@ -19,12 +19,19 @@ public class OmniPower implements ModInitializer { @Override public void onInitialize(ModContainer mod) { //if (QuiltLoader.isModLoaded("becraft")) - block_entities=true; System.out.println("OmniPower Mod Initialized!"); + load_power_event(); + block_entities=true; + + System.out.println("Registered OmniPower Events"); + for (String block:blocks) { - Block.getInstance(block); + System.out.println(block); + Block.getInstance("omni_power/"+block); } + + System.out.println("Registered OmniPower Blocks"); } public static void load_power_event(){ diff --git a/src/main/resources/blocks/cable.json b/src/main/resources/blocks/omni_power/cable.json similarity index 100% rename from src/main/resources/blocks/cable.json rename to src/main/resources/blocks/omni_power/cable.json diff --git a/src/main/resources/blocks/cable_adapter.json b/src/main/resources/blocks/omni_power/cable_adapter.json similarity index 100% rename from src/main/resources/blocks/cable_adapter.json rename to src/main/resources/blocks/omni_power/cable_adapter.json diff --git a/src/main/resources/blocks/cable_merger.json b/src/main/resources/blocks/omni_power/cable_merger.json similarity index 100% rename from src/main/resources/blocks/cable_merger.json rename to src/main/resources/blocks/omni_power/cable_merger.json diff --git a/src/main/resources/blocks/door_cube.json b/src/main/resources/blocks/omni_power/door_cube.json similarity index 100% rename from src/main/resources/blocks/door_cube.json rename to src/main/resources/blocks/omni_power/door_cube.json diff --git a/src/main/resources/blocks/lever.json b/src/main/resources/blocks/omni_power/lever.json similarity index 100% rename from src/main/resources/blocks/lever.json rename to src/main/resources/blocks/omni_power/lever.json