From 2e1abe481e81302eca4a0408ed6e704ac6674a48 Mon Sep 17 00:00:00 2001 From: stormybytes Date: Fri, 29 Oct 2021 19:07:24 +0700 Subject: [PATCH] Fixed snail breaking addons again Cope - Utils.mc --> MeteorClient.mc - MeteorClient.screenToOpen --> Utils.mc - others (too lazy) --- src/main/java/anticope/rejects/MeteorRejectsAddon.java | 2 +- src/main/java/anticope/rejects/commands/HeadsCommand.java | 8 +++----- .../java/anticope/rejects/gui/screens/HeadScreen.java | 2 +- .../rejects/gui/themes/rounded/MeteorRoundedGuiTheme.java | 2 +- .../rejects/gui/themes/rounded/widgets/WMeteorModule.java | 2 +- .../rejects/gui/themes/rounded/widgets/WMeteorTopBar.java | 2 +- .../rejects/mixin/meteor/modules/FlightMixin.java | 2 +- src/main/java/anticope/rejects/utils/GiveUtils.java | 2 +- src/main/java/anticope/rejects/utils/TntDamage.java | 5 +++-- src/main/java/anticope/rejects/utils/WorldGenUtils.java | 2 +- src/main/java/anticope/rejects/utils/seeds/Seeds.java | 2 +- 11 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/main/java/anticope/rejects/MeteorRejectsAddon.java b/src/main/java/anticope/rejects/MeteorRejectsAddon.java index 6236f5c..8efe9ac 100644 --- a/src/main/java/anticope/rejects/MeteorRejectsAddon.java +++ b/src/main/java/anticope/rejects/MeteorRejectsAddon.java @@ -7,7 +7,7 @@ import anticope.rejects.modules.*; import anticope.rejects.modules.modifier.NoRenderModifier; import anticope.rejects.utils.GiveUtils; import anticope.rejects.utils.RejectsUtils; -import meteordevelopment.meteorclient.MeteorAddon; +import meteordevelopment.meteorclient.addons.MeteorAddon; import meteordevelopment.meteorclient.MeteorClient; import meteordevelopment.meteorclient.gui.GuiThemes; import meteordevelopment.meteorclient.systems.commands.Commands; diff --git a/src/main/java/anticope/rejects/commands/HeadsCommand.java b/src/main/java/anticope/rejects/commands/HeadsCommand.java index c8f7ba2..ea6667a 100644 --- a/src/main/java/anticope/rejects/commands/HeadsCommand.java +++ b/src/main/java/anticope/rejects/commands/HeadsCommand.java @@ -2,12 +2,10 @@ package anticope.rejects.commands; import anticope.rejects.gui.screens.HeadScreen; import com.mojang.brigadier.builder.LiteralArgumentBuilder; - -import net.minecraft.command.CommandSource; - -import meteordevelopment.meteorclient.MeteorClient; import meteordevelopment.meteorclient.gui.GuiThemes; import meteordevelopment.meteorclient.systems.commands.Command; +import meteordevelopment.meteorclient.utils.Utils; +import net.minecraft.command.CommandSource; import static com.mojang.brigadier.Command.SINGLE_SUCCESS; @@ -20,7 +18,7 @@ public class HeadsCommand extends Command { @Override public void build(LiteralArgumentBuilder builder) { builder.executes(ctx -> { - MeteorClient.screenToOpen = new HeadScreen(GuiThemes.get()); + Utils.screenToOpen = new HeadScreen(GuiThemes.get()); return SINGLE_SUCCESS; }); diff --git a/src/main/java/anticope/rejects/gui/screens/HeadScreen.java b/src/main/java/anticope/rejects/gui/screens/HeadScreen.java index ed3e04b..88081e8 100644 --- a/src/main/java/anticope/rejects/gui/screens/HeadScreen.java +++ b/src/main/java/anticope/rejects/gui/screens/HeadScreen.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; -import static meteordevelopment.meteorclient.utils.Utils.mc; +import static meteordevelopment.meteorclient.MeteorClient.mc; public class HeadScreen extends WindowScreen { diff --git a/src/main/java/anticope/rejects/gui/themes/rounded/MeteorRoundedGuiTheme.java b/src/main/java/anticope/rejects/gui/themes/rounded/MeteorRoundedGuiTheme.java index 6756991..afea49d 100644 --- a/src/main/java/anticope/rejects/gui/themes/rounded/MeteorRoundedGuiTheme.java +++ b/src/main/java/anticope/rejects/gui/themes/rounded/MeteorRoundedGuiTheme.java @@ -26,7 +26,7 @@ import meteordevelopment.meteorclient.systems.modules.Module; import meteordevelopment.meteorclient.utils.render.color.Color; import meteordevelopment.meteorclient.utils.render.color.SettingColor; -import static meteordevelopment.meteorclient.utils.Utils.mc; +import static meteordevelopment.meteorclient.MeteorClient.mc; public class MeteorRoundedGuiTheme extends GuiTheme { private final SettingGroup sgGeneral = settings.getDefaultGroup(); diff --git a/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorModule.java b/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorModule.java index 72aba19..979da1a 100644 --- a/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorModule.java +++ b/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorModule.java @@ -13,7 +13,7 @@ import meteordevelopment.meteorclient.gui.widgets.pressable.WPressable; import meteordevelopment.meteorclient.systems.modules.Module; import meteordevelopment.meteorclient.utils.Utils; -import static meteordevelopment.meteorclient.utils.Utils.mc; +import static meteordevelopment.meteorclient.MeteorClient.mc; import static org.lwjgl.glfw.GLFW.GLFW_MOUSE_BUTTON_LEFT; import static org.lwjgl.glfw.GLFW.GLFW_MOUSE_BUTTON_RIGHT; diff --git a/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorTopBar.java b/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorTopBar.java index 4428275..505fcab 100644 --- a/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorTopBar.java +++ b/src/main/java/anticope/rejects/gui/themes/rounded/widgets/WMeteorTopBar.java @@ -18,7 +18,7 @@ import meteordevelopment.meteorclient.gui.widgets.WTopBar; import meteordevelopment.meteorclient.gui.widgets.pressable.WPressable; import meteordevelopment.meteorclient.utils.render.color.Color; -import static meteordevelopment.meteorclient.utils.Utils.mc; +import static meteordevelopment.meteorclient.MeteorClient.mc; import static org.lwjgl.glfw.GLFW.glfwSetCursorPos; public class WMeteorTopBar extends WTopBar implements MeteorWidget { diff --git a/src/main/java/anticope/rejects/mixin/meteor/modules/FlightMixin.java b/src/main/java/anticope/rejects/mixin/meteor/modules/FlightMixin.java index 91981fa..0cdc4c4 100644 --- a/src/main/java/anticope/rejects/mixin/meteor/modules/FlightMixin.java +++ b/src/main/java/anticope/rejects/mixin/meteor/modules/FlightMixin.java @@ -14,7 +14,7 @@ import meteordevelopment.meteorclient.settings.Setting; import meteordevelopment.meteorclient.settings.SettingGroup; import meteordevelopment.meteorclient.systems.modules.movement.Flight; -import static meteordevelopment.meteorclient.utils.Utils.mc; +import static meteordevelopment.meteorclient.MeteorClient.mc; @Mixin(Flight.class) public class FlightMixin { diff --git a/src/main/java/anticope/rejects/utils/GiveUtils.java b/src/main/java/anticope/rejects/utils/GiveUtils.java index a69feff..f4994d4 100644 --- a/src/main/java/anticope/rejects/utils/GiveUtils.java +++ b/src/main/java/anticope/rejects/utils/GiveUtils.java @@ -22,7 +22,7 @@ import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import org.apache.commons.lang3.text.WordUtils; import org.apache.commons.lang3.tuple.Triple; -import static meteordevelopment.meteorclient.utils.Utils.mc; +import static meteordevelopment.meteorclient.MeteorClient.mc; public class GiveUtils { diff --git a/src/main/java/anticope/rejects/utils/TntDamage.java b/src/main/java/anticope/rejects/utils/TntDamage.java index e7c04a9..3fbcaa1 100644 --- a/src/main/java/anticope/rejects/utils/TntDamage.java +++ b/src/main/java/anticope/rejects/utils/TntDamage.java @@ -1,5 +1,6 @@ package anticope.rejects.utils; +import meteordevelopment.meteorclient.MeteorClient; import meteordevelopment.meteorclient.utils.Utils; import net.minecraft.block.BlockState; import net.minecraft.fluid.FluidState; @@ -16,8 +17,8 @@ public class TntDamage { for(int k = -5; k <= 5; ++k) { for(int l = -5; l <= 5; ++l) { BlockPos blockPos = new BlockPos(j, k, l); - BlockState blockState = Utils.mc.world.getBlockState(blockPos); - FluidState fluidState = Utils.mc.world.getFluidState(blockPos); + BlockState blockState = MeteorClient.mc.world.getBlockState(blockPos); + FluidState fluidState = MeteorClient.mc.world.getFluidState(blockPos); float h = 2.8F; Optional optional = blockState.isAir() && fluidState.isEmpty() ? Optional.empty() : Optional.of(Math.max(blockState.getBlock().getBlastResistance(), fluidState.getBlastResistance()));; diff --git a/src/main/java/anticope/rejects/utils/WorldGenUtils.java b/src/main/java/anticope/rejects/utils/WorldGenUtils.java index 7944e5b..8f0800a 100644 --- a/src/main/java/anticope/rejects/utils/WorldGenUtils.java +++ b/src/main/java/anticope/rejects/utils/WorldGenUtils.java @@ -32,7 +32,7 @@ import java.util.stream.StreamSupport; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import static meteordevelopment.meteorclient.utils.Utils.mc; +import static meteordevelopment.meteorclient.MeteorClient.mc; public class WorldGenUtils { diff --git a/src/main/java/anticope/rejects/utils/seeds/Seeds.java b/src/main/java/anticope/rejects/utils/seeds/Seeds.java index 3a0f408..843a3c8 100644 --- a/src/main/java/anticope/rejects/utils/seeds/Seeds.java +++ b/src/main/java/anticope/rejects/utils/seeds/Seeds.java @@ -17,7 +17,7 @@ import meteordevelopment.meteorclient.systems.config.Config; import meteordevelopment.meteorclient.utils.Utils; import meteordevelopment.meteorclient.utils.player.ChatUtils; -import static meteordevelopment.meteorclient.utils.Utils.mc; +import static meteordevelopment.meteorclient.MeteorClient.mc; public class Seeds extends System { private static final Seeds INSTANCE = new Seeds();