diff --git a/build.gradle b/build.gradle index 6a03bab..37c114e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,3 @@ -apply plugin: 'java' -apply plugin: 'maven' -apply plugin: 'shadow' -apply plugin: 'forge' - -version = "1.2.2a" -group= "mcp.mobius.opis" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "Opis" - buildscript { repositories { mavenCentral() @@ -19,47 +10,30 @@ buildscript { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } - maven { - name = "shadow-repo" - url = 'http://dl.bintray.com/content/johnrengelman/gradle-plugins/' - } } dependencies { classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - classpath 'com.github.jengelman.gradle.plugins:shadow:0.8' } } +apply plugin: 'java' +apply plugin: 'maven' +apply plugin: 'forge' + +version = "1.2.2a_1.7.10" +group= "mcp.mobius.opis" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "Opis" + minecraft { version = "1.7.10-10.13.0.1208" assetDir = "eclipse/assets" + srgExtra "PK: org/apache/commons/math3 opisapache/math3" } -shadow { - - //relocation { - // pattern = 'org.apache.commons.lang3' - // shadedPattern = 'opisapache.lang3' - //} - - relocation { - pattern = 'org.apache.commons.math3' - shadedPattern = 'opisapache.math3' - } - - artifactSet { - include 'org.apache.commons' - exclude 'org.apache.commons.lang3' - include 'org.jfree' - include 'com.miglayout' - include 'net.sf.opencsv' - } -} - -tasks.shadowJar.dependsOn "reobf" - configurations { deployerJars + shade + compile.extendsFrom shade } repositories { @@ -72,11 +46,11 @@ repositories { } dependencies { - compile 'org.apache.commons:commons-math3:3.2' - compile 'org.jfree:jcommon:1.0.21' - compile 'org.jfree:jfreechart:1.0.17' - compile 'com.miglayout:miglayout-swing:4.2' - compile 'net.sf.opencsv:opencsv:2.3' + shade 'org.apache.commons:commons-math3:3.2' + shade 'org.jfree:jcommon:1.0.21' + shade 'org.jfree:jfreechart:1.0.17' + shade 'com.miglayout:miglayout-swing:4.2' + shade 'net.sf.opencsv:opencsv:2.3' compile "mcp.mobius.mobiuscore:MobiusCore:1.2.2_1.7.10:dev" deployerJars "org.apache.maven.wagon:wagon-ssh:2.2" } @@ -111,7 +85,7 @@ task copyCoreMods(type: Copy, dependsOn: "extractUserDev") { include "**/*Mobius*.jar" //include "**/*Chicken*.jar", "**/*NotEnoughItems*.jar" //exclude "**/CodeChickenLib*" // because CCC downloads it anyways.. -_- - into file(minecraft.assetDir + "/../mods") // paralell to the assets dir + into file(minecraft.runDir + "/../mods") // paralell to the assets dir } tasks.setupDevWorkspace.dependsOn copyCoreMods tasks.setupDecompWorkspace.dependsOn copyCoreMods @@ -161,4 +135,12 @@ uploadArchives { } } +jar { + configurations.shade.each { dep -> + from(project.zipTree(dep)){ + exclude 'META-INF', 'META-INF/**' + } + } +} + } diff --git a/src/main/java/mapwriter/map/mapmode/MapMode.java b/src/main/java/mapwriter/map/mapmode/MapMode.java index 2be8dc3..eec53bb 100644 --- a/src/main/java/mapwriter/map/mapmode/MapMode.java +++ b/src/main/java/mapwriter/map/mapmode/MapMode.java @@ -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()); } diff --git a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java index f506838..152564b 100644 --- a/src/main/java/mcp/mobius/opis/events/PlayerTracker.java +++ b/src/main/java/mcp/mobius/opis/events/PlayerTracker.java @@ -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; diff --git a/src/main/java/mcp/mobius/opis/gui/font/FontHelper.java b/src/main/java/mcp/mobius/opis/gui/font/FontHelper.java index fc34f3d..861c4a6 100644 --- a/src/main/java/mcp/mobius/opis/gui/font/FontHelper.java +++ b/src/main/java/mcp/mobius/opis/gui/font/FontHelper.java @@ -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; } diff --git a/src/main/java/mcp/mobius/opis/gui/widgets/LayoutCanvas.java b/src/main/java/mcp/mobius/opis/gui/widgets/LayoutCanvas.java index f8620d0..f6f8fdb 100644 --- a/src/main/java/mcp/mobius/opis/gui/widgets/LayoutCanvas.java +++ b/src/main/java/mcp/mobius/opis/gui/widgets/LayoutCanvas.java @@ -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); /* diff --git a/src/main/java/mcp/mobius/opis/gui/widgets/LayoutCropping.java b/src/main/java/mcp/mobius/opis/gui/widgets/LayoutCropping.java index b8177a7..8c015af 100644 --- a/src/main/java/mcp/mobius/opis/gui/widgets/LayoutCropping.java +++ b/src/main/java/mcp/mobius/opis/gui/widgets/LayoutCropping.java @@ -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); diff --git a/src/main/java/mcp/mobius/opis/gui/widgets/WidgetBase.java b/src/main/java/mcp/mobius/opis/gui/widgets/WidgetBase.java index 1011de5..bf71059 100644 --- a/src/main/java/mcp/mobius/opis/gui/widgets/WidgetBase.java +++ b/src/main/java/mcp/mobius/opis/gui/widgets/WidgetBase.java @@ -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)); } diff --git a/src/main/java/mcp/mobius/opis/helpers/NBTUtil.java b/src/main/java/mcp/mobius/opis/helpers/NBTUtil.java index 0ab9b2e..8c3ebbd 100644 --- a/src/main/java/mcp/mobius/opis/helpers/NBTUtil.java +++ b/src/main/java/mcp/mobius/opis/helpers/NBTUtil.java @@ -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); } } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index e7148b2..013f99b 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,14 +1,14 @@ [ { - "modid": "examplemod", - "name": "Example Mod", - "description": "Example placeholder mod.", + "modid": "Opis", + "name": "Opis", + "description": "Contextual server profiler", "version": "${version}", "mcversion": "${mcversion}", "url": "", "updateUrl": "", - "authors": ["ExampleDude"], - "credits": "The Forge and FML guys, for making this example", + "authors": ["ProfMobius"], + "credits": "", "logoFile": "", "screenshots": [], "dependencies": []