This commit is contained in:
HoosierTransfer 2024-03-21 15:05:07 -04:00
parent d9ef7a1144
commit 08d01ecc2d
4 changed files with 23081 additions and 23071 deletions

1
compile proguard Normal file
View File

@ -0,0 +1 @@
./bin/proguard.bat -injars eaglercraft-workspace.jar -outjars skibidi.jar -libraryjars "C:\Program Files\Eclipse Adoptium\jdk-21.0.2.13-hotspot\jmods\java.base.jmod" -libraryjars "C:\Users\HoosierTransfer\Downloads\hoosiertransfer-mod-u24\teavm-jso-0.9.2.jar" -libraryjars "C:\Users\HoosierTransfer\Downloads\hoosiertransfer-mod-u24\teavm-jso-apis-0.9.2.jar" -libraryjars "C:\Users\HoosierTransfer\Downloads\hoosiertransfer-mod-u24\teavm-interop-0.9.2.jar" -libraryjars "C:\Program Files\Eclipse Adoptium\jdk-21.0.2.13-hotspot\jmods\java.logging.jmod" -libraryjars "C:\Users\HoosierTransfer\Downloads\hoosiertransfer-mod-u24\jzlib-1.1.3.jar" -keep "class net.minecraft.client.main.Main { *; }" -keepnames "class *" -keepnames "enum *" -keepnames "interface *" -forceprocessing -dontshrink

File diff suppressed because it is too large Load Diff

View File

