Skip to content

Commit

Permalink
rename mixin methods to remove unnecessary prefix
Browse files Browse the repository at this point in the history
  • Loading branch information
CammiePone committed Jan 19, 2025
1 parent 8de1864 commit 4f5c472
Show file tree
Hide file tree
Showing 42 changed files with 75 additions and 75 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import net.minecraft.world.entity.Entity;

public interface Targetable {
default boolean arcanuscontinuum$canBeTargeted() {
default boolean arcanus$canBeTargeted() {
if(this instanceof Entity self) {
return !PlayerHelper.isFakePlayer(self);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ public void render(PocketDimensionPortalEntity entity, float yaw, float tickDelt
matrices.scale(scale, 1, scale);
matrices.mulPose(Axis.ZP.rotationDegrees(90));

if(!stencilBuffer.arcanuscontinuum$isStencilBufferEnabled())
stencilBuffer.arcanuscontinuum$enableStencilBufferAndReload(true);
if(!stencilBuffer.arcanus$isStencilBufferEnabled())
stencilBuffer.arcanus$enableStencilBufferAndReload(true);

GL31.glEnable(GL31.GL_STENCIL_TEST);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package dev.cammiescorner.arcanuscontinuum.client.utils;

public interface StencilBuffer {
boolean arcanuscontinuum$isStencilBufferEnabled();
boolean arcanus$isStencilBufferEnabled();

void arcanuscontinuum$enableStencilBufferAndReload(boolean cond);
void arcanus$enableStencilBufferAndReload(boolean cond);
}
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void tick() {
if(effect.shouldTriggerOnceOnExplosion())
continue;

level().getEntitiesOfClass(Entity.class, box, entity -> entity.isAlive() && !entity.isSpectator() && entity instanceof Targetable targetable && targetable.arcanuscontinuum$canBeTargeted()).forEach(entity -> {
level().getEntitiesOfClass(Entity.class, box, entity -> entity.isAlive() && !entity.isSpectator() && entity instanceof Targetable targetable && targetable.arcanus$canBeTargeted()).forEach(entity -> {
effect.effect(getCaster(), this, level(), new EntityHitResult(entity), effects, stack, potency);
});
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,6 @@ private static boolean isValidTarget(LivingEntity livingEntity) {
return false;
}

return livingEntity.arcanuscontinuum$canBeTargeted() && !livingEntity.getType().is(ArcanusEntityTags.RUNE_TRIGGER_IGNORED);
return livingEntity.arcanus$canBeTargeted() && !livingEntity.getType().is(ArcanusEntityTags.RUNE_TRIGGER_IGNORED);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public void tick() {
continue;
}

level().getEntitiesOfClass(Entity.class, box, entity -> entity.isAlive() && !entity.isSpectator() && entity instanceof Targetable targetable && targetable.arcanuscontinuum$canBeTargeted()).forEach(entity -> {
level().getEntitiesOfClass(Entity.class, box, entity -> entity.isAlive() && !entity.isSpectator() && entity instanceof Targetable targetable && targetable.arcanus$canBeTargeted()).forEach(entity -> {
if(!hasHit.contains(entity.getUUID())) {
effect.effect(getCaster(), this, level(), new EntityHitResult(entity), effects, stack, potency);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void effect(@Nullable LivingEntity caster, @Nullable Entity sourceEntity,
if(entity instanceof Player playerTarget && caster instanceof Player playerCaster && !playerCaster.canHarmPlayer(playerTarget))
return;

if(caster != null && entity instanceof Targetable targetable && targetable.arcanuscontinuum$canBeTargeted()) {
if(caster != null && entity instanceof Targetable targetable && targetable.arcanus$canBeTargeted()) {
if(entity.isInWaterRainOrBubble() && effects.contains(ArcanusSpellComponents.ELECTRIC.get()))
damage *= AttackEffects.ElectricEffectProperties.wetEntityDamageMultiplier;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public void effect(@Nullable LivingEntity caster, @Nullable Entity sourceEntity,
return;
}

if(entity instanceof LivingEntity livingEntity && livingEntity.arcanuscontinuum$canBeTargeted()) {
if(entity instanceof LivingEntity livingEntity && livingEntity.arcanus$canBeTargeted()) {
livingEntity.addEffect(new MobEffectInstance(ArcanusMobEffects.DISCOMBOBULATE.get(), ArcanusConfig.AttackEffects.DiscombobulateEffectProperties.baseEffectDuration + (int) (ArcanusConfig.AttackEffects.DiscombobulateEffectProperties.effectDurationModifier * effects.stream().filter(ArcanusSpellComponents.DISCOMBOBULATE::is).count() * potency), 0, true, false));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public static HitResult raycast(Entity origin, double maxDistance, boolean inclu

endPos = hitResult.getLocation();
maxDistance *= maxDistance;
HitResult entityHitResult = ProjectileUtil.getEntityHitResult(origin, startPos, endPos, origin.getBoundingBox().expandTowards(rotation.scale(maxDistance)).inflate(1.0D, 1D, 1D), entity -> !entity.isSpectator() && entity instanceof Targetable targetable && targetable.arcanuscontinuum$canBeTargeted(), maxDistance);
HitResult entityHitResult = ProjectileUtil.getEntityHitResult(origin, startPos, endPos, origin.getBoundingBox().expandTowards(rotation.scale(maxDistance)).inflate(1.0D, 1D, 1D), entity -> !entity.isSpectator() && entity instanceof Targetable targetable && targetable.arcanus$canBeTargeted(), maxDistance);

if(includeEntities && entityHitResult != null)
hitResult = entityHitResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ protected ClientLevelMixin(WritableLevelData worldProperties, ResourceKey<Level>
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/LevelRenderer;levelEvent(ILnet/minecraft/core/BlockPos;I)V"
))
private boolean arcanuscontinuum$noBreakingSoundsOrParticles(LevelRenderer target, int eventId, BlockPos pos, int data) {
private boolean noBreakingSoundsOrParticles(LevelRenderer target, int eventId, BlockPos pos, int data) {
return eventId != 2001 || !ArcanusComponents.isBlockWarded(this, pos);
}

@WrapWithCondition(method = "tickNonPassenger", at = @At(
value = "INVOKE",
target = "Lnet/minecraft/world/entity/Entity;tick()V"
))
private boolean arcanuscontinuum$blockEntityTick(Entity entity) {
private boolean blockEntityTick(Entity entity) {
return !ArcanusComponents.areUpdatesBlocked(entity);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public CraftingScreenMixin(CraftingMenu handler, Inventory inventory, Component
value = "INVOKE",
target = "Lnet/minecraft/client/gui/screens/inventory/CraftingScreen;renderTooltip(Lnet/minecraft/client/gui/GuiGraphics;II)V"
))
private void arcanuscontinuum$render(GuiGraphics gui, int mouseX, int mouseY, float delta, CallbackInfo info) {
private void renderSpellPatterns(GuiGraphics gui, int mouseX, int mouseY, float delta, CallbackInfo info) {
PoseStack matrices = gui.pose();
if(getMenu().getSlot(5).getItem().getItem() instanceof StaffItem) {
float scale = 0.4F;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class GuiMixin {
@Shadow private int screenHeight;

@WrapOperation(method = "renderCrosshair", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiGraphics;blit(Lnet/minecraft/resources/ResourceLocation;IIIIII)V", ordinal = 0))
private void arcanuscontinuum$moveCrosshair(GuiGraphics instance, ResourceLocation id, int x, int y, int u, int v, int w, int h, Operation<Void> original) {
private void moveCrosshair(GuiGraphics instance, ResourceLocation id, int x, int y, int u, int v, int w, int h, Operation<Void> original) {
PoseStack matrices = instance.pose();
matrices.pushPose();
matrices.translate((screenWidth - 15) / 2F, (screenHeight - 15) / 2F, 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public abstract class HumanoidModelMixin<T extends LivingEntity> extends Ageable
target = "Lnet/minecraft/util/Mth;cos(F)F",
ordinal = 1
))
private void arcanuscontinuum$modifyArmSwing(T livingEntity, float f, float g, float h, float i, float j, CallbackInfo info) {
private void modifyArmSwing(T livingEntity, float f, float g, float h, float i, float j, CallbackInfo info) {
if(!livingEntity.isSprinting() && !livingEntity.isSwimming() && !livingEntity.isFallFlying()) {
Minecraft client = Minecraft.getInstance();
ItemStack rightStack = client.options.mainHand().get() == HumanoidArm.RIGHT ? livingEntity.getMainHandItem() : livingEntity.getOffhandItem();
Expand All @@ -44,7 +44,7 @@ public abstract class HumanoidModelMixin<T extends LivingEntity> extends Ageable
}

@Inject(method = "setupAnim(Lnet/minecraft/world/entity/LivingEntity;FFFFF)V", at = @At("TAIL"))
private void arcanuscontinuum$staffRunningAnim(T entity, float f, float g, float h, float i, float j, CallbackInfo info) {
private void staffRunningAnim(T entity, float f, float g, float h, float i, float j, CallbackInfo info) {
if(entity.isSprinting() && ArcanusComponents.CASTING_COMPONENT.isProvidedBy(entity) && !ArcanusComponents.isCasting(entity) && !entity.isSwimming() && !entity.isFallFlying()) {
Minecraft client = Minecraft.getInstance();
ItemStack rightStack = client.options.mainHand().get() == HumanoidArm.RIGHT ? entity.getMainHandItem() : entity.getOffhandItem();
Expand Down Expand Up @@ -73,7 +73,7 @@ public abstract class HumanoidModelMixin<T extends LivingEntity> extends Ageable
target = "Lnet/minecraft/client/model/geom/ModelPart;xRot:F",
ordinal = 2
), cancellable = true)
private void arcanuscontinuum$positionRightArm(T entity, CallbackInfo info) {
private void positionRightArm(T entity, CallbackInfo info) {
Minecraft client = Minecraft.getInstance();
ItemStack rightStack = client.options.mainHand().get() == HumanoidArm.RIGHT ? entity.getMainHandItem() : entity.getOffhandItem();

Expand Down Expand Up @@ -121,7 +121,7 @@ public abstract class HumanoidModelMixin<T extends LivingEntity> extends Ageable
target = "Lnet/minecraft/client/model/geom/ModelPart;xRot:F",
ordinal = 2
), cancellable = true)
private void arcanuscontinuum$positionLeftArm(T entity, CallbackInfo info) {
private void positionLeftArm(T entity, CallbackInfo info) {
Minecraft client = Minecraft.getInstance();
ItemStack leftStack = client.options.mainHand().get() == HumanoidArm.RIGHT ? entity.getOffhandItem() : entity.getMainHandItem();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class ItemInHandLayerMixin {
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/ItemInHandRenderer;renderItem(Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/item/ItemDisplayContext;ZLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V"
))
private void arcanuscontinuum$adjustItem(LivingEntity entity, ItemStack stack, ItemDisplayContext transformationMode, HumanoidArm arm, PoseStack matrices, MultiBufferSource vertexConsumers, int light, CallbackInfo ci) {
private void adjustItem(LivingEntity entity, ItemStack stack, ItemDisplayContext transformationMode, HumanoidArm arm, PoseStack matrices, MultiBufferSource vertexConsumers, int light, CallbackInfo ci) {
if(ArcanusComponents.CASTING_COMPONENT.isProvidedBy(entity) && entity.getMainHandItem().getItem() instanceof StaffItem item && ArcanusComponents.isCasting(entity)) {
if(item.staffType == StaffType.STAFF) {
matrices.translate(0, 0.1, 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public abstract class ItemInHandRendererMixin {
target = "Lnet/minecraft/client/renderer/ItemInHandRenderer;renderArmWithItem(Lnet/minecraft/client/player/AbstractClientPlayer;FFLnet/minecraft/world/InteractionHand;FLnet/minecraft/world/item/ItemStack;FLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V",
ordinal = 0
))
private void arcanuscontinuum$animateStaff(float tickDelta, PoseStack matrices, MultiBufferSource.BufferSource vertexConsumers, LocalPlayer player, int light, CallbackInfo info) {
private void animateStaff(float tickDelta, PoseStack matrices, MultiBufferSource.BufferSource vertexConsumers, LocalPlayer player, int light, CallbackInfo info) {
boolean isCasting = ((ClientUtils) minecraft).isCasting();

if(minecraft.player != null && isCasting && mainHandItem.getItem() instanceof StaffItem item) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class ItemRendererMixin {
@Shadow @Final private ItemModelShaper itemModelShaper;

@Inject(method = "getModel", at = @At("HEAD"), cancellable = true)
private void arcanuscontinuum$getHeldItemModel(ItemStack stack, Level world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
private void getHeldItemModel(ItemStack stack, Level world, LivingEntity entity, int seed, CallbackInfoReturnable<BakedModel> cir) {
if(stack.getItem() instanceof StaffItem) {
BakedModel bakedModel = itemModelShaper.getModelManager().getModel(new ModelResourceLocation("minecraft", "trident_in_hand", "inventory"));
ClientLevel clientWorld = world instanceof ClientLevel cWorld ? cWorld : null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class LevelRendererMixin {
value = "INVOKE",
target = "Lnet/minecraft/client/multiplayer/ClientLevel;entitiesForRendering()Ljava/lang/Iterable;"
))
private Iterable<Entity> arcanuscontinuum$sortEntitiesForRendering(Iterable<Entity> entities) {
private Iterable<Entity> sortEntitiesForRendering(Iterable<Entity> entities) {
return EntityRendererSorter.ENTITY_ORDERING.sortedCopy(entities);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ protected LivingEntityRendererMixin(EntityRendererProvider.Context context) {
}

@Inject(method = "<init>", at = @At("TAIL"))
private void arcanuscontinuum$init(EntityRendererProvider.Context ctx, EntityModel model, float shadowRadius, CallbackInfo ci) {
private void init(EntityRendererProvider.Context ctx, EntityModel model, float shadowRadius, CallbackInfo ci) {
addLayer(new ManaWingsFeatureRenderer<>(this));
addLayer(new CounterFeatureRenderer<>(this));
}
Expand All @@ -44,7 +44,7 @@ protected LivingEntityRendererMixin(EntityRendererProvider.Context context) {
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/entity/EntityRenderer;render(Lnet/minecraft/world/entity/Entity;FFLcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;I)V"
))
private void arcanuscontinuum$boltRenderer(T livingEntity, float yaw, float tickDelta, PoseStack matrices, MultiBufferSource vertices, int light, CallbackInfo info) {
private void boltRenderer(T livingEntity, float yaw, float tickDelta, PoseStack matrices, MultiBufferSource vertices, int light, CallbackInfo info) {
Vec3 offset = new Vec3(Mth.lerp(tickDelta, livingEntity.xOld, livingEntity.getX()), Mth.lerp(tickDelta, livingEntity.yOld, livingEntity.getY()), Mth.lerp(tickDelta, livingEntity.zOld, livingEntity.getZ())).add(getRenderOffset(livingEntity, tickDelta));

matrices.pushPose();
Expand All @@ -57,7 +57,7 @@ protected LivingEntityRendererMixin(EntityRendererProvider.Context context) {
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/entity/LivingEntityRenderer;getAttackAnim(Lnet/minecraft/world/entity/LivingEntity;F)F"
))
private void arcanuscontinuum$render(T livingEntity, float f, float g, PoseStack matrices, MultiBufferSource vertexConsumerProvider, int i, CallbackInfo info) {
private void render(T livingEntity, float f, float g, PoseStack matrices, MultiBufferSource vertexConsumerProvider, int i, CallbackInfo info) {
if(livingEntity instanceof Player player && ArcanusComponents.CASTING_COMPONENT.isProvidedBy(livingEntity) && livingEntity.getMainHandItem().getItem() instanceof StaffItem item && item.staffType == StaffType.STAFF && ArcanusComponents.isCasting(livingEntity))
matrices.mulPose(Axis.YP.rotationDegrees(player.getMainArm() == HumanoidArm.RIGHT ? 65 : -65));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public abstract class MinecraftMixin implements ClientUtils {
@Shadow public abstract boolean isLocalServer();

@Inject(method = "tick", at = @At("HEAD"))
public void arcanuscontinuum$tick(CallbackInfo info) {
public void tick(CallbackInfo info) {
if(player == null)
return;

Expand Down Expand Up @@ -102,7 +102,7 @@ public abstract class MinecraftMixin implements ClientUtils {
}

@Inject(method = "handleKeybinds", at = @At("HEAD"), cancellable = true)
private void arcanuscontinuum$handleInputEvents(CallbackInfo info) {
private void handleInputEvents(CallbackInfo info) {
if(ArcanusComponents.getStunTimer(player) > 0)
info.cancel();
}
Expand All @@ -111,7 +111,7 @@ public abstract class MinecraftMixin implements ClientUtils {
value = "INVOKE",
target = "Lnet/minecraft/client/Minecraft;continueAttack(Z)V"
), cancellable = true)
public void arcanuscontinuum$onBlockBreak(CallbackInfo info) {
public void onBlockBreak(CallbackInfo info) {
if(isCasting)
info.cancel();
}
Expand All @@ -121,7 +121,7 @@ public abstract class MinecraftMixin implements ClientUtils {
target = "Lnet/minecraft/client/Minecraft;startAttack()Z",
ordinal = 0
), cancellable = true)
public void arcanuscontinuum$onLeftClick(CallbackInfo info) {
public void onLeftClick(CallbackInfo info) {
if(isCasting)
info.cancel();

Expand Down Expand Up @@ -157,7 +157,7 @@ public abstract class MinecraftMixin implements ClientUtils {
target = "Lnet/minecraft/client/Minecraft;startUseItem()V",
ordinal = 0
), cancellable = true)
public void arcanuscontinuum$onRightClick(CallbackInfo info) {
public void onRightClick(CallbackInfo info) {
if(isCasting)
info.cancel();

Expand All @@ -183,7 +183,7 @@ public abstract class MinecraftMixin implements ClientUtils {
target = "Lnet/minecraft/client/Minecraft;startUseItem()V",
ordinal = 1
), cancellable = true)
public void arcanuscontinuum$onRightClickBlock(CallbackInfo info) {
public void onRightClickBlock(CallbackInfo info) {
if(isCasting || (player != null && !player.isSpectator() && player.getMainHandItem().getItem() instanceof StaffItem))
info.cancel();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ public PlayerRendererMixin(EntityRendererProvider.Context ctx, PlayerModel<Abstr
}

@Inject(method = "<init>", at = @At("TAIL"))
private void arcanuscontinuum$init(EntityRendererProvider.Context context, boolean bl, CallbackInfo info) {
private void init(EntityRendererProvider.Context context, boolean bl, CallbackInfo info) {
addLayer(new SpellPatternFeatureRenderer<>(this));
addLayer(new HaloFeatureRenderer<>(this));
}

@Inject(method = "getTextureLocation(Lnet/minecraft/client/player/AbstractClientPlayer;)Lnet/minecraft/resources/ResourceLocation;", at = @At("HEAD"), cancellable = true)
private void arcanuscontinuum$getTexture(AbstractClientPlayer player, CallbackInfoReturnable<ResourceLocation> info) {
private void getTexture(AbstractClientPlayer player, CallbackInfoReturnable<ResourceLocation> info) {
if(player.hasEffect(ArcanusMobEffects.ANONYMITY.get()))
info.setReturnValue(Arcanus.id("textures/entity/player/anonymous.png"));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public abstract class RenderTargetMixin implements StencilBuffer {
@Shadow public abstract void resize(int width, int height, boolean clearError);

@Inject(method = "<init>", at = @At("RETURN"))
private void arcanuscontinuum$init(boolean useDepth, CallbackInfo info) {
private void init(boolean useDepth, CallbackInfo info) {
isStencilBufferEnabled = false;
}

Expand All @@ -36,7 +36,7 @@ public abstract class RenderTargetMixin implements StencilBuffer {
target = "Lcom/mojang/blaze3d/platform/GlStateManager;_texImage2D(IIIIIIIILjava/nio/IntBuffer;)V",
remap = false
))
private void arcanuscontinuum$modifyTexImage2D(Args args) {
private void modifyTexImage2D(Args args) {
if(Objects.equals(args.get(2), GL11.GL_DEPTH_COMPONENT) && isStencilBufferEnabled) {
args.set(2, GL31.GL_DEPTH24_STENCIL8);
args.set(6, ARBFramebufferObject.GL_DEPTH_STENCIL);
Expand All @@ -49,19 +49,19 @@ public abstract class RenderTargetMixin implements StencilBuffer {
target = "Lcom/mojang/blaze3d/platform/GlStateManager;_glFramebufferTexture2D(IIIII)V",
remap = false
))
private void arcanuscontinuum$modifyFrameBufferTexture2D(Args args) {
private void modifyFrameBufferTexture2D(Args args) {
if(Objects.equals(args.get(1), GL30C.GL_DEPTH_ATTACHMENT))
if(isStencilBufferEnabled)
args.set(1, GL31.GL_DEPTH_STENCIL_ATTACHMENT);
}

@Override
public boolean arcanuscontinuum$isStencilBufferEnabled() {
public boolean arcanus$isStencilBufferEnabled() {
return isStencilBufferEnabled;
}

@Override
public void arcanuscontinuum$enableStencilBufferAndReload(boolean cond) {
public void arcanus$enableStencilBufferAndReload(boolean cond) {
if(isStencilBufferEnabled != cond) {
isStencilBufferEnabled = cond;
resize(width, height, Minecraft.ON_OSX);
Expand Down
Loading

0 comments on commit 4f5c472

Please sign in to comment.