diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index 7f8d26598..6c0fcf385 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -376,6 +376,7 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.GaugeDropper); registerItemRender(MekanismItems.FactoryInstaller); registerItemRender(MekanismItems.OtherDust); + registerItemRender(MekanismItems.GlowPanel); ModelBakery.registerItemVariants(MekanismItems.WalkieTalkie, ItemWalkieTalkie.OFF_MODEL); @@ -855,10 +856,11 @@ public class ClientProxy extends CommonProxy { MekanismRenderer.init(); - ModelLoaderRegistry.registerLoader(new MekanismOBJLoader()); + ModelLoaderRegistry.registerLoader(MekanismOBJLoader.INSTANCE); MinecraftForge.EVENT_BUS.register(new CTMRegistry()); MinecraftForge.EVENT_BUS.register(this); + MinecraftForge.EVENT_BUS.register(MekanismOBJLoader.INSTANCE); //Register entity rendering handlers RenderingRegistry.registerEntityRenderingHandler(EntityObsidianTNT.class, new IRenderFactory() { diff --git a/src/main/java/mekanism/client/render/ctm/ChiselFace.java b/src/main/java/mekanism/client/render/ctm/CTMFace.java similarity index 65% rename from src/main/java/mekanism/client/render/ctm/ChiselFace.java rename to src/main/java/mekanism/client/render/ctm/CTMFace.java index c0f88a684..baf7bfe0e 100644 --- a/src/main/java/mekanism/client/render/ctm/ChiselFace.java +++ b/src/main/java/mekanism/client/render/ctm/CTMFace.java @@ -9,50 +9,50 @@ import net.minecraft.util.EnumWorldBlockLayer; /** * Chisel Face, basically a list of IChiselTexture's */ -public final class ChiselFace { +public final class CTMFace { - private List textureList; + private List textureList; - private List childFaces; + private List childFaces; private EnumWorldBlockLayer layer; - public ChiselFace() { + public CTMFace() { this(new ArrayList<>(), new ArrayList<>()); } - public ChiselFace(EnumWorldBlockLayer layer) { + public CTMFace(EnumWorldBlockLayer layer) { this(); setLayer(layer); } - public ChiselFace(List textureList, List childFaces) { + public CTMFace(List textureList, List childFaces) { this.textureList = textureList; this.childFaces = childFaces; } - public List getTextureList(){ - List list = new ArrayList<>(); + public List getTextureList(){ + List list = new ArrayList<>(); list.addAll(this.textureList); - for (ChiselFace face : childFaces){ + for (CTMFace face : childFaces){ list.addAll(face.getTextureList()); } return list; } - public void addTexture(ChiselTextureCTM texture){ + public void addTexture(TextureCTM texture){ this.textureList.add(texture); } - public void addChildFace(ChiselFace face){ + public void addChildFace(CTMFace face){ this.childFaces.add(face); } - public boolean removeTexture(ChiselTextureCTM texture){ + public boolean removeTexture(TextureCTM texture){ return this.textureList.remove(texture); } - public boolean removeChildFace(ChiselFace face){ + public boolean removeChildFace(CTMFace face){ return this.childFaces.remove(face); } diff --git a/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java b/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java index dbd9e0a2b..f37f696f4 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java +++ b/src/main/java/mekanism/client/render/ctm/CTMModelFactory.java @@ -131,7 +131,7 @@ public class CTMModelFactory implements ISmartBlockModel, ISmartItemModel, IPers for(EnumFacing facing : EnumFacing.VALUES) { - ChiselTextureCTM face = model.getFace(facing); + TextureCTM face = model.getFace(facing); ICTMBlock block = (ICTMBlock)state.getBlock(); CTMData data = block.getCTMData(state); @@ -151,7 +151,7 @@ public class CTMModelFactory implements ISmartBlockModel, ISmartItemModel, IPers return new CTMModelFactory(faceQuads, generalQuads, model); } - private void addAllQuads(List from, ChiselTextureCTM tex, @Nullable CTMBlockRenderContext ctx, IBlockState state, int quadGoal, List to) + private void addAllQuads(List from, TextureCTM tex, @Nullable CTMBlockRenderContext ctx, IBlockState state, int quadGoal, List to) { for(BakedQuad q : from) { diff --git a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java index ba193fce4..0c79ab459 100644 --- a/src/main/java/mekanism/client/render/ctm/CTMRegistry.java +++ b/src/main/java/mekanism/client/render/ctm/CTMRegistry.java @@ -30,7 +30,7 @@ public class CTMRegistry public static List> ctmTypes = new ArrayList>(); - public static Map textureCache = new HashMap(); + public static Map textureCache = new HashMap(); @SubscribeEvent public void onTextureStitch(TextureStitchEvent.Pre event) @@ -69,7 +69,7 @@ public class CTMRegistry textures.add(callback); } - public static ChiselTextureCTM createTexture(String domain, String name) + public static TextureCTM createTexture(String domain, String name) { TextureSpriteCallback[] callbacks = new TextureSpriteCallback[CTM.REQUIRED_TEXTURES]; @@ -79,6 +79,6 @@ public class CTMRegistry register(callbacks[0]); register(callbacks[1]); - return new ChiselTextureCTM(EnumWorldBlockLayer.SOLID, callbacks); + return new TextureCTM(EnumWorldBlockLayer.SOLID, callbacks); } } diff --git a/src/main/java/mekanism/client/render/ctm/ModelCTM.java b/src/main/java/mekanism/client/render/ctm/ModelCTM.java index 701b9fec6..d4891dccb 100644 --- a/src/main/java/mekanism/client/render/ctm/ModelCTM.java +++ b/src/main/java/mekanism/client/render/ctm/ModelCTM.java @@ -26,8 +26,8 @@ public class ModelCTM implements IModel { private Map overrides = Maps.newHashMap(); - private transient ChiselTextureCTM faceObj; - private transient Map overridesObj = new EnumMap<>(EnumFacing.class); + private transient TextureCTM faceObj; + private transient Map overridesObj = new EnumMap<>(EnumFacing.class); private transient IBakedModel modelObj; @@ -77,12 +77,12 @@ public class ModelCTM implements IModel overridesObj.values().forEach(t -> textures.addAll(t.getTextures())); } - public ChiselTextureCTM getDefaultFace() + public TextureCTM getDefaultFace() { return faceObj; } - public ChiselTextureCTM getFace(EnumFacing facing) + public TextureCTM getFace(EnumFacing facing) { return overridesObj.getOrDefault(facing, faceObj); } diff --git a/src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java b/src/main/java/mekanism/client/render/ctm/TextureCTM.java similarity index 94% rename from src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java rename to src/main/java/mekanism/client/render/ctm/TextureCTM.java index e86ac1cf3..fb1027141 100644 --- a/src/main/java/mekanism/client/render/ctm/ChiselTextureCTM.java +++ b/src/main/java/mekanism/client/render/ctm/TextureCTM.java @@ -13,13 +13,13 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats; import net.minecraft.util.EnumWorldBlockLayer; import net.minecraft.util.ResourceLocation; -public class ChiselTextureCTM +public class TextureCTM { protected EnumWorldBlockLayer layer; public TextureSpriteCallback[] sprites; - public ChiselTextureCTM(EnumWorldBlockLayer layer, TextureSpriteCallback[] sprites) + public TextureCTM(EnumWorldBlockLayer layer, TextureSpriteCallback[] sprites) { this.layer = layer; this.sprites = sprites; diff --git a/src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java similarity index 61% rename from src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java rename to src/main/java/mekanism/client/render/obj/GlowPanelModel.java index 1ba7bc4f0..e46b80d6f 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismSmartOBJModel.java +++ b/src/main/java/mekanism/client/render/obj/GlowPanelModel.java @@ -9,20 +9,28 @@ import java.util.List; import java.util.Map; import java.util.Set; +import javax.vecmath.Matrix4f; + import mcmultipart.client.multipart.ISmartMultipartModel; import mekanism.api.EnumColor; +import mekanism.client.render.ctm.CTMModelFactory; import mekanism.common.multipart.GlowPanelBlockState; import mekanism.common.multipart.PartGlowPanel; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.block.model.BakedQuad; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms; import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; -import net.minecraftforge.client.model.IModelPart; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.IFlexibleBakedModel; import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.IPerspectiveAwareModel; import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.TRSRTransformation; import net.minecraftforge.client.model.obj.OBJModel; @@ -36,55 +44,96 @@ import net.minecraftforge.client.model.obj.OBJModel.Vertex; import net.minecraftforge.client.model.pipeline.LightUtil; import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad; import net.minecraftforge.common.property.IExtendedBlockState; + +import org.apache.commons.lang3.tuple.ImmutablePair; +import org.apache.commons.lang3.tuple.Pair; + import codechicken.lib.vec.Matrix4; import com.google.common.base.Optional; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Lists; -public class MekanismSmartOBJModel extends OBJBakedModel implements ISmartMultipartModel +public class GlowPanelModel extends OBJBakedModel implements ISmartMultipartModel { private IBakedModel baseModel; private HashMap transformationMap = new HashMap(); - private static Map glowPanelCache = new HashMap(); + private static Map glowPanelCache = new HashMap(); + private static Map glowPanelItemCache = new HashMap(); private Set bakedQuads; private IBlockState tempState; private TextureAtlasSprite tempSprite; + private ItemStack tempStack; - public MekanismSmartOBJModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) + public GlowPanelModel(IBakedModel base, OBJModel model, IModelState state, VertexFormat format, ImmutableMap textures, HashMap transform) { model.super(model, state, format, textures); baseModel = base; transformationMap = transform; } + public EnumColor getColor() + { + if(tempStack != null) + { + return EnumColor.DYES[tempStack.getItemDamage()]; + } + + if(tempState != null) + { + return ((IExtendedBlockState)tempState).getValue(GlowPanelBlockState.colorState).color; + } + + return EnumColor.WHITE; + } + @Override public OBJBakedModel handlePartState(IBlockState state) { - if(isGlowPanel(state)) + int hash = PartGlowPanel.hash((IExtendedBlockState)state); + EnumColor color = ((IExtendedBlockState)state).getValue(GlowPanelBlockState.colorState).color; + + if(!glowPanelCache.containsKey(hash)) { - int hash = PartGlowPanel.hash((IExtendedBlockState)state); - EnumColor color = ((IExtendedBlockState)state).getValue(GlowPanelBlockState.colorState).color; - - if(!glowPanelCache.containsKey(hash)) - { - MekanismSmartOBJModel model = new MekanismSmartOBJModel(baseModel, getModel(), getState(), getFormat(), getTextures(), transformationMap); - model.tempState = state; - glowPanelCache.put(hash, model); - } - - return glowPanelCache.get(hash); + GlowPanelModel model = new GlowPanelModel(baseModel, getModel(), getState(), getFormat(), getTextures(), transformationMap); + model.tempState = state; + glowPanelCache.put(hash, model); } - return this; + return glowPanelCache.get(hash); } - public boolean isGlowPanel(IBlockState state) + @Override + public IBakedModel handleItemState(ItemStack stack) { - return state instanceof IExtendedBlockState && ((IExtendedBlockState)state).getUnlistedProperties().containsKey(GlowPanelBlockState.colorState); + if(glowPanelItemCache.containsKey(stack.getItemDamage())) + return glowPanelItemCache.get(stack.getItemDamage()); + + ImmutableMap.Builder builder = ImmutableMap.builder(); + builder.put(ModelLoader.White.loc.toString(), ModelLoader.White.instance); + TextureAtlasSprite missing = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(new ResourceLocation("missingno").toString()); + + for(String s : getModel().getMatLib().getMaterialNames()) + { + TextureAtlasSprite sprite = null; + + if(sprite==null) + sprite = Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(getModel().getMatLib().getMaterial(s).getTexture().getTextureLocation().toString()); + if(sprite==null) + sprite = missing; + + builder.put(s, sprite); + } + + builder.put("missingno", missing); + GlowPanelModel bakedModel = new GlowPanelModel(baseModel, getModel(), getState(), getFormat(), builder.build(), transformationMap); + bakedModel.tempStack = stack; + glowPanelItemCache.put(stack.getItemDamage(), bakedModel); + + return bakedModel; } @Override @@ -97,28 +146,34 @@ public class MekanismSmartOBJModel extends OBJBakedModel implements ISmartMultip Optional transform = Optional.absent(); Set coloredFaces = new HashSet(); - for(Group g : this.getModel().getMatLib().getGroups().values()) + for(Group g : getModel().getMatLib().getGroups().values()) { if(getState() instanceof OBJState) { - OBJState state = (OBJState) this.getState(); + OBJState state = (OBJState)getState(); if(state.parent != null) { - transform = state.parent.apply(Optional. absent()); + transform = state.parent.apply(Optional.absent()); } if(state.getGroupsWithVisibility(true).contains(g.getName())) { - faces.addAll(g.applyTransform(transform)); + LinkedHashSet tempFaces = g.applyTransform(transform); + faces.addAll(tempFaces); + + if(g.getName().equals("light")) + { + coloredFaces.addAll(tempFaces); + } } } else { - transform = getState().apply(Optional. absent()); + transform = getState().apply(Optional.absent()); LinkedHashSet tempFaces = g.applyTransform(transform); faces.addAll(tempFaces); - if(isGlowPanel(tempState) && g.getName().equals("light")) + if(g.getName().equals("light")) { coloredFaces.addAll(tempFaces); } @@ -147,7 +202,7 @@ public class MekanismSmartOBJModel extends OBJBakedModel implements ISmartMultip if(coloredFaces.contains(f)) { - EnumColor c = ((IExtendedBlockState) tempState).getValue(GlowPanelBlockState.colorState).color; + EnumColor c = getColor(); color = new float[] {c.getColor(0), c.getColor(1), c.getColor(2), 1}; } @@ -249,4 +304,34 @@ public class MekanismSmartOBJModel extends OBJBakedModel implements ISmartMultip { return getTexturesForOBJModel(this); } + + private Pair thirdPersonTransform; + + @Override + public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) + { + if(cameraTransformType == TransformType.GUI) + { + GlStateManager.translate(0.3F, 0.25F, 0.0F); + GlStateManager.rotate(90, 1, 0, 0); + GlStateManager.scale(1.6F, 1.6F, 1.6F); + } + else if(cameraTransformType == TransformType.FIRST_PERSON) + { + GlStateManager.translate(0.0F, 0.3F, 0.0F); + } + else if(cameraTransformType == TransformType.THIRD_PERSON) + { + GlStateManager.translate(0.0F, -0.1F, 0.0F); + + if(thirdPersonTransform == null) + { + thirdPersonTransform = ImmutablePair.of(this, CTMModelFactory.DEFAULT_BLOCK_THIRD_PERSON_MATRIX); + } + + return thirdPersonTransform; + } + + return Pair.of(this, null); + } } diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java index f48eb683e..1e86e13c4 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJLoader.java @@ -4,16 +4,95 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; +import mekanism.client.render.obj.MekanismOBJModel.OBJModelType; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.block.model.ItemCameraTransforms.TransformType; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.renderer.vertex.DefaultVertexFormats; +import net.minecraft.client.renderer.vertex.VertexFormat; +import net.minecraft.client.resources.model.IBakedModel; +import net.minecraft.client.resources.model.ModelResourceLocation; import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.event.ModelBakeEvent; import net.minecraftforge.client.model.IModel; +import net.minecraftforge.client.model.IModelState; +import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.client.model.ModelLoaderRegistry; import net.minecraftforge.client.model.obj.OBJLoader; import net.minecraftforge.client.model.obj.OBJModel; +import net.minecraftforge.client.model.obj.OBJModel.OBJBakedModel; +import net.minecraftforge.fml.common.FMLLog; +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; +import codechicken.lib.vec.Matrix4; + +import com.google.common.base.Function; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; public class MekanismOBJLoader extends OBJLoader { + public static final MekanismOBJLoader INSTANCE = new MekanismOBJLoader(); + private final Map modelCache = new HashMap(); + private static final ImmutableMap flipData = ImmutableMap.of("flip-v", String.valueOf(true)); + + public static final String[] OBJ_RENDERS = new String[] {"glow_panel"}; + + @SubscribeEvent + public void onModelBake(ModelBakeEvent event) throws IOException + { + for(String s : OBJ_RENDERS) + { + ModelResourceLocation model = new ModelResourceLocation("mekanism:" + s, "inventory"); + Object obj = event.modelRegistry.getObject(model); + + if(obj instanceof IBakedModel) + { + event.modelRegistry.putObject(model, createBakedObjItemModel((IBakedModel)obj, "mekanism:models/block/" + s + ".obj.mek", new OBJModel.OBJState(Lists.newArrayList(OBJModel.Group.ALL), true), DefaultVertexFormats.ITEM)); + } + } + } + + public OBJBakedModel createBakedObjItemModel(IBakedModel existingModel, String name, IModelState state, VertexFormat format) + { + try { + Function textureGetter = new Function() { + public TextureAtlasSprite apply(ResourceLocation location) + { + return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); + } + }; + + ResourceLocation modelLocation = new ResourceLocation(name); + OBJModel objModel = (OBJModel)OBJLoader.instance.loadModel(modelLocation); + objModel = (OBJModel)objModel.process(flipData); + ImmutableMap.Builder builder = ImmutableMap.builder(); + builder.put(ModelLoader.White.loc.toString(), ModelLoader.White.instance); + TextureAtlasSprite missing = textureGetter.apply(new ResourceLocation("missingno")); + + for(String s : objModel.getMatLib().getMaterialNames()) + { + if(objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation().getResourcePath().startsWith("#")) + { + FMLLog.severe("OBJLoader: Unresolved texture '%s' for obj model '%s'", objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation().getResourcePath(), modelLocation); + builder.put(s, missing); + } + else { + builder.put(s, textureGetter.apply(objModel.getMatLib().getMaterial(s).getTexture().getTextureLocation())); + } + } + + builder.put("missingno", missing); + + return new GlowPanelModel(existingModel, objModel, state, format, builder.build(), new HashMap()); + } catch(Exception e) { + e.printStackTrace(); + } + + return null; + } + @Override public boolean accepts(ResourceLocation modelLocation) { @@ -29,8 +108,11 @@ public class MekanismOBJLoader extends OBJLoader if(model instanceof OBJModel) { - MekanismOBJModel mekModel = new MekanismOBJModel(((OBJModel)model).getMatLib(), loc); - modelCache.put(loc, mekModel); + if(loc.getResourcePath().contains("glow_panel")) + { + MekanismOBJModel mekModel = new MekanismOBJModel(OBJModelType.GLOW_PANEL, ((OBJModel)model).getMatLib(), loc); + modelCache.put(loc, mekModel); + } } } diff --git a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java index 0bf0d8cc7..c3f354130 100644 --- a/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java +++ b/src/main/java/mekanism/client/render/obj/MekanismOBJModel.java @@ -11,15 +11,30 @@ import com.google.common.base.Function; public class MekanismOBJModel extends OBJModel { - public MekanismOBJModel(MaterialLibrary matLib, ResourceLocation modelLocation) + public OBJModelType modelType; + + public MekanismOBJModel(OBJModelType type, MaterialLibrary matLib, ResourceLocation modelLocation) { super(matLib, modelLocation); + + modelType = type; } @Override public IFlexibleBakedModel bake(IModelState state, VertexFormat format, Function bakedTextureGetter) { IFlexibleBakedModel preBaked = super.bake(state, format, bakedTextureGetter); - return new MekanismSmartOBJModel(preBaked, this, state, format, MekanismSmartOBJModel.getTexturesForOBJModel(preBaked), null); + + if(modelType == OBJModelType.GLOW_PANEL) + { + return new GlowPanelModel(preBaked, this, state, format, GlowPanelModel.getTexturesForOBJModel(preBaked), null); + } + + return null; + } + + public static enum OBJModelType + { + GLOW_PANEL } } diff --git a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java index 184031f08..3ef65046d 100644 --- a/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java +++ b/src/main/java/mekanism/common/multiblock/TileEntityInternalMultiblock.java @@ -4,6 +4,7 @@ import io.netty.buffer.ByteBuf; import java.util.ArrayList; +import net.minecraftforge.fml.common.FMLCommonHandler; import mekanism.common.PacketHandler; import mekanism.common.tile.TileEntityBasicBlock; @@ -19,7 +20,7 @@ public class TileEntityInternalMultiblock extends TileEntityBasicBlock { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { if(dataStream.readBoolean()) { diff --git a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java index 986f7ff37..6c3d39108 100644 --- a/src/main/java/mekanism/common/multipart/ItemGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/ItemGlowPanel.java @@ -14,6 +14,7 @@ import mcmultipart.item.ItemMultiPart; import mcmultipart.multipart.IMultipart; import mekanism.api.EnumColor; import mekanism.common.Mekanism; +import mekanism.common.base.IMetaItem; import mekanism.common.util.LangUtils; //import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.creativetab.CreativeTabs; @@ -26,7 +27,7 @@ import net.minecraft.util.StatCollector; import net.minecraft.util.Vec3; import net.minecraft.world.World; -public class ItemGlowPanel extends ItemMultiPart +public class ItemGlowPanel extends ItemMultiPart implements IMetaItem { public ItemGlowPanel() { @@ -48,53 +49,11 @@ public class ItemGlowPanel extends ItemMultiPart { return new PartGlowPanel(col, orientation); } - -/* - if(world.getTileEntity(pos.x, pos.y, pos.z) instanceof IMultipartContainer && ((TileMultipart) world.getTileEntity(pos.x, pos.y, pos.z)).partMap(orientation.ordinal()) instanceof HollowMicroblock) - { - return new PartGlowPanel(col, orientation); - } -*/ } return null; } -/* - public EnumFacing getSideFromVector3(Vec3 vector) - { - if(Math.abs(vector.xCoord) > Math.abs(vector.yCoord) && Math.abs(vector.xCoord) > Math.abs(vector.zCoord)) - { - if((vector.xCoord < 0.5 && vector.xCoord > 0) || vector.xCoord == -0.5) - { - return EnumFacing.EAST; - } - - return EnumFacing.WEST; - } - else if(Math.abs(vector.y) > Math.abs(vector.x) && Math.abs(vector.y) > Math.abs(vector.z)) - { - if((vector.y < 0.5 && vector.y > 0) || vector.y == -0.5) - { - return EnumFacing.UP; - } - - return EnumFacing.DOWN; - } - else if(Math.abs(vector.z) > Math.abs(vector.x) && Math.abs(vector.z) > Math.abs(vector.y)) - { - if((vector.z < 0.5 && vector.z > 0) || vector.z == -0.5) - { - return EnumFacing.SOUTH; - } - - return EnumFacing.NORTH; - } - - return null; - } -*/ - @Override public void getSubItems(Item item, CreativeTabs tab, List listToAddTo) { @@ -131,4 +90,16 @@ public class ItemGlowPanel extends ItemMultiPart { return true; } + + @Override + public String getTexture(int meta) + { + return "glow_panel"; + } + + @Override + public int getVariants() + { + return EnumColor.DYES.length; + } } diff --git a/src/main/java/mekanism/common/multipart/MultipartMekanism.java b/src/main/java/mekanism/common/multipart/MultipartMekanism.java index 5eb7b12ee..2d87935e7 100644 --- a/src/main/java/mekanism/common/multipart/MultipartMekanism.java +++ b/src/main/java/mekanism/common/multipart/MultipartMekanism.java @@ -8,7 +8,10 @@ import mcmultipart.multipart.MultipartRegistry; import mekanism.common.MekanismBlocks; import mekanism.common.Tier; import mekanism.common.block.states.BlockStateMachine.MachineType; +import net.minecraft.entity.item.EntityItem; import net.minecraft.item.ItemStack; +import net.minecraft.util.Vec3; +import net.minecraft.world.World; import net.minecraftforge.fml.common.event.FMLInterModComms; /* import codechicken.microblock.BlockMicroMaterial; @@ -192,4 +195,14 @@ public class MultipartMekanism implements IPartFactory FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(MekanismBlocks.BasicBlock2, 1, 0)); FMLInterModComms.sendMessage("ForgeMicroblock", "microMaterial", new ItemStack(MekanismBlocks.CardboardBox)); } + + public static void dropItem(ItemStack stack, World world, Vec3 pos) + { + EntityItem item = new EntityItem(world, pos.xCoord, pos.yCoord, pos.zCoord, stack); + item.motionX = world.rand.nextGaussian() * 0.05; + item.motionY = world.rand.nextGaussian() * 0.05 + 0.2; + item.motionZ = world.rand.nextGaussian() * 0.05; + item.setDefaultPickupDelay(); + world.spawnEntityInWorld(item); + } } diff --git a/src/main/java/mekanism/common/multipart/PartGlowPanel.java b/src/main/java/mekanism/common/multipart/PartGlowPanel.java index 0789a181d..d20016586 100644 --- a/src/main/java/mekanism/common/multipart/PartGlowPanel.java +++ b/src/main/java/mekanism/common/multipart/PartGlowPanel.java @@ -12,6 +12,7 @@ import mcmultipart.raytrace.PartMOP; import mcmultipart.util.TransformationHelper; import mekanism.api.Coord4D; import mekanism.api.EnumColor; +import mekanism.api.Pos3D; import mekanism.common.MekanismItems; import mekanism.common.block.states.BlockStateFacing; import mekanism.common.multipart.GlowPanelBlockState.GlowPanelColorProperty; @@ -100,7 +101,7 @@ public class PartGlowPanel extends Multipart implements IOccludingPart { if(!getWorld().isRemote && !canStay()) { - //TileMultipart.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), Vector3.fromTileEntityCenter(tile())); + MultipartMekanism.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), new Pos3D(getPos()).translate(0.5, 0.5, 0.5)); getContainer().removePart(this); } } @@ -110,7 +111,7 @@ public class PartGlowPanel extends Multipart implements IOccludingPart { if(!getWorld().isRemote && !canStay()) { - //TileMultipart.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), Vector3.fromTileEntityCenter(tile())); + MultipartMekanism.dropItem(new ItemStack(MekanismItems.GlowPanel, 1, colour.getMetaValue()), getWorld(), new Pos3D(getPos()).translate(0.5, 0.5, 0.5)); getContainer().removePart(this); } } diff --git a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java index 83e9f10e5..ce7dea9e0 100644 --- a/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java +++ b/src/main/java/mekanism/common/tile/TileEntityAdvancedElectricMachine.java @@ -32,6 +32,7 @@ import mekanism.common.util.StatUtils; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumFacing; +import net.minecraftforge.fml.common.FMLCommonHandler; public abstract class TileEntityAdvancedElectricMachine> extends TileEntityBasicMachine implements IGasHandler, ITubeConnection { @@ -314,7 +315,7 @@ public abstract class TileEntityAdvancedElectricMachine, OUTPUT extends MachineOutput, RECIPE extends MachineRecipe> extends TileEntityNoisyElectricBlock implements IElectricMachine, IComputerIntegration, ISideConfiguration, IUpgradeTile, IRedstoneControl, IConfigCardAccess, ISecurityTile { @@ -157,7 +158,7 @@ public abstract class TileEntityBasicMachine, { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { operatingTicks = dataStream.readInt(); clientActive = dataStream.readBoolean(); diff --git a/src/main/java/mekanism/common/tile/TileEntityBin.java b/src/main/java/mekanism/common/tile/TileEntityBin.java index 96a77d451..9e60f982c 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBin.java +++ b/src/main/java/mekanism/common/tile/TileEntityBin.java @@ -31,6 +31,7 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.EnumFacing; import net.minecraft.util.IChatComponent; import net.minecraft.util.ITickable; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.fml.common.Optional.Interface; import powercrystals.minefactoryreloaded.api.IDeepStorageUnit; @@ -294,7 +295,7 @@ public class TileEntityBin extends TileEntityBasicBlock implements ISidedInvento { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { isActive = dataStream.readBoolean(); clientAmount = dataStream.readInt(); diff --git a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java index 48fe1a34b..f0f274eed 100644 --- a/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java +++ b/src/main/java/mekanism/common/tile/TileEntityBoilerCasing.java @@ -24,6 +24,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.EnumFacing; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityBoilerCasing extends TileEntityMultiblock implements IHeatTransfer { @@ -296,7 +297,7 @@ public class TileEntityBoilerCasing extends TileEntityMultiblock implements IFluidContainerManager { @@ -251,7 +252,7 @@ public class TileEntityDynamicTank extends TileEntityMultiblock implements IStrictEnergyStorage, IComputerIntegration { @@ -102,7 +103,7 @@ public class TileEntityInductionCasing extends TileEntityMultiblock> extend { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { if(structure == null) { diff --git a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java index 59beede92..f674a77e4 100644 --- a/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java +++ b/src/main/java/mekanism/common/tile/TileEntityOredictionificator.java @@ -28,6 +28,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.EnumFacing; import net.minecraftforge.common.util.Constants.NBT; +import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.oredict.OreDictionary; public class TileEntityOredictionificator extends TileEntityContainerBlock implements IRedstoneControl, ISpecialConfigData, ISustainedData, ISecurityTile @@ -224,7 +225,7 @@ public class TileEntityOredictionificator extends TileEntityContainerBlock imple { super.handlePacketData(dataStream); - if(worldObj.isRemote) + if(FMLCommonHandler.instance().getEffectiveSide().isClient()) { int type = dataStream.readInt(); diff --git a/src/main/java/mekanism/common/tile/TileEntityPRC.java b/src/main/java/mekanism/common/tile/TileEntityPRC.java index b27204b48..2f2513274 100644 --- a/src/main/java/mekanism/common/tile/TileEntityPRC.java +++ b/src/main/java/mekanism/common/tile/TileEntityPRC.java @@ -41,6 +41,7 @@ import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.IFluidHandler; +import net.minecraftforge.fml.common.FMLCommonHandler; public class TileEntityPRC extends TileEntityBasicMachine implements IFluidHandler, IGasHandler, ITubeConnection, ISustainedData, ITankManager { @@ -247,7 +248,7 @@ public class TileEntityPRC extends TileEntityBasicMachine implements IStrictEnergyStorage { @@ -201,7 +202,7 @@ public class TileEntityTurbineCasing extends TileEntityMultiblock