Merge remote-tracking branch 'refs/remotes/origin/master' into mc1.11

# Conflicts: # minecraft/1.7/src/main/resources/fmlbranding.properties # minecraft/1.7/src/main/resources/mcmod.info # minecraft/1.8/src/main/resources/fmlbranding.properties # minecraft/1.8/src/main/resources/mcmod.info
NOVA-Team · Jan 10, 2017 · ce427c5 · ce427c5
2 parents 2c8af72 + 2eeb427
commit ce427c5
Show file tree

Hide file tree

Showing 22 changed files with 192 additions and 452 deletions.
diff --git a/README.md b/README.md
@@ -1,5 +1,3 @@
-# NOVA is no longer maintained
-
 [![Build Status](https://img.shields.io/travis/NOVA-Team/NOVA-Core.svg?style=flat-square)](https://travis-ci.org/NOVA-Team/NOVA-Core)
 [![Coverage](https://img.shields.io/codecov/c/github/NOVA-Team/NOVA-Core.svg?style=flat-square)](https://codecov.io/github/NOVA-Team/NOVA-Core)
 [![Tests](https://img.shields.io/jenkins/t/http/ci.novaapi.net/NOVA-Core.svg?style=flat-square)](http://ci.novaapi.net/job/NOVA-Core/lastCompletedBuild/testReport/)

diff --git a/minecraft/1.11/build.gradle b/minecraft/1.11/build.gradle
@@ -125,11 +125,11 @@ processResources {
 	inputs.property "mcversion", project.minecraft.version
 
 	from(sourceSets.main.resources.srcDirs) {
-		include 'mcmod.info'
+		include 'mcmod.info', 'fmlbranding.properties'
 		expand 'version': project.version, 'mcversion': project.minecraft.version
 	}
 
 	from(sourceSets.main.resources.srcDirs) {
-		exclude 'mcmod.info'
+		exclude 'mcmod.info', 'fmlbranding.properties'
 	}
 }
diff --git a/minecraft/1.11/src/main/resources/assets/nova/textures/NOVA.svg b/minecraft/1.11/src/main/resources/assets/nova/textures/NOVA.svg
diff --git a/minecraft/1.11/src/main/resources/fmlbranding.properties b/minecraft/1.11/src/main/resources/fmlbranding.properties
@@ -1 +1 @@
-fmlbranding=NOVA 0.0.1-SNAPSHOT
+fmlbranding=NOVA ${version}
diff --git a/minecraft/1.11/src/main/resources/mcmod.info b/minecraft/1.11/src/main/resources/mcmod.info
@@ -4,11 +4,11 @@
     "modid": "nova",
     "name": "NOVA",
     "description": "NOVA (Neatly Organized Voxel API) is a modding framework for voxel games.",
-    "version": "0.0.1",
-    "mcversion": "1.11",
+    "version": "${version}",
+    "mcversion": "${mcversion}",
     "url": "https://novaapi.net/",
     "updateUrl": "",
-    "authorList": [ "calclavia", "RX14", "AEnterprise", "magik6k", "Shadowfacts" ],
+    "authorList": [ "calclavia", "RX14", "AEnterprise", "magik6k", "Shadowfacts", "ExE Boss" ],
     "credits": "Created by the NOVA Team.\nPorted to Minecraft 1.11 by: ExE Boss.",
     "logoFile": "/assets/nova/textures/NOVA.png",
     "screenshots": [],

diff --git a/minecraft/1.7/build.gradle b/minecraft/1.7/build.gradle
@@ -123,11 +123,11 @@ processResources {
 	inputs.property "mcversion", project.minecraft.version
 
 	from(sourceSets.main.resources.srcDirs) {
-		include 'mcmod.info'
+		include 'mcmod.info', 'fmlbranding.properties'
 		expand 'version': project.version, 'mcversion': project.minecraft.version
 	}
 
 	from(sourceSets.main.resources.srcDirs) {
-		exclude 'mcmod.info'
+		exclude 'mcmod.info', 'fmlbranding.properties'
 	}
 }
diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/item/ItemConverter.java
@@ -29,11 +29,10 @@
 import net.minecraft.item.ItemStack;
 import nova.core.block.BlockFactory;
 import nova.core.component.Category;
+import nova.core.event.ItemEvent;
 import nova.core.item.Item;
 import nova.core.item.ItemBlock;
 import nova.core.item.ItemFactory;
-import nova.core.item.ItemManager;
-import nova.core.item.event.ItemIDNotFoundEvent;
 import nova.core.loader.Loadable;
 import nova.core.loader.Mod;
 import nova.core.nativewrapper.NativeConverter;
@@ -174,10 +173,10 @@ public void preInit() {
 	private void registerNOVAItemsToMinecraft() {
 		//There should be no items registered during Native Converter preInit()
 		//	item.registry.forEach(this::registerNOVAItem);
-		Game.events().on(ItemManager.ItemRegistrationEvent.class).bind(this::onItemRegistered);
+		Game.events().on(ItemEvent.Register.class).bind(this::onItemRegistered);
 	}
 
-	private void onItemRegistered(ItemManager.ItemRegistrationEvent event) {
+	private void onItemRegistered(ItemEvent.Register event) {
 		registerNOVAItem(event.itemFactory);
 	}
 
@@ -261,10 +260,10 @@ private void registerMinecraftItemsToNOVA() {
 	}
 
 	private void registerSubtypeResolution() {
-		Game.events().on(ItemIDNotFoundEvent.class).bind(this::onIDNotFound);
+		Game.events().on(ItemEvent.IDNotFound.class).bind(this::onIDNotFound);
 	}
 
-	private void onIDNotFound(ItemIDNotFoundEvent event) {
+	private void onIDNotFound(ItemEvent.IDNotFound event) {
 		// if item minecraft:planks:2 is detected, this code will register minecraft:planks:2 dynamically
 		// we cannot do this up front since there is **NO** reliable way to get the sub-items of an item
 

diff --git a/minecraft/1.7/src/main/resources/fmlbranding.properties b/minecraft/1.7/src/main/resources/fmlbranding.properties
@@ -1 +1 @@
-fmlbranding=NOVA 0.0.1-SNAPSHOT
+fmlbranding=NOVA ${version}
diff --git a/minecraft/1.7/src/main/resources/mcmod.info b/minecraft/1.7/src/main/resources/mcmod.info
@@ -4,11 +4,11 @@
     "modid": "nova",
     "name": "NOVA",
     "description": "NOVA (Neatly Organized Voxel API) is a modding framework for voxel games.",
-    "version": "0.0.1",
-    "mcversion": "1.7.10",
+    "version": "${version}",
+    "mcversion": "${mcversion}",
     "url": "https://novaapi.net/",
     "updateUrl": "",
-    "authorList": [ "calclavia", "RX14", "AEnterprise", "magik6k", "Shadowfacts" ],
+    "authorList": [ "calclavia", "RX14", "AEnterprise", "magik6k", "Shadowfacts", "ExE Boss" ],
     "credits": "Created by the NOVA Team.",
     "logoFile": "/assets/nova/textures/NOVA.png",
     "screenshots": [],

diff --git a/minecraft/1.8/build.gradle b/minecraft/1.8/build.gradle
@@ -124,11 +124,11 @@ processResources {
 	inputs.property "mcversion", project.minecraft.version
 
 	from(sourceSets.main.resources.srcDirs) {
-		include 'mcmod.info'
+		include 'mcmod.info', 'fmlbranding.properties'
 		expand 'version': project.version, 'mcversion': project.minecraft.version
 	}
 
 	from(sourceSets.main.resources.srcDirs) {
-		exclude 'mcmod.info'
+		exclude 'mcmod.info', 'fmlbranding.properties'
 	}
 }
diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemConverter.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/item/ItemConverter.java
@@ -30,11 +30,10 @@
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import nova.core.block.BlockFactory;
 import nova.core.component.Category;
+import nova.core.event.ItemEvent;
 import nova.core.item.Item;
 import nova.core.item.ItemBlock;
 import nova.core.item.ItemFactory;
-import nova.core.item.ItemManager;
-import nova.core.item.event.ItemIDNotFoundEvent;
 import nova.core.loader.Loadable;
 import nova.core.loader.Mod;
 import nova.core.nativewrapper.NativeConverter;
@@ -176,10 +175,10 @@ public void preInit() {
 	private void registerNOVAItemsToMinecraft() {
 		//There should be no items registered during Native Converter preInit()
 		//	item.registry.forEach(this::registerNOVAItem);
-		Game.events().on(ItemManager.ItemRegistrationEvent.class).bind(this::onItemRegistered);
+		Game.events().on(ItemEvent.Register.class).bind(this::onItemRegistered);
 	}
 
-	private void onItemRegistered(ItemManager.ItemRegistrationEvent event) {
+	private void onItemRegistered(ItemEvent.Register event) {
 		registerNOVAItem(event.itemFactory);
 	}
 
@@ -262,10 +261,10 @@ private void registerMinecraftItemsToNOVA() {
 	}
 
 	private void registerSubtypeResolution() {
-		Game.events().on(ItemIDNotFoundEvent.class).bind(this::onIDNotFound);
+		Game.events().on(ItemEvent.IDNotFound.class).bind(this::onIDNotFound);
 	}
 
-	private void onIDNotFound(ItemIDNotFoundEvent event) {
+	private void onIDNotFound(ItemEvent.IDNotFound event) {
 		// if item minecraft:planks:2 is detected, this code will register minecraft:planks:2 dynamically
 		// we cannot do this up front since there is **NO** reliable way to get the sub-items of an item
 

diff --git a/minecraft/1.8/src/main/resources/assets/nova/textures/NOVA.svg b/minecraft/1.8/src/main/resources/assets/nova/textures/NOVA.svg
diff --git a/minecraft/1.8/src/main/resources/fmlbranding.properties b/minecraft/1.8/src/main/resources/fmlbranding.properties
@@ -1 +1 @@
-fmlbranding=NOVA 0.0.1-SNAPSHOT
+fmlbranding=NOVA ${version}
diff --git a/minecraft/1.8/src/main/resources/mcmod.info b/minecraft/1.8/src/main/resources/mcmod.info
@@ -4,11 +4,11 @@
     "modid": "nova",
     "name": "NOVA",
     "description": "NOVA (Neatly Organized Voxel API) is a modding framework for voxel games.",
-    "version": "0.0.1",
-    "mcversion": "1.8",
+    "version": "${version}",
+    "mcversion": "${mcversion}",
     "url": "https://novaapi.net/",
     "updateUrl": "",
-    "authorList": [ "calclavia", "RX14", "AEnterprise", "magik6k", "Shadowfacts" ],
+    "authorList": [ "calclavia", "RX14", "AEnterprise", "magik6k", "Shadowfacts", "ExE Boss" ],
     "credits": "Created by the NOVA Team.",
     "logoFile": "/assets/nova/textures/NOVA.png",
     "screenshots": [],

diff --git a/src/main/java/nova/core/event/BlockEvent.java b/src/main/java/nova/core/event/BlockEvent.java
@@ -26,6 +26,9 @@
 import nova.core.world.World;
 import org.apache.commons.math3.geometry.euclidean.threed.Vector3D;
 
+/**
+ * All events related to the block.
+ */
 public abstract class BlockEvent extends CancelableEvent {
 	//The world
 	public final World world;
@@ -37,6 +40,13 @@ public BlockEvent(World world, Vector3D position) {
 		this.position = position;
 	}
 
+	/**
+	 * Event is triggered when a BlockFactory is registered.
+	 *
+	 * @see BlockFactory
+	 * @see nova.core.block.BlockManager#register(nova.core.block.BlockFactory)
+	 * @see nova.core.block.BlockManager#register(java.lang.String, java.util.function.Supplier)
+	 */
 	public static class Register extends CancelableEvent {
 		public BlockFactory blockFactory;
 
@@ -46,7 +56,7 @@ public Register(BlockFactory blockFactory) {
 	}
 
 	/**
-	 * Called when a block in the world changes.
+	 * Event is triggered when a block in the world changes.
 	 */
 	public static class Change extends BlockEvent {
 

diff --git a/src/main/java/nova/core/event/EntityEvent.java b/src/main/java/nova/core/event/EntityEvent.java
@@ -24,7 +24,7 @@
 import nova.core.event.bus.CancelableEvent;
 
 /**
- * All events related to the entity
+ * All events related to the entity.
  * @author Calclavia
  */
 public class EntityEvent extends CancelableEvent {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		fmlbranding=NOVA 0.0.1-SNAPSHOT
		fmlbranding=NOVA ${version}