Update to latest snapshot

.gitignore

@@ -9,6 +9,8 @@
 !/block
 !/gui
 !/item
+!/entity
+!/worldgen
 !/old
 !/guidelines
 

block/build.gradle

@@ -1,2 +1,4 @@
-version = "0.1"
+version = "0.1.0-SNAPSHOT"
 group = "nova.sample.block"
+
+archivesBaseName = "NOVA-Example-Block"

block/src/main/java/nova/sample/block/BlockStateful.java

@@ -6,12 +6,12 @@
 import nova.core.component.Component;
 import nova.core.component.Passthrough;
 import nova.core.component.misc.Collider;
-import nova.core.component.renderer.ItemRenderer;
 import nova.core.component.renderer.StaticRenderer;
 import nova.core.network.NetworkTarget;
 import nova.core.network.Packet;
 import nova.core.network.Syncable;
 import nova.core.network.Sync;
+import nova.core.render.model.MeshModel;
 import nova.core.render.model.Model;
 import nova.core.retention.Storable;
 import nova.core.retention.Store;
@@ -32,25 +32,21 @@ public class BlockStateful extends Block implements Storable, Stateful, Syncable
 	private double angle = 0;
 
 	public BlockStateful() {
+		components.add(new Collider(this).isOpaqueCube(false));
+		components.add(new StaticRenderer().onRender(model -> {
+			Model grinderModel = NovaBlock.grinderModel.getModel();
 
-		add(new Collider(this).isOpaqueCube(false));
+			grinderModel
+				.combineChildren("crank", "crank1", "crank2", "crank3")
+				.matrix.rotate(new Rotation(RotationUtil.DEFAULT_ORDER, 0, 0, angle));
 
-		add(new StaticRenderer(this)
-				.setOnRender(model -> {
-						Model grinderModel = NovaBlock.grinderModel.getModel();
+			if (grinderModel instanceof MeshModel)
+				((MeshModel)grinderModel).bindAll(NovaBlock.grinderTexture);
 
-						grinderModel
-							.combineChildren("crank", "crank1", "crank2", "crank3")
-							.matrix.rotate(new Rotation(RotationUtil.DEFAULT_ORDER,0, 0, angle));
-
-						model.children.add(grinderModel);
-						model.bindAll(NovaBlock.grinderTexture);
-					}
-				)
-		);
-		add(new ItemRenderer(this));
-		add(new Category("buildingBlocks"));
-		//add(new TestComponent());
+			model.children.add(grinderModel);
+		}));
+		components.add(new Category("buildingBlocks"));
+		//components.add(new TestComponent());
 
 		events.on(RightClickEvent.class).bind(this::onRightClick);
 	}
@@ -70,11 +66,6 @@ public void read(Packet packet) {
 		world().markStaticRender(position());
 	}
 
-	@Override
-	public String getID() {
-		return "stateful";
-	}
-
 	public static interface TestInterface {
 		public void test();
 	}

block/src/main/java/nova/sample/block/BlockStateless.java

@@ -1,12 +1,12 @@
 package nova.sample.block;
 
 import nova.core.block.Block;
-import nova.core.block.component.StaticBlockRenderer;
 import nova.core.component.Category;
 import nova.core.component.misc.Collider;
-import nova.core.component.renderer.ItemRenderer;
+import nova.core.component.renderer.StaticRenderer;
 import nova.core.network.Packet;
 import nova.core.network.Syncable;
