Small improvements

This commit is contained in:
Raoul Van den Berge
2016-08-06 14:00:07 +02:00
parent 7604b7ce4e
commit fd1cda1863
3 changed files with 4 additions and 12 deletions

View File

@@ -74,6 +74,7 @@ public class BlockCable extends BlockCoverable {
return new TileCable(); return new TileCable();
} }
@Override
protected BlockStateContainer createBlockState() { protected BlockStateContainer createBlockState() {
BlockStateContainer.Builder builder = new BlockStateContainer.Builder(this); BlockStateContainer.Builder builder = new BlockStateContainer.Builder(this);
@@ -113,7 +114,7 @@ public class BlockCable extends BlockCoverable {
TileEntity facing = world.getTileEntity(pos.offset(direction)); TileEntity facing = world.getTileEntity(pos.offset(direction));
if (facing instanceof INetworkMaster || facing instanceof INetworkNode) { if (facing instanceof INetworkMaster || facing instanceof INetworkNode) {
// Do not render a cable extension where our cable "head" is (e.g. importer, exporter, external storage cubes). // Do not render a cable extension where our cable "head" is (e.g. importer, exporter, external storage heads).
if (getPlacementType() != null) { if (getPlacementType() != null) {
return ((TileMultipartNode) world.getTileEntity(pos)).getFacingTile() != facing; return ((TileMultipartNode) world.getTileEntity(pos)).getFacingTile() != facing;
} }

View File

@@ -1,12 +1,10 @@
package refinedstorage.proxy; package refinedstorage.proxy;
import com.google.common.base.Predicate;
import mcmultipart.client.multipart.ModelMultipartContainer; import mcmultipart.client.multipart.ModelMultipartContainer;
import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.StateMap; import net.minecraft.client.renderer.block.statemap.StateMap;
import net.minecraft.item.Item; import net.minecraft.item.Item;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.event.ModelBakeEvent;
import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoader;
@@ -22,21 +20,13 @@ import refinedstorage.block.EnumGridType;
import refinedstorage.block.EnumStorageType; import refinedstorage.block.EnumStorageType;
import refinedstorage.item.*; import refinedstorage.item.*;
import javax.annotation.Nullable;
public class ClientProxy extends CommonProxy { public class ClientProxy extends CommonProxy {
@SubscribeEvent @SubscribeEvent
public void onModelBake(ModelBakeEvent e) { public void onModelBake(ModelBakeEvent e) {
System.out.println("Model bake event called.");
for (ModelResourceLocation model : e.getModelRegistry().getKeys()) { for (ModelResourceLocation model : e.getModelRegistry().getKeys()) {
for (BlockCable cable : cables) { for (BlockCable cable : cables) {
if (model.getResourceDomain().equals(RefinedStorage.ID) && model.getResourcePath().equals(cable.getName()) && !model.getVariant().equals("inventory")) { if (model.getResourceDomain().equals(RefinedStorage.ID) && model.getResourcePath().equals(cable.getName()) && !model.getVariant().equals("inventory")) {
e.getModelRegistry().putObject(model, new ModelMultipartContainer(e.getModelRegistry().getObject(model), new Predicate<BlockRenderLayer>() { e.getModelRegistry().putObject(model, new ModelMultipartContainer(e.getModelRegistry().getObject(model), input -> cable.canRenderInLayer(input)));
@Override
public boolean apply(@Nullable BlockRenderLayer input) {
return cable.canRenderInLayer(input);
}
}));
} }
} }
} }

View File

@@ -36,6 +36,7 @@ public abstract class TileMultipartNode extends TileNode implements IMicroblockC
public MicroblockContainer getMicroblockContainer() { public MicroblockContainer getMicroblockContainer() {
if (container == null) { if (container == null) {
container = new MicroblockContainer(this); container = new MicroblockContainer(this);
container.getPartContainer().setListener(new IMultipartContainer.IMultipartContainerListener() { container.getPartContainer().setListener(new IMultipartContainer.IMultipartContainerListener() {
@Override @Override
public void onAddPartPre(IMultipart part) { public void onAddPartPre(IMultipart part) {