fixes
This commit is contained in:
1 parent
83aea53e57
commit
aa4f6b6ddc
842 files changed
+47284
-91563
No files matched your search
@@ -1,13 +1,13 @@
|
||||
package dev.zprestige.prestige.mixin;
|
||||
|
||||
import dev.zprestige.prestige.client.Prestige;
|
||||
import dev.zprestige.prestige.event.EntityEvent4;
|
||||
import dev.zprestige.prestige.event.EntityEvent5;
|
||||
import dev.zprestige.prestige.event.EntityEvent6;
|
||||
import dev.zprestige.prestige.event.PlayerStringEvent;
|
||||
import dev.zprestige.prestige.event.TickEvent2;
|
||||
import dev.zprestige.prestige.event.PlayerRenderStateEvent;
|
||||
import dev.zprestige.prestige.event.LabelTextEvent;
|
||||
import dev.zprestige.prestige.event.RenderLabelEvent;
|
||||
import dev.zprestige.prestige.event.HealthIndicatorEvent;
|
||||
import dev.zprestige.prestige.event.FullBrightEvent;
|
||||
import dev.zprestige.prestige.type.EventPhase;
|
||||
import dev.zprestige.prestige.util.ClientUtil;
|
||||
import dev.zprestige.prestige.util.HookBridge;
|
||||
import net.lenni0451.classtransform.InjectionCallback;
|
||||
import net.lenni0451.classtransform.annotations.CTarget;
|
||||
import net.lenni0451.classtransform.annotations.CTransformer;
|
||||
@@ -26,10 +26,10 @@ public abstract class EntityRendererMixin<T extends Entity, S extends EntityRend
|
||||
method = {"getAndUpdateRenderState"},
|
||||
target = {@CTarget("HEAD")}
|
||||
)
|
||||
public void a(T entity, float tickDelta) {
|
||||
public void applyRenderRotationAtGetAndUpdateRenderStateHead(T entity, float tickDelta) {
|
||||
if (entity == MinecraftClient.getInstance().player) {
|
||||
if (Prestige.eventBus != null && Prestige.o != null && ClientUtil.aT(Prestige.o) != null && ClientUtil.aU(Prestige.eventBus, EntityEvent4.class)) {
|
||||
ClientUtil.aW(ClientUtil.aV(entity, EventPhase.PRE));
|
||||
if (Prestige.eventBus != null && Prestige.silentRotationManager != null && HookBridge.getRenderStateRotation(Prestige.silentRotationManager) != null && HookBridge.hasRenderStatePreListeners(Prestige.eventBus, PlayerRenderStateEvent.class)) {
|
||||
HookBridge.postRenderStatePreEvent(HookBridge.createRenderStatePreEvent(entity, EventPhase.PRE));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -38,10 +38,10 @@ public abstract class EntityRendererMixin<T extends Entity, S extends EntityRend
|
||||
method = {"getAndUpdateRenderState"},
|
||||
target = {@CTarget("RETURN")}
|
||||
)
|
||||
public void b(T entity, float tickDelta) {
|
||||
public void restoreRenderRotationAtGetAndUpdateRenderStateReturn(T entity, float tickDelta) {
|
||||
if (entity == MinecraftClient.getInstance().player) {
|
||||
if (Prestige.eventBus != null && Prestige.p != null && ClientUtil.aX(Prestige.p) && ClientUtil.aY(Prestige.eventBus, EntityEvent4.class)) {
|
||||
ClientUtil.ba(ClientUtil.aZ(entity, EventPhase.POST));
|
||||
if (Prestige.eventBus != null && Prestige.visualRotationManager != null && HookBridge.isRenderRotationApplied(Prestige.visualRotationManager) && HookBridge.hasRenderStatePostListeners(Prestige.eventBus, PlayerRenderStateEvent.class)) {
|
||||
HookBridge.postRenderStatePostEvent(HookBridge.createRenderStatePostEvent(entity, EventPhase.POST));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -51,10 +51,10 @@ public abstract class EntityRendererMixin<T extends Entity, S extends EntityRend
|
||||
target = {@CTarget("RETURN")},
|
||||
cancellable = true
|
||||
)
|
||||
private void c(T entity, BlockPos pos, InjectionCallback cir) {
|
||||
if (ClientUtil.bb(Prestige.eventBus, TickEvent2.class)) {
|
||||
TickEvent2 event = ClientUtil.bc();
|
||||
if (ClientUtil.bd(event)) {
|
||||
private void forceFullSkyLightAtReturn(T entity, BlockPos pos, InjectionCallback cir) {
|
||||
if (HookBridge.hasEntitySkyLightListeners(Prestige.eventBus, FullBrightEvent.class)) {
|
||||
FullBrightEvent event = HookBridge.createEntitySkyLightEvent();
|
||||
if (HookBridge.postEntitySkyLightEvent(event)) {
|
||||
cir.setReturnValue(15);
|
||||
}
|
||||
}
|
||||
@@ -64,29 +64,29 @@ public abstract class EntityRendererMixin<T extends Entity, S extends EntityRend
|
||||
method = {"updateRenderState"},
|
||||
target = {@CTarget("RETURN")}
|
||||
)
|
||||
public void d(T entity, S state, float tickDelta) {
|
||||
public void modifyNameLabelAtUpdateRenderStateReturn(T entity, S state, float tickDelta) {
|
||||
if (Prestige.eventBus != null && state.displayName != null) {
|
||||
boolean hasLabelText = ClientUtil.be(Prestige.eventBus, EntityEvent5.class);
|
||||
boolean hasHealthIndicators = ClientUtil.bf(Prestige.eventBus, PlayerStringEvent.class);
|
||||
boolean hasRenderLabel = ClientUtil.bg(Prestige.eventBus, EntityEvent6.class);
|
||||
boolean hasLabelText = HookBridge.hasLabelTextListeners(Prestige.eventBus, LabelTextEvent.class);
|
||||
boolean hasHealthIndicators = HookBridge.hasHealthIndicatorListeners(Prestige.eventBus, HealthIndicatorEvent.class);
|
||||
boolean hasRenderLabel = HookBridge.hasRenderLabelListeners(Prestige.eventBus, RenderLabelEvent.class);
|
||||
if (hasLabelText || hasHealthIndicators || hasRenderLabel) {
|
||||
Text originalDisplayName = state.displayName;
|
||||
Text displayName = originalDisplayName;
|
||||
if (entity instanceof PlayerEntity player && entity.isAlive() && (hasLabelText || hasHealthIndicators)) {
|
||||
EntityEvent5 labelTextEvent = ClientUtil.bh(entity, originalDisplayName);
|
||||
boolean labelTextCancelled = ClientUtil.bi(labelTextEvent);
|
||||
displayName = ClientUtil.bj(labelTextEvent);
|
||||
LabelTextEvent labelTextEvent = HookBridge.createLabelTextEvent(entity, originalDisplayName);
|
||||
boolean labelTextCancelled = HookBridge.postLabelTextEvent(labelTextEvent);
|
||||
displayName = HookBridge.getLabelText(labelTextEvent);
|
||||
if (!labelTextCancelled) {
|
||||
PlayerStringEvent event = ClientUtil.bk(player, "");
|
||||
if (ClientUtil.bl(event)) {
|
||||
displayName = Text.of(displayName.getString() + ClientUtil.bm(event));
|
||||
HealthIndicatorEvent event = HookBridge.createHealthIndicatorEvent(player, "");
|
||||
if (HookBridge.postHealthIndicatorEvent(event)) {
|
||||
displayName = Text.of(displayName.getString() + HookBridge.getHealthIndicatorSuffix(event));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (hasRenderLabel) {
|
||||
EntityEvent6 event = ClientUtil.bn(originalDisplayName, displayName, entity);
|
||||
if (ClientUtil.bo(event)) {
|
||||
RenderLabelEvent event = HookBridge.createRenderLabelEvent(originalDisplayName, displayName, entity);
|
||||
if (HookBridge.postRenderLabelEvent(event)) {
|
||||
state.displayName = null;
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user