Fix ComponentException when calling getID() on a BWBlock through Worl…

…d.getBlock() (#270)
NOVA-Team · Feb 26, 2017 · 5b4dc92 · 5b4dc92
1 parent 4872e5f
commit 5b4dc92
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java b/minecraft/1.7/src/main/java/nova/core/wrapper/mc/forge/v17/wrapper/block/world/BWWorld.java
@@ -25,6 +25,7 @@
 import net.minecraft.util.AxisAlignedBB;
 import nova.core.block.Block;
 import nova.core.block.BlockFactory;
+import nova.core.component.misc.FactoryProvider;
 import nova.core.entity.Entity;
 import nova.core.entity.EntityFactory;
 import nova.core.item.Item;
@@ -82,7 +83,10 @@ public Optional<Block> getBlock(Vector3D position) {
 		} else if (mcBlock instanceof FWBlock) {
 			return Optional.of(((FWBlock) mcBlock).getBlockInstance(access, position));
 		} else {
-			return Optional.of(new BWBlock(mcBlock, this, position));
+			BWBlock block = new BWBlock(mcBlock, this, position);
+			Game.blocks().get(net.minecraft.block.Block.blockRegistry.getNameForObject(block))
+				.ifPresent(blockFactory -> block.components.getOrAdd(new FactoryProvider(blockFactory)));
+			return Optional.of(block);
 		}
 	}
 

diff --git a/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/world/BWWorld.java b/minecraft/1.8/src/main/java/nova/core/wrapper/mc/forge/v18/wrapper/block/world/BWWorld.java
@@ -27,6 +27,7 @@
 import net.minecraft.util.BlockPos;
 import nova.core.block.Block;
 import nova.core.block.BlockFactory;
+import nova.core.component.misc.FactoryProvider;
 import nova.core.entity.Entity;
 import nova.core.entity.EntityFactory;
 import nova.core.item.Item;
@@ -86,7 +87,10 @@ public Optional<Block> getBlock(Vector3D position) {
 		} else if (mcBlock instanceof FWBlock) {
 			return Optional.of(((FWBlock) mcBlock).getBlockInstance(access, position));
 		} else {
-			return Optional.of(new BWBlock(mcBlock, this, position));
+			BWBlock block = new BWBlock(mcBlock, this, position);
+			Game.blocks().get(net.minecraft.block.Block.blockRegistry.getNameForObject(block).toString())
+				.ifPresent(blockFactory -> block.components.getOrAdd(new FactoryProvider(blockFactory)));
+			return Optional.of(block);
 		}
 	}