PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-22 04:27:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change package

Browse source
This commit is contained in:
Matthew Messinger 2015-11-17 00:09:04 -05:00
parent 0734ac963d
commit 2f01397d5e
66 changed files with 267 additions and 439 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
build.gradle
View file

@ -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 {

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -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

BIN
liteloader/liteloader-1.8-SNAPSHOT-sources.jar Normal file
View file

Binary file not shown.

0
voxellib/liteloader/liteloader-1.8-SNAPSHOT-srg.jar → liteloader/liteloader-1.8-SNAPSHOT-srgnames.jar
View file

4
src/main/java/com/minelittlepony/minelp/LiteModMineLittlePony.java → src/main/java/com/brohoof/minelittlepony/LiteModMineLittlePony.java
View file

@ -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

21
src/main/java/com/minelittlepony/minelp/MineLittlePony.java → src/main/java/com/brohoof/minelittlepony/MineLittlePony.java
View file

@ -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;

8
src/main/java/com/minelittlepony/minelp/Pony.java → src/main/java/com/brohoof/minelittlepony/Pony.java
View file

@ -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;

2
src/main/java/com/minelittlepony/minelp/PonyConfig.java → src/main/java/com/brohoof/minelittlepony/PonyConfig.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.minelp;
package com.brohoof.minelittlepony;
import com.minelittlepony.minelp.util.MineLPLogger;
import com.voxelmodpack.common.properties.ModConfig;

2
src/main/java/com/minelittlepony/minelp/PonyLevel.java → src/main/java/com/brohoof/minelittlepony/PonyLevel.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.minelp;
package com.brohoof.minelittlepony;
public enum PonyLevel {
PONIES,

6
src/main/java/com/minelittlepony/minelp/PonyManager.java → src/main/java/com/brohoof/minelittlepony/PonyManager.java
View file

@ -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;

0
src/main/java/com/minelittlepony/minelp/gui/FakeVoxelPropertyCheckBox.java → src/main/java/com/brohoof/minelittlepony/gui/FakeVoxelPropertyToggleBox.java
View file

6
src/main/java/com/minelittlepony/minelp/gui/MineLittlePonyGUI.java → src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUI.java
View file

@ -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;

5
src/main/java/com/minelittlepony/minelp/gui/MineLittlePonyGUIMob.java → src/main/java/com/brohoof/minelittlepony/gui/MineLittlePonyGUIMob.java
View file

@ -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;

2
src/main/java/com/minelittlepony/minelp/hdskins/gui/EntityPonyModel.java → src/main/java/com/brohoof/minelittlepony/hdskins/gui/EntityPonyModel.java
View file

@ -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;

8
src/main/java/com/minelittlepony/minelp/hdskins/gui/GuiSkinsMineLP.java → src/main/java/com/brohoof/minelittlepony/hdskins/gui/GuiSkinsMineLP.java
View file

@ -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;

8
src/main/java/com/minelittlepony/minelp/hdskins/gui/RenderPonyModel.java → src/main/java/com/brohoof/minelittlepony/hdskins/gui/RenderPonyModel.java
View file

@ -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;

2
src/main/java/com/minelittlepony/minelp/model/ModelArmor.java → src/main/java/com/brohoof/minelittlepony/model/ModelArmor.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.minelp.model;
package com.brohoof.minelittlepony.model;
public abstract class ModelArmor {
public final String path;

5
src/main/java/com/minelittlepony/minelp/model/ModelHornGlow.java → src/main/java/com/brohoof/minelittlepony/model/ModelHornGlow.java
View file

@ -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;

6
src/main/java/com/minelittlepony/minelp/model/ModelPony.java → src/main/java/com/brohoof/minelittlepony/model/ModelPony.java
View file

@ -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);
}

18
src/main/java/com/minelittlepony/minelp/model/PMAPI.java → src/main/java/com/brohoof/minelittlepony/model/PMAPI.java
View file

@ -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 {

7
src/main/java/com/minelittlepony/minelp/model/PlayerModel.java → src/main/java/com/brohoof/minelittlepony/model/PlayerModel.java
View file

@ -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;

5
src/main/java/com/minelittlepony/minelp/model/ScalableModelBox.java → src/main/java/com/brohoof/minelittlepony/model/ScalableModelBox.java
View file

@ -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;

6
src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_newPonyArmor.java → src/main/java/com/brohoof/minelittlepony/model/pony/armor/pm_newPonyArmor.java
View file

@ -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;

4
src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_skeletonPonyArmor.java → src/main/java/com/brohoof/minelittlepony/model/pony/armor/pm_skeletonPonyArmor.java
View file

@ -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;

4
src/main/java/com/minelittlepony/minelp/model/pony/armor/pm_zombiePonyArmor.java → src/main/java/com/brohoof/minelittlepony/model/pony/armor/pm_zombiePonyArmor.java
View file

@ -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;

6
src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_Human.java → src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_Human.java
View file

@ -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 {

4
src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_newPony.java → src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_newPony.java
View file

@ -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) {

4
src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_skeletonPony.java → src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_skeletonPony.java
View file

@ -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 {

4
src/main/java/com/minelittlepony/minelp/model/pony/armor/pma_zombiePony.java → src/main/java/com/brohoof/minelittlepony/model/pony/armor/pma_zombiePony.java
View file

@ -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 {

4
src/main/java/com/minelittlepony/minelp/model/pony/pm_Human.java → src/main/java/com/brohoof/minelittlepony/model/pony/pm_Human.java
View file

@ -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;

23
src/main/java/com/minelittlepony/minelp/model/pony/pm_newPonyAdv.java → src/main/java/com/brohoof/minelittlepony/model/pony/pm_newPonyAdv.java
View file

@ -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;

2
src/main/java/com/minelittlepony/minelp/model/pony/pm_skeletonPony.java → src/main/java/com/brohoof/minelittlepony/model/pony/pm_skeletonPony.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.minelp.model.pony;
package com.brohoof.minelittlepony.model.pony;
import static net.minecraft.client.renderer.GlStateManager.*;

4
src/main/java/com/minelittlepony/minelp/model/pony/pm_zombiePony.java → src/main/java/com/brohoof/minelittlepony/model/pony/pm_zombiePony.java
View file

@ -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;

2
src/main/java/com/minelittlepony/minelp/renderer/AniParams.java → src/main/java/com/brohoof/minelittlepony/renderer/AniParams.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.minelp.renderer;
package com.brohoof.minelittlepony.renderer;
public class AniParams {

2
src/main/java/com/minelittlepony/minelp/renderer/CompressiveRendering.java → src/main/java/com/brohoof/minelittlepony/renderer/CompressiveRendering.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.minelp.renderer;
package com.brohoof.minelittlepony.renderer;
import java.util.ArrayList;
import java.util.Collection;

5
src/main/java/com/minelittlepony/minelp/renderer/HornGlowRenderer.java → src/main/java/com/brohoof/minelittlepony/renderer/HornGlowRenderer.java
View file

@ -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;

8
src/main/java/com/brohoof/minelittlepony/renderer/IRenderPony.java Normal file
View file

@ -0,0 +1,8 @@
package com.brohoof.minelittlepony.renderer;
import com.brohoof.minelittlepony.model.PlayerModel;
public interface IRenderPony {
PlayerModel getPony();
}

2
src/main/java/com/minelittlepony/minelp/renderer/PlaneRenderer.java → src/main/java/com/brohoof/minelittlepony/renderer/PlaneRenderer.java
View file

@ -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;

24
src/main/java/com/minelittlepony/minelp/renderer/RenderPony.java → src/main/java/com/brohoof/minelittlepony/renderer/RenderPony.java
View file

@ -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;

18
src/main/java/com/minelittlepony/minelp/renderer/RenderPonyMob.java → src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyMob.java
View file

@ -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<T extends EntityLiving> 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<T extends EntityLiving> extends RenderLiving
preRenderCallback((T) entitylivingbaseIn, partialTickTime);
}
@SuppressWarnings("unused")
protected void rotateCorpse(T entity, float xPosition, float yPosition, float zPosition) {}
@SuppressWarnings("unchecked")

8
src/main/java/com/minelittlepony/minelp/renderer/RenderPonySkeleton.java → src/main/java/com/brohoof/minelittlepony/renderer/RenderPonySkeleton.java
View file

@ -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<EntitySkeleton> {
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;
}

8
src/main/java/com/minelittlepony/minelp/renderer/RenderPonyVillager.java → src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyVillager.java
View file

@ -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;

6
src/main/java/com/minelittlepony/minelp/renderer/RenderPonyZombie.java → src/main/java/com/brohoof/minelittlepony/renderer/RenderPonyZombie.java
View file

@ -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;

4
src/main/java/com/minelittlepony/minelp/renderer/ScalableModelRenderer.java → src/main/java/com/brohoof/minelittlepony/renderer/ScalableModelRenderer.java
View file

@ -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;

11
src/main/java/com/minelittlepony/minelp/renderer/layer/LayerHeldPonyItem.java → src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerHeldPonyItem.java
View file

@ -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
}

31
src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonyArmor.java → src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyArmor.java
View file

@ -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<String, ResourceLocation> field_110859_k = Maps.newHashMap();
private static final Map<String, ResourceLocation> ponyArmorMap = Maps.newHashMap();
private static final Map<String, ResourceLocation> onlyPonyArmorMap = Maps.newHashMap();
private static final String[] bipedArmorFilenamePrefix = { "leather", "chainmail", "iron", "gold", "diamond" };
private static HashSet<String> ponyArmors = new HashSet<String>();
private static final Map<String, ResourceLocation> HUMAN_ARMORS = Maps.newHashMap();
private static final Map<ResourceLocation, ResourceLocation> PONY_ARMORS = Maps.newHashMap();
private RendererLivingEntity renderer;
private LayerBipedArmor humanArmor;

8
src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonyCape.java → src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonyCape.java
View file

@ -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;

10
src/main/java/com/minelittlepony/minelp/renderer/layer/LayerPonySkull.java → src/main/java/com/brohoof/minelittlepony/renderer/layer/LayerPonySkull.java
View file

@ -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;

4
src/main/java/com/minelittlepony/minelp/transformers/RenderPlayerTransformer.java → src/main/java/com/brohoof/minelittlepony/transformers/RenderPlayerTransformer.java
View file

@ -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);

2
src/main/java/com/minelittlepony/minelp/util/MineLPLogger.java → src/main/java/com/brohoof/minelittlepony/util/MineLPLogger.java
View file

@ -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;

2
src/main/java/com/minelittlepony/minelp/util/MineLPObf.java → src/main/java/com/brohoof/minelittlepony/util/MineLPObf.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.minelp.util;
package com.brohoof.minelittlepony.util;
import com.mumfrey.liteloader.core.runtime.Obf;

2
src/main/java/com/minelittlepony/minelp/util/MineLPPrivateFields.java → src/main/java/com/brohoof/minelittlepony/util/MineLPPrivateFields.java
View file

@ -1,4 +1,4 @@
package com.minelittlepony.minelp.util;
package com.brohoof.minelittlepony.util;
import java.util.Map;

7
src/main/java/com/minelittlepony/minelp/util/MineLPRData.java → src/main/java/com/brohoof/minelittlepony/util/MineLPRData.java
View file

@ -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;

8
src/main/java/com/minelittlepony/minelp/util/MineLPReflection.java → src/main/java/com/brohoof/minelittlepony/util/MineLPReflection.java
View file

@ -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;

157
src/main/java/com/minelittlepony/minelp/gui/VoxelPropertyIntSlider.java
View file

@ -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<IVoxelPropertyProviderInteger> {
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) {}
}

8
src/main/java/com/minelittlepony/minelp/renderer/IRenderPony.java
View file

@ -1,8 +0,0 @@
package com.minelittlepony.minelp.renderer;
import com.minelittlepony.minelp.model.PlayerModel;
public interface IRenderPony {
PlayerModel getPony();
}

2
src/main/java/com/voxelmodpack/common/VoxelCommonLiteMod.java
View file

@ -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;

2
src/main/java/com/voxelmodpack/hdskins/HDPrivateFields.java
View file

@ -25,9 +25,7 @@ public class HDPrivateFields<P, T> extends PrivateFields<P, T> {
protected HDObf(String seargeName, String obfName, String mcpName) {
super(seargeName, obfName, mcpName);
// TODO Auto-generated constructor stub
}
}
}

8
src/main/resources/litemod.json
View file

@ -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."

17
voxellib/build.gradle
View file

@ -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'

2
voxellib/src/main/java/com/voxelmodpack/common/LiteModVoxelCommon.java
View file

@ -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;
}

