Cleanup

src/main/java/net/shadowfacts/simplemultipart/client/MissingMultipartBakedModel.java

@@ -14,6 +14,8 @@ import java.util.Random;
  */
 public class MissingMultipartBakedModel implements MultipartBakedModel {
 
+	// TODO: actual missing model
+
 	@Override
 	public List<BakedQuad> getQuads(MultipartState state, MultipartSlot slot, Direction side, Random random) {
 		return ImmutableList.of();

src/main/java/net/shadowfacts/simplemultipart/client/MultipartContainerBakedModel.java

@@ -30,6 +30,7 @@ public class MultipartContainerBakedModel implements BakedModel {
 		MultipartContainerBlockState containerState = (MultipartContainerBlockState)state;
 		Map<MultipartSlot, MultipartState> parts = containerState.getParts();
 		MultipartModels models = SimpleMultipartClient.getMultipartModels();
+		// TODO: would manually building the list be more efficient?
 		return parts.entrySet().stream()
 				.flatMap(entry -> {
 					MultipartBakedModel partModel = models.getModel(entry.getValue());

src/main/java/net/shadowfacts/simplemultipart/client/MultipartModels.java

@@ -11,13 +11,8 @@ import java.util.Map;
 public class MultipartModels {
 
 	private final Map<MultipartState, MultipartBakedModel> models = new IdentityHashMap<>();
-//	private final BakedModelManager modelManager;
 	private final MultipartBakedModel missingModel = new MissingMultipartBakedModel();
 
-	public MultipartModels() {
-//		this.modelManager = modelManager;
-	}
-
 	public MultipartBakedModel getMissingModel() {
 		return missingModel;
 	}

src/main/java/net/shadowfacts/simplemultipart/client/SimpleMultipartClient.java

@@ -12,7 +12,6 @@ public class SimpleMultipartClient implements ClientModInitializer {
 
 	@Override
 	public void onInitializeClient() {
-//		multipartModels = new MultipartModels(MinecraftClient.getInstance().getBlockRenderManager().getModels().getModelManager());
 	}
 
 	public static MultipartModels getMultipartModels() {

src/main/java/net/shadowfacts/simplemultipart/client/util/RenderStateProvider.java

@@ -1,4 +1,4 @@
-package net.shadowfacts.simplemultipart.client;
+package net.shadowfacts.simplemultipart.client.util;
 
 import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;

src/main/java/net/shadowfacts/simplemultipart/container/MultipartContainerBlock.java

@@ -11,7 +11,7 @@ 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.client.RenderStateProvider;
+import net.shadowfacts.simplemultipart.client.util.RenderStateProvider;
 import net.shadowfacts.simplemultipart.multipart.MultipartSlot;
 import net.shadowfacts.simplemultipart.multipart.MultipartState;
 
@@ -59,11 +59,6 @@ public class MultipartContainerBlock extends Block implements BlockEntityProvide
 		return shape == null ? VoxelShapes.empty() : shape;
 	}
 
-	@Override
-	public VoxelShape getRayTraceShape(BlockState var1, BlockView var2, BlockPos var3) {
-		return super.getRayTraceShape(var1, var2, var3);
-	}
-
 	@Override
 	public MultipartContainerBlockEntity createBlockEntity(BlockView world) {
 		return new MultipartContainerBlockEntity();

src/main/java/net/shadowfacts/simplemultipart/item/ItemMultipart.java

@@ -41,7 +41,7 @@ public class ItemMultipart extends Item {
 			return ActionResult.FAILURE;
 		}
 
-		MultipartState partState = part.getStateForPlacement(slot, container);
+		MultipartState partState = part.getPlacementState(slot, container);
 		if (!container.canInsert(partState, slot)) {
 			return ActionResult.FAILURE;
 		}

src/main/java/net/shadowfacts/simplemultipart/mixin/client/MixinBlockRenderManager.java

@@ -9,7 +9,7 @@ import net.minecraft.client.render.block.BlockRenderer;
 import net.minecraft.client.render.model.BakedModel;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.ExtendedBlockView;
-import net.shadowfacts.simplemultipart.client.RenderStateProvider;
+import net.shadowfacts.simplemultipart.client.util.RenderStateProvider;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;

src/main/java/net/shadowfacts/simplemultipart/mixin/client/MixinFuckYouBiomeColors.java

@@ -1,21 +0,0 @@
-package net.shadowfacts.simplemultipart.mixin.client;
-
-import net.minecraft.client.render.block.BiomeColors;
-import net.minecraft.client.render.block.GrassColorHandler;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.ExtendedBlockView;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Overwrite;
-
-/**
- * @author shadowfacts
- */
-@Mixin(BiomeColors.class)
-public class MixinFuckYouBiomeColors {
-
-	@Overwrite
-	public static int grassColorAt(ExtendedBlockView world, BlockPos pos) {
-		return GrassColorHandler.getColor(0.5D, 1.0D);
-	}
-
-}

src/main/java/net/shadowfacts/simplemultipart/multipart/Multipart.java

@@ -49,7 +49,7 @@ public abstract class Multipart {
 		return true;
 	}
 
-	public MultipartState getStateForPlacement(MultipartSlot slot, MultipartContainerBlockEntity container) {
+	public MultipartState getPlacementState(MultipartSlot slot, MultipartContainerBlockEntity container) {
 		return getDefaultState();
 	}
 

src/main/resources/simplemultipart.client.json

@@ -3,7 +3,6 @@
   "package": "net.shadowfacts.simplemultipart.mixin.client",
   "compatibilityLevel": "JAVA_8",
   "mixins": [
-    "MixinFuckYouBiomeColors",
     "MixinBakedModelManager",
     "MixinBlockRenderManager"
   ],

src/test/java/net/shadowfacts/simplemultipart/test/GreenMultipart.java

@@ -18,6 +18,7 @@ public class GreenMultipart extends Multipart {
 	}
 
 	@Override
+	@Deprecated
 	public VoxelShape getBoundingShape(MultipartState state, MultipartSlot slot, MultipartContainerBlockEntity container) {
 		return VoxelShapes.cube(0, 0, 0, 1, 1, 1/16f);
 	}

src/test/java/net/shadowfacts/simplemultipart/test/RedMultipart.java

@@ -18,6 +18,7 @@ public class RedMultipart extends Multipart {
 	}
 
 	@Override
+	@Deprecated
 	public VoxelShape getBoundingShape(MultipartState state, MultipartSlot slot, MultipartContainerBlockEntity container) {
 		return VoxelShapes.cube(0, 0, 0, 1, 1/16f, 1);
 	}