@ -195,8 +195,9 @@ public class BlockTrapDoor extends Block {
* Check whether this Block can be placed on the given side * Check whether this Block can be placed on the given side
*/ */
public boolean canPlaceBlockOnSide(World world, BlockPos blockpos, EnumFacing enumfacing) { public boolean canPlaceBlockOnSide(World world, BlockPos blockpos, EnumFacing enumfacing) {
return !enumfacing.getAxis().isVertical() // Hoosiertransfer mod
&& isValidSupportBlock(world.getBlockState(blockpos.offset(enumfacing.getOpposite())).getBlock()); // this is a feature from newer versions of minecraft
return !enumfacing.getAxis().isVertical();
} }
protected static EnumFacing getFacing(int meta) { protected static EnumFacing getFacing(int meta) {

View File

@ -12,22 +12,31 @@ import net.lax1dude.eaglercraft.v1_8.opengl.WorldRenderer;
import net.minecraft.client.renderer.GLAllocation; import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.Tessellator;
/**+ /**
* +
* This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code. * This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
* *
* Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!" * Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!"
* Mod Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team * Mod Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team
* *
* EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved. * EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights
* Reserved.
* *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, * DISCLAIMED.
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * DIRECT,
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) * (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
* DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
* LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
* *
@ -76,7 +85,8 @@ public class ModelRenderer {
this.setTextureOffset(texOffX, texOffY); this.setTextureOffset(texOffX, texOffY);
} }
/**+ /**
* +
* Sets the current box's rotation points and rotation angles to * Sets the current box's rotation points and rotation angles to
* another box. * another box.
*/ */
@ -94,7 +104,8 @@ public class ModelRenderer {
return this; return this;
} }
/**+ /**
* +
* Creates a textured box. Args: originX, originY, originZ, * Creates a textured box. Args: originX, originY, originZ,
* width, height, depth, scaleFactor. * width, height, depth, scaleFactor.
*/ */
@ -107,7 +118,8 @@ public class ModelRenderer {
return this; return this;
} }
/**+ /**
* +
* Creates a textured box. Args: originX, originY, originZ, * Creates a textured box. Args: originX, originY, originZ,
* width, height, depth, scaleFactor. * width, height, depth, scaleFactor.
*/ */
@ -117,7 +129,8 @@ public class ModelRenderer {
return this; return this;
} }
/**+ /**
* +
* Creates a textured box. Args: originX, originY, originZ, * Creates a textured box. Args: originX, originY, originZ,
* width, height, depth, scaleFactor. * width, height, depth, scaleFactor.
*/ */
@ -128,7 +141,8 @@ public class ModelRenderer {
return this; return this;
} }
/**+ /**
* +
* Creates a textured box. Args: originX, originY, originZ, * Creates a textured box. Args: originX, originY, originZ,
* width, height, depth, scaleFactor. * width, height, depth, scaleFactor.
*/ */
@ -145,75 +159,41 @@ public class ModelRenderer {
} }
public void render(float parFloat1) { public void render(float parFloat1) {
if (!this.isHidden) { if (!this.isHidden && this.showModel) {
if (this.showModel) { if (!this.compiled) {
if (!this.compiled) { this.compileDisplayList(parFloat1);
this.compileDisplayList(parFloat1); }
}
GlStateManager.translate(this.offsetX, this.offsetY, this.offsetZ);
if (this.rotateAngleX == 0.0F && this.rotateAngleY == 0.0F && this.rotateAngleZ == 0.0F) {
if (this.rotationPointX == 0.0F && this.rotationPointY == 0.0F && this.rotationPointZ == 0.0F) {
GlStateManager.callList(this.displayList);
if (this.childModels != null) {
for (int k = 0; k < this.childModels.size(); ++k) {
((ModelRenderer) this.childModels.get(k)).render(parFloat1);
}
}
} else {
GlStateManager.translate(this.rotationPointX * parFloat1, this.rotationPointY * parFloat1,
this.rotationPointZ * parFloat1);
GlStateManager.callList(this.displayList);
if (this.childModels != null) {
for (int j = 0; j < this.childModels.size(); ++j) {
((ModelRenderer) this.childModels.get(j)).render(parFloat1);
}
}
GlStateManager.translate(-this.rotationPointX * parFloat1, -this.rotationPointY * parFloat1,
-this.rotationPointZ * parFloat1);
}
} else {
GlStateManager.pushMatrix();
GlStateManager.translate(this.rotationPointX * parFloat1, this.rotationPointY * parFloat1,
this.rotationPointZ * parFloat1);
if (this.rotateAngleZ != 0.0F) {
GlStateManager.rotate(this.rotateAngleZ * 57.295776F, 0.0F, 0.0F, 1.0F);
}
if (this.rotateAngleY != 0.0F) {
GlStateManager.rotate(this.rotateAngleY * 57.295776F, 0.0F, 1.0F, 0.0F);
}
if (this.rotateAngleX != 0.0F) {
GlStateManager.rotate(this.rotateAngleX * 57.295776F, 1.0F, 0.0F, 0.0F);
}
GlStateManager.translate(this.offsetX, this.offsetY, this.offsetZ);
if (this.rotateAngleX == 0.0F && this.rotateAngleY == 0.0F && this.rotateAngleZ == 0.0F) {
if (this.rotationPointX == 0.0F && this.rotationPointY == 0.0F && this.rotationPointZ == 0.0F) {
GlStateManager.callList(this.displayList); GlStateManager.callList(this.displayList);
if (this.childModels != null) { if (this.childModels != null) {
for (int i = 0; i < this.childModels.size(); ++i) { for (int k = 0; k < this.childModels.size(); ++k) {
((ModelRenderer) this.childModels.get(i)).render(parFloat1); ((ModelRenderer) this.childModels.get(k)).render(parFloat1);
}
}
} else {
GlStateManager.translate(this.rotationPointX * parFloat1, this.rotationPointY * parFloat1,
this.rotationPointZ * parFloat1);
GlStateManager.callList(this.displayList);
if (this.childModels != null) {
for (int j = 0; j < this.childModels.size(); ++j) {
((ModelRenderer) this.childModels.get(j)).render(parFloat1);
} }
} }
GlStateManager.popMatrix(); GlStateManager.translate(-this.rotationPointX * parFloat1, -this.rotationPointY * parFloat1,
-this.rotationPointZ * parFloat1);
} }
} else {
GlStateManager.translate(-this.offsetX, -this.offsetY, -this.offsetZ);
}
}
}
public void renderWithRotation(float parFloat1) {
if (!this.isHidden) {
if (this.showModel) {
if (!this.compiled) {
this.compileDisplayList(parFloat1);
}
GlStateManager.pushMatrix(); GlStateManager.pushMatrix();
GlStateManager.translate(this.rotationPointX * parFloat1, this.rotationPointY * parFloat1, GlStateManager.translate(this.rotationPointX * parFloat1, this.rotationPointY * parFloat1,
this.rotationPointZ * parFloat1); this.rotationPointZ * parFloat1);
if (this.rotateAngleZ != 0.0F) {
GlStateManager.rotate(this.rotateAngleZ * 57.295776F, 0.0F, 0.0F, 1.0F);
}
if (this.rotateAngleY != 0.0F) { if (this.rotateAngleY != 0.0F) {
GlStateManager.rotate(this.rotateAngleY * 57.295776F, 0.0F, 1.0F, 0.0F); GlStateManager.rotate(this.rotateAngleY * 57.295776F, 0.0F, 1.0F, 0.0F);
} }
@ -222,52 +202,81 @@ public class ModelRenderer {
GlStateManager.rotate(this.rotateAngleX * 57.295776F, 1.0F, 0.0F, 0.0F); GlStateManager.rotate(this.rotateAngleX * 57.295776F, 1.0F, 0.0F, 0.0F);
} }
GlStateManager.callList(this.displayList);
if (this.childModels != null) {
for (int i = 0; i < this.childModels.size(); ++i) {
((ModelRenderer) this.childModels.get(i)).render(parFloat1);
}
}
GlStateManager.popMatrix();
}
GlStateManager.translate(-this.offsetX, -this.offsetY, -this.offsetZ);
}
}
public void renderWithRotation(float parFloat1) {
if (!this.isHidden && this.showModel) {
if (!this.compiled) {
this.compileDisplayList(parFloat1);
}
GlStateManager.pushMatrix();
GlStateManager.translate(this.rotationPointX * parFloat1, this.rotationPointY * parFloat1,
this.rotationPointZ * parFloat1);
if (this.rotateAngleY != 0.0F) {
GlStateManager.rotate(this.rotateAngleY * 57.295776F, 0.0F, 1.0F, 0.0F);
}
if (this.rotateAngleX != 0.0F) {
GlStateManager.rotate(this.rotateAngleX * 57.295776F, 1.0F, 0.0F, 0.0F);
}
if (this.rotateAngleZ != 0.0F) {
GlStateManager.rotate(this.rotateAngleZ * 57.295776F, 0.0F, 0.0F, 1.0F);
}
GlStateManager.callList(this.displayList);
GlStateManager.popMatrix();
}
}
/**
* +
* Allows the changing of Angles after a box has been rendered
*/
public void postRender(float scale) {
if (!this.isHidden && this.showModel) {
if (!this.compiled) {
this.compileDisplayList(scale);
}
if (this.rotateAngleX == 0.0F && this.rotateAngleY == 0.0F && this.rotateAngleZ == 0.0F) {
if (this.rotationPointX != 0.0F || this.rotationPointY != 0.0F || this.rotationPointZ != 0.0F) {
GlStateManager.translate(this.rotationPointX * scale, this.rotationPointY * scale,
this.rotationPointZ * scale);
}
} else {
GlStateManager.translate(this.rotationPointX * scale, this.rotationPointY * scale,
this.rotationPointZ * scale);
if (this.rotateAngleZ != 0.0F) { if (this.rotateAngleZ != 0.0F) {
GlStateManager.rotate(this.rotateAngleZ * 57.295776F, 0.0F, 0.0F, 1.0F); GlStateManager.rotate(this.rotateAngleZ * 57.295776F, 0.0F, 0.0F, 1.0F);
} }
GlStateManager.callList(this.displayList); if (this.rotateAngleY != 0.0F) {
GlStateManager.popMatrix(); GlStateManager.rotate(this.rotateAngleY * 57.295776F, 0.0F, 1.0F, 0.0F);
}
if (this.rotateAngleX != 0.0F) {
GlStateManager.rotate(this.rotateAngleX * 57.295776F, 1.0F, 0.0F, 0.0F);
}
} }
} }
} }
/**+ /**
* Allows the changing of Angles after a box has been rendered * +
*/
public void postRender(float scale) {
if (!this.isHidden) {
if (this.showModel) {
if (!this.compiled) {
this.compileDisplayList(scale);
}
if (this.rotateAngleX == 0.0F && this.rotateAngleY == 0.0F && this.rotateAngleZ == 0.0F) {
if (this.rotationPointX != 0.0F || this.rotationPointY != 0.0F || this.rotationPointZ != 0.0F) {
GlStateManager.translate(this.rotationPointX * scale, this.rotationPointY * scale,
this.rotationPointZ * scale);
}
} else {
GlStateManager.translate(this.rotationPointX * scale, this.rotationPointY * scale,
this.rotationPointZ * scale);
if (this.rotateAngleZ != 0.0F) {
GlStateManager.rotate(this.rotateAngleZ * 57.295776F, 0.0F, 0.0F, 1.0F);
}
if (this.rotateAngleY != 0.0F) {
GlStateManager.rotate(this.rotateAngleY * 57.295776F, 0.0F, 1.0F, 0.0F);
}
if (this.rotateAngleX != 0.0F) {
GlStateManager.rotate(this.rotateAngleX * 57.295776F, 1.0F, 0.0F, 0.0F);
}
}
}
}
}
/**+
* Compiles a GL display list for this model * Compiles a GL display list for this model
*/ */
private void compileDisplayList(float scale) { private void compileDisplayList(float scale) {
@ -283,7 +292,8 @@ public class ModelRenderer {
this.compiled = true; this.compiled = true;
} }
/**+ /**
* +
* Returns the model renderer with the new texture parameters. * Returns the model renderer with the new texture parameters.
*/ */
public ModelRenderer setTextureSize(int textureWidthIn, int textureHeightIn) { public ModelRenderer setTextureSize(int textureWidthIn, int textureHeightIn) {