Fixes for 1.7.0

Removed shadow plugin and moved to shade + repackager
Fixed mcmod.info
This commit is contained in:
ProfMobius committed 2014-08-25 03:37:01 +02:00
1 parent 2909be4e64
commit 0dae62a1e5
9 files changed
+44 -56

No files matched your search

@@ -98,7 +98,7 @@ public class MapMode {
public void setScreenRes() {
Minecraft mc = Minecraft.getMinecraft();
ScaledResolution sRes = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight);
ScaledResolution sRes = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
this.setScreenRes(mc.displayWidth, mc.displayHeight, sRes.getScaledWidth(), sRes.getScaledHeight(), sRes.getScaleFactor());
}
@@ -3,6 +3,8 @@ package mcp.mobius.opis.events;
import java.util.HashMap;
import java.util.HashSet;
import com.mojang.authlib.GameProfile;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.PlayerEvent;
import mcp.mobius.opis.modOpis;
@@ -40,7 +42,9 @@ public enum PlayerTracker{
}
public AccessLevel getPlayerAccessLevel(String name){
if (MinecraftServer.getServer().getConfigurationManager().isPlayerOpped(name) || MinecraftServer.getServer().isSinglePlayer())
GameProfile profile = MinecraftServer.getServer().getConfigurationManager().func_152612_a(name).getGameProfile();
if (MinecraftServer.getServer().getConfigurationManager().func_152596_g(profile) || MinecraftServer.getServer().isSinglePlayer())
return AccessLevel.ADMIN;
else if (playerPrivileged.contains(name))
return AccessLevel.PRIVILEGED;
@@ -27,7 +27,7 @@ public class FontHelper {
public static void drawString(String s, int x, int y, TrueTypeFont font, float scaleX, float scaleY, float... rgba){
Minecraft mc = Minecraft.getMinecraft();
ScaledResolution sr = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight);
ScaledResolution sr = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
if(mc.gameSettings.hideGUI){
return;
}
@@ -25,7 +25,7 @@ public class LayoutCanvas extends LayoutBase{
@Override
public void draw(){
this.rez = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight);
this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
this.setGeometry(0, 0, this.rez.getScaledWidth(), this.rez.getScaledHeight(), CType.ABSXY, CType.ABSXY);
/*
@@ -22,7 +22,7 @@ public class LayoutCropping extends LayoutBase {
@Override
public void draw(){
this.rez = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight);
this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
this.saveGLState();
GL11.glEnable(GL11.GL_BLEND);
@@ -43,7 +43,7 @@ public abstract class WidgetBase implements IWidget {
public WidgetBase(){
this.setParent(null);
this.mc = Minecraft.getMinecraft();
this.rez = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight);
this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
this.texManager = this.mc.renderEngine;
this.setGeometry(new WidgetGeometry(0, 0, 50, 50, CType.ABSXY, CType.ABSXY));
}
@@ -51,7 +51,7 @@ public abstract class WidgetBase implements IWidget {
public WidgetBase(IWidget parent){
this.setParent(parent);
this.mc = Minecraft.getMinecraft();
this.rez = new ScaledResolution(mc.gameSettings, mc.displayWidth, mc.displayHeight);
this.rez = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
this.texManager = this.mc.renderEngine;
this.setGeometry(new WidgetGeometry(0, 0, 50, 50, CType.ABSXY, CType.ABSXY));
}
@@ -3,8 +3,10 @@ package mcp.mobius.opis.helpers;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTSizeTracker;
import net.minecraft.nbt.NBTTagByte;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagInt;
@@ -94,7 +96,7 @@ public class NBTUtil {
{
byte[] abyte = new byte[short1];
istream.readFully(abyte);
return CompressedStreamTools.decompress(abyte);
return CompressedStreamTools.func_152457_a(abyte, NBTSizeTracker.field_152451_a);
}
}