Skip to content

Commit b7c2a92

Browse files
Tommsy64Tommsy64
committed
Update to 1.12.2 by copying Divisor's 1.12.1 version of RenderPlayerAPI
1 parent 46f3bc5 commit b7c2a92

19 files changed

Lines changed: 1008 additions & 1027 deletions

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
}
88
}
99
dependencies {
10-
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
10+
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
1111
}
1212
}
1313

‎build.properties‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
minecraft.version=1.10.2
2-
minecraft.mappings=snapshot_20161111
3-
forge.version=12.18.3.2511
4-
renderplayerapi.version=1.1
1+
minecraft.version=1.12.2
2+
minecraft.mappings=snapshot_20171003
3+
forge.version=14.23.3.2702
4+
renderplayerapi.version=1.0

‎readme.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Render Player API core
33
======================
44

5-
Version 1.1 for Minecraft 1.10.2
5+
Version 1.1 for Minecraft 1.12.2
66

77
by Divisor
88

‎src/main/java/api/player/model/IModelPlayer.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,6 @@ public interface IModelPlayer
8282

8383
void localRenderDeadmau5Head(float paramFloat);
8484

85-
void realSetInvisible(boolean paramBoolean);
86-
87-
void superSetInvisible(boolean paramBoolean);
88-
89-
void localSetInvisible(boolean paramBoolean);
90-
9185
void realSetLivingAnimations(net.minecraft.entity.EntityLivingBase paramEntityLivingBase, float paramFloat1, float paramFloat2, float paramFloat3);
9286

9387
void superSetLivingAnimations(net.minecraft.entity.EntityLivingBase paramEntityLivingBase, float paramFloat1, float paramFloat2, float paramFloat3);
@@ -112,6 +106,12 @@ public interface IModelPlayer
112106

113107
void localSetTextureOffset(String paramString, int paramInt1, int paramInt2);
114108

109+
void realSetVisible(boolean paramBoolean);
110+
111+
void superSetVisible(boolean paramBoolean);
112+
113+
void localSetVisible(boolean paramBoolean);
114+
115115
net.minecraft.client.model.ModelRenderer getBipedBodyField();
116116

117117
void setBipedBodyField(net.minecraft.client.model.ModelRenderer bipedBody);

‎src/main/java/api/player/model/ModelPlayerAPI.java‎

Lines changed: 98 additions & 98 deletions
Large diffs are not rendered by default.

‎src/main/java/api/player/model/ModelPlayerArmorClassVisitor.java‎

Lines changed: 146 additions & 146 deletions
Large diffs are not rendered by default.

‎src/main/java/api/player/model/ModelPlayerArmorConstructorVisitor.java‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ public ModelPlayerArmorConstructorVisitor(MethodVisitor paramMethodVisitor, bool
3838
public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf)
3939
{
4040
if(isObfuscated && name.equals("<init>") && owner.equals("net/minecraft/client/model/ModelBiped"))
41-
owner = "bjp";
42-
if(name.equals("<init>") && owner.equals(isObfuscated ? "obf_patterns/playerapi_1_7_2/ModelPlayerArmor" : "deobf_patterns/playerapi_1_7_2/ModelPlayerArmor"))
41+
owner = "bpx";
42+
if(name.equals("<init>") && owner.equals("api/player/model/ModelPlayerArmor"))
4343
{
4444
desc = desc.substring(0, desc.indexOf(")")) + "Ljava/lang/String;)V";
4545
mv.visitVarInsn(Opcodes.ALOAD, parameterOffset);
4646
}
4747
super.visitMethodInsn(opcode, owner, name, desc, itf);
48-
if(createApi && name.equals("<init>") && owner.equals(isObfuscated ? "bjp" : "net/minecraft/client/model/ModelBiped"))
48+
if(createApi && name.equals("<init>") && owner.equals(isObfuscated ? "bpx" : "net/minecraft/client/model/ModelBiped"))
4949
{
5050
mv.visitVarInsn(Opcodes.ALOAD, 0);
5151
mv.visitVarInsn(Opcodes.ALOAD, 0);
@@ -59,12 +59,7 @@ public void visitMethodInsn(int opcode, String owner, String name, String desc,
5959
mv.visitFieldInsn(Opcodes.PUTFIELD, "api/player/model/ModelPlayerArmor", "modelPlayerAPI", "Lapi/player/model/ModelPlayerAPI;");
6060

6161
mv.visitVarInsn(Opcodes.ALOAD, 0);
62-
mv.visitVarInsn(Opcodes.FLOAD, 1);
63-
mv.visitVarInsn(Opcodes.FLOAD, 2);
64-
mv.visitVarInsn(Opcodes.ILOAD, 3);
65-
mv.visitVarInsn(Opcodes.ILOAD, 4);
66-
mv.visitLdcInsn(false);
67-
mv.visitMethodInsn(Opcodes.INVOKESTATIC, "api/player/model/ModelPlayerAPI", "beforeLocalConstructing", "(Lapi/player/model/IModelPlayerAPI;FFIIZ)V", false);
62+
mv.visitMethodInsn(Opcodes.INVOKESTATIC, "api/player/model/ModelPlayerAPI", "beforeLocalConstructing", "(Lapi/player/model/IModelPlayerAPI;)V", false);
6863
}
6964
}
7065

@@ -74,12 +69,7 @@ public void visitInsn(int opcode)
7469
if(createApi && opcode == Opcodes.RETURN)
7570
{
7671
mv.visitVarInsn(Opcodes.ALOAD, 0);
77-
mv.visitVarInsn(Opcodes.FLOAD, 1);
78-
mv.visitVarInsn(Opcodes.FLOAD, 2);
79-
mv.visitVarInsn(Opcodes.ILOAD, 3);
80-
mv.visitVarInsn(Opcodes.ILOAD, 4);
81-
mv.visitLdcInsn(false);
82-
mv.visitMethodInsn(Opcodes.INVOKESTATIC, "api/player/model/ModelPlayerAPI", "afterLocalConstructing", "(Lapi/player/model/IModelPlayerAPI;FFIIZ)V", false);
72+
mv.visitMethodInsn(Opcodes.INVOKESTATIC, "api/player/model/ModelPlayerAPI", "afterLocalConstructing", "(Lapi/player/model/IModelPlayerAPI;)V", false);
8373
}
8474
super.visitInsn(opcode);
8575
}

