Merge remote-tracking branch 'origin/main'

This commit is contained in:
Goodbird committed 2024-03-09 22:54:11 +03:00
commit 4267c095dd
4 files changed
+3 -3

No files matched your search

@@ -85,7 +85,7 @@ public class RenderCustomModel extends GeoEntityRenderer<EntityCustomModel> {
public Color getRenderColor(EntityCustomModel animatable, float partialTicks) {
if(animatable.hurtTime>0 || animatable.deathTime > 0){
return Color.ofRGBA(255, 30, 30, 255);
return Color.ofRGBA(255, 153, 153, 255);
}else{
if(animatable.isSemiVisible){
return Color.ofRGBA(255, 255, 255, 100);
@@ -75,7 +75,7 @@ public class MixinGeckoAddonClient {
if(!supportEnabled)
return;
int y = 319;
int y = gui.guiTop + 188;
gui.addLabel(new GuiNpcLabel(212,"Model Animation", gui.guiLeft + 185, y + 5));
gui.addButton(new GuiNpcButton(212, gui.guiLeft + 300, y, 100, 20, "selectServer.edit"));
if (!((IDataDisplay)gui.npc.display).hasCustomModel()) {