Skip to content

Commit aaea75f

Browse files
AzureAaronAzureAaron
committed
Rename Mixins
1 parent 7b809ee commit aaea75f

File tree

59 files changed

+157
-157
lines changed

Some content is hidden

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

59 files changed

+157
-157
lines changed

‎src/main/java/net/azureaaron/mod/Particles.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import net.azureaaron.mod.config.AaronModConfig;
1212
import net.azureaaron.mod.config.AaronModConfigManager;
1313
import net.azureaaron.mod.config.ConfigUtils;
14-
import net.azureaaron.mod.mixins.accessors.BillboardParticleAccessor;
14+
import net.azureaaron.mod.mixins.accessors.SingleQuadParticleAccessor;
1515
import net.azureaaron.mod.utils.Functions;
1616
import net.minecraft.client.particle.Particle;
1717
import net.minecraft.client.particle.SingleQuadParticle;
@@ -49,7 +49,7 @@ public static Particle modifyParticle(Particle particle, Identifier id) {
4949
float scale = AaronModConfigManager.get().particles.scaling.getOrDefault(id, 1f);
5050

5151
//Only set the alpha if won't result in the particle being discarded by the fragment shader or if its not greater than the default
52-
if (particle instanceof SingleQuadParticle billboard && billboard instanceof BillboardParticleAccessor accessor && alpha > 0.1f && alpha < accessor.getAlpha()) {
52+
if (particle instanceof SingleQuadParticle billboard && billboard instanceof SingleQuadParticleAccessor accessor && alpha > 0.1f && alpha < accessor.getAlpha()) {
5353
accessor.invokeSetAlpha(alpha);
5454
billboard.markHasCustomAlpha();
5555
}

‎src/main/java/net/azureaaron/mod/commands/vanilla/CopyChatCommand.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import com.mojang.brigadier.tree.LiteralCommandNode;
1313

1414
import net.azureaaron.mod.annotations.Init;
15-
import net.azureaaron.mod.mixins.accessors.ChatAccessor;
15+
import net.azureaaron.mod.mixins.accessors.ChatComponentAccessor;
1616
import net.fabricmc.fabric.api.client.command.v2.ClientCommandRegistrationCallback;
1717
import net.fabricmc.fabric.api.client.command.v2.FabricClientCommandSource;
1818
import net.minecraft.ChatFormatting;
@@ -46,8 +46,8 @@ private static void register(CommandDispatcher<FabricClientCommandSource> dispat
4646
* The new middle click to copy chat supersedes this feature!
4747
*/
4848
private static int copyMessage(FabricClientCommandSource source, String excerpt) {
49-
List<GuiMessage> chatHistory = ((ChatAccessor) minecraftClient.gui.getChat()).getMessages();
50-
int maxChatHistoryLength = ChatAccessor.getMaxHistoryLength();
49+
List<GuiMessage> chatHistory = ((ChatComponentAccessor) minecraftClient.gui.getChat()).getMessages();
50+
int maxChatHistoryLength = ChatComponentAccessor.getMaxHistoryLength();
5151
int maxIteration = (chatHistory.size() >= maxChatHistoryLength) ? maxChatHistoryLength : chatHistory.size();
5252
boolean foundAMessage = false;
5353

‎src/main/java/net/azureaaron/mod/features/CopyChatMessages.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import net.azureaaron.mod.annotations.Init;
1212
import net.azureaaron.mod.config.AaronModConfigManager;
1313
import net.azureaaron.mod.config.configs.RefinementsConfig;
14-
import net.azureaaron.mod.mixins.accessors.ChatAccessor;
14+
import net.azureaaron.mod.mixins.accessors.ChatComponentAccessor;
1515
import net.azureaaron.mod.utils.ItemUtils;
1616
import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
1717
import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents;
@@ -47,7 +47,7 @@ public static void init() {
4747

4848
private static boolean onMouseInput(Screen screen, MouseButtonEvent click, boolean consumed) {
4949
int configuredButton = AaronModConfigManager.get().refinements.chat.copyChatMouseButton == RefinementsConfig.MouseButton.MIDDLE ? GLFW.GLFW_MOUSE_BUTTON_MIDDLE : GLFW.GLFW_MOUSE_BUTTON_LEFT;
50-
ChatAccessor chatAccessor = ((ChatAccessor) CLIENT.gui.getChat());
50+
ChatComponentAccessor chatAccessor = ((ChatComponentAccessor) CLIENT.gui.getChat());
5151

5252
if (click.button() == configuredButton && AaronModConfigManager.get().refinements.chat.copyChatMessages) {
5353
double chatLineX = toChatLineX(click.x());
@@ -111,7 +111,7 @@ private static void sendToast(boolean success) {
111111
}
112112

113113
private static int getMessageIndex(double chatLineX, double chatLineY) {
114-
ChatAccessor chatAccessor = ((ChatAccessor) CLIENT.gui.getChat());
114+
ChatComponentAccessor chatAccessor = ((ChatComponentAccessor) CLIENT.gui.getChat());
115115

116116
int lineIndex = getMessageLineIndex(chatLineX, chatLineY);
117117
if (lineIndex == -1) return -1;
@@ -152,19 +152,19 @@ private static int getMessageIndex(double chatLineX, double chatLineY) {
152152
}
153153

154154
private static double toChatLineX(double x) {
155-
ChatAccessor chatAccessor = ((ChatAccessor) CLIENT.gui.getChat());
155+
ChatComponentAccessor chatAccessor = ((ChatComponentAccessor) CLIENT.gui.getChat());
156156
return x / chatAccessor.invokeGetScale() - 4.0;
157157
}
158158

159159
private static double toChatLineY(double y) {
160-
ChatAccessor chatAccessor = ((ChatAccessor) CLIENT.gui.getChat());
160+
ChatComponentAccessor chatAccessor = ((ChatComponentAccessor) CLIENT.gui.getChat());
161161
double d = CLIENT.getWindow().getGuiScaledHeight() - y - 40.0;
162162

163163
return d / (chatAccessor.invokeGetScale() * chatAccessor.invokeGetLineHeight());
164164
}
165165

166166
private static int getMessageEndLineIndex(double chatLineX, double chatLineY) {
167-
ChatAccessor chatAccessor = ((ChatAccessor) CLIENT.gui.getChat());
167+
ChatComponentAccessor chatAccessor = ((ChatComponentAccessor) CLIENT.gui.getChat());
168168
int i = getMessageLineIndex(chatLineX, chatLineY);
169169
if (i == -1) {
170170
return -1;
@@ -183,7 +183,7 @@ private static int getMessageEndLineIndex(double chatLineX, double chatLineY) {
183183

184184
private static int getMessageLineIndex(double chatLineX, double chatLineY) {
185185
ChatComponent chatHud = CLIENT.gui.getChat();
186-
ChatAccessor chatAccessor = (ChatAccessor) chatHud;
186+
ChatComponentAccessor chatAccessor = (ChatComponentAccessor) chatHud;
187187

188188
if (chatHud.isChatFocused() && !chatAccessor.invokeIsChatHidden()) {
189189
if (!(chatLineX < -4.0) && !(chatLineX > Mth.floor(chatAccessor.invokeGetWidth() / chatAccessor.invokeGetScale()))) {

‎src/main/java/net/azureaaron/mod/features/DragonHealth.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import net.azureaaron.mod.annotations.Init;
1010
import net.azureaaron.mod.config.AaronModConfigManager;
1111
import net.azureaaron.mod.events.WorldRenderExtractionCallback;
12-
import net.azureaaron.mod.mixins.accessors.ClientEntityManagerAccessor;
13-
import net.azureaaron.mod.mixins.accessors.ClientWorldAccessor;
12+
import net.azureaaron.mod.mixins.accessors.TransientEntitySectionManagerAccessor;
13+
import net.azureaaron.mod.mixins.accessors.ClientLevelAccessor;
1414
import net.azureaaron.mod.utils.Cache;
1515
import net.azureaaron.mod.utils.render.primitive.PrimitiveCollector;
1616
import net.minecraft.client.Minecraft;
@@ -41,7 +41,7 @@ private static void extractRendering(PrimitiveCollector collector) {
4141
for (Entity entity : world.entitiesForRendering()) {
4242
if (entity instanceof EnderDragon dragon) {
4343
@SuppressWarnings("unchecked")
44-
EntityLookup<Entity> entityIndex = ((ClientEntityManagerAccessor<Entity>) ((ClientWorldAccessor) world).getEntityStorage()).getEntityStorage();
44+
EntityLookup<Entity> entityIndex = ((TransientEntitySectionManagerAccessor<Entity>) ((ClientLevelAccessor) world).getEntityStorage()).getEntityStorage();
4545

4646
for (Entity indexedEntity : entityIndex.getAllEntities()) {
4747
if (indexedEntity instanceof ArmorStand armourStand && armourStand.getBoundingBox().intersects(dragon.getBoundingBox()) && armourStand.hasCustomName()) {

src/main/java/net/azureaaron/mod/mixins/HandledScreenMixin.java renamed to src/main/java/net/azureaaron/mod/mixins/AbstractContainerScreenMixin.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
1414

1515
@Mixin(AbstractContainerScreen.class)
16-
public abstract class HandledScreenMixin<T extends AbstractContainerMenu> extends Screen implements MenuAccess<T> {
16+
public abstract class AbstractContainerScreenMixin<T extends AbstractContainerMenu> extends Screen implements MenuAccess<T> {
1717

18-
protected HandledScreenMixin(Component title) {
18+
protected AbstractContainerScreenMixin(Component title) {
1919
super(title);
2020
}
2121

src/main/java/net/azureaaron/mod/mixins/AbstractSignBlockEntityRendererMixin.java renamed to src/main/java/net/azureaaron/mod/mixins/AbstractSignRendererMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import net.minecraft.world.level.block.entity.SignBlockEntity;
1313

1414
@Mixin(AbstractSignRenderer.class)
15-
public abstract class AbstractSignBlockEntityRendererMixin implements BlockEntityRenderer<SignBlockEntity, SignRenderState> {
15+
public abstract class AbstractSignRendererMixin implements BlockEntityRenderer<SignBlockEntity, SignRenderState> {
1616

1717
@ModifyReturnValue(method = "isOutlineVisible", at = @At("RETURN"))
1818
private static boolean aaronMod$renderGlowingTextOutlineWhenZoomedIn(boolean renderGlowingOutline) {

src/main/java/net/azureaaron/mod/mixins/MobSpawnerLogicMixin.java renamed to src/main/java/net/azureaaron/mod/mixins/BaseSpawnerMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import net.minecraft.world.level.BaseSpawner;
1010

1111
@Mixin(BaseSpawner.class)
12-
public class MobSpawnerLogicMixin {
12+
public class BaseSpawnerMixin {
1313

1414
@Inject(method = "clientTick", at = @At("HEAD"), cancellable = true)
1515
private void aaronMod$dontTickClientLogic(CallbackInfo ci) {

src/main/java/net/azureaaron/mod/mixins/ChatHudMixin.java renamed to src/main/java/net/azureaaron/mod/mixins/ChatComponentMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import net.minecraft.client.gui.components.ChatComponent;
1919

2020
@Mixin(ChatComponent.class)
21-
public class ChatHudMixin {
21+
public class ChatComponentMixin {
2222
@Shadow
2323
@Mutable
2424
private static int MAX_CHAT_HISTORY;

src/main/java/net/azureaaron/mod/mixins/ChestBlockEntityRendererMixin.java renamed to src/main/java/net/azureaaron/mod/mixins/ChestRendererMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import net.minecraft.world.level.block.entity.LidBlockEntity;
1515

1616
@Mixin(ChestRenderer.class)
17-
public abstract class ChestBlockEntityRendererMixin<T extends BlockEntity & LidBlockEntity> implements BlockEntityRenderer<T, ChestRenderState> {
17+
public abstract class ChestRendererMixin<T extends BlockEntity & LidBlockEntity> implements BlockEntityRenderer<T, ChestRenderState> {
1818

1919
@ModifyReturnValue(method = "xmasTextures", at = @At("RETURN"))
2020
private static boolean aaronMod$decemberChristmasChests(boolean isAroundChristmas) {

src/main/java/net/azureaaron/mod/mixins/ClientCommonNetworkHandlerMixin.java renamed to src/main/java/net/azureaaron/mod/mixins/ClientCommonPacketListenerImplMixin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import net.minecraft.network.protocol.common.ClientboundPingPacket;
1111

1212
@Mixin(ClientCommonPacketListenerImpl.class)
13-
public class ClientCommonNetworkHandlerMixin {
13+
public class ClientCommonPacketListenerImplMixin {
1414

1515
@Inject(method = "handlePing", at = @At("RETURN"))
1616
private void aaronMod$onServerTick(ClientboundPingPacket packet, CallbackInfo ci) {

0 commit comments

Comments
 (0)