‎src/main/java/api/player/model/ModelPlayerBase.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -232,25 +232,6 @@ public void afterRenderDeadmau5Head(float paramFloat)
232232
{
233233
}
234234

235-
public void beforeSetInvisible(boolean paramBoolean)
236-
{
237-
}
238-
239-
public void setInvisible(boolean paramBoolean)
240-
{
241-
ModelPlayerBase overwritten = internalModelPlayerAPI.GetOverwrittenSetInvisible(this);
242-
243-
if(overwritten == null)
244-
modelPlayerAPI.localSetInvisible(paramBoolean);
245-
else if(overwritten != this)
246-
overwritten.setInvisible(paramBoolean);
247-
248-
}
249-
250-
public void afterSetInvisible(boolean paramBoolean)
251-
{
252-
}
253-
254235
public void beforeSetLivingAnimations(net.minecraft.entity.EntityLivingBase paramEntityLivingBase, float paramFloat1, float paramFloat2, float paramFloat3)
255236
{
256237
}
@@ -327,6 +308,25 @@ public void afterSetTextureOffset(String paramString, int paramInt1, int paramIn
327308
{
328309
}
329310

311+
public void beforeSetVisible(boolean paramBoolean)
312+
{
313+
}
314+
315+
public void setVisible(boolean paramBoolean)
316+
{
317+
ModelPlayerBase overwritten = internalModelPlayerAPI.GetOverwrittenSetVisible(this);
318+
319+
if(overwritten == null)
320+
modelPlayerAPI.localSetVisible(paramBoolean);
321+
else if(overwritten != this)
322+
overwritten.setVisible(paramBoolean);
323+
324+
}
325+
326+
public void afterSetVisible(boolean paramBoolean)
327+
{
328+
}
329+
330330
protected final net.minecraft.client.model.ModelBiped modelBiped;
331331
protected final net.minecraft.client.model.ModelPlayer modelPlayer;
332332
protected final api.player.model.ModelPlayerArmor modelPlayerArmor;

‎src/main/java/api/player/model/ModelPlayerBaseSorting.java‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,6 @@ public final class ModelPlayerBaseSorting
9090
private String[] afterRenderDeadmau5HeadSuperiors = null;
9191
private String[] afterRenderDeadmau5HeadInferiors = null;
9292

93-
private String[] beforeSetInvisibleSuperiors = null;
94-
private String[] beforeSetInvisibleInferiors = null;
95-
private String[] overrideSetInvisibleSuperiors = null;
96-
private String[] overrideSetInvisibleInferiors = null;
97-
private String[] afterSetInvisibleSuperiors = null;
98-
private String[] afterSetInvisibleInferiors = null;
99-
10093
private String[] beforeSetLivingAnimationsSuperiors = null;
10194
private String[] beforeSetLivingAnimationsInferiors = null;
10295
private String[] overrideSetLivingAnimationsSuperiors = null;
@@ -125,6 +118,13 @@ public final class ModelPlayerBaseSorting
125118
private String[] afterSetTextureOffsetSuperiors = null;
126119
private String[] afterSetTextureOffsetInferiors = null;
127120

121+
private String[] beforeSetVisibleSuperiors = null;
122+
private String[] beforeSetVisibleInferiors = null;
123+
private String[] overrideSetVisibleSuperiors = null;
124+
private String[] overrideSetVisibleInferiors = null;
125+
private String[] afterSetVisibleSuperiors = null;
126+
private String[] afterSetVisibleInferiors = null;
127+
128128

129129
public String[] getBeforeLocalConstructingSuperiors()
130130
{
@@ -725,66 +725,6 @@ public void setAfterRenderDeadmau5HeadInferiors(String[] value)
725725
afterRenderDeadmau5HeadInferiors = value;
726726
}
727727

728-
public String[] getBeforeSetInvisibleSuperiors()
729-
{
730-
return beforeSetInvisibleSuperiors;
731-
}
732-
733-
public String[] getBeforeSetInvisibleInferiors()
734-
{
735-
return beforeSetInvisibleInferiors;
736-
}
737-
738-
public String[] getOverrideSetInvisibleSuperiors()
739-
{
740-
return overrideSetInvisibleSuperiors;
741-
}
742-
743-
public String[] getOverrideSetInvisibleInferiors()
744-
{
745-
return overrideSetInvisibleInferiors;
746-
}
747-
748-
public String[] getAfterSetInvisibleSuperiors()
749-
{
750-
return afterSetInvisibleSuperiors;
751-
}
752-
753-
public String[] getAfterSetInvisibleInferiors()
754-
{
755-
return afterSetInvisibleInferiors;
756-
}
757-
758-
public void setBeforeSetInvisibleSuperiors(String[] value)
759-
{
760-
beforeSetInvisibleSuperiors = value;
761-
}
762-
763-
public void setBeforeSetInvisibleInferiors(String[] value)
764-
{
765-
beforeSetInvisibleInferiors = value;
766-
}
767-
768-
public void setOverrideSetInvisibleSuperiors(String[] value)
769-
{
770-
overrideSetInvisibleSuperiors = value;
771-
}
772-
773-
public void setOverrideSetInvisibleInferiors(String[] value)
774-
{
775-
overrideSetInvisibleInferiors = value;
776-
}
777-
778-
public void setAfterSetInvisibleSuperiors(String[] value)
779-
{
780-
afterSetInvisibleSuperiors = value;
781-
}
782-
783-
public void setAfterSetInvisibleInferiors(String[] value)
784-
{
785-
afterSetInvisibleInferiors = value;
786-
}
787-
788728
public String[] getBeforeSetLivingAnimationsSuperiors()
789729
{
790730
return beforeSetLivingAnimationsSuperiors;
@@ -1025,4 +965,64 @@ public void setAfterSetTextureOffsetInferiors(String[] value)
1025965
afterSetTextureOffsetInferiors = value;
1026966
}
1027967

968+
public String[] getBeforeSetVisibleSuperiors()
969+
{
970+
return beforeSetVisibleSuperiors;
971+
}
972+
973+
public String[] getBeforeSetVisibleInferiors()
974+
{
975+
return beforeSetVisibleInferiors;
976+
}
977+
978+
public String[] getOverrideSetVisibleSuperiors()
979+
{
980+
return overrideSetVisibleSuperiors;
981+
}
982+
983+
public String[] getOverrideSetVisibleInferiors()
984+
{
985+
return overrideSetVisibleInferiors;
986+
}
987+
988+
public String[] getAfterSetVisibleSuperiors()
989+
{
990+
return afterSetVisibleSuperiors;
991+
}
992+
993+
public String[] getAfterSetVisibleInferiors()
994+
{
995+
return afterSetVisibleInferiors;
996+
}
997+
998+
public void setBeforeSetVisibleSuperiors(String[] value)
999+
{
1000+
beforeSetVisibleSuperiors = value;
1001+
}
1002+
1003+
public void setBeforeSetVisibleInferiors(String[] value)
1004+
{
1005+
beforeSetVisibleInferiors = value;
1006+
}
1007+
1008+
public void setOverrideSetVisibleSuperiors(String[] value)
1009+
{
1010+
overrideSetVisibleSuperiors = value;
1011+
}
1012+
1013+
public void setOverrideSetVisibleInferiors(String[] value)
1014+
{
1015+
overrideSetVisibleInferiors = value;
1016+
}
1017+
1018+
public void setAfterSetVisibleSuperiors(String[] value)
1019+
{
1020+
afterSetVisibleSuperiors = value;
1021+
}
1022+
1023+
public void setAfterSetVisibleInferiors(String[] value)
1024+
{
1025+
afterSetVisibleInferiors = value;
1026+
}
1027+
10281028
}

0 commit comments

Comments
 (0)