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

Fix mappings for hdskins

Browse source
This commit is contained in:
Matthew Messinger 2017-06-16 01:41:36 -04:00
parent 05483e1961
commit 825fc22f55
5 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build.gradle
View file

@ -28,7 +28,7 @@ sourceCompatibility = 1.8
minecraft { minecraft {
version = "1.12" version = "1.12"
mappings = 'snapshot_20170611' mappings = 'snapshot_20170615'
runDir = 'run' runDir = 'run'
replace '@VERSION@', project.version replace '@VERSION@', project.version
} }
@ -48,14 +48,14 @@ mixin {
} }
litemod.json { litemod.json {
author = 'Verdana, Rene_Z, Mumfrey, JoyJoy' author = 'Verdana, Rene_Z, Mumfrey, Killjoy1221'
description = 'Mine Little Pony turns players and mobs into ponies' description = 'Mine Little Pony turns players and mobs into ponies'
description.minelittlepony = '''\ description.minelittlepony = '''\
Mine Little Pony turns players and mobs into ponies Mine Little Pony turns players and mobs into ponies
Press F9 ingame to access settings'''.stripIndent() Press F9 ingame to access settings'''.stripIndent()
description.hdskinsmod = '''\ description.hdskinsmod = '''\
Seperate skin server for Mine Little Pony that also supports HD skins. Separate skin server for Mine Little Pony that also supports HD skins.
Access via Skin Manager key binding (default: F1) in the main menu.'''.stripIndent() Access via button on the main menu.'''.stripIndent()
mixinConfigs += [ mixinConfigs += [
'mixin.minelp.json', 'mixin.minelp.json',
@ -65,7 +65,7 @@ litemod.json {
jar { jar {
from sourceSets.hdskins.output from sourceSets.hdskins.output
from litemod.outputs from litemod
} }
sourceJar { sourceJar {
// add hdskins sources // add hdskins sources
@ -73,7 +73,7 @@ sourceJar {
} }
task srgJar(type: Jar) { task srgJar(type: Jar) {
from sourceSets.hdskins.output from sourceSets.hdskins.output
from litemod.outputs from litemod
classifier "mc$minecraft.version-srg" classifier "mc$minecraft.version-srg"
baseName "mod-${project.name.toLowerCase()}" baseName "mod-${project.name.toLowerCase()}"
} }

4
build.number
View file

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Tue Jun 13 04:25:28 EDT 2017 #Fri Jun 16 00:07:29 EDT 2017
build.number=346 build.number=375

5
src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiItemStackButton.java
View file

@ -13,10 +13,9 @@ public class GuiItemStackButton extends GuiButton {
this.itemStack = itemStack; this.itemStack = itemStack;
} }
// drawButton
@Override @Override
public void func_191745_a(Minecraft mc, int mouseX, int mouseY, float partialTicks) { public void drawButton(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
super.func_191745_a(mc, mouseX, mouseY, partialTicks); super.drawButton(mc, mouseX, mouseY, partialTicks);
mc.getRenderItem().renderItemIntoGUI(itemStack, this.x + 2, this.y + 2); mc.getRenderItem().renderItemIntoGUI(itemStack, this.x + 2, this.y + 2);
} }

12
src/hdskins/java/com/voxelmodpack/hdskins/gui/GuiSkins.java
View file

@ -1,5 +1,9 @@
package com.voxelmodpack.hdskins.gui; package com.voxelmodpack.hdskins.gui;
import static com.mojang.authlib.minecraft.MinecraftProfileTexture.Type.ELYTRA;
import static com.mojang.authlib.minecraft.MinecraftProfileTexture.Type.SKIN;
import static net.minecraft.client.renderer.GlStateManager.*;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.mojang.authlib.GameProfile; import com.mojang.authlib.GameProfile;
import com.mojang.authlib.exceptions.AuthenticationException; import com.mojang.authlib.exceptions.AuthenticationException;
@ -33,8 +37,6 @@ import org.lwjgl.BufferUtils;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import org.lwjgl.util.glu.GLU; import org.lwjgl.util.glu.GLU;
import javax.imageio.ImageIO;
import javax.swing.*;
import java.awt.Color; import java.awt.Color;
import java.awt.Window.Type; import java.awt.Window.Type;
import java.awt.dnd.DropTarget; import java.awt.dnd.DropTarget;
@ -44,10 +46,8 @@ import java.io.IOException;
import java.nio.DoubleBuffer; import java.nio.DoubleBuffer;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import javax.imageio.ImageIO;
import static com.mojang.authlib.minecraft.MinecraftProfileTexture.Type.ELYTRA; import javax.swing.*;
import static com.mojang.authlib.minecraft.MinecraftProfileTexture.Type.SKIN;
import static net.minecraft.client.renderer.GlStateManager.*;
public class GuiSkins extends GuiScreen { public class GuiSkins extends GuiScreen {
private static final int MAX_SKIN_DIMENSION = 8192; private static final int MAX_SKIN_DIMENSION = 8192;

3
src/hdskins/java/com/voxelmodpack/hdskins/gui/HDSkinsConfigPanel.java
View file

@ -18,8 +18,7 @@ public class HDSkinsConfigPanel implements ConfigPanel {
@Override @Override
public void drawPanel(ConfigPanelHost host, int mouseX, int mouseY, float partialTicks) { public void drawPanel(ConfigPanelHost host, int mouseX, int mouseY, float partialTicks) {
// TODO drawButton this.button.drawButton(Minecraft.getMinecraft(), mouseX, mouseY, partialTicks);
this.button.func_191745_a(Minecraft.getMinecraft(), mouseX, mouseY, partialTicks);
} }
@Override @Override