Update with fixes

SyntaxPhoenix · Oct 23, 2020 · 56e873a · 56e873a
1 parent 994566d
commit 56e873a
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 31 deletions.
diff --git a/src/main/java/com/syntaxphoenix/bundles/generator/api/GeneratorApi.java b/src/main/java/com/syntaxphoenix/bundles/generator/api/GeneratorApi.java
@@ -2,9 +2,12 @@
 
 import com.syntaxphoenix.bundles.generator.api.biome.Biome;
 import com.syntaxphoenix.bundles.generator.api.environment.Block;
+import com.syntaxphoenix.bundles.generator.api.environment.BlockAdapter;
+import com.syntaxphoenix.bundles.generator.api.environment.ContainerAdapter;
 import com.syntaxphoenix.bundles.generator.api.environment.Entity;
+import com.syntaxphoenix.bundles.generator.api.environment.EntityAdapter;
 import com.syntaxphoenix.bundles.generator.api.environment.Item;
-import com.syntaxphoenix.bundles.generator.api.environment.ObjectAdapter;
+import com.syntaxphoenix.bundles.generator.api.environment.ItemAdapter;
 import com.syntaxphoenix.bundles.generator.api.noise.NoiseGenerator;
 import com.syntaxphoenix.bundles.generator.api.registry.adapter.RegistryHandler;
 import com.syntaxphoenix.syntaxapi.utils.key.Namespace;
@@ -13,8 +16,6 @@ public abstract class GeneratorApi {
 
 	public static final Namespace NAMESPACE = Namespace.of("generatorapi");
 
-	public abstract RegistryHandler<ObjectAdapter<?>> getObjectRegistry();
-
 	public abstract RegistryHandler<NoiseGenerator> getNoiseRegistry();
 
 	public abstract RegistryHandler<Entity> getEntityRegistry();
@@ -25,4 +26,12 @@ public abstract class GeneratorApi {
 
 	public abstract RegistryHandler<Item> getItemRegistry();
 
+	public abstract RegistryHandler<ContainerAdapter> getContainerAdapterRegistry();
+
+	public abstract RegistryHandler<EntityAdapter> getEntityAdapterRegistry();
+
+	public abstract RegistryHandler<BlockAdapter> getBlockAdapterRegistry();
+
+	public abstract RegistryHandler<ItemAdapter> getItemAdapterRegistry();
+
 }
diff --git a/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/Block.java b/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/Block.java
@@ -9,6 +9,6 @@ public Block(IKey key) {
 		super(key);
 	}
 
-	public abstract BlockAdapter<?> getAdapter();
+	public abstract BlockAdapter getAdapter();
 
 }
diff --git a/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/BlockAdapter.java b/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/BlockAdapter.java
@@ -2,30 +2,30 @@
 
 import com.syntaxphoenix.syntaxapi.utils.key.IKey;
 
