diff --git a/gradle.properties b/gradle.properties index 4c6558f..1b063fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ minecraft_version=1.7.10 -forge_version=10.13.4.1481 +forge_version=10.13.4.1490 NEI_version=1.0.5.111 mod_version=0.0.1 diff --git a/src/main/java/com/enderio/core/client/gui/GuiScreenBase.java b/src/main/java/com/enderio/core/client/gui/GuiScreenBase.java index 181e9a0..60e1c47 100644 --- a/src/main/java/com/enderio/core/client/gui/GuiScreenBase.java +++ b/src/main/java/com/enderio/core/client/gui/GuiScreenBase.java @@ -14,6 +14,7 @@ import org.lwjgl.opengl.GL12; import com.enderio.core.api.client.gui.IGuiScreen; import com.enderio.core.client.gui.ToolTipManager.ToolTipRenderer; +import com.enderio.core.client.gui.widget.GhostSlot; import com.enderio.core.client.gui.widget.GuiToolTip; public abstract class GuiScreenBase extends GuiScreen implements ToolTipRenderer, IGuiScreen { @@ -37,6 +38,9 @@ public abstract class GuiScreenBase extends GuiScreen implements ToolTipRenderer protected int guiTop; protected boolean drawButtons = true; + + protected GuiScreenBase() { + } protected GuiScreenBase(int xSize, int ySize) { this.xSize = xSize; @@ -229,4 +233,13 @@ public abstract class GuiScreenBase extends GuiScreen implements ToolTipRenderer actionPerformed(guiButton); } + @Override + public int getOverlayOffsetX() { + return 0; + } + + @Override + public List getGhostSlots() { + return null; + } } diff --git a/src/main/java/com/enderio/core/client/gui/button/IconButton.java b/src/main/java/com/enderio/core/client/gui/button/IconButton.java index 3357873..f29499a 100644 --- a/src/main/java/com/enderio/core/client/gui/button/IconButton.java +++ b/src/main/java/com/enderio/core/client/gui/button/IconButton.java @@ -4,7 +4,6 @@ import java.awt.Rectangle; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiButton; -import net.minecraft.client.renderer.Tessellator; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/enderio/core/client/render/RenderUtil.java b/src/main/java/com/enderio/core/client/render/RenderUtil.java index 1862680..e1e4efb 100644 --- a/src/main/java/com/enderio/core/client/render/RenderUtil.java +++ b/src/main/java/com/enderio/core/client/render/RenderUtil.java @@ -13,6 +13,7 @@ import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.OpenGlHelper; +import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.client.renderer.RenderHelper; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.entity.RenderManager; @@ -29,10 +30,8 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.util.Timer; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.client.model.obj.Face; -import net.minecraftforge.client.model.obj.GroupObject; -import net.minecraftforge.client.model.obj.TextureCoordinate; -import net.minecraftforge.client.model.obj.WavefrontObject; +import net.minecraftforge.client.ForgeHooksClient; +import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.fluids.FluidTank; @@ -52,8 +51,6 @@ import com.enderio.core.common.vecmath.Vector4d; import com.enderio.core.common.vecmath.Vector4f; import com.enderio.core.common.vecmath.Vertex; -import static org.lwjgl.opengl.GL11.*; - import cpw.mods.fml.relauncher.ReflectionHelper; import static net.minecraftforge.common.util.ForgeDirection.*; import static org.lwjgl.opengl.GL11.*; @@ -107,7 +104,10 @@ public class RenderUtil { /** * Non-thread-safe holder for the current render pass. You must update this in * your block's canRenderInPass method for it to work properly! + * + * DEPRECATED - Should use {@link ForgeHooksClient#getWorldRenderPass()} */ + @Deprecated public static volatile int theRenderPass = 0; private static Field initTimer() { @@ -371,8 +371,6 @@ public class RenderUtil { } } - BlockCoord bc = new BlockCoord(x, y, z); - List edges; if (forceAllEdges) { edges = RenderUtil.getEdgesForFace(face); @@ -704,9 +702,9 @@ public class RenderUtil { public static void renderBillboardQuad(float rot, double scale) { glPushMatrix(); - + rotateToPlayer(); - + glPushMatrix(); glRotatef(rot, 0, 0, 1); diff --git a/src/main/java/com/enderio/core/common/ContainerEnder.java b/src/main/java/com/enderio/core/common/ContainerEnder.java index 7a3fdd9..26df4e0 100644 --- a/src/main/java/com/enderio/core/common/ContainerEnder.java +++ b/src/main/java/com/enderio/core/common/ContainerEnder.java @@ -19,7 +19,7 @@ public abstract class ContainerEnder extends Container { protected final int startHotBarSlot; protected final int endHotBarSlot; - protected T inv; + private T inv; public ContainerEnder(InventoryPlayer playerInv, T inv) { this.inv = inv; diff --git a/src/main/java/com/enderio/core/common/util/PlayerUtil.java b/src/main/java/com/enderio/core/common/util/PlayerUtil.java index d071802..1925062 100644 --- a/src/main/java/com/enderio/core/common/util/PlayerUtil.java +++ b/src/main/java/com/enderio/core/common/util/PlayerUtil.java @@ -9,7 +9,6 @@ public class PlayerUtil { public static UUID getPlayerUUID(String username) { for (Map.Entry entry : UsernameCache.getMap().entrySet()) { - if(entry.getValue().equalsIgnoreCase(username)) { return entry.getKey(); }