Fix dependency injection + Fix FWWorldGenerator

Additional changes: OreGenerationRegistry was replaced with Registry<Ore>, as it was redundant.
EB-Archive · Jan 5, 2017 · fa624d1 · fa624d1
1 parent 8a80864
commit fa624d1
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 18 deletions.
diff --git a/...t/1.11/src/main/java/nova/worldgen/wrapper/mc/forge/v1_11/launch/NovaWorldgenWrapper.java b/...t/1.11/src/main/java/nova/worldgen/wrapper/mc/forge/v1_11/launch/NovaWorldgenWrapper.java
@@ -23,14 +23,15 @@
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import nova.core.loader.Loadable;
 import nova.core.loader.Mod;
+import nova.internal.worldgen.depmodules.WorldgenModule;
 import nova.worldgen.WorldgenManager;
 import nova.worldgen.wrapper.mc.forge.v1_11.wrapper.world.forward.FWWorldGenerator;
 
 /**
  *
  * @author ExE Boss
  */
-@Mod(id = NovaWorldgenWrapper.id, name = NovaWorldgenWrapper.name, version = NovaWorldgenWrapper.version, novaVersion = "0.0.1")
+@Mod(id = NovaWorldgenWrapper.id, name = NovaWorldgenWrapper.name, version = NovaWorldgenWrapper.version, modules = { WorldgenModule.class }, novaVersion = "0.0.1")
 public class NovaWorldgenWrapper implements Loadable {
 
 	public static final String version = "0.0.1";

diff --git a/...ain/java/nova/worldgen/wrapper/mc/forge/v1_11/wrapper/world/forward/FWWorldGenerator.java b/...ain/java/nova/worldgen/wrapper/mc/forge/v1_11/wrapper/world/forward/FWWorldGenerator.java
@@ -53,7 +53,7 @@ public FWWorldGenerator(WorldgenManager worldgenManager) {
 		this.worldgenManager = worldgenManager;
 		this.oreGen = new HashMap<>();
 		Game.events().on(WorldgenEvent.RegisterOre.class).bind(evt -> {
-			this.oreGen.put(evt.ore, new WorldGenMinable(((Block)Game.natives().toNative(evt.ore.block)).getDefaultState(),
+			this.oreGen.put(evt.ore, new WorldGenMinable(((Block)Game.natives().toNative(evt.ore.block.build())).getDefaultState(),
 					(int) Math.round(evt.ore.clusterSize * 5)));
 		});
 	}

diff --git a/minecraft/1.7/build.gradle b/minecraft/1.7/build.gradle
@@ -17,8 +17,7 @@ buildscript {
 
 apply plugin: "maven-publish"
 apply plugin: "com.jfrog.artifactory"
-//apply from: "https://raw.githubusercontent.com/NOVA-Team/NOVA-Gradle/master/shared-scripts/java.gradle"
-apply from: "../../../../.Libraries/java.gradle"
+apply from: "https://raw.githubusercontent.com/NOVA-Team/NOVA-Gradle/master/shared-scripts/java.gradle"
 
 publishing {
 	publications {

diff --git a/...raft/1.7/src/main/java/nova/worldgen/wrapper/mc/forge/v17/launch/NovaWorldgenWrapper.java b/...raft/1.7/src/main/java/nova/worldgen/wrapper/mc/forge/v17/launch/NovaWorldgenWrapper.java
@@ -23,14 +23,15 @@
 import cpw.mods.fml.common.registry.GameRegistry;
 import nova.core.loader.Loadable;
 import nova.core.loader.Mod;
+import nova.internal.worldgen.depmodules.WorldgenModule;
 import nova.worldgen.WorldgenManager;
 import nova.worldgen.wrapper.mc.forge.v17.wrapper.world.forward.FWWorldGenerator;
 
 /**
  *
  * @author ExE Boss
  */
-@Mod(id = NovaWorldgenWrapper.id, name = NovaWorldgenWrapper.name, version = NovaWorldgenWrapper.version, novaVersion = "0.0.1")
+@Mod(id = NovaWorldgenWrapper.id, name = NovaWorldgenWrapper.name, version = NovaWorldgenWrapper.version, modules = { WorldgenModule.class }, novaVersion = "0.0.1")
 public class NovaWorldgenWrapper implements Loadable {
 
 	public static final String version = "0.0.1";

diff --git a/.../main/java/nova/worldgen/wrapper/mc/forge/v17/wrapper/world/forward/FWWorldGenerator.java b/.../main/java/nova/worldgen/wrapper/mc/forge/v17/wrapper/world/forward/FWWorldGenerator.java
@@ -51,7 +51,7 @@ public FWWorldGenerator(WorldgenManager worldgenManager) {
 		this.worldgenManager = worldgenManager;
 		this.oreGen = new HashMap<>();
 		Game.events().on(WorldgenEvent.RegisterOre.class).bind(evt -> {
-			this.oreGen.put(evt.ore, new WorldGenMinable(((Block)Game.natives().toNative(evt.ore.block)),
+			this.oreGen.put(evt.ore, new WorldGenMinable(((Block)Game.natives().toNative(evt.ore.block.build())),
 					(int) Math.round(evt.ore.clusterSize * 5)));
 		});
 	}

diff --git a/...raft/1.8/src/main/java/nova/worldgen/wrapper/mc/forge/v18/launch/NovaWorldgenWrapper.java b/...raft/1.8/src/main/java/nova/worldgen/wrapper/mc/forge/v18/launch/NovaWorldgenWrapper.java
@@ -23,14 +23,15 @@
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import nova.core.loader.Loadable;
 import nova.core.loader.Mod;
+import nova.internal.worldgen.depmodules.WorldgenModule;
 import nova.worldgen.WorldgenManager;
 import nova.worldgen.wrapper.mc.forge.v18.wrapper.world.forward.FWWorldGenerator;
 
 /**
  *
  * @author ExE Boss
  */
-@Mod(id = NovaWorldgenWrapper.id, name = NovaWorldgenWrapper.name, version = NovaWorldgenWrapper.version, novaVersion = "0.0.1")
+@Mod(id = NovaWorldgenWrapper.id, name = NovaWorldgenWrapper.name, version = NovaWorldgenWrapper.version, modules = { WorldgenModule.class }, novaVersion = "0.0.1")
 public class NovaWorldgenWrapper implements Loadable {
 
 	public static final String version = "0.0.1";

diff --git a/.../main/java/nova/worldgen/wrapper/mc/forge/v18/wrapper/world/forward/FWWorldGenerator.java b/.../main/java/nova/worldgen/wrapper/mc/forge/v18/wrapper/world/forward/FWWorldGenerator.java
@@ -52,7 +52,7 @@ public FWWorldGenerator(WorldgenManager worldgenManager) {
 		this.worldgenManager = worldgenManager;
 		this.oreGen = new HashMap<>();
 		Game.events().on(WorldgenEvent.RegisterOre.class).bind(evt -> {
-			this.oreGen.put(evt.ore, new WorldGenMinable(((Block)Game.natives().toNative(evt.ore.block)).getDefaultState(),
+			this.oreGen.put(evt.ore, new WorldGenMinable(((Block)Game.natives().toNative(evt.ore.block.build())).getDefaultState(),
 					(int) Math.round(evt.ore.clusterSize * 5)));
 		});
 	}

diff --git a/...a/worldgen/ore/OreGenerationRegistry.java → ...l/worldgen/depmodules/WorldgenModule.java b/...a/worldgen/ore/OreGenerationRegistry.java → ...l/worldgen/depmodules/WorldgenModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 NOVA, All rights reserved.
+ * Copyright (c) 2017 NOVA, All rights reserved.
  * This library is free software, licensed under GNU Lesser General Public License version 3
  *
  * This file is part of NOVA.
@@ -18,10 +18,20 @@
  * along with NOVA.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package nova.worldgen.ore;
+package nova.internal.worldgen.depmodules;
 
-import nova.core.util.registry.Registry;
+import nova.worldgen.WorldgenManager;
+import se.jbee.inject.bind.BinderModule;
+import se.jbee.inject.util.Scoped;
 
-public class OreGenerationRegistry extends Registry<Ore> {
+/**
+ *
+ * @author ExE Boss
+ */
+public class WorldgenModule extends BinderModule {
 
+	@Override
+	protected void declare() {
+		per(Scoped.APPLICATION).bind(WorldgenManager.class).toConstructor();
+	}
 }
diff --git a/src/main/java/nova/worldgen/Generable.java b/src/main/java/nova/worldgen/Generable.java
@@ -19,7 +19,7 @@ public abstract class Generable implements Identifiable {
 	public final String id;
 
 	public Generable(String id) {
-		this.id = Identifiable.addPrefix(id, false);
+		this.id = id;
 	}
 
 	@Override

diff --git a/src/main/java/nova/worldgen/WorldgenManager.java b/src/main/java/nova/worldgen/WorldgenManager.java
@@ -25,7 +25,6 @@
 import nova.internal.core.Game;
 import nova.worldgen.event.WorldgenEvent;
 import nova.worldgen.ore.Ore;
-import nova.worldgen.ore.OreGenerationRegistry;
 
 import java.util.Optional;
 
@@ -36,7 +35,7 @@
 public class WorldgenManager extends Manager<WorldgenManager> {
 	public final Registry<Ore> registry;
 
-	public WorldgenManager(OreGenerationRegistry registry) {
+	public WorldgenManager(Registry<Ore> registry) {
 		this.registry = registry;
 	}
 

diff --git a/src/main/java/nova/worldgen/event/WorldgenEvent.java b/src/main/java/nova/worldgen/event/WorldgenEvent.java
@@ -17,6 +17,7 @@
  * You should have received a copy of the GNU General Public License
  * along with NOVA.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 package nova.worldgen.event;
 
 import nova.core.event.bus.CancelableEvent;

diff --git a/src/main/java/nova/worldgen/world/WorldInfo.java b/src/main/java/nova/worldgen/world/WorldInfo.java
@@ -20,11 +20,12 @@
 
 package nova.worldgen.world;
 
+import nova.core.util.registry.Registry;
 import nova.core.util.shape.Cuboid;
-import nova.worldgen.ore.OreGenerationRegistry;
+import nova.worldgen.ore.Ore;
 
 /**
- * This class profides information on world that world generator may need
+ * This class provides information on world that world generator may need
  */
 public abstract class WorldInfo {
 	/**
@@ -40,5 +41,5 @@ public abstract class WorldInfo {
 	/**
 	 * @return {@link OreGenerationRegistry} for the world
 	 */
-	public abstract OreGenerationRegistry getOreGenerationRegistry();
+	public abstract Registry<Ore> getOreGenerationRegistry();
 }