-public abstract class BlockAdapter<H> extends ObjectAdapter<Block> {
+public abstract class BlockAdapter extends ObjectAdapter<Block, BlockAdapter> {
 
 	public BlockAdapter(IKey key) {
 		super(key);
 	}
 
-	public abstract H getBlock(World<?> world, int x, int y, int z);
+	public abstract Object getBlock(World<?> world, int x, int y, int z);
 
-	public H setBlock(World<?> world, int x, int y, int z, Block data) {
+	public Object setBlock(World<?> world, int x, int y, int z, Block data) {
 		return setBlock(getBlock(world, x, y, z), data);
 	}
 
-	public abstract H setBlock(H handle, Block data);
+	public abstract Object setBlock(Object handle, Block data);
 
 	public Block getData(World<?> world, int x, int y, int z) {
 		return getData(getBlock(world, x, y, z));
 	}
 
-	public abstract Block getData(H handle);
+	public abstract Block getData(Object handle);
 
 	public boolean hasData(World<?> world, int x, int y, int z, Block data) {
 		return hasData(getBlock(world, x, y, z), data);
 	}
 
-	public abstract boolean hasData(H handle, Block data);
+	public abstract boolean hasData(Object handle, Block data);
 
 }
diff --git a/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/Container.java b/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/Container.java
@@ -8,7 +8,7 @@ public Container(IKey key) {
 		super(key);
 	}
 
-	public abstract ContainerAdapter<?> getAdapter();
+	public abstract ContainerAdapter getAdapter();
 
 	public abstract int getSize();
 

diff --git a/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/ContainerAdapter.java b/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/ContainerAdapter.java
@@ -2,16 +2,16 @@
 
 import com.syntaxphoenix.syntaxapi.utils.key.IKey;
 
-public abstract class ContainerAdapter<H> extends ObjectAdapter<Container> {
+public abstract class ContainerAdapter extends ObjectAdapter<Container, ContainerAdapter> {
 
 	public ContainerAdapter(IKey key) {
 		super(key);
 	}
 
 	public abstract Container createContainer(int size);
 
-	public abstract Container toContainer(H handle);
+	public abstract Container toContainer(Object handle);
 
-	public abstract H fromContainer(Container container);
+	public abstract Object fromContainer(Container container);
 
 }
diff --git a/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/Entity.java b/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/Entity.java
@@ -13,6 +13,6 @@ public Entity(IKey key) {
 
 	public abstract void setName(String name);
 
-	public abstract EntityAdapter<?> getAdapter();
+	public abstract EntityAdapter getAdapter();
 
 }
diff --git a/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/EntityAdapter.java b/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/EntityAdapter.java
@@ -2,18 +2,18 @@
 
 import com.syntaxphoenix.syntaxapi.utils.key.IKey;
 
-public abstract class EntityAdapter<H> extends ObjectAdapter<Entity> {
+public abstract class EntityAdapter extends ObjectAdapter<Entity, EntityAdapter> {
 
 	public EntityAdapter(IKey key) {
 		super(key);
 	}
 
-	public abstract H spawnEntity(World<?> world, int x, int y, int z, Entity entity);
-
-	public abstract H dropItem(World<?> world, int x, int y, int z, Item item);
+	public abstract Object spawnEntity(World<?> world, int x, int y, int z, Entity entity);
 
-	public abstract Entity getData(H handle);
-
-	public abstract boolean hasData(H handle, Entity entity);
+	public abstract Object dropItem(World<?> world, int x, int y, int z, Item item);
+
+	public abstract Entity getData(Object handle);
+
+	public abstract boolean hasData(Object handle, Entity entity);
 
 }
diff --git a/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/Item.java b/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/Item.java
@@ -13,6 +13,6 @@ public Item(IKey key) {
 
 	public abstract void setAmount(int amount);
 
-	public abstract ItemAdapter<?> getAdapter();
+	public abstract ItemAdapter getAdapter();
 
 }
diff --git a/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/ItemAdapter.java b/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/ItemAdapter.java
@@ -2,16 +2,16 @@
 
 import com.syntaxphoenix.syntaxapi.utils.key.IKey;
 
-public abstract class ItemAdapter<H> extends ObjectAdapter<Item> {
-	
+public abstract class ItemAdapter extends ObjectAdapter<Item, ItemAdapter> {
+
 	public ItemAdapter(IKey key) {
 		super(key);
 	}
 
 	public abstract Item buildItem(int amount);
-	
-	public abstract H fromItem(Item item);
-	
-	public abstract Item toItem(H handle);
-	
+
+	public abstract Object fromItem(Item item);
+
+	public abstract Item toItem(Object handle);
+
 }
diff --git a/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/ObjectAdapter.java b/src/main/java/com/syntaxphoenix/bundles/generator/api/environment/ObjectAdapter.java
@@ -4,7 +4,7 @@
 import com.syntaxphoenix.syntaxapi.utils.key.AbstractKeyed;
 import com.syntaxphoenix.syntaxapi.utils.key.IKey;
 
-public abstract class ObjectAdapter<T extends WorldObject<T>> extends AbstractKeyed implements IRegisterable<ObjectAdapter<T>> {
+public abstract class ObjectAdapter<T extends WorldObject<T>, S extends ObjectAdapter<T, S>> extends AbstractKeyed implements IRegisterable<S> {
 
 	public ObjectAdapter(IKey key) {
 		super(key);