Skip to content

Commit 14cf205

Browse files
author
eaglercraft
committed
u49
1 parent 9f98385 commit 14cf205

File tree

47 files changed

+982
-628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+982
-628
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
u48
1+
u49
-76 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"pluginName":"EaglercraftXBungee","pluginVersion":"1.3.5","pluginButton":"Download \"EaglerXBungee-1.3.5.jar\"","pluginFilename":"EaglerXBungee.zip"}
1+
{"pluginName":"EaglercraftXBungee","pluginVersion":"1.3.6","pluginButton":"Download \"EaglerXBungee-1.3.6.jar\"","pluginFilename":"EaglerXBungee.zip"}

src/game/java/net/minecraft/client/model/ModelRenderer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public void renderWithRotation(float parFloat1) {
205205
GlStateManager.translate(this.rotationPointX * parFloat1, this.rotationPointY * parFloat1,
206206
this.rotationPointZ * parFloat1);
207207

208-
// note: vanilla order for this function is YXZ not ZYX for some reason
208+
// note: vanilla order for this transformation was YXZ not ZYX for some reason
209209
GlStateManager.rotateZYXRad(this.rotateAngleX, this.rotateAngleY, this.rotateAngleZ);
210210

211211
GlStateManager.callList(this.displayList);

src/game/java/net/minecraft/client/renderer/EntityRenderer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@
115115
public class EntityRenderer implements IResourceManagerReloadListener {
116116
private static final Logger logger = LogManager.getLogger();
117117
private static final ResourceLocation locationRainPng = new ResourceLocation("textures/environment/rain.png");
118+
private static final ResourceLocation locationRainDeferredPng = new ResourceLocation(
119+
"eagler:glsl/deferred/rain.png");
118120
private static final ResourceLocation locationSnowPng = new ResourceLocation("textures/environment/snow.png");
119121
public static boolean anaglyphEnable;
120122
public static int anaglyphField;
@@ -178,9 +180,7 @@ public class EntityRenderer implements IResourceManagerReloadListener {
178180
private int frameCount;
179181
private GameOverlayFramebuffer overlayFramebuffer;
180182
private float eagPartialTicks = 0.0f;
181-
182183
public float currentProjMatrixFOV = 0.0f;
183-
184184
private boolean initializedOF = false;
185185

186186
public EntityRenderer(Minecraft mcIn, IResourceManager resourceManagerIn) {
@@ -1370,7 +1370,8 @@ private void renderCloudsCheck(RenderGlobal renderGlobalIn, float partialTicks,
13701370
GlStateManager.matrixMode(GL_MODELVIEW);
13711371
GlStateManager.pushMatrix();
13721372
this.setupFog(0, partialTicks);
1373-
renderGlobalIn.renderClouds(partialTicks, pass);
1373+
// renderGlobalIn.renderClouds(partialTicks, pass);
1374+
renderGlobalIn.cloudRenderer.renderClouds(partialTicks, pass);
13741375
GlStateManager.disableFog();
13751376
GlStateManager.popMatrix();
13761377
GlStateManager.matrixMode(GL_PROJECTION);
@@ -1542,8 +1543,7 @@ protected void renderRainSnow(float partialTicks) {
15421543

15431544
b1 = 0;
15441545
this.mc.getTextureManager()
1545-
.bindTexture(df ? new ResourceLocation("eagler:glsl/deferred/rain.png")
1546-
: locationRainPng);
1546+
.bindTexture(df ? locationRainDeferredPng : locationRainPng);
15471547
if (df) {
15481548
DeferredStateManager.setRoughnessConstant(0.5f);
15491549
DeferredStateManager.setMetalnessConstant(0.05f);

0 commit comments

Comments
 (0)