+import nova.core.render.pipeline.BlockRenderPipeline;
 
 /**
  * Literally, this is a test block.
@@ -15,13 +15,10 @@
 public class BlockStateless extends Block implements Syncable {
 
 	public BlockStateless() {
-		add(new StaticBlockRenderer(this)).setTexture(NovaBlock.steelTexture);
+		components.add(new StaticRenderer().onRender(new BlockRenderPipeline(this).withTexture(NovaBlock.steelTexture).build()));
+		components.add(new Collider(this));
+		components.add(new Category("buildingBlocks"));
 
-		add(new Collider(this));
-
-		add(new ItemRenderer(this));
-
-		add(new Category("buildingBlocks"));
 		events.on(RightClickEvent.class).bind(this::onRightClick);
 	}
 
@@ -39,9 +36,4 @@ public void read(Packet packet) {
 	public void write(Packet packet) {
 		packet.writeInt(1234);
 	}
-
-	@Override
-	public String getID() {
-		return "simple";
-	}
 }

block/src/main/java/nova/sample/block/NovaBlock.java

@@ -5,8 +5,7 @@
 import nova.core.item.ItemFactory;
 import nova.core.item.ItemManager;
 import nova.core.loader.Loadable;
-import nova.core.loader.NovaMod;
-import nova.core.nativewrapper.NativeManager;
+import nova.core.loader.Mod;
 import nova.core.network.NetworkManager;
 import nova.core.recipes.RecipeManager;
 import nova.core.recipes.crafting.ItemIngredient;
@@ -22,10 +21,10 @@
  *
  * @author Calclavia
  */
