Skip to content

Commit dbf964a

Browse files
DeftuDeftu
committed
OneConfig A77, Textile 0.11.1
1 parent 37b4ec0 commit dbf964a

23 files changed

+105
-92
lines changed

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ plugins {
1818

1919
toolkitLoomHelper {
2020
useOneConfig {
21-
version = "1.0.0-alpha.76"
21+
version = "1.0.0-alpha.77"
2222
loaderVersion = "1.1.0-alpha.44"
2323

2424
usePolyMixin = true

‎src/main/java/club/sk1er/patcher/Patcher.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ private void registerEvents(Object... events) {
264264

265265
private void registerCommands(Object... commands) {
266266
for (Object command : commands) {
267-
CommandManager.registerCommand(command);
267+
CommandManager.register(command);
268268
}
269269
}
270270

‎src/main/java/club/sk1er/patcher/commands/PatcherCommand.java‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package club.sk1er.patcher.commands;
22

3+
import dev.deftu.textile.minecraft.MCSimpleTextHolder;
4+
import dev.deftu.textile.minecraft.MCTextFormat;
35
import org.polyfrost.oneconfig.api.commands.v1.factories.annotated.*;
46
import club.sk1er.patcher.Patcher;
57
import club.sk1er.patcher.config.PatcherConfig;
@@ -21,7 +23,7 @@ private static void main() {
2123
//Patcher.instance.getPatcherConfig().openGui();
2224
}
2325

24-
@Command(value = "blacklist", description = "Tell the client that you don't want to use the 1.11+ chat length on the specified server IP.", greedy = true)
26+
@Command(value = "blacklist", description = "Tell the client that you don't want to use the 1.11+ chat length on the specified server IP.")
2527
public void blacklist(@Parameter("ip") String ip) {
2628
String status = Patcher.instance.addOrRemoveBlacklist(ip) ? "&cnow" : "&ano longer";
2729
ChatUtilities.sendNotification(
@@ -55,11 +57,11 @@ public void scale(@Parameter
5557
//(autoCompletesTo = {"help", "off", "none", "small", "normal", "large", "auto", "0", "1", "2", "3", "4", "5"})
5658
String argument) {
5759
if (argument.equalsIgnoreCase("help")) {
58-
ChatUtilities.sendMessage(" &eInventory Scale", false);
59-
ChatUtilities.sendMessage("&7Usage: /inventoryscale <scaling>", false);
60-
ChatUtilities.sendMessage("&7Scaling may be a number between 1-5, or", false);
61-
ChatUtilities.sendMessage("&7small/normal/large/auto", false);
62-
ChatUtilities.sendMessage("&7Use '/inventoryscale off' to disable scaling.", false);
60+
ChatUtilities.sendMessage(new MCSimpleTextHolder(" Inventory Scale").withFormatting(MCTextFormat.YELLOW), false);
61+
ChatUtilities.sendMessage(new MCSimpleTextHolder("Usage: /inventoryscale <scaling>").withFormatting(MCTextFormat.GRAY), false);
62+
ChatUtilities.sendMessage(new MCSimpleTextHolder("Scaling may be a number between 1-5, or").withFormatting(MCTextFormat.GRAY), false);
63+
ChatUtilities.sendMessage(new MCSimpleTextHolder("small/normal/large/auto").withFormatting(MCTextFormat.GRAY), false);
64+
ChatUtilities.sendMessage(new MCSimpleTextHolder("Use '/inventoryscale off' to disable scaling.").withFormatting(MCTextFormat.GRAY), false);
6365
return;
6466
}
6567

@@ -103,7 +105,7 @@ public void scale(@Parameter
103105
Patcher.instance.forceSaveConfig();
104106
}
105107

106-
@Command(value = "sendcoords", description = "Send your current coordinates in chat. Anything after 'sendcoords' will be put at the end of the message.", greedy = true)
108+
@Command(value = "sendcoords", description = "Send your current coordinates in chat. Anything after 'sendcoords' will be put at the end of the message.")
107109
public void sendcoords(@Parameter("additional information") @Nullable String message) {
108110
EntityPlayerSP player = Minecraft.getMinecraft().thePlayer;
109111
player.sendChatMessage("x: " + (int) player.posX + ", y: " + (int) player.posY + ", z: " + (int) player.posZ +

‎src/main/java/club/sk1er/patcher/hooks/DebugCrosshairHook.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package club.sk1er.patcher.hooks;
22

3-
import org.polyfrost.universal.UResolution;
3+
import dev.deftu.omnicore.client.render.OmniResolution;
44
import net.minecraft.client.Minecraft;
55
import net.minecraft.client.renderer.GlStateManager;
66
import net.minecraft.client.renderer.Tessellator;
@@ -15,12 +15,12 @@ public class DebugCrosshairHook {
1515

1616
public static void renderDirections(float partialTicks, Minecraft mc) {
1717
GlStateManager.pushMatrix();
18-
GlStateManager.translate((float)(UResolution.getScaledWidth() / 2), (float)(UResolution.getScaledHeight() / 2), 0);
18+
GlStateManager.translate((float)(OmniResolution.getScaledWidth() / 2), (float)(OmniResolution.getScaledHeight() / 2), 0);
1919
Entity entity = mc.getRenderViewEntity();
2020
GlStateManager.rotate(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * partialTicks, -1.0F, 0.0F, 0.0F);
2121
GlStateManager.rotate(entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * partialTicks, 0.0F, 1.0F, 0.0F);
2222
GlStateManager.scale(-1.0F, -1.0F, -1.0F);
23-
double mcScale = UResolution.getScaleFactor();
23+
double mcScale = OmniResolution.getScaleFactor();
2424
GlStateManager.scale(1 / mcScale, 1 / mcScale, 1 / mcScale);
2525
GlStateManager.disableTexture2D();
2626
GlStateManager.depthMask(false);

‎src/main/java/club/sk1er/patcher/hooks/GuiNewChatHook.java‎

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

33
import club.sk1er.patcher.config.PatcherConfig;
44
import com.google.common.collect.Queues;
5-
import org.polyfrost.universal.ChatColor;
5+
import dev.deftu.textile.minecraft.MCTextFormat;
66
import net.minecraft.client.Minecraft;
77
import net.minecraft.client.gui.Gui;
88
import net.minecraft.client.renderer.GlStateManager;
@@ -56,7 +56,7 @@ public static void drawMessageQueue() {
5656
Gui.drawRect(0, 0, chatWidth + 4, 9, 2130706432);
5757
GlStateManager.enableBlend();
5858
GlStateManager.translate(0, 0, 50);
59-
mc.fontRendererObj.drawStringWithShadow(ChatColor.GRAY + "[+" + messageQueue.size() + " pending lines]", 0, 1, -1);
59+
mc.fontRendererObj.drawStringWithShadow(MCTextFormat.GRAY + "[+" + messageQueue.size() + " pending lines]", 0, 1, -1);
6060
GlStateManager.popMatrix();
6161
GlStateManager.disableAlpha();
6262
GlStateManager.disableBlend();

‎src/main/java/club/sk1er/patcher/mixins/bugfixes/ContainerMixin_PlaySound.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package club.sk1er.patcher.mixins.bugfixes;
22

3-
import org.polyfrost.universal.USound;
3+
import dev.deftu.omnicore.client.OmniClientSound;
44
import net.minecraft.client.Minecraft;
55
import net.minecraft.inventory.Container;
66
import net.minecraft.inventory.ContainerPlayer;
@@ -29,7 +29,7 @@ public class ContainerMixin_PlaySound {
2929
if (slot != null) {
3030
ItemStack slotStack = slot.getStack();
3131
if (slotStack != null && slotStack.getItem() instanceof ItemArmor && slotStack.getItemDamage() > slotStack.getMaxDamage() - 2) {
32-
USound.INSTANCE.playSoundStatic(new ResourceLocation("random.break"), 1, 1);
32+
OmniClientSound.play(new ResourceLocation("random.break"), 1f, 1f);
3333
}
3434
}
3535
}

‎src/main/java/club/sk1er/patcher/mixins/bugfixes/GuiIngameForgeMixin_FixProfilerSection.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package club.sk1er.patcher.mixins.bugfixes;
22

3+
import dev.deftu.omnicore.client.OmniClient;
34
import net.minecraft.client.Minecraft;
45
import net.minecraft.client.gui.GuiIngame;
56
import net.minecraftforge.client.GuiIngameForge;
@@ -22,8 +23,8 @@ public GuiIngameForgeMixin_FixProfilerSection(Minecraft mcIn) {
2223
remap = false
2324
)
2425
private void patcher$fixProfilerSectionNotEnding(int width, int height, CallbackInfo ci) {
25-
if (this.mc.mcProfiler.getNameOfLastSection().endsWith("chat")) {
26-
this.mc.mcProfiler.endSection();
26+
if (OmniClient.getInstance().mcProfiler.getNameOfLastSection().endsWith("chat")) {
27+
OmniClient.getInstance().mcProfiler.endSection();
2728
}
2829
}
2930
}

‎src/main/java/club/sk1er/patcher/mixins/bugfixes/GuiScreenResourcePacksMixin_FixOpenPackFolder.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package club.sk1er.patcher.mixins.bugfixes;
22

3-
import org.polyfrost.universal.UDesktop;
3+
import dev.deftu.omnicore.client.OmniDesktop;
44
import net.minecraft.client.Minecraft;
55
import net.minecraft.client.gui.GuiScreenResourcePacks;
66
import org.spongepowered.asm.mixin.Mixin;
@@ -22,7 +22,7 @@ public class GuiScreenResourcePacksMixin_FixOpenPackFolder {
2222
cancellable = true
2323
)
2424
private void patcher$fixFolderOpening(CallbackInfo ci) {
25-
if (UDesktop.open(Minecraft.getMinecraft().getResourcePackRepository().getDirResourcepacks())) {
25+
if (OmniDesktop.open(Minecraft.getMinecraft().getResourcePackRepository().getDirResourcepacks())) {
2626
ci.cancel();
2727
}
2828
}

‎src/main/java/club/sk1er/patcher/mixins/bugfixes/ServerListEntryNormalMixin_BufferFix.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package club.sk1er.patcher.mixins.bugfixes;
22

3-
import org.polyfrost.universal.ChatColor;
43
import com.google.common.util.concurrent.ThreadFactoryBuilder;
4+
import dev.deftu.textile.minecraft.MCTextFormat;
55
import net.minecraft.client.Minecraft;
66
import net.minecraft.client.gui.GuiMultiplayer;
77
import net.minecraft.client.multiplayer.ServerData;
@@ -82,7 +82,7 @@ public class ServerListEntryNormalMixin_BufferFix {
8282
public Future<?> patcher$drawEntry(ThreadPoolExecutor instance, Runnable r) {
8383
// Check if too many running tasks, if yes cancel & set to "spamming"
8484
if (patcher$runningTaskCount > patcher$serverCountCache * 2) {
85-
patcher$setServerFail(ChatColor.GRAY + "Stop spamming... refresh the server list.");
85+
patcher$setServerFail(MCTextFormat.GRAY + "Stop spamming... refresh the server list.");
8686
return patcher$threadPoolExecutor.submit(() -> {});
8787
}
8888

@@ -97,16 +97,16 @@ public class ServerListEntryNormalMixin_BufferFix {
9797
try {
9898
future.get(SERVER_TIMEOUT, TimeUnit.SECONDS);
9999
} catch (TimeoutException e1) {
100-
patcher$setServerFail(ChatColor.RED + "Timed out");
100+
patcher$setServerFail(MCTextFormat.RED + "Timed out");
101101
} catch (ExecutionException e2) {
102102
if (e2.getCause() instanceof UnknownHostException)
103-
patcher$setServerFail(ChatColor.DARK_RED + "Can't resolve hostname");
103+
patcher$setServerFail(MCTextFormat.DARK_RED + "Can't resolve hostname");
104104
else
105-
patcher$setServerFail(ChatColor.DARK_RED + "Can't connect to server.");
105+
patcher$setServerFail(MCTextFormat.DARK_RED + "Can't connect to server.");
106106

107107
} catch (Exception e3) {
108108
// Shouldn't happen anymore but just in case
109-
patcher$setServerFail(ChatColor.DARK_RED + "Can't connect to server.");
109+
patcher$setServerFail(MCTextFormat.DARK_RED + "Can't connect to server.");
110110
}
111111
patcher$runningTaskCount--;
112112
});

‎src/main/java/club/sk1er/patcher/mixins/features/GuiIngameForgeMixin_TitleRendering.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package club.sk1er.patcher.mixins.features;
22

33
import club.sk1er.patcher.config.PatcherConfig;
4-
import org.polyfrost.universal.UResolution;
4+
import club.sk1er.patcher.mixins.accessors.GuiIngameAccessor;
5+
import dev.deftu.omnicore.client.render.OmniResolution;
56
import net.minecraft.client.Minecraft;
67
import net.minecraft.client.gui.FontRenderer;
78
import net.minecraft.client.gui.GuiIngame;
@@ -27,9 +28,9 @@ public GuiIngameForgeMixin_TitleRendering(Minecraft mc) {
2728
private void patcher$modifyTitle(int l, int age, float opacity, CallbackInfo ci) {
2829
float titleScale = 1;
2930
if (PatcherConfig.autoTitleScale) {
30-
float width = this.fontrenderer.getStringWidth(this.displayedTitle) * 4.0F;
31-
if (width > UResolution.getScaledWidth()) {
32-
titleScale = (UResolution.getScaledWidth() / width);
31+
float width = this.fontrenderer.getStringWidth(((GuiIngameAccessor) this).getDisplayedTitle()) * 4.0F;
32+
if (width > OmniResolution.getScaledWidth()) {
33+
titleScale = (OmniResolution.getScaledWidth() / width);
3334
}
3435
}
3536
GlStateManager.scale(titleScale, titleScale, titleScale);
@@ -38,9 +39,9 @@ public GuiIngameForgeMixin_TitleRendering(Minecraft mc) {
3839
private void patcher$modifySubtitle(int l, int age, float opacity, CallbackInfo ci) {
3940
float titleScale = 1;
4041
if (PatcherConfig.autoTitleScale) {
41-
float width = this.fontrenderer.getStringWidth(this.displayedSubTitle) * 2.0F;
42-
if (width > UResolution.getScaledWidth()) {
43-
titleScale = (UResolution.getScaledWidth() / width);
42+
float width = this.fontrenderer.getStringWidth(((GuiIngameAccessor) this).getDisplayedSubTitle()) * 2.0F;
43+
if (width > OmniResolution.getScaledWidth()) {
44+
titleScale = (OmniResolution.getScaledWidth() / width);
4445
}
4546
}
4647
GlStateManager.scale(titleScale, titleScale, titleScale);

0 commit comments

Comments
 (0)