Skip to content

Commit ee06e25

Browse files
committed
fix slider eye glow and opening
1 parent 1f8a9b9 commit ee06e25

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

src/main/java/teamport/aether/entity/boss/slider/MobBossSlider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public boolean canBreatheUnderwater() {
194194

195195
@Override
196196
public String getEntityTexture() {
197-
if (this.isAwake() && !this.doingSlam() && this.wakeUpTimer <= 0) {
197+
if (this.isAwake() && !this.doingSlam()) {
198198
if (this.isAngry()) {
199199
return "/assets/aether/textures/entity/boss_slider/slider_awake_red.png";
200200
}

src/main/java/teamport/aether/entity/boss/slider/MobRendererSlider.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import net.fabricmc.api.EnvType;
44
import net.fabricmc.api.Environment;
5+
import net.minecraft.client.render.LightmapHelper;
56
import net.minecraft.client.render.entity.MobRenderer;
67
import net.minecraft.client.render.model.ModelBase;
78
import net.minecraft.client.render.tessellator.Tessellator;
@@ -26,10 +27,8 @@ public void renderPreview(Tessellator tessellator, MobBossSlider slider, double
2627
}
2728

2829
public boolean setEyeBrightness(MobBossSlider slider, int renderPass) {
29-
if (renderPass != 0) {
30-
return false;
31-
} else {
32-
if (slider.isAwake() && !slider.doingSlam() && slider.wakeUpTimer <= 0) {
30+
if (renderPass == 0) {
31+
if (slider.isAwake() && !slider.doingSlam()) {
3332
if (slider.isAngry()) {
3433
this.bindTexture("/assets/aether/textures/entity/boss_slider/slider_awake_red_glow.png");
3534
} else {
@@ -42,13 +41,17 @@ public boolean setEyeBrightness(MobBossSlider slider, int renderPass) {
4241
this.bindTexture("/assets/aether/textures/entity/boss_slider/slider_sleep_glow.png");
4342
}
4443
}
44+
if (LightmapHelper.isLightmapEnabled()) {
45+
LightmapHelper.setLightmapCoord(LightmapHelper.getLightmapCoord(15, 15));
46+
}
4547

46-
float f1 = (1.0F - slider.getBrightness(1.0F)) * 0.5F;
47-
GL11.glEnable(GL11.GL_BLEND);
48-
GL11.glDisable(GL11.GL_ALPHA_TEST);
48+
GL11.glEnable(3042);
49+
GL11.glDisable(3008);
4950
GL11.glBlendFunc(770, 771);
50-
GL11.glColor4f(1.0F, 1.0F, 1.0F, f1);
51+
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
5152
return true;
53+
} else {
54+
return false;
5255
}
5356
}
5457

0 commit comments

Comments
 (0)