Update to forge and fuck up the cables? Not sure :P

This commit is contained in:
Stuart Pomeroy 2016-03-26 15:58:38 +00:00
parent bc5c30dd3a
commit 6498bd1974
16 changed files with 91 additions and 108 deletions

View file

@ -23,16 +23,16 @@ public class StackToolTipEvent
@SubscribeEvent
public void handleItemTooltipEvent(ItemTooltipEvent event)
{
if (event.itemStack.getItem() instanceof IListInfoProvider)
if (event.getItemStack().getItem() instanceof IListInfoProvider)
{
((IListInfoProvider) event.itemStack.getItem()).addInfo(event.toolTip, false);
} else if (event.itemStack.getItem() instanceof IEnergyInterfaceItem)
((IListInfoProvider) event.getItemStack().getItem()).addInfo(event.getToolTip(), false);
} else if (event.getItemStack().getItem() instanceof IEnergyInterfaceItem)
{
if (Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT))
{
int percentage = percentage(
(int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxPower(event.itemStack),
(int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getEnergy(event.itemStack));
(int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxPower(event.getItemStack()),
(int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getEnergy(event.getItemStack()));
ChatFormatting color;
if (percentage <= 10)
{
@ -44,25 +44,25 @@ public class StackToolTipEvent
{
color = ChatFormatting.YELLOW;
}
event.toolTip.add(color + ""
event.getToolTip().add(color + ""
+ PowerSystem.getLocaliszedPower(
(int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getEnergy(event.itemStack))
(int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getEnergy(event.getItemStack()))
+ ChatFormatting.LIGHT_PURPLE + " stored");
event.toolTip.add(Color.GREEN + ""
event.getToolTip().add(Color.GREEN + ""
+ PowerSystem.getLocaliszedPower(
(int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxPower(event.itemStack))
(int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxPower(event.getItemStack()))
+ ChatFormatting.LIGHT_PURPLE + " max");
event.toolTip
event.getToolTip()
.add(ChatFormatting.GREEN + "" + percentage + "%" + ChatFormatting.LIGHT_PURPLE + " charged");
event.toolTip.add(Color.GREEN + "" + PowerSystem.getLocaliszedPower(
(int) ((IEnergyInterfaceItem) event.itemStack.getItem()).getMaxTransfer(event.itemStack))
event.getToolTip().add(Color.GREEN + "" + PowerSystem.getLocaliszedPower(
(int) ((IEnergyInterfaceItem) event.getItemStack().getItem()).getMaxTransfer(event.getItemStack()))
+ ChatFormatting.LIGHT_PURPLE + " /tick in/out");
}
} else
{
try
{
Block block = Block.getBlockFromItem(event.itemStack.getItem());
Block block = Block.getBlockFromItem(event.getItemStack().getItem());
if (block != null && block instanceof BlockContainer
&& block.getClass().getCanonicalName().startsWith("techreborn."))
{
@ -70,12 +70,12 @@ public class StackToolTipEvent
block.getDefaultState());
if (tile instanceof IListInfoProvider)
{
((IListInfoProvider) tile).addInfo(event.toolTip, false);
((IListInfoProvider) tile).addInfo(event.getToolTip(), false);
}
}
} catch (NullPointerException e)
{
Core.logHelper.debug("Failed to load info for " + event.itemStack.getDisplayName());
Core.logHelper.debug("Failed to load info for " + event.getItemStack().getDisplayName());
}
}
}

View file

@ -1,8 +1,5 @@
package techreborn.client;
import java.awt.*;
import java.util.ArrayList;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.event.GuiScreenEvent;
import net.minecraftforge.fml.client.GuiModList;
@ -10,6 +7,9 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import reborncore.client.gui.GuiUtil;
import techreborn.Core;
import java.awt.*;
import java.util.ArrayList;
public class VersionCheckerClient
{
ResourceLocation texture;
@ -22,7 +22,7 @@ public class VersionCheckerClient
@SubscribeEvent
public void drawGui(GuiScreenEvent.DrawScreenEvent event)
{
if (event.gui instanceof GuiModList)
if (event.getGui() instanceof GuiModList)
{
ArrayList<String> changeLog = Core.INSTANCE.versionChecker.getChangeLogSinceCurrentVersion();
String s = "";
@ -36,16 +36,16 @@ public class VersionCheckerClient
{
s = "There is an update for TechReborn with " + changeLog.size() + " changes.";
}
event.gui.drawString(event.gui.mc.fontRendererObj, s, 10, 5, Color.white.getRGB());
event.getGui().drawString(event.getGui().mc.fontRendererObj, s, 10, 5, Color.white.getRGB());
if (!Core.INSTANCE.versionChecker.isLatestVersion())
{
if (event.mouseY < 20)
if (event.getMouseY() < 20)
{
GuiUtil.drawTooltipBox(5, 15, 330, changeLog.size() * 10 + 5);
int y = 20;
for (String change : changeLog)
{
event.gui.drawString(event.gui.mc.fontRendererObj, change, 10, y, Color.white.getRGB());
event.getGui().drawString(event.getGui().mc.fontRendererObj, change, 10, y, Color.white.getRGB());
y += 10;
}
}

View file

@ -38,13 +38,13 @@ public class ChargeHud
showHud = !showHud;
}
if (event.isCancelable() || event.type != ElementType.ALL)
if (event.isCancelable() || event.getType() != ElementType.ALL)
return;
if (mc.inGameHasFocus || (mc.currentScreen != null && mc.gameSettings.showDebugInfo))
{
if (ConfigTechReborn.ShowChargeHud)
drawChargeHud(event.resolution);
drawChargeHud(event.getResolution());
}
}

View file

@ -33,7 +33,7 @@ public class ClientPartModelBakery
{
for (EnumCableType type : EnumCableType.values())
{
event.map.registerSprite(new ResourceLocation(type.textureName));
event.getMap().registerSprite(new ResourceLocation(type.textureName));
}
}

View file

@ -1,29 +1,20 @@
package techreborn.client.render.parts;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.*;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.property.IExtendedBlockState;
import org.lwjgl.util.vector.Vector3f;
import reborncore.common.misc.vecmath.Vecs3dCube;
import techreborn.parts.CableMultipart;
import techreborn.parts.EnumCableType;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import net.minecraft.block.state.IBlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.renderer.block.model.BlockFaceUV;
import net.minecraft.client.renderer.block.model.BlockPartFace;
import net.minecraft.client.renderer.block.model.FaceBakery;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.block.model.ItemOverrideList;
import net.minecraft.client.renderer.block.model.ModelRotation;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.util.EnumFacing;
import net.minecraftforge.common.property.IExtendedBlockState;
import org.lwjgl.util.vector.Vector3f;
import reborncore.common.misc.vecmath.Vecs3dCube;
import techreborn.parts.CableMultipart;
import techreborn.parts.EnumCableType;
public class RenderCablePart implements IBakedModel
{
@ -40,6 +31,14 @@ public class RenderCablePart implements IBakedModel
public void addCubeToList(Vecs3dCube cube, ArrayList<BakedQuad> list, BlockPartFace face,
ModelRotation modelRotation, TextureAtlasSprite cubeTexture)
{
System.out.print(" Max X:" + cube.getMaxX());
System.out.print(" Min X:" + cube.getMinX());
System.out.print(" Max Y:" + cube.getMaxY());
System.out.print(" Min Y:" + cube.getMinY());
System.out.print(" Max Z:" + cube.getMaxZ());
System.out.print(" Min Z:" + cube.getMinZ());
BlockFaceUV uv = new BlockFaceUV(new float[] { (float) cube.getMinX(), (float) cube.getMinY(),
(float) cube.getMaxX(), (float) cube.getMaxY() }, 0);
face = new BlockPartFace(null, 0, "", uv);
@ -53,7 +52,7 @@ public class RenderCablePart implements IBakedModel
EnumFacing.UP, modelRotation, null, true, true));// up
list.add(faceBakery.makeBakedQuad(
new Vector3f((float) cube.getMinX(), (float) cube.getMinY(), (float) cube.getMinZ()),
new Vector3f((float) cube.getMaxX(), (float) cube.getMaxY(), (float) cube.getMaxZ()), face, cubeTexture,
new Vector3f((float) cube.getMaxX(), (float) cube.getMaxY(), (float) cube.getMinZ()), face, cubeTexture,
EnumFacing.NORTH, modelRotation, null, true, true));// north
list.add(faceBakery.makeBakedQuad(
new Vector3f((float) cube.getMinX(), (float) cube.getMinY(), (float) cube.getMaxZ()),
@ -98,13 +97,13 @@ public class RenderCablePart implements IBakedModel
}
if (state.getValue(CableMultipart.NORTH))
{
addCubeToList(new Vecs3dCube(thickness, thickness, 0.0, lastThickness, lastThickness, thickness), list,
face, ModelRotation.X0_Y0, texture);
addCubeToList(new Vecs3dCube(thickness, thickness, lastThickness, lastThickness, lastThickness, 16.0),
list, face, ModelRotation.X0_Y0, texture);
}
if (state.getValue(CableMultipart.SOUTH))
{
addCubeToList(new Vecs3dCube(thickness, thickness, lastThickness, lastThickness, lastThickness, 16.0),
list, face, ModelRotation.X0_Y0, texture);
addCubeToList(new Vecs3dCube(thickness, thickness, 0.0, lastThickness , lastThickness, thickness), list,
face, ModelRotation.X0_Y0, texture);
}
if (state.getValue(CableMultipart.EAST))
{