1
voxellib/src/main/java/com/voxelmodpack/common/gui/GuiScreenEx.java
View file

@ -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;

6
voxellib/src/main/java/com/voxelmodpack/common/properties/gui/GuiVoxelBoxSettingsPanel.java
View file

@ -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) {

66
voxellib/src/main/java/com/voxelmodpack/common/runtime/PrivateFields.java
View file

@ -132,55 +132,33 @@ public class PrivateFields<P, T> {
this.set(null, value);
}
public static final StaticFields<I18n, Locale> locale = new StaticFields<I18n, Locale>(I18n.class,
ObfMap.currentLocale);
public static final StaticFields<Gui, ResourceLocation> optionsBackground = new StaticFields<Gui, ResourceLocation>(
Gui.class, ObfMap.optionsBackground);
public static final StaticFields<I18n, Locale> locale = new StaticFields<I18n, Locale>(I18n.class, ObfMap.currentLocale);
public static final StaticFields<Gui, ResourceLocation> optionsBackground = new StaticFields<Gui, ResourceLocation>(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<GuiScreen, GuiButton> guiScreenSelectedButton = new PrivateFields<GuiScreen, GuiButton>(
GuiScreen.class, ObfMap.guiScreenSelectedButton);
public static final PrivateFields<WorldInfo, WorldType> worldType = new PrivateFields<WorldInfo, WorldType>(
WorldInfo.class, ObfMap.worldType);
public static final PrivateFields<SoundManager, SoundSystem> soundSystem = new PrivateFields<SoundManager, SoundSystem>(
SoundManager.class, ObfMap.soundSystemThread);
public static final PrivateFields<GuiSlot, Long> lastClicked = new PrivateFields<GuiSlot, Long>(GuiSlot.class,
ObfMap.lastClicked);
public static final PrivateFields<EntityRenderer, Double> renderZoom = new PrivateFields<EntityRenderer, Double>(
EntityRenderer.class, ObfMap.renderZoom);
public static final PrivateFields<EntityRenderer, Double> renderOfsetX = new PrivateFields<EntityRenderer, Double>(
EntityRenderer.class, ObfMap.renderOfsetX);
public static final PrivateFields<EntityRenderer, Double> renderOfsetY = new PrivateFields<EntityRenderer, Double>(
EntityRenderer.class, ObfMap.renderOfsetY);
public static final PrivateFields<World, Float> rainingStrength = new PrivateFields<World, Float>(World.class,
ObfMap.rainingStrength);
public static final PrivateFields<World, Float> thunderingStrength = new PrivateFields<World, Float>(World.class,
ObfMap.thunderingStrength);
public static final PrivateFields<ThreadDownloadImageData, BufferedImage> downloadedImage = new PrivateFields<ThreadDownloadImageData, BufferedImage>(
ThreadDownloadImageData.class, ObfMap.downloadedImage);
public static final PrivateFields<GuiMultiplayer, ServerList> internetServerList = new PrivateFields<GuiMultiplayer, ServerList>(
GuiMultiplayer.class, ObfMap.internetServerList);
public static final PrivateFields<GuiMultiplayer, ServerSelectionList> serverSelectionList = new PrivateFields<GuiMultiplayer, ServerSelectionList>(
GuiMultiplayer.class, ObfMap.serverSelectionList);
public static final PrivateFields<GuiScreenResourcePacks, GuiScreen> guiResourcePacksParentScreen = new PrivateFields<GuiScreenResourcePacks, GuiScreen>(
GuiScreenResourcePacks.class, ObfMap.guiResourcePacksParentScreen);
public static final PrivateFields<AbstractResourcePack, File> abstractResourcePackFile = new PrivateFields<AbstractResourcePack, File>(
AbstractResourcePack.class, ObfMap.abstractResourcePackFile);
public static final PrivateFields<Minecraft, Framebuffer> mcFramebuffer = new PrivateFields<Minecraft, Framebuffer>(
Minecraft.class, ObfMap.mcFramebuffer);
public static final PrivateFields<ThreadDownloadImageData, String> imageUrl = new PrivateFields<ThreadDownloadImageData, String>(
ThreadDownloadImageData.class, ObfMap.imageUrl);
public static final PrivateFields<ThreadDownloadImageData, Thread> imageThread = new PrivateFields<ThreadDownloadImageData, Thread>(
ThreadDownloadImageData.class, ObfMap.imageThread);
public static final PrivateFields<ThreadDownloadImageData, IImageBuffer> imageBuffer = new PrivateFields<ThreadDownloadImageData, IImageBuffer>(
ThreadDownloadImageData.class, ObfMap.imageBuffer);
public static final PrivateFields<ThreadDownloadImageData, File> imageFile = new PrivateFields<ThreadDownloadImageData, File>(
ThreadDownloadImageData.class, ObfMap.imageFile);
public static final PrivateFields<GuiScreen, GuiButton> guiScreenSelectedButton = new PrivateFields<GuiScreen, GuiButton>(GuiScreen.class, ObfMap.guiScreenSelectedButton);
public static final PrivateFields<WorldInfo, WorldType> worldType = new PrivateFields<WorldInfo, WorldType>(WorldInfo.class, ObfMap.worldType);
public static final PrivateFields<SoundManager, SoundSystem> soundSystem = new PrivateFields<SoundManager, SoundSystem>(SoundManager.class, ObfMap.soundSystemThread);
public static final PrivateFields<GuiSlot, Long> lastClicked = new PrivateFields<GuiSlot, Long>(GuiSlot.class, ObfMap.lastClicked);
public static final PrivateFields<EntityRenderer, Double> renderZoom = new PrivateFields<EntityRenderer, Double>(EntityRenderer.class, ObfMap.renderZoom);
public static final PrivateFields<EntityRenderer, Double> renderOfsetX = new PrivateFields<EntityRenderer, Double>(EntityRenderer.class, ObfMap.renderOfsetX);
public static final PrivateFields<EntityRenderer, Double> renderOfsetY = new PrivateFields<EntityRenderer, Double>(EntityRenderer.class, ObfMap.renderOfsetY);
public static final PrivateFields<World, Float> rainingStrength = new PrivateFields<World, Float>(World.class, ObfMap.rainingStrength);
public static final PrivateFields<World, Float> thunderingStrength = new PrivateFields<World, Float>(World.class, ObfMap.thunderingStrength);
public static final PrivateFields<ThreadDownloadImageData, BufferedImage> downloadedImage = new PrivateFields<ThreadDownloadImageData, BufferedImage>(ThreadDownloadImageData.class, ObfMap.downloadedImage);
public static final PrivateFields<GuiMultiplayer, ServerList> internetServerList = new PrivateFields<GuiMultiplayer, ServerList>(GuiMultiplayer.class, ObfMap.internetServerList);
public static final PrivateFields<GuiMultiplayer, ServerSelectionList> serverSelectionList = new PrivateFields<GuiMultiplayer, ServerSelectionList>(GuiMultiplayer.class, ObfMap.serverSelectionList);
public static final PrivateFields<GuiScreenResourcePacks, GuiScreen> guiResourcePacksParentScreen = new PrivateFields<GuiScreenResourcePacks, GuiScreen>(GuiScreenResourcePacks.class, ObfMap.guiResourcePacksParentScreen);
public static final PrivateFields<AbstractResourcePack, File> abstractResourcePackFile = new PrivateFields<AbstractResourcePack, File>(AbstractResourcePack.class, ObfMap.abstractResourcePackFile);
public static final PrivateFields<Minecraft, Framebuffer> mcFramebuffer = new PrivateFields<Minecraft, Framebuffer>(Minecraft.class, ObfMap.mcFramebuffer);
public static final PrivateFields<ThreadDownloadImageData, String> imageUrl = new PrivateFields<ThreadDownloadImageData, String>(ThreadDownloadImageData.class, ObfMap.imageUrl);
public static final PrivateFields<ThreadDownloadImageData, Thread> imageThread = new PrivateFields<ThreadDownloadImageData, Thread>(ThreadDownloadImageData.class, ObfMap.imageThread);
public static final PrivateFields<ThreadDownloadImageData, IImageBuffer> imageBuffer = new PrivateFields<ThreadDownloadImageData, IImageBuffer>(ThreadDownloadImageData.class, ObfMap.imageBuffer);
public static final PrivateFields<ThreadDownloadImageData, File> imageFile = new PrivateFields<ThreadDownloadImageData, File>(ThreadDownloadImageData.class, ObfMap.imageFile);
public static final PrivateFields<SoundEventAccessorComposite, List<ISoundEventAccessor>> eventSounds = new PrivateFields<SoundEventAccessorComposite, List<ISoundEventAccessor>>(
SoundEventAccessorComposite.class, ObfMap.eventSounds);
public static final PrivateFields<SoundEventAccessorComposite, List<ISoundEventAccessor>> eventSounds = new PrivateFields<SoundEventAccessorComposite, List<ISoundEventAccessor>>(SoundEventAccessorComposite.class, ObfMap.eventSounds);
public static final PrivateFields<TextureManager, Map<ResourceLocation, ? extends ITextureObject>> resourceToTextureMap = new PrivateFields<TextureManager, Map<ResourceLocation, ? extends ITextureObject>>(
TextureManager.class, ObfMap.resourceToTextureMap);
}

24
voxellib/src/main/java/com/voxelmodpack/common/runtime/PrivateMethods.java
View file

@ -122,24 +122,16 @@ public class PrivateMethods<P, R> {
}
// Methods on public classes
public static final PrivateMethods<GuiContainer, Slot> containerGetSlotAtPosition = new PrivateMethods<GuiContainer, Slot>(
GuiContainer.class, ObfMap.getSlotAtPosition, int.class, int.class);
public static final PrivateMethods<GuiContainer, Void> containerHandleMouseClick = new PrivateMethods<GuiContainer, Void>(
GuiContainer.class, ObfMap.handleMouseClick, Slot.class, int.class, int.class, int.class);
public static final PrivateMethods<GuiContainerCreative, Void> selectTab = new PrivateMethods<GuiContainerCreative, Void>(
GuiContainerCreative.class, ObfMap.selectTab, CreativeTabs.class);
public static final PrivateMethods<GuiMainMenu, Void> mainMenuRenderSkyBox = new PrivateMethods<GuiMainMenu, PrivateMethods.Void>(
GuiMainMenu.class, ObfMap.renderSkyBox, int.class, int.class, float.class);
public static final PrivateMethods<GuiContainer, Slot> containerGetSlotAtPosition = new PrivateMethods<GuiContainer, Slot>(GuiContainer.class, ObfMap.getSlotAtPosition, int.class, int.class);
public static final PrivateMethods<GuiContainer, Void> containerHandleMouseClick = new PrivateMethods<GuiContainer, Void>(GuiContainer.class, ObfMap.handleMouseClick, Slot.class, int.class, int.class, int.class);
public static final PrivateMethods<GuiContainerCreative, Void> selectTab = new PrivateMethods<GuiContainerCreative, Void>(GuiContainerCreative.class, ObfMap.selectTab, CreativeTabs.class);
public static final PrivateMethods<GuiMainMenu, Void> mainMenuRenderSkyBox = new PrivateMethods<GuiMainMenu, PrivateMethods.Void>(GuiMainMenu.class, ObfMap.renderSkyBox, int.class, int.class, float.class);
public static final PrivateMethods<GuiScreen, Void> guiScreenMouseClicked = new PrivateMethods<GuiScreen, Void>(
GuiScreen.class, ObfMap.guiScreenMouseClicked, int.class, int.class, int.class);
public static final PrivateMethods<GuiScreen, Void> guiScreenMouseMovedOrUp = new PrivateMethods<GuiScreen, Void>(
GuiScreen.class, ObfMap.guiScreenMouseMovedOrUp, int.class, int.class, int.class);
public static final PrivateMethods<GuiScreen, Void> guiScreenKeyTyped = new PrivateMethods<GuiScreen, Void>(
GuiScreen.class, ObfMap.guiScreenKeyTyped, char.class, int.class);
public static final PrivateMethods<GuiScreen, Void> guiScreenMouseClicked = new PrivateMethods<GuiScreen, Void>(GuiScreen.class, ObfMap.guiScreenMouseClicked, int.class, int.class, int.class);
public static final PrivateMethods<GuiScreen, Void> guiScreenMouseMovedOrUp = new PrivateMethods<GuiScreen, Void>(GuiScreen.class, ObfMap.guiScreenMouseMovedOrUp, int.class, int.class, int.class);
public static final PrivateMethods<GuiScreen, Void> guiScreenKeyTyped = new PrivateMethods<GuiScreen, Void>(GuiScreen.class, ObfMap.guiScreenKeyTyped, char.class, int.class);
// Methods on dynamic classes below here
@SuppressWarnings({ "unchecked", "rawtypes" })
public static final PrivateMethods<Container, Void> scrollTo = new PrivateMethods(
PrivateClasses.ContainerCreative.Class, ObfMap.scrollTo, float.class);
public static final PrivateMethods<Container, Void> scrollTo = new PrivateMethods(PrivateClasses.ContainerCreative.Class, ObfMap.scrollTo, float.class);
}

6
voxellib/src/main/resources/litemod.json
View file

@ -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"
}