From 9de68758661c52116cdbd576770a20a5481e4b27 Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Thu, 27 Dec 2018 21:55:51 -0500 Subject: [PATCH] Reorganize --- .../client/MultipartBakedModel.java | 2 +- .../container/AbstractContainerBlock.java | 3 +-- .../AbstractContainerBlockEntity.java | 22 +++++++++++++++---- .../container/ContainerBlockState.java | 2 +- .../container/ContainerEventHandler.java | 1 - .../MultipartContainer.java | 3 ++- .../simplemultipart/item/ItemMultipart.java | 2 +- .../simplemultipart/multipart/Multipart.java | 1 - .../multipart/MultipartState.java | 1 - .../{api => multipart}/MultipartView.java | 7 +++++- .../multipart/entity/MultipartEntity.java | 2 +- .../entity/MultipartEntityProvider.java | 2 +- .../simplemultipart/util/MultipartHelper.java | 2 +- .../util/MultipartHitResult.java | 2 +- .../util/MultipartPlacementContext.java | 2 +- .../simplemultipart/test/EntityTestPart.java | 4 ++-- .../simplemultipart/test/SlabMultipart.java | 2 +- .../simplemultipart/test/TestMultipart.java | 2 +- .../test/TickableEntityTestPart.java | 4 ++-- 19 files changed, 41 insertions(+), 25 deletions(-) rename src/main/java/net/shadowfacts/simplemultipart/{api => container}/MultipartContainer.java (76%) rename src/main/java/net/shadowfacts/simplemultipart/{api => multipart}/MultipartView.java (70%) diff --git a/src/main/java/net/shadowfacts/simplemultipart/client/MultipartBakedModel.java b/src/main/java/net/shadowfacts/simplemultipart/client/MultipartBakedModel.java index 7eb1ac3..b11a4c4 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/client/MultipartBakedModel.java +++ b/src/main/java/net/shadowfacts/simplemultipart/client/MultipartBakedModel.java @@ -4,7 +4,7 @@ import net.minecraft.block.BlockState; import net.minecraft.client.render.model.BakedModel; import net.minecraft.client.render.model.BakedQuad; import net.minecraft.util.math.Direction; -import net.shadowfacts.simplemultipart.api.MultipartView; +import net.shadowfacts.simplemultipart.multipart.MultipartView; import java.util.List; import java.util.Random; diff --git a/src/main/java/net/shadowfacts/simplemultipart/container/AbstractContainerBlock.java b/src/main/java/net/shadowfacts/simplemultipart/container/AbstractContainerBlock.java index 8088db5..6ad315e 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/container/AbstractContainerBlock.java +++ b/src/main/java/net/shadowfacts/simplemultipart/container/AbstractContainerBlock.java @@ -11,11 +11,10 @@ import net.minecraft.util.shape.VoxelShapes; import net.minecraft.world.BlockView; import net.minecraft.world.ExtendedBlockView; import net.minecraft.world.World; -import net.shadowfacts.simplemultipart.api.MultipartContainer; import net.shadowfacts.simplemultipart.client.util.RenderStateProvider; import net.shadowfacts.simplemultipart.util.MultipartHelper; import net.shadowfacts.simplemultipart.util.MultipartHitResult; -import net.shadowfacts.simplemultipart.api.MultipartView; +import net.shadowfacts.simplemultipart.multipart.MultipartView; import java.util.Set; diff --git a/src/main/java/net/shadowfacts/simplemultipart/container/AbstractContainerBlockEntity.java b/src/main/java/net/shadowfacts/simplemultipart/container/AbstractContainerBlockEntity.java index de06f1b..0fba8de 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/container/AbstractContainerBlockEntity.java +++ b/src/main/java/net/shadowfacts/simplemultipart/container/AbstractContainerBlockEntity.java @@ -19,12 +19,11 @@ import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.loot.context.LootContext; import net.minecraft.world.loot.context.Parameters; import net.shadowfacts.simplemultipart.SimpleMultipart; -import net.shadowfacts.simplemultipart.api.MultipartContainer; import net.shadowfacts.simplemultipart.multipart.MultipartState; import net.shadowfacts.simplemultipart.multipart.entity.MultipartEntity; import net.shadowfacts.simplemultipart.multipart.entity.MultipartEntityProvider; import net.shadowfacts.simplemultipart.util.MultipartHelper; -import net.shadowfacts.simplemultipart.api.MultipartView; +import net.shadowfacts.simplemultipart.multipart.MultipartView; import net.shadowfacts.simplemultipart.util.ShapeUtils; import java.util.*; @@ -196,8 +195,8 @@ public abstract class AbstractContainerBlockEntity extends BlockEntity implement public static class Entry implements MultipartView { public final MultipartContainer container; - public final MultipartState state; - public final MultipartEntity entity; + public MultipartState state; + public MultipartEntity entity; private Entry(MultipartContainer container, MultipartState state, MultipartEntity entity) { this.container = container; @@ -215,10 +214,25 @@ public abstract class AbstractContainerBlockEntity extends BlockEntity implement return state; } + @Override + public void setState(MultipartState state) { + this.state = state; + } + @Override public MultipartEntity getEntity() { return entity; } + + @Override + public void setEntity(MultipartEntity entity) { + this.entity = entity; + } + + @Override + public String toString() { + return "Entry{" + state + "}"; + } } } diff --git a/src/main/java/net/shadowfacts/simplemultipart/container/ContainerBlockState.java b/src/main/java/net/shadowfacts/simplemultipart/container/ContainerBlockState.java index dcf9969..6f088b1 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/container/ContainerBlockState.java +++ b/src/main/java/net/shadowfacts/simplemultipart/container/ContainerBlockState.java @@ -1,7 +1,7 @@ package net.shadowfacts.simplemultipart.container; import net.minecraft.block.BlockState; -import net.shadowfacts.simplemultipart.api.MultipartView; +import net.shadowfacts.simplemultipart.multipart.MultipartView; import java.util.Set; diff --git a/src/main/java/net/shadowfacts/simplemultipart/container/ContainerEventHandler.java b/src/main/java/net/shadowfacts/simplemultipart/container/ContainerEventHandler.java index e23e449..8fe06b6 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/container/ContainerEventHandler.java +++ b/src/main/java/net/shadowfacts/simplemultipart/container/ContainerEventHandler.java @@ -8,7 +8,6 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.world.World; -import net.shadowfacts.simplemultipart.api.MultipartContainer; import net.shadowfacts.simplemultipart.util.MultipartHitResult; import net.shadowfacts.simplemultipart.SimpleMultipart; import net.shadowfacts.simplemultipart.util.MultipartHelper; diff --git a/src/main/java/net/shadowfacts/simplemultipart/api/MultipartContainer.java b/src/main/java/net/shadowfacts/simplemultipart/container/MultipartContainer.java similarity index 76% rename from src/main/java/net/shadowfacts/simplemultipart/api/MultipartContainer.java rename to src/main/java/net/shadowfacts/simplemultipart/container/MultipartContainer.java index ea1fb20..ed0a224 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/api/MultipartContainer.java +++ b/src/main/java/net/shadowfacts/simplemultipart/container/MultipartContainer.java @@ -1,5 +1,6 @@ -package net.shadowfacts.simplemultipart.api; +package net.shadowfacts.simplemultipart.container; +import net.shadowfacts.simplemultipart.multipart.MultipartView; import net.shadowfacts.simplemultipart.multipart.MultipartState; import java.util.Set; diff --git a/src/main/java/net/shadowfacts/simplemultipart/item/ItemMultipart.java b/src/main/java/net/shadowfacts/simplemultipart/item/ItemMultipart.java index 64a161e..3468722 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/item/ItemMultipart.java +++ b/src/main/java/net/shadowfacts/simplemultipart/item/ItemMultipart.java @@ -5,7 +5,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemUsageContext; import net.minecraft.util.ActionResult; import net.shadowfacts.simplemultipart.SimpleMultipart; -import net.shadowfacts.simplemultipart.api.MultipartContainer; +import net.shadowfacts.simplemultipart.container.MultipartContainer; import net.shadowfacts.simplemultipart.multipart.Multipart; import net.shadowfacts.simplemultipart.multipart.MultipartState; import net.shadowfacts.simplemultipart.util.MultipartPlacementContext; diff --git a/src/main/java/net/shadowfacts/simplemultipart/multipart/Multipart.java b/src/main/java/net/shadowfacts/simplemultipart/multipart/Multipart.java index d71a349..a3ed759 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/multipart/Multipart.java +++ b/src/main/java/net/shadowfacts/simplemultipart/multipart/Multipart.java @@ -13,7 +13,6 @@ import net.minecraft.world.loot.LootTables; import net.minecraft.world.loot.context.LootContext; import net.shadowfacts.simplemultipart.SimpleMultipart; import net.shadowfacts.simplemultipart.util.MultipartPlacementContext; -import net.shadowfacts.simplemultipart.api.MultipartView; import java.util.List; diff --git a/src/main/java/net/shadowfacts/simplemultipart/multipart/MultipartState.java b/src/main/java/net/shadowfacts/simplemultipart/multipart/MultipartState.java index 84e39e2..bbf4c4c 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/multipart/MultipartState.java +++ b/src/main/java/net/shadowfacts/simplemultipart/multipart/MultipartState.java @@ -8,7 +8,6 @@ import net.minecraft.state.property.Property; import net.minecraft.util.Hand; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.loot.context.LootContext; -import net.shadowfacts.simplemultipart.api.MultipartView; import java.util.List; diff --git a/src/main/java/net/shadowfacts/simplemultipart/api/MultipartView.java b/src/main/java/net/shadowfacts/simplemultipart/multipart/MultipartView.java similarity index 70% rename from src/main/java/net/shadowfacts/simplemultipart/api/MultipartView.java rename to src/main/java/net/shadowfacts/simplemultipart/multipart/MultipartView.java index d85ac60..e2acfdc 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/api/MultipartView.java +++ b/src/main/java/net/shadowfacts/simplemultipart/multipart/MultipartView.java @@ -1,5 +1,6 @@ -package net.shadowfacts.simplemultipart.api; +package net.shadowfacts.simplemultipart.multipart; +import net.shadowfacts.simplemultipart.container.MultipartContainer; import net.shadowfacts.simplemultipart.multipart.Multipart; import net.shadowfacts.simplemultipart.multipart.MultipartState; import net.shadowfacts.simplemultipart.multipart.entity.MultipartEntity; @@ -14,8 +15,12 @@ public interface MultipartView { MultipartState getState(); + void setState(MultipartState state); + MultipartEntity getEntity(); + void setEntity(MultipartEntity entity); + default Multipart getMultipart() { return getState().getMultipart(); } diff --git a/src/main/java/net/shadowfacts/simplemultipart/multipart/entity/MultipartEntity.java b/src/main/java/net/shadowfacts/simplemultipart/multipart/entity/MultipartEntity.java index 751a810..e15bb60 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/multipart/entity/MultipartEntity.java +++ b/src/main/java/net/shadowfacts/simplemultipart/multipart/entity/MultipartEntity.java @@ -1,7 +1,7 @@ package net.shadowfacts.simplemultipart.multipart.entity; import net.minecraft.nbt.CompoundTag; -import net.shadowfacts.simplemultipart.api.MultipartContainer; +import net.shadowfacts.simplemultipart.container.MultipartContainer; /** * @author shadowfacts diff --git a/src/main/java/net/shadowfacts/simplemultipart/multipart/entity/MultipartEntityProvider.java b/src/main/java/net/shadowfacts/simplemultipart/multipart/entity/MultipartEntityProvider.java index f9ed2b6..e554a55 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/multipart/entity/MultipartEntityProvider.java +++ b/src/main/java/net/shadowfacts/simplemultipart/multipart/entity/MultipartEntityProvider.java @@ -1,6 +1,6 @@ package net.shadowfacts.simplemultipart.multipart.entity; -import net.shadowfacts.simplemultipart.api.MultipartContainer; +import net.shadowfacts.simplemultipart.container.MultipartContainer; import net.shadowfacts.simplemultipart.multipart.MultipartState; /** diff --git a/src/main/java/net/shadowfacts/simplemultipart/util/MultipartHelper.java b/src/main/java/net/shadowfacts/simplemultipart/util/MultipartHelper.java index 250f33f..ef07856 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/util/MultipartHelper.java +++ b/src/main/java/net/shadowfacts/simplemultipart/util/MultipartHelper.java @@ -14,7 +14,7 @@ import net.minecraft.util.math.Vec3d; import net.minecraft.util.shape.VoxelShape; import net.minecraft.world.World; import net.shadowfacts.simplemultipart.SimpleMultipart; -import net.shadowfacts.simplemultipart.api.MultipartContainer; +import net.shadowfacts.simplemultipart.container.MultipartContainer; import net.shadowfacts.simplemultipart.multipart.Multipart; import net.shadowfacts.simplemultipart.multipart.MultipartState; diff --git a/src/main/java/net/shadowfacts/simplemultipart/util/MultipartHitResult.java b/src/main/java/net/shadowfacts/simplemultipart/util/MultipartHitResult.java index ee9b360..93287de 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/util/MultipartHitResult.java +++ b/src/main/java/net/shadowfacts/simplemultipart/util/MultipartHitResult.java @@ -4,7 +4,7 @@ import net.minecraft.util.HitResult; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; import net.minecraft.util.math.Vec3d; -import net.shadowfacts.simplemultipart.api.MultipartView; +import net.shadowfacts.simplemultipart.multipart.MultipartView; /** * @author shadowfacts diff --git a/src/main/java/net/shadowfacts/simplemultipart/util/MultipartPlacementContext.java b/src/main/java/net/shadowfacts/simplemultipart/util/MultipartPlacementContext.java index b48fa25..b3e1677 100644 --- a/src/main/java/net/shadowfacts/simplemultipart/util/MultipartPlacementContext.java +++ b/src/main/java/net/shadowfacts/simplemultipart/util/MultipartPlacementContext.java @@ -5,7 +5,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.ItemUsageContext; import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.Direction; -import net.shadowfacts.simplemultipart.api.MultipartContainer; +import net.shadowfacts.simplemultipart.container.MultipartContainer; /** * @author shadowfacts diff --git a/src/test/java/net/shadowfacts/simplemultipart/test/EntityTestPart.java b/src/test/java/net/shadowfacts/simplemultipart/test/EntityTestPart.java index 49334f6..7168acc 100644 --- a/src/test/java/net/shadowfacts/simplemultipart/test/EntityTestPart.java +++ b/src/test/java/net/shadowfacts/simplemultipart/test/EntityTestPart.java @@ -6,13 +6,13 @@ import net.minecraft.util.Hand; import net.minecraft.util.math.BlockPos; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; -import net.shadowfacts.simplemultipart.api.MultipartContainer; +import net.shadowfacts.simplemultipart.container.MultipartContainer; import net.shadowfacts.simplemultipart.container.AbstractContainerBlockEntity; import net.shadowfacts.simplemultipart.multipart.Multipart; import net.shadowfacts.simplemultipart.multipart.MultipartState; import net.shadowfacts.simplemultipart.multipart.entity.MultipartEntity; import net.shadowfacts.simplemultipart.multipart.entity.MultipartEntityProvider; -import net.shadowfacts.simplemultipart.api.MultipartView; +import net.shadowfacts.simplemultipart.multipart.MultipartView; /** * @author shadowfacts diff --git a/src/test/java/net/shadowfacts/simplemultipart/test/SlabMultipart.java b/src/test/java/net/shadowfacts/simplemultipart/test/SlabMultipart.java index 81b3a96..c7fb5bc 100644 --- a/src/test/java/net/shadowfacts/simplemultipart/test/SlabMultipart.java +++ b/src/test/java/net/shadowfacts/simplemultipart/test/SlabMultipart.java @@ -9,7 +9,7 @@ import net.minecraft.util.shape.VoxelShapes; import net.shadowfacts.simplemultipart.multipart.Multipart; import net.shadowfacts.simplemultipart.multipart.MultipartState; import net.shadowfacts.simplemultipart.util.MultipartPlacementContext; -import net.shadowfacts.simplemultipart.api.MultipartView; +import net.shadowfacts.simplemultipart.multipart.MultipartView; /** * @author shadowfacts diff --git a/src/test/java/net/shadowfacts/simplemultipart/test/TestMultipart.java b/src/test/java/net/shadowfacts/simplemultipart/test/TestMultipart.java index cd2b431..3f65e5e 100644 --- a/src/test/java/net/shadowfacts/simplemultipart/test/TestMultipart.java +++ b/src/test/java/net/shadowfacts/simplemultipart/test/TestMultipart.java @@ -10,7 +10,7 @@ import net.minecraft.util.shape.VoxelShapes; import net.shadowfacts.simplemultipart.multipart.Multipart; import net.shadowfacts.simplemultipart.multipart.MultipartState; import net.shadowfacts.simplemultipart.util.MultipartPlacementContext; -import net.shadowfacts.simplemultipart.api.MultipartView; +import net.shadowfacts.simplemultipart.multipart.MultipartView; /** * @author shadowfacts diff --git a/src/test/java/net/shadowfacts/simplemultipart/test/TickableEntityTestPart.java b/src/test/java/net/shadowfacts/simplemultipart/test/TickableEntityTestPart.java index 8295222..e315f6c 100644 --- a/src/test/java/net/shadowfacts/simplemultipart/test/TickableEntityTestPart.java +++ b/src/test/java/net/shadowfacts/simplemultipart/test/TickableEntityTestPart.java @@ -6,8 +6,8 @@ import net.minecraft.util.Hand; import net.minecraft.util.Tickable; import net.minecraft.util.shape.VoxelShape; import net.minecraft.util.shape.VoxelShapes; -import net.shadowfacts.simplemultipart.api.MultipartContainer; -import net.shadowfacts.simplemultipart.api.MultipartView; +import net.shadowfacts.simplemultipart.container.MultipartContainer; +import net.shadowfacts.simplemultipart.multipart.MultipartView; import net.shadowfacts.simplemultipart.multipart.Multipart; import net.shadowfacts.simplemultipart.multipart.MultipartState; import net.shadowfacts.simplemultipart.multipart.entity.MultipartEntity;