Fixes, but getting an error for some reason
This commit is contained in:
parent
a68468b82e
commit
74d41073a6
7 changed files with 59 additions and 41 deletions
common/mekanism
api
client
common
generators/common/tileentity
|
@ -7,6 +7,7 @@ import net.minecraft.tileentity.TileEntity;
|
|||
import net.minecraft.util.MathHelper;
|
||||
import net.minecraft.world.IBlockAccess;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.chunk.Chunk;
|
||||
import net.minecraftforge.common.ForgeDirection;
|
||||
|
||||
import com.google.common.io.ByteArrayDataInput;
|
||||
|
@ -141,6 +142,16 @@ public class Object3D
|
|||
return translate(side.offsetX, side.offsetY, side.offsetZ);
|
||||
}
|
||||
|
||||
public boolean exists(World world)
|
||||
{
|
||||
return world.getChunkProvider().chunkExists(xCoord >> 4, zCoord >> 4);
|
||||
}
|
||||
|
||||
public Chunk getChunk(World world)
|
||||
{
|
||||
return world.getChunkFromBlockCoords(xCoord >> 4, zCoord >> 4);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString()
|
||||
{
|
||||
|
|
|
@ -139,7 +139,7 @@ public class ClientProxy extends CommonProxy
|
|||
Mekanism.configuration.load();
|
||||
MekanismClient.enableSounds = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "EnableSounds", true).getBoolean(true);
|
||||
MekanismClient.fancyUniversalCableRender = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "FancyUniversalCableRender", true).getBoolean(true);
|
||||
MekanismClient.baseSoundVolume = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SoundVolume", 1).getDouble(1);
|
||||
MekanismClient.baseSoundVolume = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "SoundVolume", 1.0D).getDouble(1.0D);
|
||||
Mekanism.configuration.save();
|
||||
}
|
||||
|
||||
|
@ -267,7 +267,7 @@ public class ClientProxy extends CommonProxy
|
|||
|
||||
@Override
|
||||
public void registerRenderInformation()
|
||||
{
|
||||
{
|
||||
RenderPartTransmitter.init();
|
||||
|
||||
//Register entity rendering handlers
|
||||
|
|
|
@ -3,7 +3,6 @@ package mekanism.client.render;
|
|||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import mekanism.api.transmitters.TransmissionType;
|
||||
import mekanism.api.transmitters.TransmissionType.Size;
|
||||
import mekanism.client.render.MekanismRenderer.DisplayInteger;
|
||||
import mekanism.client.render.MekanismRenderer.Model3D;
|
||||
|
@ -11,6 +10,8 @@ import mekanism.common.multipart.PartMechanicalPipe;
|
|||
import mekanism.common.multipart.PartPressurizedTube;
|
||||
import mekanism.common.multipart.PartTransmitter;
|
||||
import mekanism.common.multipart.PartUniversalCable;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.renderer.texture.IconRegister;
|
||||
import net.minecraft.util.Icon;
|
||||
|
@ -45,36 +46,6 @@ public class RenderPartTransmitter implements IIconRegister
|
|||
private static final double offset = 0.015;
|
||||
|
||||
private HashMap<ForgeDirection, HashMap<Fluid, DisplayInteger[]>> cachedLiquids = new HashMap<ForgeDirection, HashMap<Fluid, DisplayInteger[]>>();
|
||||
|
||||
static
|
||||
{
|
||||
small_models = CCModel.parseObjModels(new ResourceLocation("mekanism", "models/transmitter_small.obj"), 7, null);
|
||||
|
||||
for(CCModel c : small_models.values())
|
||||
{
|
||||
c.apply(new Translation(.5, .5, .5));
|
||||
c.computeLighting(LightModel.standardLightModel);
|
||||
c.shrinkUVs(0.0005);
|
||||
}
|
||||
|
||||
large_models = CCModel.parseObjModels(new ResourceLocation("mekanism", "models/transmitter_large.obj"), 7, null);
|
||||
|
||||
for(CCModel c : large_models.values())
|
||||
{
|
||||
c.apply(new Translation(.5, .5, .5));
|
||||
c.computeLighting(LightModel.standardLightModel);
|
||||
c.shrinkUVs(0.0005);
|
||||
}
|
||||
|
||||
cableContentsModels = CCModel.parseObjModels(new ResourceLocation("mekanism", "models/transmitter_contents.obj"), 7, null);
|
||||
|
||||
for(CCModel c : cableContentsModels.values())
|
||||
{
|
||||
c.apply(new Translation(.5, .5, .5));
|
||||
c.computeLighting(LightModel.standardLightModel);
|
||||
c.shrinkUVs(0.0005);
|
||||
}
|
||||
}
|
||||
|
||||
public static RenderPartTransmitter getInstance()
|
||||
{
|
||||
|
@ -85,6 +56,33 @@ public class RenderPartTransmitter implements IIconRegister
|
|||
{
|
||||
INSTANCE = new RenderPartTransmitter();
|
||||
TextureUtils.addIconRegistrar(INSTANCE);
|
||||
|
||||
small_models = CCModel.parseObjModels(MekanismUtils.getResource(ResourceType.MODEL, "transmitter_small.obj"), 7, null);
|
||||
|
||||
for(CCModel c : small_models.values())
|
||||
{
|
||||
c.apply(new Translation(.5, .5, .5));
|
||||
c.computeLighting(LightModel.standardLightModel);
|
||||
c.shrinkUVs(0.0005);
|
||||
}
|
||||
|
||||
large_models = CCModel.parseObjModels(MekanismUtils.getResource(ResourceType.MODEL, "transmitter_large.obj"), 7, null);
|
||||
|
||||
for(CCModel c : large_models.values())
|
||||
{
|
||||
c.apply(new Translation(.5, .5, .5));
|
||||
c.computeLighting(LightModel.standardLightModel);
|
||||
c.shrinkUVs(0.0005);
|
||||
}
|
||||
|
||||
cableContentsModels = CCModel.parseObjModels(MekanismUtils.getResource(ResourceType.MODEL, "transmitter_contents.obj"), 7, null);
|
||||
|
||||
for(CCModel c : cableContentsModels.values())
|
||||
{
|
||||
c.apply(new Translation(.5, .5, .5));
|
||||
c.computeLighting(LightModel.standardLightModel);
|
||||
c.shrinkUVs(0.0005);
|
||||
}
|
||||
}
|
||||
|
||||
private void push()
|
||||
|
|
|
@ -2,6 +2,8 @@ package mekanism.client.render.item;
|
|||
|
||||
import mekanism.api.EnumColor;
|
||||
import mekanism.api.energy.IEnergizedItem;
|
||||
import mekanism.api.transmitters.TransmissionType;
|
||||
import mekanism.api.transmitters.TransmissionType.Size;
|
||||
import mekanism.client.ClientProxy;
|
||||
import mekanism.client.MekanismClient;
|
||||
import mekanism.client.model.ModelEnergyCube;
|
||||
|
@ -24,8 +26,8 @@ import mekanism.common.item.ItemBlockMachine;
|
|||
import mekanism.common.item.ItemJetpack;
|
||||
import mekanism.common.item.ItemRobit;
|
||||
import mekanism.common.item.ItemWalkieTalkie;
|
||||
import mekanism.common.tileentity.TileEntityBin;
|
||||
import mekanism.common.multipart.ItemPartTransmitter;
|
||||
import mekanism.common.tileentity.TileEntityBin;
|
||||
import mekanism.common.util.MekanismUtils;
|
||||
import mekanism.common.util.MekanismUtils.ResourceType;
|
||||
import net.minecraft.block.Block;
|
||||
|
@ -325,7 +327,7 @@ public class ItemRenderingHandler implements IItemRenderer
|
|||
GL11.glTranslated(0.0F, -1.0F, 0.0F);
|
||||
GL11.glDisable(GL11.GL_CULL_FACE);
|
||||
|
||||
switch(item.getItem().getDamage(item))
|
||||
switch(item.getItemDamage())
|
||||
{
|
||||
case 0:
|
||||
Minecraft.getMinecraft().renderEngine.bindTexture(MekanismUtils.getResource(ResourceType.RENDER, "UniversalCable.png"));
|
||||
|
@ -341,9 +343,17 @@ public class ItemRenderingHandler implements IItemRenderer
|
|||
break;
|
||||
}
|
||||
|
||||
transmitterSmall.renderSide(ForgeDirection.UP, true);
|
||||
transmitterSmall.renderSide(ForgeDirection.DOWN, true);
|
||||
transmitterSmall.renderCenter(new boolean[]{true, true, false, false, false, false});
|
||||
if(TransmissionType.values()[item.getItemDamage()].transmitterSize == Size.SMALL)
|
||||
{
|
||||
transmitterSmall.renderSide(ForgeDirection.UP, true);
|
||||
transmitterSmall.renderSide(ForgeDirection.DOWN, true);
|
||||
transmitterSmall.renderCenter(new boolean[]{true, true, false, false, false, false});
|
||||
}
|
||||
else {
|
||||
transmitterLarge.renderSide(ForgeDirection.UP, true);
|
||||
transmitterLarge.renderSide(ForgeDirection.DOWN, true);
|
||||
transmitterLarge.renderCenter(new boolean[]{true, true, false, false, false, false});
|
||||
}
|
||||
|
||||
GL11.glEnable(GL11.GL_CULL_FACE);
|
||||
|
||||
|
|
|
@ -633,7 +633,7 @@ public class Mekanism
|
|||
NetworkReader = new ItemNetworkReader(configuration.getItem("NetworkReader", 11222).getInt()).setUnlocalizedName("NetworkReader");
|
||||
Jetpack = (ItemJetpack)new ItemJetpack(configuration.getItem("Jetpack", 11223).getInt()).setUnlocalizedName("Jetpack");
|
||||
WalkieTalkie = new ItemWalkieTalkie(configuration.getItem("WalkieTalkie", 11224).getInt()).setUnlocalizedName("WalkieTalkie");
|
||||
PartTransmitter = new ItemPartTransmitter(configuration.getItem("MultipartTransmitter", 11223).getInt()).setUnlocalizedName("MultipartTransmitter");
|
||||
PartTransmitter = new ItemPartTransmitter(configuration.getItem("MultipartTransmitter", 11225).getInt()).setUnlocalizedName("MultipartTransmitter");
|
||||
configuration.save();
|
||||
//TODO 1.7, fix item shifts
|
||||
|
||||
|
|
|
@ -20,7 +20,6 @@ import codechicken.multipart.TMultiPart;
|
|||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
|
||||
public class ItemPartTransmitter extends JItemMultiPart
|
||||
{
|
||||
|
||||
|
|
|
@ -143,7 +143,7 @@ public class TileEntitySolarGenerator extends TileEntityGenerator
|
|||
ret *= ((ISolarLevel)worldObj.provider).getSolarEnergyMultiplier();
|
||||
}
|
||||
|
||||
if(worldObj.provider.getBiomeGenForCoords(xCoord << 4, zCoord << 4) instanceof BiomeGenDesert)
|
||||
if(worldObj.provider.getBiomeGenForCoords(xCoord >> 4, zCoord >> 4) instanceof BiomeGenDesert)
|
||||
{
|
||||
ret *= 1.5;
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue