Horse rendering fixed (kinda)

This commit is contained in:
catfoolyou 2025-03-28 13:24:17 -04:00
parent d7ce60ce3b
commit fff3671bc1
11 changed files with 24918 additions and 24916 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

Binary file not shown.

Binary file not shown.

View File

@ -16,7 +16,10 @@ public abstract class NetHandler
return true; return true;
} }
public void unexpectedPacket(Packet par1Packet) {} public void unexpectedPacket(Packet par1Packet) {
System.out.println("fuck");
System.out.println("unexpected packet " + par1Packet.getClass().getSimpleName());
}
public void handlePackets() { public void handlePackets() {
} }

View File

@ -543,30 +543,20 @@ public class NetServerHandler extends NetHandler
*/ */
public void sendPacketToPlayer(Packet par1Packet) public void sendPacketToPlayer(Packet par1Packet)
{ {
if (par1Packet instanceof Packet3Chat) if (par1Packet instanceof Packet3Chat) {
{ Packet3Chat var2 = (Packet3Chat) par1Packet;
Packet3Chat var2 = (Packet3Chat)par1Packet;
int var3 = this.playerEntity.getChatVisibility(); int var3 = this.playerEntity.getChatVisibility();
if (var3 == 2) if (var3 == 2) {
{
return; return;
} }
if (var3 == 1 && !var2.getIsServer()) if (var3 == 1 && !var2.getIsServer()) {
{
return; return;
} }
} }
try this.netManager.addToSendQueue(par1Packet);
{
this.netManager.addToSendQueue(par1Packet); // This is a problem
}
catch (Exception var10)
{
var10.printStackTrace();
}
} }
public void handleBlockItemSwitch(Packet16BlockItemSwitch par1Packet16BlockItemSwitch) public void handleBlockItemSwitch(Packet16BlockItemSwitch par1Packet16BlockItemSwitch)

View File

