From becde6da546a99e4ba7b028b722a8d3e1a8f70e0 Mon Sep 17 00:00:00 2001
From: pietru <jabartek2004.bob@gmail.com>
Date: Sat, 25 May 2024 16:51:05 +0200
Subject: [PATCH] update for flux 0.6.0

---
 gradle.properties                             |  4 +--
 .../java/net/pietru/omni_power/OmniPower.java | 34 ++++++++++++-------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 3b93f53..189cd3b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@ org.gradle.parallel=true
 org.gradle.caching=false
 
 # Project Info
-version=1.4
+version=1.5.0
 group=net.pietru
 id=omni_power
 
@@ -12,4 +12,4 @@ id=omni_power
 cosmic_reach_version=0.1.31
 cosmic_quilt_version=2.0.2
 
-fluxapi_version=0.5.10
\ 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 86aa437..2d1f2e5 100644
--- a/src/main/java/net/pietru/omni_power/OmniPower.java
+++ b/src/main/java/net/pietru/omni_power/OmniPower.java
@@ -1,14 +1,14 @@
 package net.pietru.omni_power;
 
-import dev.crmodders.flux.api.v5.block.impl.BasicResourceBlock;
-import dev.crmodders.flux.api.v5.generators.BlockGenerator;
-import dev.crmodders.flux.registry.FluxRegistries;
-import dev.crmodders.flux.tags.Identifier;
+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 net.pietru.omni_power.blockevents.Power;
 import dev.crmodders.cosmicquilt.api.entrypoint.ModInitializer;
+import org.greenrobot.eventbus.Subscribe;
 import org.quiltmc.loader.api.ModContainer;
-import org.quiltmc.loader.api.QuiltLoader;
 
 public class OmniPower implements ModInitializer {
 	public static final String MOD_ID = "omni_power";
@@ -22,17 +22,25 @@ public class OmniPower implements ModInitializer {
 	};
 	@Override
 	public void onInitialize(ModContainer mod) {
-		if (QuiltLoader.isModLoaded("becraft"))
-			block_entities=true;
+		//if (QuiltLoader.isModLoaded("becraft"))
+		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) {
-			//Block.getInstance(MOD_ID+":"+block);
-			//BlockBuilderUtils.getBlockFromJson(new Identifier(MOD_ID, block));
-			FluxRegistries.BLOCKS.register(
-					new Identifier(MOD_ID, block),
-					BlockGenerator::createGenerator
-			);
+			event.registerBlock(() -> new DataModBlock(block,new ResourceLocation(MOD_ID, "blocks/" + block + ".json")));
 		}
 	}
 }