diff --git a/build.gradle b/build.gradle index 88a0e43..6bfade8 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { apply from: "https://raw.githubusercontent.com/NOVA-Team/NOVA-Gradle/master/shared-scripts/java.gradle" dependencies { - nova(nova_version) + compile nova(nova_version) } nova { diff --git a/minecraft/1.11/gradle.properties b/minecraft/1.11/gradle.properties index 70bef15..160c5b2 100644 --- a/minecraft/1.11/gradle.properties +++ b/minecraft/1.11/gradle.properties @@ -1,10 +1,8 @@ -group = nova.wordgen - minecraft.version = 1.11 forge.version = 13.19.1.2189 forgeGradleVersion = 2.2-SNAPSHOT packaging = jar info.inceptionYear = 2016 -info.description = The NOVA-Minecraft Minecraft 1.11 wrapper. +info.description = The NOVA-Worldgen Minecraft 1.11 wrapper. info.organization.name = NOVA diff --git a/minecraft/1.7/gradle.properties b/minecraft/1.7/gradle.properties index 213f077..1ab3696 100644 --- a/minecraft/1.7/gradle.properties +++ b/minecraft/1.7/gradle.properties @@ -1,7 +1,3 @@ -version = 0.0.1-SNAPSHOT -group = nova.worldgen.wrapper.mc17 - -nova.version = 0.1.0-SNAPSHOT minecraft.version = 1.7.10 forge.version = 10.13.4.1448-1.7.10 forgeGradleVersion = 1.2-SNAPSHOT diff --git a/minecraft/1.8/gradle.properties b/minecraft/1.8/gradle.properties index 7226657..ac2a829 100644 --- a/minecraft/1.8/gradle.properties +++ b/minecraft/1.8/gradle.properties @@ -1,7 +1,3 @@ -version = 0.0.1-SNAPSHOT -group = nova.worldgen.wrapper.mc18 - -nova.version = 0.1.0-SNAPSHOT minecraft.version = 1.8 forge.version = 11.14.3.1491 forgeGradleVersion = 1.2-SNAPSHOT diff --git a/src/main/java/nova/worldgen/Generable.java b/src/main/java/nova/worldgen/Generable.java index 00a2abd..789145b 100644 --- a/src/main/java/nova/worldgen/Generable.java +++ b/src/main/java/nova/worldgen/Generable.java @@ -5,9 +5,7 @@ */ package nova.worldgen; -import nova.core.util.id.Identifiable; -import nova.core.util.id.Identifier; -import nova.core.util.id.StringIdentifier; +import nova.core.util.Identifiable; /** * This class describes a structure that will be generated @@ -23,7 +21,7 @@ public Generable(String id) { } @Override - public final Identifier getID() { - return new StringIdentifier(id); + public final String getID() { + return id; } } diff --git a/src/main/java/nova/worldgen/ore/Ore.java b/src/main/java/nova/worldgen/ore/Ore.java index eee7d22..8e86cf7 100644 --- a/src/main/java/nova/worldgen/ore/Ore.java +++ b/src/main/java/nova/worldgen/ore/Ore.java @@ -22,14 +22,13 @@ import nova.core.block.BlockFactory; import nova.core.util.EnumSelector; -import nova.core.util.id.Identifiable; import nova.worldgen.Generable; /** * This class describes a resource that will be placed in the world * as an ore by the world generator. */ -public final class Ore extends Generable implements Identifiable { +public final class Ore extends Generable { public final BlockFactory block; public final double rarity; public final double clusterSize;