@ -5,7 +5,7 @@ import java.util.List;
public class ConfigConstants { public class ConfigConstants {
public static final String version = "25w13a"; public static final String version = "25w13b";
public static final String mainMenuString = "Eaglercraft " + version; public static final String mainMenuString = "Eaglercraft " + version;
public static final String forkMe = "https://git.zelz.net/catfoolyou/Project164"; public static final String forkMe = "https://git.zelz.net/catfoolyou/Project164";

View File

@ -7,7 +7,7 @@ import net.minecraft.src.RenderEngine;
public class TextureLocation { public class TextureLocation {
private String path; public String path;
private int glObject; private int glObject;
public TextureLocation(String path) { public TextureLocation(String path) {

View File

@ -8,12 +8,12 @@ public class EntityHorse extends EntityAnimal implements IInvBasic
private static final IEntitySelector horseBreedingSelector = new EntityHorseBredSelector(); private static final IEntitySelector horseBreedingSelector = new EntityHorseBredSelector();
private static final Attribute horseJumpStrength = (new RangedAttribute("horse.jumpStrength", 0.7D, 0.0D, 2.0D)).func_111117_a("Jump Strength").setShouldWatch(true); private static final Attribute horseJumpStrength = (new RangedAttribute("horse.jumpStrength", 0.7D, 0.0D, 2.0D)).func_111117_a("Jump Strength").setShouldWatch(true);
private static final String[] horseArmorTextures = new String[] {null, "textures/entity/horse/armor/horse_armor_iron.png", "textures/entity/horse/armor/horse_armor_gold.png", "textures/entity/horse/armor/horse_armor_diamond.png"}; private static final String[] horseArmorTextures = new String[] {null, "textures/entity/horse/armor/horse_armor_iron.png", "textures/entity/horse/armor/horse_armor_gold.png", "textures/entity/horse/armor/horse_armor_diamond.png"};
private static final String[] field_110273_bx = new String[] {"", "meo", "goo", "dio"}; //private static final String[] field_110273_bx = new String[] {"", "meo", "goo", "dio"};
private static final int[] armorValues = new int[] {0, 5, 7, 11}; private static final int[] armorValues = new int[] {0, 5, 7, 11};
private static final String[] horseTextures = new String[] {"textures/entity/horse/horse_white.png", "textures/entity/horse/horse_creamy.png", "textures/entity/horse/horse_chestnut.png", "textures/entity/horse/horse_brown.png", "textures/entity/horse/horse_black.png", "textures/entity/horse/horse_gray.png", "textures/entity/horse/horse_darkbrown.png"}; private static final String[] horseTextures = new String[] {"textures/entity/horse/horse_white.png", "textures/entity/horse/horse_creamy.png", "textures/entity/horse/horse_chestnut.png", "textures/entity/horse/horse_brown.png", "textures/entity/horse/horse_black.png", "textures/entity/horse/horse_gray.png", "textures/entity/horse/horse_darkbrown.png"};
private static final String[] field_110269_bA = new String[] {"hwh", "hcr", "hch", "hbr", "hbl", "hgr", "hdb"}; //private static final String[] field_110269_bA = new String[] {"hwh", "hcr", "hch", "hbr", "hbl", "hgr", "hdb"};
private static final String[] horseMarkingTextures = new String[] {null, "textures/entity/horse/horse_markings_white.png", "textures/entity/horse/horse_markings_whitefield.png", "textures/entity/horse/horse_markings_whitedots.png", "textures/entity/horse/horse_markings_blackdots.png"}; private static final String[] horseMarkingTextures = new String[] {null, "textures/entity/horse/horse_markings_white.png", "textures/entity/horse/horse_markings_whitefield.png", "textures/entity/horse/horse_markings_whitedots.png", "textures/entity/horse/horse_markings_blackdots.png"};
private static final String[] field_110292_bC = new String[] {"", "wo_", "wmo", "wdo", "bdo"}; //private static final String[] field_110292_bC = new String[] {"", "wo_", "wmo", "wdo", "bdo"};
private int eatingHaystackCounter; private int eatingHaystackCounter;
private int openMouthCounter; private int openMouthCounter;
private int jumpRearingCounter; private int jumpRearingCounter;
@ -644,7 +644,7 @@ public class EntityHorse extends EntityAnimal implements IInvBasic
private void setHorseTexturePaths() private void setHorseTexturePaths()
{ {
this.field_110286_bQ = "horse/"; this.field_110286_bQ = "";
this.field_110280_bR[0] = null; this.field_110280_bR[0] = null;
this.field_110280_bR[1] = null; this.field_110280_bR[1] = null;
this.field_110280_bR[2] = null; this.field_110280_bR[2] = null;
@ -657,19 +657,23 @@ public class EntityHorse extends EntityAnimal implements IInvBasic
var3 = var2 & 255; var3 = var2 & 255;
int var4 = (var2 & 65280) >> 8; int var4 = (var2 & 65280) >> 8;
this.field_110280_bR[0] = horseTextures[var3]; this.field_110280_bR[0] = horseTextures[var3];
this.field_110286_bQ = this.field_110286_bQ + field_110269_bA[var3]; this.field_110286_bQ = this.field_110286_bQ + horseTextures[var3];
this.field_110280_bR[1] = horseMarkingTextures[var4]; this.field_110280_bR[1] = horseMarkingTextures[var4];
this.field_110286_bQ = this.field_110286_bQ + field_110292_bC[var4]; if(horseMarkingTextures[var4] != null){
//this.field_110286_bQ = this.field_110286_bQ + horseMarkingTextures[var4];
}
} }
else else
{ {
this.field_110280_bR[0] = ""; this.field_110280_bR[0] = "";
this.field_110286_bQ = this.field_110286_bQ + "_" + var1 + "_"; this.field_110286_bQ = horseTextures[0];
} }
var3 = this.func_110241_cb(); var3 = this.func_110241_cb();
this.field_110280_bR[2] = horseArmorTextures[var3]; this.field_110280_bR[2] = horseArmorTextures[var3];
this.field_110286_bQ = this.field_110286_bQ + field_110273_bx[var3]; if(horseArmorTextures[var3] != null){
this.field_110286_bQ = this.field_110286_bQ + horseArmorTextures[var3];
}
} }
public String getHorseTexture() public String getHorseTexture()

View File

@ -88,7 +88,7 @@ public class RenderHorse extends RenderLiving
if (var3 == null) if (var3 == null)
{ {
var3 = new TextureLocation(var2); var3 = new TextureLocation(var2);
//Minecraft.getMinecraft().getTextureManager().loadTexture(var3, new LayeredTexture(par1EntityHorse.getVariantTexturePaths())); var3.bindTexture();
field_110852_a.put(var2, var3); field_110852_a.put(var2, var3);
} }
@ -114,7 +114,7 @@ public class RenderHorse extends RenderLiving
@Override @Override
protected void bindTexture(EntityLivingBase par1EntityLiving) { protected void bindTexture(EntityLivingBase par1EntityLiving) {
this.func_110849_a((EntityHorse) par1EntityLiving).bindTexture();
} }
/** /**