diff --git a/build.gradle b/build.gradle index 928a5f21..84e7ffa5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,36 +1,55 @@ plugins { - id 'net.minecraftforge.gradle.tweaker-client' version '2.0.1' + id 'net.minecraftforge.gradle.tweaker-client' version '2.0.2' } -evaluationDependsOnChildren() +ext.voxellib = project ':voxellib' +ext.revision = 186 -archivesBaseName = "mod_minelp" -version = "1.8-UNOFFICIAL_mc1.8" +archivesBaseName = "MineLittlePony" +group = 'com.brohoof.minelp' +version = '1.8' minecraft { version = "1.8" - mappings = 'snapshot_20150606' - tweakClass = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker' + mappings = 'snapshot_20151027' runDir = 'run' - // fix reobf issues -// srgExtra "FD: com/voxelmodpack/common/properties/gui/GuiVoxelBoxSettingsPanel/zLevel bub/e" -// srgExtra "FD: com/voxelmodpack/common/gui/GuiControl/zLevel bub/e" -// srgExtra "FD: com/voxelmodpack/common/gui/GuiScreenEx/zLevel bub/e" + tweakClass = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker' + replace '@VERSION@',project.version } + +processResources { + def props = [ + version: version, + mcversion: minecraft.version, + revision: revision + ] + inputs.properties props + from(sourceSets.main.resources.srcDirs) { + include 'litemod.json' + expand props + } + from(sourceSets.main.resources.srcDirs) { + exclude 'litemod.json' + } +} repositories.flatDir { - dir 'voxellib/liteloader' + dir 'liteloader' } dependencies { - compile project(':voxellib') + deobfProvided 'com.mumfrey:liteloader:1.8-SNAPSHOT:srgnames' + provided voxellib } jar { - extension 'litemod' manifest.attributes.remove 'TweakClass' + extension 'litemod' } -task standaloneJar(type:Jar, dependsOn: [reobfJar, project(':voxellib').reobfJar]) { - extension "litemod" - from zipTree(jar.archivePath) - from project(':voxellib').jar.archivePath +task standaloneJar(type: Jar, dependsOn: [{voxellib.build}, reobfJar]) { + extension 'litemod' + from zipTree(jar.archivePath) + + // voxellib + from {voxellib.jar.archivePath} + classifier 'standalone' } artifacts { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 87f3af33..09e711f1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-bin.zip diff --git a/liteloader/liteloader-1.8-SNAPSHOT-sources.jar b/liteloader/liteloader-1.8-SNAPSHOT-sources.jar new file mode 100644 index 00000000..29224102 Binary files /dev/null and b/liteloader/liteloader-1.8-SNAPSHOT-sources.jar differ diff --git a/voxellib/liteloader/liteloader-1.8-SNAPSHOT-srg.jar b/liteloader/liteloader-1.8-SNAPSHOT-srgnames.jar similarity index 100% rename from voxellib/liteloader/liteloader-1.8-SNAPSHOT-srg.jar rename to liteloader/liteloader-1.8-SNAPSHOT-srgnames.jar diff --git a/src/main/java/com/minelittlepony/minelp/LiteModMineLittlePony.java b/src/main/java/com/brohoof/minelittlepony/LiteModMineLittlePony.java similarity index 78% rename from src/main/java/com/minelittlepony/minelp/LiteModMineLittlePony.java rename to src/main/java/com/brohoof/minelittlepony/LiteModMineLittlePony.java index f2299fea..d2d4a204 100644 --- a/src/main/java/com/minelittlepony/minelp/LiteModMineLittlePony.java +++ b/src/main/java/com/brohoof/minelittlepony/LiteModMineLittlePony.java @@ -1,11 +1,11 @@ -package com.minelittlepony.minelp; +package com.brohoof.minelittlepony; import com.voxelmodpack.common.VoxelCommonLiteMod; public class LiteModMineLittlePony extends VoxelCommonLiteMod { public LiteModMineLittlePony() { - super("com.minelittlepony.minelp.MineLittlePony"); + super("com.brohoof.minelittlepony.MineLittlePony"); } @Override diff --git a/src/main/java/com/minelittlepony/minelp/MineLittlePony.java b/src/main/java/com/brohoof/minelittlepony/MineLittlePony.java similarity index 92% rename from src/main/java/com/minelittlepony/minelp/MineLittlePony.java rename to src/main/java/com/brohoof/minelittlepony/MineLittlePony.java index b351d176..1f392500 100644 --- a/src/main/java/com/minelittlepony/minelp/MineLittlePony.java +++ b/src/main/java/com/brohoof/minelittlepony/MineLittlePony.java @@ -1,22 +1,21 @@ -package com.minelittlepony.minelp; +package com.brohoof.minelittlepony; import java.io.File; import org.lwjgl.input.Keyboard; -import com.minelittlepony.minelp.gui.MineLittlePonyGUI; -import com.minelittlepony.minelp.gui.MineLittlePonyGUIMob; -import com.minelittlepony.minelp.hdskins.gui.EntityPonyModel; -import com.minelittlepony.minelp.hdskins.gui.GuiSkinsMineLP; -import com.minelittlepony.minelp.hdskins.gui.RenderPonyModel; -import com.minelittlepony.minelp.renderer.RenderPonySkeleton; -import com.minelittlepony.minelp.renderer.RenderPonyVillager; -import com.minelittlepony.minelp.renderer.RenderPonyZombie; -import com.minelittlepony.minelp.util.MineLPLogger; +import com.brohoof.minelittlepony.gui.MineLittlePonyGUI; +import com.brohoof.minelittlepony.gui.MineLittlePonyGUIMob; +import com.brohoof.minelittlepony.hdskins.gui.EntityPonyModel; +import com.brohoof.minelittlepony.hdskins.gui.GuiSkinsMineLP; +import com.brohoof.minelittlepony.hdskins.gui.RenderPonyModel; +import com.brohoof.minelittlepony.renderer.RenderPonySkeleton; +import com.brohoof.minelittlepony.renderer.RenderPonyVillager; +import com.brohoof.minelittlepony.renderer.RenderPonyZombie; +import com.brohoof.minelittlepony.util.MineLPLogger; import com.mumfrey.liteloader.InitCompleteListener; import com.mumfrey.liteloader.core.LiteLoader; import com.mumfrey.liteloader.util.ModUtilities; -import com.voxelmodpack.common.properties.ModConfig; import com.voxelmodpack.common.properties.gui.SettingsPanelManager; import com.voxelmodpack.hdskins.HDSkinManager; import com.voxelmodpack.hdskins.gui.GuiSkins; diff --git a/src/main/java/com/minelittlepony/minelp/Pony.java b/src/main/java/com/brohoof/minelittlepony/Pony.java similarity index 98% rename from src/main/java/com/minelittlepony/minelp/Pony.java rename to src/main/java/com/brohoof/minelittlepony/Pony.java index 9b565e4e..ceebdb26 100644 --- a/src/main/java/com/minelittlepony/minelp/Pony.java +++ b/src/main/java/com/brohoof/minelittlepony/Pony.java @@ -1,13 +1,13 @@ -package com.minelittlepony.minelp; +package com.brohoof.minelittlepony; import java.awt.Color; import java.awt.image.BufferedImage; import javax.imageio.ImageIO; -import com.minelittlepony.minelp.model.PMAPI; -import com.minelittlepony.minelp.model.PlayerModel; -import com.minelittlepony.minelp.util.MineLPLogger; +import com.brohoof.minelittlepony.model.PMAPI; +import com.brohoof.minelittlepony.model.PlayerModel; +import com.brohoof.minelittlepony.util.MineLPLogger; import com.voxelmodpack.common.runtime.PrivateFields; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/minelittlepony/minelp/PonyConfig.java b/src/main/java/com/brohoof/minelittlepony/PonyConfig.java similarity index 98% rename from src/main/java/com/minelittlepony/minelp/PonyConfig.java rename to src/main/java/com/brohoof/minelittlepony/PonyConfig.java index d8c5a0a1..792228b9 100644 --- a/src/main/java/com/minelittlepony/minelp/PonyConfig.java +++ b/src/main/java/com/brohoof/minelittlepony/PonyConfig.java @@ -1,4 +1,4 @@ -package com.minelittlepony.minelp; +package com.brohoof.minelittlepony; import com.minelittlepony.minelp.util.MineLPLogger; import com.voxelmodpack.common.properties.ModConfig; diff --git a/src/main/java/com/minelittlepony/minelp/PonyLevel.java b/src/main/java/com/brohoof/minelittlepony/PonyLevel.java similarity index 92% rename from src/main/java/com/minelittlepony/minelp/PonyLevel.java rename to src/main/java/com/brohoof/minelittlepony/PonyLevel.java index be7371d6..51cad3f6 100644 --- a/src/main/java/com/minelittlepony/minelp/PonyLevel.java +++ b/src/main/java/com/brohoof/minelittlepony/PonyLevel.java @@ -1,4 +1,4 @@ -package com.minelittlepony.minelp; +package com.brohoof.minelittlepony; public enum PonyLevel { PONIES, diff --git a/src/main/java/com/minelittlepony/minelp/PonyManager.java b/src/main/java/com/brohoof/minelittlepony/PonyManager.java similarity index 98% rename from src/main/java/com/minelittlepony/minelp/PonyManager.java rename to src/main/java/com/brohoof/minelittlepony/PonyManager.java index a0bdac93..7a8570b5 100644 --- a/src/main/java/com/minelittlepony/minelp/PonyManager.java +++ b/src/main/java/com/brohoof/minelittlepony/PonyManager.java @@ -1,12 +1,12 @@ -package com.minelittlepony.minelp; +package com.brohoof.minelittlepony; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import com.minelittlepony.minelp.model.PMAPI; -import com.minelittlepony.minelp.util.MineLPLogger; +import com.brohoof.minelittlepony.model.PMAPI; +import com.brohoof.minelittlepony.util.MineLPLogger; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.entity.passive.EntityVillager; diff --git a/src/main/java/com/minelittlepony/minelp/gui/FakeVoxelPropertyCheckBox.java b/src/main/java/com/brohoof/minelittlepony/gui/FakeVoxelPropertyToggleBox.java similarity index 100% rename from src/main/java/com/minelittlepony/minelp/gui/FakeVoxelPropertyCheckBox.java rename to src/main/java/com/brohoof/minelittlepony/gui/FakeVoxelPropertyToggleBox.java diff --git a/src/main/java/com/minelittlepony/minelp/gui/MineLittlePonyGUI.java b/src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUI.java similarity index 91% rename from src/main/java/com/minelittlepony/minelp/gui/MineLittlePonyGUI.java rename to src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUI.java index 01d16afc..3788ee3e 100644 --- a/src/main/java/com/minelittlepony/minelp/gui/MineLittlePonyGUI.java +++ b/src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUI.java @@ -1,6 +1,8 @@ -package com.minelittlepony.minelp.gui; +package com.brohoof.minelittlepony.gui; -import com.minelittlepony.minelp.MineLittlePony; +import com.brohoof.minelittlepony.MineLittlePony; +import com.brohoof.minelittlepony.PonyConfig; +import com.brohoof.minelittlepony.PonyLevel; import com.voxelmodpack.common.properties.VoxelProperty; import com.voxelmodpack.common.properties.VoxelPropertyLabel; import com.voxelmodpack.common.properties.gui.GuiVoxelBoxSettingsPanel; diff --git a/src/main/java/com/minelittlepony/minelp/gui/MineLittlePonyGUIMob.java b/src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUIMob.java similarity index 93% rename from src/main/java/com/minelittlepony/minelp/gui/MineLittlePonyGUIMob.java rename to src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUIMob.java index ce4428cd..d2fad70e 100644 --- a/src/main/java/com/minelittlepony/minelp/gui/MineLittlePonyGUIMob.java +++ b/src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUIMob.java @@ -1,6 +1,7 @@ -package com.minelittlepony.minelp.gui; +package com.brohoof.minelittlepony.gui; -import com.minelittlepony.minelp.MineLittlePony; +import com.brohoof.minelittlepony.MineLittlePony; +import com.brohoof.minelittlepony.PonyConfig; import com.voxelmodpack.common.properties.VoxelProperty; import com.voxelmodpack.common.properties.VoxelPropertyLabel; import com.voxelmodpack.common.properties.gui.GuiVoxelBoxSettingsPanel; diff --git a/src/main/java/com/minelittlepony/minelp/hdskins/gui/EntityPonyModel.java b/src/main/java/com/brohoof/minelittlepony/hdskins/gui/EntityPonyModel.java similarity index 82% rename from src/main/java/com/minelittlepony/minelp/hdskins/gui/EntityPonyModel.java rename to src/main/java/com/brohoof/minelittlepony/hdskins/gui/EntityPonyModel.java index 9d3086c1..d74dcb57 100644 --- a/src/main/java/com/minelittlepony/minelp/hdskins/gui/EntityPonyModel.java +++ b/src/main/java/com/brohoof/minelittlepony/hdskins/gui/EntityPonyModel.java @@ -1,4 +1,4 @@ -package com.minelittlepony.minelp.hdskins.gui; +package com.brohoof.minelittlepony.hdskins.gui; import com.mojang.authlib.GameProfile; import com.voxelmodpack.hdskins.gui.EntityPlayerModel; diff --git a/src/main/java/com/minelittlepony/minelp/hdskins/gui/GuiSkinsMineLP.java b/src/main/java/com/brohoof/minelittlepony/hdskins/gui/GuiSkinsMineLP.java similarity index 85% rename from src/main/java/com/minelittlepony/minelp/hdskins/gui/GuiSkinsMineLP.java rename to src/main/java/com/brohoof/minelittlepony/hdskins/gui/GuiSkinsMineLP.java index 144b6b0b..f5b2552e 100644 --- a/src/main/java/com/minelittlepony/minelp/hdskins/gui/GuiSkinsMineLP.java +++ b/src/main/java/com/brohoof/minelittlepony/hdskins/gui/GuiSkinsMineLP.java @@ -1,10 +1,10 @@ -package com.minelittlepony.minelp.hdskins.gui; +package com.brohoof.minelittlepony.hdskins.gui; import java.awt.image.BufferedImage; -import com.minelittlepony.minelp.PonyManager; -import com.minelittlepony.minelp.hdskins.gui.EntityPonyModel; -import com.minelittlepony.minelp.util.MineLPLogger; +import com.brohoof.minelittlepony.PonyManager; +import com.brohoof.minelittlepony.hdskins.gui.EntityPonyModel; +import com.brohoof.minelittlepony.util.MineLPLogger; import com.mojang.authlib.GameProfile; import com.voxelmodpack.hdskins.gui.EntityPlayerModel; import com.voxelmodpack.hdskins.gui.GuiSkins; diff --git a/src/main/java/com/minelittlepony/minelp/hdskins/gui/RenderPonyModel.java b/src/main/java/com/brohoof/minelittlepony/hdskins/gui/RenderPonyModel.java similarity index 87% rename from src/main/java/com/minelittlepony/minelp/hdskins/gui/RenderPonyModel.java rename to src/main/java/com/brohoof/minelittlepony/hdskins/gui/RenderPonyModel.java index a3331e54..2a942d39 100644 --- a/src/main/java/com/minelittlepony/minelp/hdskins/gui/RenderPonyModel.java +++ b/src/main/java/com/brohoof/minelittlepony/hdskins/gui/RenderPonyModel.java @@ -1,8 +1,8 @@ -package com.minelittlepony.minelp.hdskins.gui; +package com.brohoof.minelittlepony.hdskins.gui; -import com.minelittlepony.minelp.Pony; -import com.minelittlepony.minelp.PonyManager; -import com.minelittlepony.minelp.model.PlayerModel; +import com.brohoof.minelittlepony.MineLittlePony; +import com.brohoof.minelittlepony.Pony; +import com.brohoof.minelittlepony.model.PlayerModel; import com.voxelmodpack.hdskins.gui.EntityPlayerModel; import com.voxelmodpack.hdskins.gui.RenderPlayerModel; diff --git a/src/main/java/com/minelittlepony/minelp/model/ModelArmor.java b/src/main/java/com/brohoof/minelittlepony/model/ModelArmor.java similarity index 89% rename from src/main/java/com/minelittlepony/minelp/model/ModelArmor.java rename to src/main/java/com/brohoof/minelittlepony/model/ModelArmor.java index a2c17716..f0c92a43 100644 --- a/src/main/java/com/minelittlepony/minelp/model/ModelArmor.java +++ b/src/main/java/com/brohoof/minelittlepony/model/ModelArmor.java @@ -1,4 +1,4 @@ -package com.minelittlepony.minelp.model; +package com.brohoof.minelittlepony.model; public abstract class ModelArmor { public final String path; diff --git a/src/main/java/com/minelittlepony/minelp/model/ModelHornGlow.java b/src/main/java/com/brohoof/minelittlepony/model/ModelHornGlow.java similarity index 97% rename from src/main/java/com/minelittlepony/minelp/model/ModelHornGlow.java rename to src/main/java/com/brohoof/minelittlepony/model/ModelHornGlow.java index 8f84bd71..6c0a5735 100644 --- a/src/main/java/com/minelittlepony/minelp/model/ModelHornGlow.java +++ b/src/main/java/com/brohoof/minelittlepony/model/ModelHornGlow.java @@ -1,6 +1,7 @@ -package com.minelittlepony.minelp.model; +package com.brohoof.minelittlepony.model; + +import com.brohoof.minelittlepony.renderer.HornGlowRenderer; -import com.minelittlepony.minelp.renderer.HornGlowRenderer; import net.minecraft.client.model.PositionTextureVertex; import net.minecraft.client.model.TexturedQuad; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/com/minelittlepony/minelp/model/ModelPony.java b/src/main/java/com/brohoof/minelittlepony/model/ModelPony.java similarity index 96% rename from src/main/java/com/minelittlepony/minelp/model/ModelPony.java rename to src/main/java/com/brohoof/minelittlepony/model/ModelPony.java index fc4bd30a..d3e459db 100644 --- a/src/main/java/com/minelittlepony/minelp/model/ModelPony.java +++ b/src/main/java/com/brohoof/minelittlepony/model/ModelPony.java @@ -1,7 +1,6 @@ -package com.minelittlepony.minelp.model; +package com.brohoof.minelittlepony.model; -import com.minelittlepony.minelp.PonyManager; -import com.minelittlepony.minelp.renderer.AniParams; +import com.brohoof.minelittlepony.renderer.AniParams; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelPlayer; @@ -60,7 +59,6 @@ public abstract class ModelPony extends ModelPlayer { @Override public void render(Entity player, float Move, float Moveswing, float Loop, float Right, float Down, float Scale) { - PonyManager.getInstance(); if (player instanceof AbstractClientPlayer) { setModelVisibilities((AbstractClientPlayer) player); } diff --git a/src/main/java/com/minelittlepony/minelp/model/PMAPI.java b/src/main/java/com/brohoof/minelittlepony/model/PMAPI.java similarity index 78% rename from src/main/java/com/minelittlepony/minelp/model/PMAPI.java rename to src/main/java/com/brohoof/minelittlepony/model/PMAPI.java index cd156f4c..e54d66ed 100644 --- a/src/main/java/com/minelittlepony/minelp/model/PMAPI.java +++ b/src/main/java/com/brohoof/minelittlepony/model/PMAPI.java @@ -1,15 +1,15 @@ -package com.minelittlepony.minelp.model; +package com.brohoof.minelittlepony.model; import java.lang.reflect.Field; -import com.minelittlepony.minelp.model.pony.pm_Human; -import com.minelittlepony.minelp.model.pony.pm_newPonyAdv; -import com.minelittlepony.minelp.model.pony.pm_skeletonPony; -import com.minelittlepony.minelp.model.pony.pm_zombiePony; -import com.minelittlepony.minelp.model.pony.armor.pma_Human; -import com.minelittlepony.minelp.model.pony.armor.pma_newPony; -import com.minelittlepony.minelp.model.pony.armor.pma_skeletonPony; -import com.minelittlepony.minelp.model.pony.armor.pma_zombiePony; +import com.brohoof.minelittlepony.model.pony.pm_Human; +import com.brohoof.minelittlepony.model.pony.pm_newPonyAdv; +import com.brohoof.minelittlepony.model.pony.pm_skeletonPony; +import com.brohoof.minelittlepony.model.pony.pm_zombiePony; +import com.brohoof.minelittlepony.model.pony.armor.pma_Human; +import com.brohoof.minelittlepony.model.pony.armor.pma_newPony; +import com.brohoof.minelittlepony.model.pony.armor.pma_skeletonPony; +import com.brohoof.minelittlepony.model.pony.armor.pma_zombiePony; public final class PMAPI { diff --git a/src/main/java/com/minelittlepony/minelp/model/PlayerModel.java b/src/main/java/com/brohoof/minelittlepony/model/PlayerModel.java similarity index 92% rename from src/main/java/com/minelittlepony/minelp/model/PlayerModel.java rename to src/main/java/com/brohoof/minelittlepony/model/PlayerModel.java index d3198c0c..369e0210 100644 --- a/src/main/java/com/minelittlepony/minelp/model/PlayerModel.java +++ b/src/main/java/com/brohoof/minelittlepony/model/PlayerModel.java @@ -1,9 +1,10 @@ -package com.minelittlepony.minelp.model; +package com.brohoof.minelittlepony.model; -import com.minelittlepony.minelp.model.ModelArmor; -import com.minelittlepony.minelp.model.ModelPony; import java.text.DecimalFormat; +import com.brohoof.minelittlepony.model.ModelArmor; +import com.brohoof.minelittlepony.model.ModelPony; + public class PlayerModel { public final int id; public String name; diff --git a/src/main/java/com/minelittlepony/minelp/model/ScalableModelBox.java b/src/main/java/com/brohoof/minelittlepony/model/ScalableModelBox.java similarity index 97% rename from src/main/java/com/minelittlepony/minelp/model/ScalableModelBox.java rename to src/main/java/com/brohoof/minelittlepony/model/ScalableModelBox.java index a4dd90ae..afcd1924 100644 --- a/src/main/java/com/minelittlepony/minelp/model/ScalableModelBox.java +++ b/src/main/java/com/brohoof/minelittlepony/model/ScalableModelBox.java @@ -1,6 +1,7 @@ -package com.minelittlepony.minelp.model; +package com.brohoof.minelittlepony.model; + +import com.brohoof.minelittlepony.renderer.ScalableModelRenderer; -import com.minelittlepony.minelp.renderer.ScalableModelRenderer; import net.minecraft.client.model.PositionTextureVertex; import net.minecraft.client.model.TexturedQuad; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_newPonyArmor.java b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pm_newPonyArmor.java similarity index 98% rename from src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_newPonyArmor.java rename to src/main/java/com/brohoof/minelittlepony/model/pony/armor/pm_newPonyArmor.java index ce188c1a..658802b8 100644 --- a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_newPonyArmor.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pm_newPonyArmor.java @@ -1,7 +1,7 @@ -package com.minelittlepony.minelp.model.pony.armor; +package com.brohoof.minelittlepony.model.pony.armor; -import com.minelittlepony.minelp.model.pony.pm_newPonyAdv; -import com.minelittlepony.minelp.renderer.AniParams; +import com.brohoof.minelittlepony.model.pony.pm_newPonyAdv; +import com.brohoof.minelittlepony.renderer.AniParams; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_skeletonPonyArmor.java b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pm_skeletonPonyArmor.java similarity index 97% rename from src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_skeletonPonyArmor.java rename to src/main/java/com/brohoof/minelittlepony/model/pony/armor/pm_skeletonPonyArmor.java index 5c741d34..c151a5f4 100644 --- a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_skeletonPonyArmor.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pm_skeletonPonyArmor.java @@ -1,6 +1,6 @@ -package com.minelittlepony.minelp.model.pony.armor; +package com.brohoof.minelittlepony.model.pony.armor; -import com.minelittlepony.minelp.model.pony.armor.pm_newPonyArmor; +import com.brohoof.minelittlepony.model.pony.armor.pm_newPonyArmor; import net.minecraft.util.MathHelper; diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_zombiePonyArmor.java b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pm_zombiePonyArmor.java similarity index 97% rename from src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_zombiePonyArmor.java rename to src/main/java/com/brohoof/minelittlepony/model/pony/armor/pm_zombiePonyArmor.java index f9fa2a34..efde2cdb 100644 --- a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_zombiePonyArmor.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pm_zombiePonyArmor.java @@ -1,6 +1,6 @@ -package com.minelittlepony.minelp.model.pony.armor; +package com.brohoof.minelittlepony.model.pony.armor; -import com.minelittlepony.minelp.model.pony.armor.pm_newPonyArmor; +import com.brohoof.minelittlepony.model.pony.armor.pm_newPonyArmor; import net.minecraft.util.MathHelper; diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_Human.java b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_Human.java similarity index 57% rename from src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_Human.java rename to src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_Human.java index 2b0afcf5..c1db1ff4 100644 --- a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_Human.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_Human.java @@ -1,7 +1,7 @@ -package com.minelittlepony.minelp.model.pony.armor; +package com.brohoof.minelittlepony.model.pony.armor; -import com.minelittlepony.minelp.model.ModelArmor; -import com.minelittlepony.minelp.model.pony.pm_Human; +import com.brohoof.minelittlepony.model.ModelArmor; +import com.brohoof.minelittlepony.model.pony.pm_Human; public class pma_Human extends ModelArmor { diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_newPony.java b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_newPony.java similarity index 68% rename from src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_newPony.java rename to src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_newPony.java index 56a4aa67..4d005554 100644 --- a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_newPony.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_newPony.java @@ -1,6 +1,6 @@ -package com.minelittlepony.minelp.model.pony.armor; +package com.brohoof.minelittlepony.model.pony.armor; -import com.minelittlepony.minelp.model.ModelArmor; +import com.brohoof.minelittlepony.model.ModelArmor; public class pma_newPony extends ModelArmor { public pma_newPony(String path) { diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_skeletonPony.java b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_skeletonPony.java similarity index 70% rename from src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_skeletonPony.java rename to src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_skeletonPony.java index ffd7cc4b..dc74724a 100644 --- a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_skeletonPony.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_skeletonPony.java @@ -1,6 +1,6 @@ -package com.minelittlepony.minelp.model.pony.armor; +package com.brohoof.minelittlepony.model.pony.armor; -import com.minelittlepony.minelp.model.ModelArmor; +import com.brohoof.minelittlepony.model.ModelArmor; public class pma_skeletonPony extends ModelArmor { diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_zombiePony.java b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_zombiePony.java similarity index 69% rename from src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_zombiePony.java rename to src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_zombiePony.java index 45ddad5d..e9e5d964 100644 --- a/src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_zombiePony.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_zombiePony.java @@ -1,6 +1,6 @@ -package com.minelittlepony.minelp.model.pony.armor; +package com.brohoof.minelittlepony.model.pony.armor; -import com.minelittlepony.minelp.model.ModelArmor; +import com.brohoof.minelittlepony.model.ModelArmor; public class pma_zombiePony extends ModelArmor { diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/pm_Human.java b/src/main/java/com/brohoof/minelittlepony/model/pony/pm_Human.java similarity index 76% rename from src/main/java/com/minelittlepony/minelp/model/pony/pm_Human.java rename to src/main/java/com/brohoof/minelittlepony/model/pony/pm_Human.java index dec6a163..d1167f14 100644 --- a/src/main/java/com/minelittlepony/minelp/model/pony/pm_Human.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/pm_Human.java @@ -1,6 +1,6 @@ -package com.minelittlepony.minelp.model.pony; +package com.brohoof.minelittlepony.model.pony; -import com.minelittlepony.minelp.model.ModelPony; +import com.brohoof.minelittlepony.model.ModelPony; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/pm_newPonyAdv.java b/src/main/java/com/brohoof/minelittlepony/model/pony/pm_newPonyAdv.java similarity index 98% rename from src/main/java/com/minelittlepony/minelp/model/pony/pm_newPonyAdv.java rename to src/main/java/com/brohoof/minelittlepony/model/pony/pm_newPonyAdv.java index 6fb6e6f4..9d95e712 100644 --- a/src/main/java/com/minelittlepony/minelp/model/pony/pm_newPonyAdv.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/pm_newPonyAdv.java @@ -1,17 +1,24 @@ -package com.minelittlepony.minelp.model.pony; +package com.brohoof.minelittlepony.model.pony; -import static net.minecraft.client.renderer.GlStateManager.*; +import static net.minecraft.client.renderer.GlStateManager.blendFunc; +import static net.minecraft.client.renderer.GlStateManager.color; +import static net.minecraft.client.renderer.GlStateManager.popAttrib; +import static net.minecraft.client.renderer.GlStateManager.popMatrix; +import static net.minecraft.client.renderer.GlStateManager.pushMatrix; +import static net.minecraft.client.renderer.GlStateManager.rotate; +import static net.minecraft.client.renderer.GlStateManager.scale; +import static net.minecraft.client.renderer.GlStateManager.translate; import java.util.Random; import org.lwjgl.opengl.GL11; -import com.minelittlepony.minelp.PonyManager; -import com.minelittlepony.minelp.model.ModelPony; -import com.minelittlepony.minelp.renderer.AniParams; -import com.minelittlepony.minelp.renderer.CompressiveRendering; -import com.minelittlepony.minelp.renderer.HornGlowRenderer; -import com.minelittlepony.minelp.renderer.PlaneRenderer; +import com.brohoof.minelittlepony.MineLittlePony; +import com.brohoof.minelittlepony.model.ModelPony; +import com.brohoof.minelittlepony.renderer.AniParams; +import com.brohoof.minelittlepony.renderer.CompressiveRendering; +import com.brohoof.minelittlepony.renderer.HornGlowRenderer; +import com.brohoof.minelittlepony.renderer.PlaneRenderer; import net.minecraft.client.model.ModelRenderer; import net.minecraft.util.MathHelper; diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/pm_skeletonPony.java b/src/main/java/com/brohoof/minelittlepony/model/pony/pm_skeletonPony.java similarity index 99% rename from src/main/java/com/minelittlepony/minelp/model/pony/pm_skeletonPony.java rename to src/main/java/com/brohoof/minelittlepony/model/pony/pm_skeletonPony.java index 922fd608..8e3e6dfc 100644 --- a/src/main/java/com/minelittlepony/minelp/model/pony/pm_skeletonPony.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/pm_skeletonPony.java @@ -1,4 +1,4 @@ -package com.minelittlepony.minelp.model.pony; +package com.brohoof.minelittlepony.model.pony; import static net.minecraft.client.renderer.GlStateManager.*; diff --git a/src/main/java/com/minelittlepony/minelp/model/pony/pm_zombiePony.java b/src/main/java/com/brohoof/minelittlepony/model/pony/pm_zombiePony.java similarity index 97% rename from src/main/java/com/minelittlepony/minelp/model/pony/pm_zombiePony.java rename to src/main/java/com/brohoof/minelittlepony/model/pony/pm_zombiePony.java index 2928ebf2..6d6c9181 100644 --- a/src/main/java/com/minelittlepony/minelp/model/pony/pm_zombiePony.java +++ b/src/main/java/com/brohoof/minelittlepony/model/pony/pm_zombiePony.java @@ -1,6 +1,6 @@ -package com.minelittlepony.minelp.model.pony; +package com.brohoof.minelittlepony.model.pony; -import com.minelittlepony.minelp.model.pony.pm_newPonyAdv; +import com.brohoof.minelittlepony.model.pony.pm_newPonyAdv; import net.minecraft.util.MathHelper; diff --git a/src/main/java/com/minelittlepony/minelp/renderer/AniParams.java b/src/main/java/com/brohoof/minelittlepony/renderer/AniParams.java similarity index 89% rename from src/main/java/com/minelittlepony/minelp/renderer/AniParams.java rename to src/main/java/com/brohoof/minelittlepony/renderer/AniParams.java index cc69d90a..bc16556f 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/AniParams.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/AniParams.java @@ -1,4 +1,4 @@ -package com.minelittlepony.minelp.renderer; +package com.brohoof.minelittlepony.renderer; public class AniParams { diff --git a/src/main/java/com/minelittlepony/minelp/renderer/CompressiveRendering.java b/src/main/java/com/brohoof/minelittlepony/renderer/CompressiveRendering.java similarity index 98% rename from src/main/java/com/minelittlepony/minelp/renderer/CompressiveRendering.java rename to src/main/java/com/brohoof/minelittlepony/renderer/CompressiveRendering.java index b6d5e317..e352c346 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/CompressiveRendering.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/CompressiveRendering.java @@ -1,4 +1,4 @@ -package com.minelittlepony.minelp.renderer; +package com.brohoof.minelittlepony.renderer; import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/com/minelittlepony/minelp/renderer/HornGlowRenderer.java b/src/main/java/com/brohoof/minelittlepony/renderer/HornGlowRenderer.java similarity index 98% rename from src/main/java/com/minelittlepony/minelp/renderer/HornGlowRenderer.java rename to src/main/java/com/brohoof/minelittlepony/renderer/HornGlowRenderer.java index 833c7f57..ab8bd46c 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/HornGlowRenderer.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/HornGlowRenderer.java @@ -1,6 +1,5 @@ -package com.minelittlepony.minelp.renderer; +package com.brohoof.minelittlepony.renderer; -import com.minelittlepony.minelp.model.ModelHornGlow; import java.util.ArrayList; import java.util.Iterator; import java.util.List; @@ -10,6 +9,8 @@ import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.Tessellator; import org.lwjgl.opengl.GL11; +import com.brohoof.minelittlepony.model.ModelHornGlow; + public class HornGlowRenderer { public float textureWidth; public float textureHeight; diff --git a/src/main/java/com/brohoof/minelittlepony/renderer/IRenderPony.java b/src/main/java/com/brohoof/minelittlepony/renderer/IRenderPony.java new file mode 100644 index 00000000..20a4f037 --- /dev/null +++ b/src/main/java/com/brohoof/minelittlepony/renderer/IRenderPony.java @@ -0,0 +1,8 @@ +package com.brohoof.minelittlepony.renderer; + +import com.brohoof.minelittlepony.model.PlayerModel; + +public interface IRenderPony { + + PlayerModel getPony(); +} diff --git a/src/main/java/com/minelittlepony/minelp/renderer/PlaneRenderer.java b/src/main/java/com/brohoof/minelittlepony/renderer/PlaneRenderer.java similarity index 99% rename from src/main/java/com/minelittlepony/minelp/renderer/PlaneRenderer.java rename to src/main/java/com/brohoof/minelittlepony/renderer/PlaneRenderer.java index 85d8d7b5..fa0dc9d4 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/PlaneRenderer.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/PlaneRenderer.java @@ -1,4 +1,4 @@ -package com.minelittlepony.minelp.renderer; +package com.brohoof.minelittlepony.renderer; import static net.minecraft.client.renderer.GlStateManager.*; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/minelittlepony/minelp/renderer/RenderPony.java b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPony.java similarity index 91% rename from src/main/java/com/minelittlepony/minelp/renderer/RenderPony.java rename to src/main/java/com/brohoof/minelittlepony/renderer/RenderPony.java index f63e2ef6..e13d1c34 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/RenderPony.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPony.java @@ -1,18 +1,18 @@ -package com.minelittlepony.minelp.renderer; +package com.brohoof.minelittlepony.renderer; import static net.minecraft.client.renderer.GlStateManager.scale; -import com.minelittlepony.minelp.Pony; -import com.minelittlepony.minelp.PonyManager; -import com.minelittlepony.minelp.model.PMAPI; -import com.minelittlepony.minelp.model.PlayerModel; -import com.minelittlepony.minelp.model.pony.pm_Human; -import com.minelittlepony.minelp.model.pony.pm_newPonyAdv; -import com.minelittlepony.minelp.renderer.layer.LayerHeldPonyItem; -import com.minelittlepony.minelp.renderer.layer.LayerPonyArmor; -import com.minelittlepony.minelp.renderer.layer.LayerPonyCape; -import com.minelittlepony.minelp.renderer.layer.LayerPonySkull; -import com.minelittlepony.minelp.util.MineLPPrivateFields; +import com.brohoof.minelittlepony.MineLittlePony; +import com.brohoof.minelittlepony.Pony; +import com.brohoof.minelittlepony.model.PMAPI; +import com.brohoof.minelittlepony.model.PlayerModel; +import com.brohoof.minelittlepony.model.pony.pm_Human; +import com.brohoof.minelittlepony.model.pony.pm_newPonyAdv; +import com.brohoof.minelittlepony.renderer.layer.LayerHeldPonyItem; +import com.brohoof.minelittlepony.renderer.layer.LayerPonyArmor; +import com.brohoof.minelittlepony.renderer.layer.LayerPonyCape; +import com.brohoof.minelittlepony.renderer.layer.LayerPonySkull; +import com.brohoof.minelittlepony.util.MineLPPrivateFields; import com.mumfrey.liteloader.transformers.AppendInsns; import com.mumfrey.liteloader.transformers.Obfuscated; diff --git a/src/main/java/com/minelittlepony/minelp/renderer/RenderPonyMob.java b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyMob.java similarity index 92% rename from src/main/java/com/minelittlepony/minelp/renderer/RenderPonyMob.java rename to src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyMob.java index 781d4fba..2f604cd7 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/RenderPonyMob.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyMob.java @@ -1,12 +1,12 @@ -package com.minelittlepony.minelp.renderer; +package com.brohoof.minelittlepony.renderer; -import com.minelittlepony.minelp.PonyManager; -import com.minelittlepony.minelp.model.ModelPony; -import com.minelittlepony.minelp.model.PlayerModel; -import com.minelittlepony.minelp.model.pony.pm_newPonyAdv; -import com.minelittlepony.minelp.renderer.layer.LayerHeldPonyItem; -import com.minelittlepony.minelp.renderer.layer.LayerPonyArmor; -import com.minelittlepony.minelp.renderer.layer.LayerPonySkull; +import com.brohoof.minelittlepony.MineLittlePony; +import com.brohoof.minelittlepony.model.ModelPony; +import com.brohoof.minelittlepony.model.PlayerModel; +import com.brohoof.minelittlepony.model.pony.pm_newPonyAdv; +import com.brohoof.minelittlepony.renderer.layer.LayerHeldPonyItem; +import com.brohoof.minelittlepony.renderer.layer.LayerPonyArmor; +import com.brohoof.minelittlepony.renderer.layer.LayerPonySkull; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.client.renderer.entity.RenderManager; @@ -111,7 +111,6 @@ public abstract class RenderPonyMob extends RenderLiving return this.getEntityTexture((T) var1); } - @SuppressWarnings("unused") protected void preRenderCallback(T entity, float partick) {} @SuppressWarnings("unchecked") @@ -120,7 +119,6 @@ public abstract class RenderPonyMob extends RenderLiving preRenderCallback((T) entitylivingbaseIn, partialTickTime); } - @SuppressWarnings("unused") protected void rotateCorpse(T entity, float xPosition, float yPosition, float zPosition) {} @SuppressWarnings("unchecked") diff --git a/src/main/java/com/minelittlepony/minelp/renderer/RenderPonySkeleton.java b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java similarity index 87% rename from src/main/java/com/minelittlepony/minelp/renderer/RenderPonySkeleton.java rename to src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java index 5dc9158e..4f696a30 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/RenderPonySkeleton.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java @@ -1,9 +1,9 @@ -package com.minelittlepony.minelp.renderer; +package com.brohoof.minelittlepony.renderer; import org.lwjgl.opengl.GL11; -import com.minelittlepony.minelp.PonyManager; -import com.minelittlepony.minelp.model.PMAPI; +import com.brohoof.minelittlepony.PonyManager; +import com.brohoof.minelittlepony.model.PMAPI; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; @@ -16,7 +16,7 @@ public class RenderPonySkeleton extends RenderPonyMob { super(rm, PMAPI.skeletonPony); addLayer(new LayerBipedArmor(this) { @Override - protected void func_177177_a() { + protected void initArmor() { this.field_177189_c = PMAPI.skeletonPony.model; this.field_177186_d = PMAPI.skeletonPony.model; } diff --git a/src/main/java/com/minelittlepony/minelp/renderer/RenderPonyVillager.java b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyVillager.java similarity index 86% rename from src/main/java/com/minelittlepony/minelp/renderer/RenderPonyVillager.java rename to src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyVillager.java index a6f03d8a..c3bb3537 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/RenderPonyVillager.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyVillager.java @@ -1,10 +1,10 @@ -package com.minelittlepony.minelp.renderer; + package com.brohoof.minelittlepony.renderer; import org.lwjgl.opengl.GL11; -import com.minelittlepony.minelp.Pony; -import com.minelittlepony.minelp.PonyManager; -import com.minelittlepony.minelp.model.PMAPI; +import com.brohoof.minelittlepony.MineLittlePony; +import com.brohoof.minelittlepony.Pony; +import com.brohoof.minelittlepony.model.PMAPI; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.passive.EntityVillager; diff --git a/src/main/java/com/minelittlepony/minelp/renderer/RenderPonyZombie.java b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyZombie.java similarity index 87% rename from src/main/java/com/minelittlepony/minelp/renderer/RenderPonyZombie.java rename to src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyZombie.java index a02a394b..9e03e671 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/RenderPonyZombie.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyZombie.java @@ -1,7 +1,7 @@ -package com.minelittlepony.minelp.renderer; +package com.brohoof.minelittlepony.renderer; -import com.minelittlepony.minelp.PonyManager; -import com.minelittlepony.minelp.model.PMAPI; +import com.brohoof.minelittlepony.PonyManager; +import com.brohoof.minelittlepony.model.PMAPI; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.entity.monster.EntityPigZombie; diff --git a/src/main/java/com/minelittlepony/minelp/renderer/ScalableModelRenderer.java b/src/main/java/com/brohoof/minelittlepony/renderer/ScalableModelRenderer.java similarity index 99% rename from src/main/java/com/minelittlepony/minelp/renderer/ScalableModelRenderer.java rename to src/main/java/com/brohoof/minelittlepony/renderer/ScalableModelRenderer.java index da628a67..79e8cccc 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/ScalableModelRenderer.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/ScalableModelRenderer.java @@ -1,11 +1,11 @@ -package com.minelittlepony.minelp.renderer; +package com.brohoof.minelittlepony.renderer; import java.util.ArrayList; import java.util.List; import org.lwjgl.opengl.GL11; -import com.minelittlepony.minelp.model.ScalableModelBox; +import com.brohoof.minelittlepony.model.ScalableModelBox; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/minelittlepony/minelp/renderer/layer/LayerHeldPonyItem.java b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerHeldPonyItem.java similarity index 94% rename from src/main/java/com/minelittlepony/minelp/renderer/layer/LayerHeldPonyItem.java rename to src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerHeldPonyItem.java index e5255e80..d50e80d2 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/layer/LayerHeldPonyItem.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerHeldPonyItem.java @@ -1,11 +1,11 @@ -package com.minelittlepony.minelp.renderer.layer; +package com.brohoof.minelittlepony.renderer.layer; import static net.minecraft.client.renderer.GlStateManager.*; -import com.minelittlepony.minelp.model.PMAPI; -import com.minelittlepony.minelp.model.PlayerModel; -import com.minelittlepony.minelp.model.pony.pm_newPonyAdv; -import com.minelittlepony.minelp.renderer.IRenderPony; +import com.brohoof.minelittlepony.model.PMAPI; +import com.brohoof.minelittlepony.model.PlayerModel; +import com.brohoof.minelittlepony.model.pony.pm_newPonyAdv; +import com.brohoof.minelittlepony.renderer.IRenderPony; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelRenderer; @@ -116,7 +116,6 @@ public class LayerHeldPonyItem implements LayerRenderer { } } - @SuppressWarnings("unused") public void renderItemGlow(EntityLivingBase entity, ItemStack drop, int glowColor) { // TODO reimplement } diff --git a/src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonyArmor.java b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyArmor.java similarity index 91% rename from src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonyArmor.java rename to src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyArmor.java index ffbeabcf..5808dcbb 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonyArmor.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyArmor.java @@ -1,18 +1,16 @@ -package com.minelittlepony.minelp.renderer.layer; +package com.brohoof.minelittlepony.renderer.layer; import java.io.IOException; -import java.util.HashSet; import java.util.Map; +import com.brohoof.minelittlepony.MineLittlePony; +import com.brohoof.minelittlepony.common.IPonyArmor; +import com.brohoof.minelittlepony.model.ModelPony; +import com.brohoof.minelittlepony.model.PlayerModel; +import com.brohoof.minelittlepony.model.pony.pm_Human; +import com.brohoof.minelittlepony.model.pony.armor.pm_newPonyArmor; +import com.brohoof.minelittlepony.renderer.IRenderPony; import com.google.common.collect.Maps; -import com.minelittlepony.minelp.PonyManager; -import com.minelittlepony.minelp.model.ModelPony; -import com.minelittlepony.minelp.model.PlayerModel; -import com.minelittlepony.minelp.model.pony.pm_Human; -import com.minelittlepony.minelp.model.pony.pm_newPonyAdv; -import com.minelittlepony.minelp.model.pony.armor.pm_newPonyArmor; -import com.minelittlepony.minelp.renderer.IRenderPony; -import com.minelittlepony.minelp.util.MineLPReflection; import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBase; @@ -21,8 +19,6 @@ import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.entity.RendererLivingEntity; import net.minecraft.client.renderer.entity.layers.LayerBipedArmor; import net.minecraft.client.renderer.entity.layers.LayerRenderer; -import net.minecraft.client.renderer.texture.TextureUtil; -import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.item.ItemArmor; import net.minecraft.item.ItemArmor.ArmorMaterial; @@ -31,14 +27,11 @@ import net.minecraft.util.ResourceLocation; public class LayerPonyArmor implements LayerRenderer { - private static final ResourceLocation ENCHANTED_ITEM_GLINT_RES = new ResourceLocation("textures/misc/enchanted_item_glint.png"); + private static final ResourceLocation ENCHANTED_ITEM_GLINT_RES = new ResourceLocation( + "textures/misc/enchanted_item_glint.png"); - private static final Map field_110859_k = Maps.newHashMap(); - private static final Map ponyArmorMap = Maps.newHashMap(); - private static final Map onlyPonyArmorMap = Maps.newHashMap(); - private static final String[] bipedArmorFilenamePrefix = { "leather", "chainmail", "iron", "gold", "diamond" }; - - private static HashSet ponyArmors = new HashSet(); + private static final Map HUMAN_ARMORS = Maps.newHashMap(); + private static final Map PONY_ARMORS = Maps.newHashMap(); private RendererLivingEntity renderer; private LayerBipedArmor humanArmor; diff --git a/src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonyCape.java b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyCape.java similarity index 95% rename from src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonyCape.java rename to src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyCape.java index ccccdd35..0b824cac 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonyCape.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyCape.java @@ -1,10 +1,10 @@ -package com.minelittlepony.minelp.renderer.layer; +package com.brohoof.minelittlepony.renderer.layer; import static net.minecraft.client.renderer.GlStateManager.*; -import com.minelittlepony.minelp.model.PMAPI; -import com.minelittlepony.minelp.model.PlayerModel; -import com.minelittlepony.minelp.renderer.IRenderPony; +import com.brohoof.minelittlepony.model.PMAPI; +import com.brohoof.minelittlepony.model.PlayerModel; +import com.brohoof.minelittlepony.renderer.IRenderPony; import net.minecraft.client.entity.AbstractClientPlayer; import net.minecraft.client.renderer.entity.RenderPlayer; diff --git a/src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonySkull.java b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonySkull.java similarity index 93% rename from src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonySkull.java rename to src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonySkull.java index e0342bdd..4226ea71 100644 --- a/src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonySkull.java +++ b/src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonySkull.java @@ -1,11 +1,11 @@ -package com.minelittlepony.minelp.renderer.layer; +package com.brohoof.minelittlepony.renderer.layer; import static net.minecraft.client.renderer.GlStateManager.*; -import com.minelittlepony.minelp.model.ModelPony; -import com.minelittlepony.minelp.model.PlayerModel; -import com.minelittlepony.minelp.model.pony.pm_newPonyAdv; -import com.minelittlepony.minelp.renderer.IRenderPony; +import com.brohoof.minelittlepony.model.ModelPony; +import com.brohoof.minelittlepony.model.PlayerModel; +import com.brohoof.minelittlepony.model.pony.pm_newPonyAdv; +import com.brohoof.minelittlepony.renderer.IRenderPony; import com.mojang.authlib.GameProfile; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/minelittlepony/minelp/transformers/RenderPlayerTransformer.java b/src/main/java/com/brohoof/minelittlepony/transformers/RenderPlayerTransformer.java similarity index 59% rename from src/main/java/com/minelittlepony/minelp/transformers/RenderPlayerTransformer.java rename to src/main/java/com/brohoof/minelittlepony/transformers/RenderPlayerTransformer.java index 5d69ee4a..8a37afff 100644 --- a/src/main/java/com/minelittlepony/minelp/transformers/RenderPlayerTransformer.java +++ b/src/main/java/com/brohoof/minelittlepony/transformers/RenderPlayerTransformer.java @@ -1,10 +1,10 @@ -package com.minelittlepony.minelp.transformers; +package com.brohoof.minelittlepony.transformers; import com.mumfrey.liteloader.transformers.ClassOverlayTransformer; public class RenderPlayerTransformer extends ClassOverlayTransformer { - private static final String overlayClassName = "com.minelittlepony.minelp.renderer.RenderPony"; + private static final String overlayClassName = "com.brohoof.minelittlepony.renderer.RenderPony"; public RenderPlayerTransformer() { super(overlayClassName); diff --git a/src/main/java/com/minelittlepony/minelp/util/MineLPLogger.java b/src/main/java/com/brohoof/minelittlepony/util/MineLPLogger.java similarity index 98% rename from src/main/java/com/minelittlepony/minelp/util/MineLPLogger.java rename to src/main/java/com/brohoof/minelittlepony/util/MineLPLogger.java index 2ae0c454..eb72caaf 100644 --- a/src/main/java/com/minelittlepony/minelp/util/MineLPLogger.java +++ b/src/main/java/com/brohoof/minelittlepony/util/MineLPLogger.java @@ -1,4 +1,4 @@ -package com.minelittlepony.minelp.util; +package com.brohoof.minelittlepony.util; import com.mumfrey.liteloader.util.log.LiteLoaderLogger; import org.apache.logging.log4j.Level; diff --git a/src/main/java/com/minelittlepony/minelp/util/MineLPObf.java b/src/main/java/com/brohoof/minelittlepony/util/MineLPObf.java similarity index 93% rename from src/main/java/com/minelittlepony/minelp/util/MineLPObf.java rename to src/main/java/com/brohoof/minelittlepony/util/MineLPObf.java index dcb2075f..e2609004 100644 --- a/src/main/java/com/minelittlepony/minelp/util/MineLPObf.java +++ b/src/main/java/com/brohoof/minelittlepony/util/MineLPObf.java @@ -1,4 +1,4 @@ -package com.minelittlepony.minelp.util; +package com.brohoof.minelittlepony.util; import com.mumfrey.liteloader.core.runtime.Obf; diff --git a/src/main/java/com/minelittlepony/minelp/util/MineLPPrivateFields.java b/src/main/java/com/brohoof/minelittlepony/util/MineLPPrivateFields.java similarity index 95% rename from src/main/java/com/minelittlepony/minelp/util/MineLPPrivateFields.java rename to src/main/java/com/brohoof/minelittlepony/util/MineLPPrivateFields.java index 3eded698..66a6ade5 100644 --- a/src/main/java/com/minelittlepony/minelp/util/MineLPPrivateFields.java +++ b/src/main/java/com/brohoof/minelittlepony/util/MineLPPrivateFields.java @@ -1,4 +1,4 @@ -package com.minelittlepony.minelp.util; +package com.brohoof.minelittlepony.util; import java.util.Map; diff --git a/src/main/java/com/minelittlepony/minelp/util/MineLPRData.java b/src/main/java/com/brohoof/minelittlepony/util/MineLPRData.java similarity index 97% rename from src/main/java/com/minelittlepony/minelp/util/MineLPRData.java rename to src/main/java/com/brohoof/minelittlepony/util/MineLPRData.java index c1a6c5e3..f857f876 100644 --- a/src/main/java/com/minelittlepony/minelp/util/MineLPRData.java +++ b/src/main/java/com/brohoof/minelittlepony/util/MineLPRData.java @@ -1,7 +1,5 @@ -package com.minelittlepony.minelp.util; +package com.brohoof.minelittlepony.util; -import com.minelittlepony.minelp.util.MineLPLogger; -import com.minelittlepony.minelp.util.MineLPReflection; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -9,6 +7,9 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import com.brohoof.minelittlepony.util.MineLPLogger; +import com.brohoof.minelittlepony.util.MineLPReflection; + public class MineLPRData { public boolean installed = false; public boolean compatible = false; diff --git a/src/main/java/com/minelittlepony/minelp/util/MineLPReflection.java b/src/main/java/com/brohoof/minelittlepony/util/MineLPReflection.java similarity index 98% rename from src/main/java/com/minelittlepony/minelp/util/MineLPReflection.java rename to src/main/java/com/brohoof/minelittlepony/util/MineLPReflection.java index 4ea95b13..74ed1c25 100644 --- a/src/main/java/com/minelittlepony/minelp/util/MineLPReflection.java +++ b/src/main/java/com/brohoof/minelittlepony/util/MineLPReflection.java @@ -1,11 +1,13 @@ -package com.minelittlepony.minelp.util; +package com.brohoof.minelittlepony.util; -import com.minelittlepony.minelp.util.MineLPLogger; -import com.minelittlepony.minelp.util.MineLPRData; import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; + +import com.brohoof.minelittlepony.util.MineLPLogger; +import com.brohoof.minelittlepony.util.MineLPRData; + import net.minecraft.client.Minecraft; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.renderer.RenderGlobal; diff --git a/src/main/java/com/minelittlepony/minelp/gui/VoxelPropertyIntSlider.java b/src/main/java/com/minelittlepony/minelp/gui/VoxelPropertyIntSlider.java deleted file mode 100644 index 21b08de0..00000000 --- a/src/main/java/com/minelittlepony/minelp/gui/VoxelPropertyIntSlider.java +++ /dev/null @@ -1,157 +0,0 @@ -package com.minelittlepony.minelp.gui; - -import org.lwjgl.input.Mouse; - -import com.voxelmodpack.common.LiteModVoxelCommon; -import com.voxelmodpack.common.gui.interfaces.IExtendedGui; -import com.voxelmodpack.common.properties.VoxelProperty; -import com.voxelmodpack.common.properties.interfaces.IVoxelPropertyProviderInteger; - -import net.minecraft.client.resources.I18n; -import net.minecraft.util.MathHelper; - -public class VoxelPropertyIntSlider extends VoxelProperty { - int minValue; - int maxValue; - float value; - boolean overReset; - boolean overSlide; - boolean overBar; - boolean setBar; - boolean dragging; - int offset; - String minText; - String midText; - String maxText; - String labelText; - - public VoxelPropertyIntSlider(IVoxelPropertyProviderInteger parent, String binding, String text, int xPos, - int yPos) { - super(parent, binding, text, xPos, yPos); - this.minValue = 0; - this.maxValue = 2; - this.value = 2.0F; - this.overReset = false; - this.overSlide = false; - this.overBar = false; - this.setBar = false; - this.dragging = false; - this.offset = 0; - this.minText = I18n.format("minelp.options.ponylevel.human"); - this.midText = I18n.format("minelp.options.ponylevel.mix"); - this.maxText = I18n.format("minelp.options.ponylevel.pony"); - } - - @Override - public void draw(IExtendedGui gui, int mouseX, int mouseY) { - this.overReset = this.mouseOverReset(mouseX, mouseY); - int outset = this.overReset ? 1 : 0; - int v = this.overReset ? 16 : 0; - drawRect(this.xPosition + 160 - outset, this.yPosition + 11 - outset, this.xPosition + 212 + outset, - this.yPosition + 26 + outset, -16777216); - gui.drawTessellatedModalBorderRect(LiteModVoxelCommon.GUIPARTS, 256, this.xPosition + 159 - outset, - this.yPosition + 10 - outset, this.xPosition + 213 + outset, this.yPosition + 27 + outset, 0, v, 16, - 16 + v, 4); - this.drawString(this.mc.fontRendererObj, "Default", this.xPosition + 169, this.yPosition + 15, - this.overReset ? 16777215 : 10066329); - int sliderLeft = this.xPosition + 48; - int sliderRight = this.xPosition + 124; - int sliderXPos = sliderLeft + 32; - int sliderXPos2 = sliderLeft + 45; - int sliderYPos = this.yPosition + 12; - int sliderYPos2 = this.yPosition + 25; - int sliderMinX = sliderLeft - (sliderXPos + sliderXPos2) / 2 + 5; - int sliderMaxX = sliderRight - (sliderXPos + sliderXPos2) / 2 - 5; - this.drawHorizontalLine(sliderLeft, sliderRight, this.yPosition + 18, -6710887); - this.drawVerticalLine(this.xPosition + 86, this.yPosition + 14, this.yPosition + 22, -6710887); - this.drawVerticalLine(sliderLeft, this.yPosition + 14, this.yPosition + 22, -6710887); - this.drawVerticalLine(sliderRight, this.yPosition + 14, this.yPosition + 22, -6710887); - if (this.displayText != null) { - this.drawString(this.mc.fontRendererObj, this.displayText, this.xPosition + 15, this.yPosition - 14, 10079487); - } - - this.drawString(this.mc.fontRendererObj, this.minText, this.xPosition + 35, this.yPosition, 16777215); - if (this.midText != null) { - this.drawString(this.mc.fontRendererObj, this.midText, this.xPosition + 80, this.yPosition, 16777215); - } - - if (this.maxText != null) { - this.drawString(this.mc.fontRendererObj, this.maxText, this.xPosition + 110, this.yPosition, 16777215); - } else { - float scale = (this.value + 1.0F) / 2.0F; - int displayValue = MathHelper.ceiling_float_int( - (this.minValue + (this.maxValue - this.minValue) * scale) * 100.0F); - this.drawString(this.mc.fontRendererObj, displayValue + "%", this.xPosition + 130, this.yPosition + 15, - 16777215); - } - - this.overSlide = this.mouseIn(mouseX, mouseY, sliderXPos, sliderYPos, sliderXPos2, sliderYPos2); - this.overBar = this.mouseIn(mouseX, mouseY, sliderLeft, sliderYPos, sliderRight, sliderYPos2) - && !this.overSlide; - if (this.dragging) { - if (Mouse.isButtonDown(0)) { - this.offset = Math.min(Math.max(mouseX - (sliderXPos + sliderXPos2) / 2, sliderMinX), sliderMaxX); - this.value = (float) this.offset / (float) sliderMaxX; - } else { - this.value = (float) this.offset / (float) sliderMaxX; - this.propertyProvider.setProperty(this.propertyBinding, - Math.round(this.value) + 1); - this.dragging = false; - } - } else { - this.offset = (this.propertyProvider.getIntProperty(this.propertyBinding) - - 1) * sliderMaxX; - this.value = (float) this.offset / (float) sliderMaxX; - } - - if (this.setBar) { - this.offset = mouseX - (sliderXPos + sliderXPos2) / 2; - this.value = (float) this.offset / (float) sliderMaxX; - this.propertyProvider.setProperty(this.propertyBinding, - Math.round(this.value) + 1); - this.setBar = false; - this.dragging = true; - } - - if (this.offset > sliderMaxX) { - this.offset = sliderMaxX; - } - - if (this.offset < sliderMinX) { - this.offset = sliderMinX; - } - - drawRect(sliderXPos2 - 1 + this.offset, sliderYPos2 - 1, sliderXPos + 1 + this.offset, sliderYPos + 1, - -16777216); - gui.drawTessellatedModalBorderRect(LiteModVoxelCommon.GUIPARTS, 256, sliderXPos + this.offset, sliderYPos, - sliderXPos2 + this.offset, sliderYPos2, 0, !this.overSlide && !this.dragging ? 0 : 16, 16, - !this.overSlide && !this.dragging ? 16 : 32, 4); - } - - protected boolean mouseIn(int mouseX, int mouseY, int x1, int y1, int x2, int y2) { - return mouseX > x1 + this.offset && mouseX < x2 + this.offset && mouseY > y1 && mouseY < y2; - } - - protected boolean mouseOverReset(int mouseX, int mouseY) { - return mouseX > this.xPosition + 159 && mouseX < this.xPosition + 213 && mouseY > this.yPosition + 10 - && mouseY < this.yPosition + 27; - } - - @Override - public void mouseClicked(int mouseX, int mouseY) { - if (this.overSlide) { - this.dragging = true; - this.playClickSound(this.mc.getSoundHandler()); - } else if (this.overBar) { - this.setBar = true; - this.playClickSound(this.mc.getSoundHandler()); - } else if (this.overReset) { - this.propertyProvider.setProperty(this.propertyBinding, 2); - this.playClickSound(this.mc.getSoundHandler()); - } - - } - - @Override - public void keyTyped(char keyChar, int keyCode) {} -} diff --git a/src/main/java/com/minelittlepony/minelp/renderer/IRenderPony.java b/src/main/java/com/minelittlepony/minelp/renderer/IRenderPony.java deleted file mode 100644 index 9488cd32..00000000 --- a/src/main/java/com/minelittlepony/minelp/renderer/IRenderPony.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.minelittlepony.minelp.renderer; - -import com.minelittlepony.minelp.model.PlayerModel; - -public interface IRenderPony { - - PlayerModel getPony(); -} diff --git a/src/main/java/com/voxelmodpack/common/VoxelCommonLiteMod.java b/src/main/java/com/voxelmodpack/common/VoxelCommonLiteMod.java index 613f7952..dd034f8b 100644 --- a/src/main/java/com/voxelmodpack/common/VoxelCommonLiteMod.java +++ b/src/main/java/com/voxelmodpack/common/VoxelCommonLiteMod.java @@ -19,7 +19,7 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger; import net.minecraft.launchwrapper.Launch; public abstract class VoxelCommonLiteMod implements LiteMod, Configurable { - private String bundledJarName = "voxelcommon-2.3.1.jar"; + private String bundledJarName = "voxelcommon-2.4.0.jar"; private final String voxelCommonClassName = "com.voxelmodpack.common.LiteModVoxelCommon"; private final String modClassName; private LiteMod mod; diff --git a/src/main/java/com/voxelmodpack/hdskins/HDPrivateFields.java b/src/main/java/com/voxelmodpack/hdskins/HDPrivateFields.java index b7a10d3a..bd7f368f 100644 --- a/src/main/java/com/voxelmodpack/hdskins/HDPrivateFields.java +++ b/src/main/java/com/voxelmodpack/hdskins/HDPrivateFields.java @@ -25,9 +25,7 @@ public class HDPrivateFields extends PrivateFields { protected HDObf(String seargeName, String obfName, String mcpName) { super(seargeName, obfName, mcpName); - // TODO Auto-generated constructor stub } - } } diff --git a/src/main/resources/litemod.json b/src/main/resources/litemod.json index 1f9f8521..682ae243 100644 --- a/src/main/resources/litemod.json +++ b/src/main/resources/litemod.json @@ -1,11 +1,11 @@ { "name": "minelp", - "mcversion": "1.8", - "version": "1.8-UNOFFICIAL", - "revision": "185.21", + "mcversion": "${mcversion}", + "version": "${version}", + "revision": "${revision}", "author": "Verdana, Rene_Z, Mumfrey, JoyJoy", "voxelCommonJarName": "voxelcommon-2.4.0.jar", - "classTransformerClasses": "com.minelittlepony.minelp.transformers.RenderPlayerTransformer", + "classTransformerClasses": "com.brohoof.minelittlepony.transformers.RenderPlayerTransformer", "description": "Mine Little Pony turns players and mobs into ponies", "description.minelittlepony": "Mine Little Pony turns players and mobs into ponies", "description.hdskins": "Seperate skin server for Mine Little Pony that also supports HD skins. Access via Skin Manager key binding (default: F1) in the main menu." diff --git a/voxellib/build.gradle b/voxellib/build.gradle index 85f129f3..f0f52a54 100644 --- a/voxellib/build.gradle +++ b/voxellib/build.gradle @@ -1,21 +1,18 @@ apply plugin: 'net.minecraftforge.gradle.tweaker-client' -archivesBaseName = "lib_voxelcommon" -version = "4.4.0-mc1.8" +archivesBaseName = "voxelcommon" +version = "2.4.0" minecraft { version = "1.8" - mappings = 'snapshot_20150606' + mappings = 'snapshot_20151027' + runDir = '../run' tweakClass = 'com.mumfrey.liteloader.launch.LiteLoaderTweaker' } repositories.flatDir { - dir 'liteloader' + dir '../liteloader' } dependencies { - deobfCompile 'com.mumfrey:liteloader:1.8-SNAPSHOT:srg' -} -jar { - extension 'litemod' - archiveName = 'voxelcommon-2.4.0.jar' - manifest.attributes.remove 'TweakClass' + deobfCompile 'com.mumfrey:liteloader:1.8-SNAPSHOT:srgnames' } +jar.manifest.attributes.remove 'TweakClass' diff --git a/voxellib/src/main/java/com/voxelmodpack/common/LiteModVoxelCommon.java b/voxellib/src/main/java/com/voxelmodpack/common/LiteModVoxelCommon.java index 8e9c4c61..5f6c5147 100644 --- a/voxellib/src/main/java/com/voxelmodpack/common/LiteModVoxelCommon.java +++ b/voxellib/src/main/java/com/voxelmodpack/common/LiteModVoxelCommon.java @@ -82,7 +82,7 @@ public class LiteModVoxelCommon implements PacketHandler { @Override public boolean handlePacket(INetHandler netHandler, Packet packet) { S03PacketTimeUpdate timeUpdatePacket = (S03PacketTimeUpdate) packet; - LiteModVoxelCommon.updateTime(netHandler, timeUpdatePacket.func_149366_c(), timeUpdatePacket.func_149365_d()); + LiteModVoxelCommon.updateTime(netHandler, timeUpdatePacket.getTotalWorldTime(), timeUpdatePacket.getWorldTime()); return false; } diff --git a/voxellib/src/main/java/com/voxelmodpack/common/gui/GuiScreenEx.java b/voxellib/src/main/java/com/voxelmodpack/common/gui/GuiScreenEx.java index bd19a9df..d40d09d6 100644 --- a/voxellib/src/main/java/com/voxelmodpack/common/gui/GuiScreenEx.java +++ b/voxellib/src/main/java/com/voxelmodpack/common/gui/GuiScreenEx.java @@ -96,7 +96,6 @@ public abstract class GuiScreenEx extends GuiScreen implements IExtendedGui { /** * Draws a solid color rectangle with the specified coordinates and color. */ - @SuppressWarnings("cast") public void drawDepthRect(int x1, int y1, int x2, int y2, int color) { if (x1 < x2) { int xTemp = x1; diff --git a/voxellib/src/main/java/com/voxelmodpack/common/properties/gui/GuiVoxelBoxSettingsPanel.java b/voxellib/src/main/java/com/voxelmodpack/common/properties/gui/GuiVoxelBoxSettingsPanel.java index fffd6fd5..6234a250 100644 --- a/voxellib/src/main/java/com/voxelmodpack/common/properties/gui/GuiVoxelBoxSettingsPanel.java +++ b/voxellib/src/main/java/com/voxelmodpack/common/properties/gui/GuiVoxelBoxSettingsPanel.java @@ -264,10 +264,8 @@ public abstract class GuiVoxelBoxSettingsPanel extends GuiScreenEx implements Co if (keyCode == Keyboard.KEY_TAB) { VoxelProperty focused = null; // focused property - VoxelProperty next = null; // next focusable property AFTER the - // focused property - VoxelProperty before = null; // first focusable property BEFORE - // the focused property + VoxelProperty next = null; // next focusable property AFTER the focused property + VoxelProperty before = null; // first focusable property BEFORE the focused property // Search through properties to find focus chain for (VoxelProperty property : this.properties) { diff --git a/voxellib/src/main/java/com/voxelmodpack/common/runtime/PrivateFields.java b/voxellib/src/main/java/com/voxelmodpack/common/runtime/PrivateFields.java index 765815e3..c38bbb9e 100644 --- a/voxellib/src/main/java/com/voxelmodpack/common/runtime/PrivateFields.java +++ b/voxellib/src/main/java/com/voxelmodpack/common/runtime/PrivateFields.java @@ -132,55 +132,33 @@ public class PrivateFields { this.set(null, value); } - public static final StaticFields locale = new StaticFields(I18n.class, - ObfMap.currentLocale); - public static final StaticFields optionsBackground = new StaticFields( - Gui.class, ObfMap.optionsBackground); + public static final StaticFields locale = new StaticFields(I18n.class, ObfMap.currentLocale); + public static final StaticFields optionsBackground = new StaticFields(Gui.class, ObfMap.optionsBackground); } // If anyone screws up the formatting of this table again I will have them // fed to a shark - public static final PrivateFields guiScreenSelectedButton = new PrivateFields( - GuiScreen.class, ObfMap.guiScreenSelectedButton); - public static final PrivateFields worldType = new PrivateFields( - WorldInfo.class, ObfMap.worldType); - public static final PrivateFields soundSystem = new PrivateFields( - SoundManager.class, ObfMap.soundSystemThread); - public static final PrivateFields lastClicked = new PrivateFields(GuiSlot.class, - ObfMap.lastClicked); - public static final PrivateFields renderZoom = new PrivateFields( - EntityRenderer.class, ObfMap.renderZoom); - public static final PrivateFields renderOfsetX = new PrivateFields( - EntityRenderer.class, ObfMap.renderOfsetX); - public static final PrivateFields renderOfsetY = new PrivateFields( - EntityRenderer.class, ObfMap.renderOfsetY); - public static final PrivateFields rainingStrength = new PrivateFields(World.class, - ObfMap.rainingStrength); - public static final PrivateFields thunderingStrength = new PrivateFields(World.class, - ObfMap.thunderingStrength); - public static final PrivateFields downloadedImage = new PrivateFields( - ThreadDownloadImageData.class, ObfMap.downloadedImage); - public static final PrivateFields internetServerList = new PrivateFields( - GuiMultiplayer.class, ObfMap.internetServerList); - public static final PrivateFields serverSelectionList = new PrivateFields( - GuiMultiplayer.class, ObfMap.serverSelectionList); - public static final PrivateFields guiResourcePacksParentScreen = new PrivateFields( - GuiScreenResourcePacks.class, ObfMap.guiResourcePacksParentScreen); - public static final PrivateFields abstractResourcePackFile = new PrivateFields( - AbstractResourcePack.class, ObfMap.abstractResourcePackFile); - public static final PrivateFields mcFramebuffer = new PrivateFields( - Minecraft.class, ObfMap.mcFramebuffer); - public static final PrivateFields imageUrl = new PrivateFields( - ThreadDownloadImageData.class, ObfMap.imageUrl); - public static final PrivateFields imageThread = new PrivateFields( - ThreadDownloadImageData.class, ObfMap.imageThread); - public static final PrivateFields imageBuffer = new PrivateFields( - ThreadDownloadImageData.class, ObfMap.imageBuffer); - public static final PrivateFields imageFile = new PrivateFields( - ThreadDownloadImageData.class, ObfMap.imageFile); + public static final PrivateFields guiScreenSelectedButton = new PrivateFields(GuiScreen.class, ObfMap.guiScreenSelectedButton); + public static final PrivateFields worldType = new PrivateFields(WorldInfo.class, ObfMap.worldType); + public static final PrivateFields soundSystem = new PrivateFields(SoundManager.class, ObfMap.soundSystemThread); + public static final PrivateFields lastClicked = new PrivateFields(GuiSlot.class, ObfMap.lastClicked); + public static final PrivateFields renderZoom = new PrivateFields(EntityRenderer.class, ObfMap.renderZoom); + public static final PrivateFields renderOfsetX = new PrivateFields(EntityRenderer.class, ObfMap.renderOfsetX); + public static final PrivateFields renderOfsetY = new PrivateFields(EntityRenderer.class, ObfMap.renderOfsetY); + public static final PrivateFields rainingStrength = new PrivateFields(World.class, ObfMap.rainingStrength); + public static final PrivateFields thunderingStrength = new PrivateFields(World.class, ObfMap.thunderingStrength); + public static final PrivateFields downloadedImage = new PrivateFields(ThreadDownloadImageData.class, ObfMap.downloadedImage); + public static final PrivateFields internetServerList = new PrivateFields(GuiMultiplayer.class, ObfMap.internetServerList); + public static final PrivateFields serverSelectionList = new PrivateFields(GuiMultiplayer.class, ObfMap.serverSelectionList); + public static final PrivateFields guiResourcePacksParentScreen = new PrivateFields(GuiScreenResourcePacks.class, ObfMap.guiResourcePacksParentScreen); + public static final PrivateFields abstractResourcePackFile = new PrivateFields(AbstractResourcePack.class, ObfMap.abstractResourcePackFile); + public static final PrivateFields mcFramebuffer = new PrivateFields(Minecraft.class, ObfMap.mcFramebuffer); + public static final PrivateFields imageUrl = new PrivateFields(ThreadDownloadImageData.class, ObfMap.imageUrl); + public static final PrivateFields imageThread = new PrivateFields(ThreadDownloadImageData.class, ObfMap.imageThread); + public static final PrivateFields imageBuffer = new PrivateFields(ThreadDownloadImageData.class, ObfMap.imageBuffer); + public static final PrivateFields imageFile = new PrivateFields(ThreadDownloadImageData.class, ObfMap.imageFile); - public static final PrivateFields> eventSounds = new PrivateFields>( - SoundEventAccessorComposite.class, ObfMap.eventSounds); + public static final PrivateFields> eventSounds = new PrivateFields>(SoundEventAccessorComposite.class, ObfMap.eventSounds); public static final PrivateFields> resourceToTextureMap = new PrivateFields>( TextureManager.class, ObfMap.resourceToTextureMap); } diff --git a/voxellib/src/main/java/com/voxelmodpack/common/runtime/PrivateMethods.java b/voxellib/src/main/java/com/voxelmodpack/common/runtime/PrivateMethods.java index fbaf841f..c29e7504 100644 --- a/voxellib/src/main/java/com/voxelmodpack/common/runtime/PrivateMethods.java +++ b/voxellib/src/main/java/com/voxelmodpack/common/runtime/PrivateMethods.java @@ -122,24 +122,16 @@ public class PrivateMethods { } // Methods on public classes - public static final PrivateMethods containerGetSlotAtPosition = new PrivateMethods( - GuiContainer.class, ObfMap.getSlotAtPosition, int.class, int.class); - public static final PrivateMethods containerHandleMouseClick = new PrivateMethods( - GuiContainer.class, ObfMap.handleMouseClick, Slot.class, int.class, int.class, int.class); - public static final PrivateMethods selectTab = new PrivateMethods( - GuiContainerCreative.class, ObfMap.selectTab, CreativeTabs.class); - public static final PrivateMethods mainMenuRenderSkyBox = new PrivateMethods( - GuiMainMenu.class, ObfMap.renderSkyBox, int.class, int.class, float.class); + public static final PrivateMethods containerGetSlotAtPosition = new PrivateMethods(GuiContainer.class, ObfMap.getSlotAtPosition, int.class, int.class); + public static final PrivateMethods containerHandleMouseClick = new PrivateMethods(GuiContainer.class, ObfMap.handleMouseClick, Slot.class, int.class, int.class, int.class); + public static final PrivateMethods selectTab = new PrivateMethods(GuiContainerCreative.class, ObfMap.selectTab, CreativeTabs.class); + public static final PrivateMethods mainMenuRenderSkyBox = new PrivateMethods(GuiMainMenu.class, ObfMap.renderSkyBox, int.class, int.class, float.class); - public static final PrivateMethods guiScreenMouseClicked = new PrivateMethods( - GuiScreen.class, ObfMap.guiScreenMouseClicked, int.class, int.class, int.class); - public static final PrivateMethods guiScreenMouseMovedOrUp = new PrivateMethods( - GuiScreen.class, ObfMap.guiScreenMouseMovedOrUp, int.class, int.class, int.class); - public static final PrivateMethods guiScreenKeyTyped = new PrivateMethods( - GuiScreen.class, ObfMap.guiScreenKeyTyped, char.class, int.class); + public static final PrivateMethods guiScreenMouseClicked = new PrivateMethods(GuiScreen.class, ObfMap.guiScreenMouseClicked, int.class, int.class, int.class); + public static final PrivateMethods guiScreenMouseMovedOrUp = new PrivateMethods(GuiScreen.class, ObfMap.guiScreenMouseMovedOrUp, int.class, int.class, int.class); + public static final PrivateMethods guiScreenKeyTyped = new PrivateMethods(GuiScreen.class, ObfMap.guiScreenKeyTyped, char.class, int.class); // Methods on dynamic classes below here @SuppressWarnings({ "unchecked", "rawtypes" }) - public static final PrivateMethods scrollTo = new PrivateMethods( - PrivateClasses.ContainerCreative.Class, ObfMap.scrollTo, float.class); + public static final PrivateMethods scrollTo = new PrivateMethods(PrivateClasses.ContainerCreative.Class, ObfMap.scrollTo, float.class); } \ No newline at end of file diff --git a/voxellib/src/main/resources/litemod.json b/voxellib/src/main/resources/litemod.json index 96cd31b6..da88d57e 100644 --- a/voxellib/src/main/resources/litemod.json +++ b/voxellib/src/main/resources/litemod.json @@ -1,8 +1,8 @@ { "name": "voxellib", - "mcversion": "1.7.10", - "version": "2.3.1", - "revision": "234", + "mcversion": "1.8", + "version": "2.4.0", + "revision": "241", "author": "The VoxelModPack Team", "description": "VoxelLib contains all of the shared functionality for the VoxelModPack mods" }