-@NovaMod(id = NovaBlock.id, name = "Nova Example Block", version = "0.0.1", novaVersion = "0.0.1")
+@Mod(id = NovaBlock.MOD_ID, name = "Nova Example Block", version = "0.0.1", novaVersion = "0.0.1")
 public class NovaBlock implements Loadable {
 
-	public static final String id = "novablock";
+	public static final String MOD_ID = "novablock";
 
 	public static BlockFactory blockStateful;
 	public static BlockFactory blockStateless;
@@ -48,10 +47,10 @@ public class NovaBlock implements Loadable {
 	public final RecipeManager recipeManager;
 
 	public NovaBlock(BlockManager blockManager,
-					 ItemManager itemManager,
-					 RenderManager renderManager,
-					 NetworkManager networkManager,
-					 RecipeManager recipeManager) {
+	                 ItemManager itemManager,
+	                 RenderManager renderManager,
+	                 NetworkManager networkManager,
+	                 RecipeManager recipeManager) {
 		this.blockManager = blockManager;
 		this.itemManager = itemManager;
 		this.renderManager = renderManager;
@@ -62,23 +61,23 @@ public NovaBlock(BlockManager blockManager,
 
 	@Override
 	public void preInit() {
-		steelTexture = renderManager.registerTexture(new BlockTexture(id, "blockSteel"));
-		grinderTexture = renderManager.registerTexture(new BlockTexture(id, "grinder"));
+		steelTexture = renderManager.registerTexture(new BlockTexture(MOD_ID, "block_steel"));
+		grinderTexture = renderManager.registerTexture(new BlockTexture(MOD_ID, "grinder"));
 
-		blockStateful = blockManager.register(BlockStateful.class);
-		blockStateless = blockManager.register(BlockStateless.class);
+		blockStateful = blockManager.register(MOD_ID + ":stateful", BlockStateful::new);
+		blockStateless = blockManager.register(MOD_ID + ":simple", BlockStateless::new);
 
 		itemBlockStateful = itemManager.getItemFromBlock(blockStateful);
 		itemBlockStateless = itemManager.getItemFromBlock(blockStateless);
 
-		grinderEntityTexture = renderManager.registerTexture(new EntityTexture(id, "grinderEntity"));
-
-		grinderModel = renderManager.registerModel(new TechneModelProvider(id, "grinder"));
+		grinderEntityTexture = renderManager.registerTexture(new EntityTexture(MOD_ID, "grinder_entity"));
+		grinderModel = renderManager.registerModel(new TechneModelProvider(MOD_ID, "grinder"));
 
 		// try to add a recipe
-		ItemIngredient stickIngredient = ItemIngredient.forItem("minecraft:stick"); //TODO: This should be obtained from some dictonary too
+		//ItemIngredient stickIngredient = ItemIngredient.forItem("minecraft:stick"); //TODO: This should be obtained from some dictonary too
+		ItemIngredient stickIngredient = ItemIngredient.forDictionary("stickWood");
 		ItemIngredient ingotIngredient = ItemIngredient.forDictionary("ingotIron");
 
-		recipeManager.addRecipe(new ShapedCraftingRecipe(itemBlockStateless.makeItem(), "AAA-ABA-AAA", ingotIngredient, stickIngredient));
+		recipeManager.addRecipe(new ShapedCraftingRecipe(itemBlockStateless.build(), "AAA-ABA-AAA", ingotIngredient, stickIngredient));
 	}
 }

build.gradle

@@ -1,9 +1,8 @@
 plugins {
 	id "java"
-	id "nova.gradle" version "0.2.4"
+	id "nova.gradle" version "0.2.6"
 }
 
-
 subprojects {
 	apply plugin: "java"
 	apply plugin: "nova.gradle"
@@ -23,12 +22,11 @@ subprojects {
 	nova {
 		wrappers {
 			"17" {
-				wrapper "nova.wrapper.mc1710:NovaWrapper-MC1.7.10:0.1-SNAPSHOT"
+				wrapper "nova.core:NOVA-Core-Wrapper-MC1.7:$nova_version"
 			}
 			"18" {
-				wrapper "nova.wrapper.mc18:NovaWrapper-MC1.8:0.1-SNAPSHOT"
+				wrapper "nova.core:NOVA-Core-Wrapper-MC1.8:$nova_version"
 			}
 		}
 	}
-
 }

entity/build.gradle

@@ -0,0 +1,4 @@
+version = "0.1.0-SNAPSHOT"
+group = "nova.sample.entity"
+
+archivesBaseName = "NOVA-Example-Entity"

entity/src/main/java/nova/sample/entity/NovaEntity.java

@@ -0,0 +1,26 @@
+package nova.sample.entity;
+
+import nova.core.entity.EntityManager;
+import nova.core.loader.Loadable;
+import nova.core.loader.Mod;
+import nova.core.render.RenderManager;
+
+/**
+ * Used to test NOVA entities.
+ *
+ * @author ExE Boss
+ */
+@Mod(id = NovaEntity.MOD_ID, name = "Nova Example Entity", version = "0.0.1", novaVersion = "0.0.1")
+public class NovaEntity implements Loadable {
+
+	public static final String MOD_ID = "novaentity";
+
+	public final EntityManager entityManager;
+	public final RenderManager renderManager;
+
+	public NovaEntity(EntityManager entityManager,
+	                  RenderManager renderManager) {
+		this.entityManager = entityManager;
+		this.renderManager = renderManager;
+	}
+}

gradle.properties

@@ -1 +1,4 @@
+version = 0.1.0-SNAPSHOT
+group = nova.sample
+
 nova_version = 0.1.0-SNAPSHOT

gui/build.gradle

@@ -1,6 +1,8 @@
-version = "0.1"
+version = "0.1.0-SNAPSHOT"
 group = "nova.sample.gui"
 
+archivesBaseName = "NOVA-Example-GUI"
+
 dependencies {
-	compile "nova.gui:NOVA-GUI:0.0.1-SNAPSHOT"
+	compile group: "nova.gui", name: "NOVA-GUI", version: "0.0.1-SNAPSHOT", changing: true
 }

gui/src/main/java/nova/sample/gui/NovaGui.java

@@ -2,22 +2,22 @@
 
 import nova.core.block.BlockFactory;
 import nova.core.block.BlockManager;
-import nova.core.gui.Background;
-import nova.core.gui.ComponentEvent.ActionEvent;
-import nova.core.gui.Gui;
-import nova.core.gui.GuiEvent.BindEvent;
-import nova.core.gui.GuiEvent.UnBindEvent;
-import nova.core.gui.component.Button;
-import nova.core.gui.component.Container;
-import nova.core.gui.component.Label;
-import nova.core.gui.component.inventory.Slot;
-import nova.core.gui.factory.GuiManager;
-import nova.core.gui.layout.Anchor;
-import nova.core.gui.layout.FlowLayout;
+import nova.gui.Background;
+import nova.gui.ComponentEvent.ActionEvent;
+import nova.gui.Gui;
+import nova.gui.GuiEvent.BindEvent;
+import nova.gui.GuiEvent.UnBindEvent;
+import nova.gui.component.Button;
+import nova.gui.component.Container;
+import nova.gui.component.Label;
+import nova.gui.component.inventory.Slot;
+import nova.gui.factory.GuiManager;
+import nova.gui.layout.Anchor;
+import nova.gui.layout.FlowLayout;
 import nova.core.item.ItemFactory;
 import nova.core.item.ItemManager;
 import nova.core.loader.Loadable;
-import nova.core.loader.NovaMod;
+import nova.core.loader.Mod;
 import nova.core.network.NetworkManager;
 import nova.core.network.NetworkTarget.Side;
 import nova.core.recipes.RecipeManager;
@@ -33,10 +33,10 @@
  *
  * @author Calclavia
  */
-@NovaMod(id = NovaGui.id, name = "Nova GUI example", version = "0.0.1", novaVersion = "0.0.1")
+@Mod(id = NovaGui.MOD_ID, name = "Nova GUI example", version = "0.0.1", novaVersion = "0.0.1")
 public class NovaGui implements Loadable {
 
-	public static final String id = "novagui";
+	public static final String MOD_ID = "novaexamplegui";
 
 	public static BlockFactory blockTest;
 	public static ItemFactory itemBlockTest;
@@ -51,11 +51,11 @@ public class NovaGui implements Loadable {
 	public final RecipeManager recipeManager;
 
 	public NovaGui(BlockManager blockManager,
-		ItemManager itemManager,
-		RenderManager renderManager,
-		GuiManager guiFactory,
-		RecipeManager recipeManager,
-		NetworkManager networkManager) {
+	               ItemManager itemManager,
+	               RenderManager renderManager,
+	               GuiManager guiFactory,
+	               RecipeManager recipeManager,
+	               NetworkManager networkManager) {
 		this.blockManager = blockManager;
 		this.itemManager = itemManager;
 		this.renderManager = renderManager;
@@ -67,7 +67,7 @@ public NovaGui(BlockManager blockManager,
 	}
 
 	public static void initializeGUI() {
-		guiFactory.register(() -> new Gui("testgui")
+		guiFactory.register("testgui", () -> new Gui("testgui")
 				.add(new Button("testbutton2", "I'm EAST")
 					.setMaximumSize(Integer.MAX_VALUE, 120)
 
@@ -103,16 +103,17 @@ public static void initializeGUI() {
 
 	@Override
 	public void preInit() {
-		blockTest = blockManager.register(BlockSimpleTest.class);
+		blockTest = blockManager.register(MOD_ID + ":gui", BlockSimpleTest::new);
 
 		itemBlockTest = itemManager.getItemFromBlock(blockTest);
 
-		steelTexture = renderManager.registerTexture(new BlockTexture(id, "blockSteel"));
+		steelTexture = renderManager.registerTexture(new BlockTexture(MOD_ID, "block_steel"));
 
 		// try to add a recipe
-		ItemIngredient stickIngredient = ItemIngredient.forItem("minecraft:stick"); //TODO: This should be obtained from some dictonary too
+		//ItemIngredient stickIngredient = ItemIngredient.forItem("minecraft:stick"); //TODO: This should be obtained from some dictonary too
+		ItemIngredient stickIngredient = ItemIngredient.forDictionary("stickWood");
 		ItemIngredient ingotIngredient = ItemIngredient.forDictionary("ingotIron");
-		recipeManager.addRecipe(new ShapedCraftingRecipe(itemBlockTest.makeItem(), "AAA-ABA-AAA", ingotIngredient, stickIngredient));
+		recipeManager.addRecipe(new ShapedCraftingRecipe(itemBlockTest.build(), "AAA-ABA-AAA", ingotIngredient, stickIngredient));
 
 		initializeGUI();
 	}