Skip to content
This repository was archived by the owner on Nov 28, 2025. It is now read-only.

Commit 41c3a42

Browse files
moehreagmoehreag
committed
some more bugfixes, request timeouts, ...
1 parent b484889 commit 41c3a42

File tree

58 files changed

+132
-401
lines changed

Some content is hidden

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

58 files changed

+132
-401
lines changed

‎1.16_combat-6/src/main/java/io/github/axolotlclient/AxolotlClient.java‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@
5454
import io.github.axolotlclient.util.FeatureDisabler;
5555
import io.github.axolotlclient.util.Logger;
5656
import io.github.axolotlclient.util.LoggerImpl;
57-
import io.github.axolotlclient.util.UnsupportedMod;
5857
import io.github.axolotlclient.util.notifications.Notifications;
5958
import io.github.axolotlclient.util.translation.Translations;
6059
import net.fabricmc.api.ClientModInitializer;
@@ -75,9 +74,6 @@ public class AxolotlClient implements ClientModInitializer {
7574
public static Logger LOGGER;
7675
public static AxolotlClientConfig CONFIG;
7776
public static ConfigManager configManager;
78-
public static UnsupportedMod badmod;
79-
public static boolean titleDisclaimer = false;
80-
public static boolean showWarning = true;
8177

8278
public static void getModules() {
8379
modules.add(SkyResourceManager.getInstance());
@@ -114,26 +110,6 @@ public void onInitializeClient() {
114110
VERSION = FabricLoader.getInstance().getModContainer(MODID).orElseThrow(IllegalStateException::new)
115111
.getMetadata().getVersion().getFriendlyString();
116112

117-
if (FabricLoader.getInstance().isModLoaded("ares")) {
118-
badmod = new UnsupportedMod("Ares Client", UnsupportedMod.UnsupportedReason.BAN_REASON);
119-
} else if (FabricLoader.getInstance().isModLoaded("inertia")) {
120-
badmod = new UnsupportedMod("Inertia Client", UnsupportedMod.UnsupportedReason.BAN_REASON);
121-
} else if (FabricLoader.getInstance().isModLoaded("meteor-client")) {
122-
badmod = new UnsupportedMod("Meteor Client", UnsupportedMod.UnsupportedReason.BAN_REASON);
123-
} else if (FabricLoader.getInstance().isModLoaded("wurst")) {
124-
badmod = new UnsupportedMod("Wurst Client", UnsupportedMod.UnsupportedReason.BAN_REASON);
125-
} else if (FabricLoader.getInstance().isModLoaded("baritone")) {
126-
badmod = new UnsupportedMod("Baritone", UnsupportedMod.UnsupportedReason.BAN_REASON);
127-
} else if (FabricLoader.getInstance().isModLoaded("essential-container")) {
128-
badmod = new UnsupportedMod("Essential", UnsupportedMod.UnsupportedReason.MIGHT_CRASH,
129-
UnsupportedMod.UnsupportedReason.UNKNOWN_CONSEQUENSES);
130-
} else if (FabricLoader.getInstance().isModLoaded("optifabric")) {
131-
badmod = new UnsupportedMod("OptiFine", UnsupportedMod.UnsupportedReason.MIGHT_CRASH,
132-
UnsupportedMod.UnsupportedReason.UNKNOWN_CONSEQUENSES);
133-
} else {
134-
showWarning = false;
135-
}
136-
137113
CONFIG = new AxolotlClientConfig();
138114
config.add(someNiceBackground);
139115

@@ -162,8 +138,6 @@ public void onInitializeClient() {
162138

163139
modules.forEach(Module::lateInit);
164140

165-
/*ResourceLoader.registerBuiltinResourcePack(new Identifier("axolotlclient", "axolotlclient-ui"), container,
166-
ResourcePackActivationType.NORMAL);*/
167141
ClientTickEvents.END_CLIENT_TICK.register(client -> tickClient());
168142

169143
FeatureDisabler.init();

‎1.16_combat-6/src/main/java/io/github/axolotlclient/api/chat/ChannelSettingsScreen.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import io.github.axolotlclient.api.requests.ChannelRequest;
3535
import io.github.axolotlclient.api.types.Channel;
3636
import io.github.axolotlclient.api.types.Persistence;
37+
import io.github.axolotlclient.api.util.UUIDHelper;
3738
import net.minecraft.client.gui.screen.Screen;
3839
import net.minecraft.client.gui.screen.ScreenTexts;
3940
import net.minecraft.client.gui.widget.AbstractButtonWidget;
@@ -151,7 +152,7 @@ public Persistence.Type getValue() {
151152
addButton(new ButtonWidget(width / 2 + 4, footerY, 150, 20, ScreenTexts.DONE, widget -> {
152153
ChannelRequest.updateChannel(channel.getId(), nameField.getText(),
153154
Persistence.of(persistence.getValue(), count.get().get(), duration.get().get()),
154-
Arrays.stream(namesInput.getText().split(",")).filter(s -> !s.isEmpty()).toArray(String[]::new));
155+
Arrays.stream(namesInput.getText().split(",")).filter(s -> !s.isEmpty()).map(UUIDHelper::ensureUuid).toArray(String[]::new));
155156
client.openScreen(parent);
156157
}));
157158
}

‎1.16_combat-6/src/main/java/io/github/axolotlclient/api/chat/CreateChannelScreen.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import io.github.axolotlclient.AxolotlClientConfig.impl.util.DrawUtil;
3434
import io.github.axolotlclient.api.requests.ChannelRequest;
3535
import io.github.axolotlclient.api.types.Persistence;
36+
import io.github.axolotlclient.api.util.UUIDHelper;
3637
import net.minecraft.client.gui.screen.Screen;
3738
import net.minecraft.client.gui.screen.ScreenTexts;
3839
import net.minecraft.client.gui.widget.AbstractButtonWidget;
@@ -59,7 +60,7 @@ public void render(MatrixStack graphics, int mouseX, int mouseY, float delta) {
5960
renderBackground(graphics);
6061
drawCenteredText(graphics, textRenderer, title, width / 2, 36 / 2 - textRenderer.fontHeight / 2, -1);
6162
super.render(graphics, mouseX, mouseY, delta);
62-
hoveredElement(mouseX, mouseY).filter(e -> e instanceof ButtonWidget).map(b -> (ButtonWidget)b).ifPresent(b -> b.renderToolTip(graphics, mouseX, mouseY));
63+
hoveredElement(mouseX, mouseY).filter(e -> e instanceof ButtonWidget).map(b -> (ButtonWidget) b).ifPresent(b -> b.renderToolTip(graphics, mouseX, mouseY));
6364
}
6465

6566
@Override
@@ -147,7 +148,7 @@ public Persistence.Type getValue() {
147148
addButton(new ButtonWidget(width / 2 + 4, footerY, 150, 20, ScreenTexts.DONE, widget -> {
148149
ChannelRequest.createChannel(nameField.getText(),
149150
Persistence.of(persistence.getValue(), count.get().get(), duration.get().get()),
150-
Arrays.stream(namesInput.getText().split(",")).filter(s -> !s.isEmpty()).toArray(String[]::new));
151+
Arrays.stream(namesInput.getText().split(",")).filter(s -> !s.isEmpty()).map(UUIDHelper::ensureUuid).toArray(String[]::new));
151152
client.openScreen(parent);
152153
}));
153154
}

‎1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/CrashReportMixin.java‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎1.16_combat-6/src/main/java/io/github/axolotlclient/mixin/TitleScreenMixin.java‎

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -33,21 +33,16 @@
3333
import io.github.axolotlclient.modules.hud.HudEditScreen;
3434
import io.github.axolotlclient.modules.zoom.Zoom;
3535
import io.github.axolotlclient.util.OSUtil;
36-
import io.github.axolotlclient.util.UnsupportedMod;
3736
import net.fabricmc.loader.api.FabricLoader;
3837
import net.minecraft.SharedConstants;
3938
import net.minecraft.client.MinecraftClient;
4039
import net.minecraft.client.gui.screen.ConfirmChatLinkScreen;
41-
import net.minecraft.client.gui.screen.ConfirmScreen;
4240
import net.minecraft.client.gui.screen.Screen;
4341
import net.minecraft.client.gui.screen.TitleScreen;
4442
import net.minecraft.client.gui.widget.ButtonWidget;
4543
import net.minecraft.client.util.InputUtil;
46-
import net.minecraft.client.util.math.MatrixStack;
47-
import net.minecraft.text.LiteralText;
4844
import net.minecraft.text.Text;
4945
import net.minecraft.text.TranslatableText;
50-
import net.minecraft.util.Formatting;
5146
import org.spongepowered.asm.mixin.Mixin;
5247
import org.spongepowered.asm.mixin.injection.At;
5348
import org.spongepowered.asm.mixin.injection.Inject;
@@ -116,46 +111,4 @@ protected TitleScreenMixin() {
116111
public void axolotlclient$noRealmsIcons(CallbackInfoReturnable<Boolean> cir) {
117112
cir.setReturnValue(false);
118113
}
119-
120-
@Inject(method = "init", at = @At("HEAD"))
121-
public void axolotlclient$showBadModsScreen(CallbackInfo ci) {
122-
if (AxolotlClient.showWarning) {
123-
StringBuilder description = new StringBuilder();
124-
for (int i = 0; i < AxolotlClient.badmod.reason().length; i++) {
125-
UnsupportedMod.UnsupportedReason reason = AxolotlClient.badmod.reason()[i];
126-
if (i > 0 && i < AxolotlClient.badmod.reason().length - 1) {
127-
description.append(", to ");
128-
} else if (i > 0) {
129-
description.append(" and to ");
130-
}
131-
description.append(reason);
132-
}
133-
description.append(". ");
134-
135-
MinecraftClient.getInstance().openScreen(new ConfirmScreen((boolean confirmed) -> {
136-
if (confirmed) {
137-
AxolotlClient.showWarning = false;
138-
AxolotlClient.titleDisclaimer = true;
139-
System.out.println("Proceed with Caution!");
140-
MinecraftClient.getInstance().openScreen(new TitleScreen());
141-
} else {
142-
MinecraftClient.getInstance().stop();
143-
}
144-
}, new LiteralText("Axolotlclient warning").formatted(Formatting.RED), new LiteralText("The mod ")
145-
.append(new LiteralText(AxolotlClient.badmod.name()).formatted(Formatting.BOLD, Formatting.DARK_RED))
146-
.append(" is known to ").append(description.toString())
147-
.append("AxolotlClient will not be responsible for any punishment or crashes you will encounter while using it.\n Proceed with Caution!"),
148-
new TranslatableText("gui.proceed"), new TranslatableText("menu.quit")));
149-
}
150-
}
151-
152-
@Inject(method = "render", at = @At("TAIL"))
153-
public void axolotlclient$addDisclaimer(MatrixStack matrices, int mouseX, int mouseY, float delta, CallbackInfo ci) {
154-
if (AxolotlClient.titleDisclaimer) {
155-
TitleScreen.drawCenteredString(matrices, this.textRenderer,
156-
"You are playing at your own risk with unsupported Mods", this.width / 2, 5, 0xFFCC8888);
157-
TitleScreen.drawCenteredString(matrices, this.textRenderer, "Things could break!", this.width / 2, 15,
158-
0xFFCC8888);
159-
}
160-
}
161114
}

‎1.16_combat-6/src/main/resources/axolotlclient.mixins.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"ClientPlayerEntityMixin",
1616
"ClientPlayNetworkHandlerMixin",
1717
"ClientWorldMixin",
18-
"CrashReportMixin",
1918
"DebugHudMixin",
2019
"DownloadingTerrainScreenMixin",
2120
"EmitterParticleMixin",

‎1.20/src/main/java/io/github/axolotlclient/AxolotlClient.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@
5959
import net.fabricmc.api.ClientModInitializer;
6060
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
6161
import net.fabricmc.fabric.api.resource.ResourceManagerHelper;
62-
import net.fabricmc.fabric.api.resource.ResourcePackActivationType;
6362
import net.fabricmc.loader.api.FabricLoader;
6463
import net.minecraft.resource.Resource;
6564
import net.minecraft.resource.ResourceType;
@@ -138,8 +137,6 @@ public void onInitializeClient() {
138137

139138
modules.forEach(Module::lateInit);
140139

141-
ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("axolotlclient", "axolotlclient-ui"), FabricLoader.getInstance().getModContainer(MODID).orElseThrow(),
142-
ResourcePackActivationType.NORMAL);
143140
ClientTickEvents.END_CLIENT_TICK.register(client -> tickClient());
144141
ResourceManagerHelper.get(ResourceType.CLIENT_RESOURCES).registerReloadListener(SkyResourceManager.getInstance());
145142

‎1.20/src/main/java/io/github/axolotlclient/api/chat/ChannelSettingsScreen.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import io.github.axolotlclient.api.requests.ChannelRequest;
3232
import io.github.axolotlclient.api.types.Channel;
3333
import io.github.axolotlclient.api.types.Persistence;
34+
import io.github.axolotlclient.api.util.UUIDHelper;
3435
import net.minecraft.client.gui.GuiGraphics;
3536
import net.minecraft.client.gui.screen.Screen;
3637
import net.minecraft.client.gui.tooltip.Tooltip;
@@ -124,7 +125,7 @@ protected void init() {
124125
addDrawableChild(ButtonWidget.builder(CommonTexts.DONE, widget -> {
125126
ChannelRequest.updateChannel(channel.getId(), nameField.getText(),
126127
Persistence.of(persistence.getValue(), count.get().get(), duration.get().get()),
127-
Arrays.stream(namesInput.getText().split(",")).filter(s -> !s.isEmpty()).toArray(String[]::new));
128+
Arrays.stream(namesInput.getText().split(",")).filter(s -> !s.isEmpty()).map(UUIDHelper::ensureUuid).toArray(String[]::new));
128129
client.setScreen(parent);
129130
}).positionAndSize(width / 2 + 4, footerY, 150, 20).build());
130131
}

‎1.20/src/main/java/io/github/axolotlclient/api/chat/CreateChannelScreen.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
import io.github.axolotlclient.api.requests.ChannelRequest;
3232
import io.github.axolotlclient.api.types.Persistence;
33+
import io.github.axolotlclient.api.util.UUIDHelper;
3334
import net.minecraft.client.gui.GuiGraphics;
3435
import net.minecraft.client.gui.screen.Screen;
3536
import net.minecraft.client.gui.tooltip.Tooltip;
@@ -119,7 +120,7 @@ protected void init() {
119120
addDrawableChild(ButtonWidget.builder(CommonTexts.DONE, widget -> {
120121
ChannelRequest.createChannel(nameField.getText(),
121122
Persistence.of(persistence.getValue(), count.get().get(), duration.get().get()),
122-
Arrays.stream(namesInput.getText().split(",")).filter(s -> !s.isEmpty()).toArray(String[]::new));
123+
Arrays.stream(namesInput.getText().split(",")).filter(s -> !s.isEmpty()).map(UUIDHelper::ensureUuid).toArray(String[]::new));
123124
client.setScreen(parent);
124125
}).positionAndSize(width / 2 + 4, footerY, 150, 20).build());
125126
}

‎1.20/src/main/java/io/github/axolotlclient/modules/blur/MotionBlur.java‎

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

2323
package io.github.axolotlclient.modules.blur;
2424

25+
import java.io.IOException;
26+
2527
import com.google.gson.JsonSyntaxException;
2628
import com.mojang.blaze3d.shader.GlUniform;
2729
import io.github.axolotlclient.AxolotlClient;
@@ -36,8 +38,6 @@
3638
import net.minecraft.util.Identifier;
3739
import org.apache.commons.io.IOUtils;
3840

39-
import java.io.IOException;
40-
4141
public class MotionBlur extends AbstractModule {
4242

4343
private static final MotionBlur Instance = new MotionBlur();

0 commit comments

Comments
 (0)