Skip to content

Commit dc4087e

Browse files
committed
Update
1 parent 5dc0c43 commit dc4087e

File tree

8 files changed

+7
-247
lines changed

8 files changed

+7
-247
lines changed

src/main/java/nekiplay/meteorplus/MeteorPlusAddon.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,13 @@
2727
import meteordevelopment.meteorclient.addons.MeteorAddon;
2828
import meteordevelopment.meteorclient.systems.modules.Category;
2929
import meteordevelopment.meteorclient.systems.modules.Modules;
30-
import meteordevelopment.meteorclient.systems.hud.Hud;
3130
import meteordevelopment.meteorclient.systems.hud.HudGroup;
32-
import net.minecraft.item.ItemStack;
3331
import nekiplay.meteorplus.features.modules.movement.fastladder.FastLadderPlus;
3432
import nekiplay.meteorplus.features.modules.movement.fly.FlyPlus;
3533
import nekiplay.meteorplus.features.modules.movement.jesus.JesusPlus;
3634
import nekiplay.meteorplus.features.modules.movement.nofall.NoFallPlus;
3735
import nekiplay.meteorplus.features.modules.movement.speed.SpeedPlus;
3836
import nekiplay.meteorplus.features.modules.movement.spider.SpiderPlus;
39-
import net.minecraft.item.Items;
4037
import net.minecraft.util.Identifier;
4138
import org.slf4j.Logger;
4239
import org.slf4j.LoggerFactory;
@@ -161,7 +158,6 @@ public void onInitialize() {
161158
modules.add(new FastLadderPlus());
162159
modules.add(new TriggerBot());
163160
modules.add(new EyeFinder());
164-
modules.add(new InventoryMovePlus());
165161
modules.add(new AutoDropPlus());
166162
modules.add(new NoFallPlus());
167163
modules.add(new TimerPlus());

src/main/java/nekiplay/meteorplus/features/commands/GotoPlusCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
4040

4141

4242
BlockIterator.register(64, mc.world.getHeight() / 2, (blockPos, blockState) -> {
43-
switch (BlockUtils.isValidMobSpawn(blockPos, true)) {
43+
switch (BlockUtils.isValidMobSpawn(blockPos, mc.world.getBlockState(blockPos), 0)) {
4444
case Never:
4545
break;
4646
case Potential, Always:

src/main/java/nekiplay/meteorplus/features/modules/combat/AutoLeave.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import meteordevelopment.meteorclient.systems.modules.Categories;
99
import meteordevelopment.meteorclient.systems.modules.Module;
1010
import meteordevelopment.meteorclient.utils.player.ChatUtils;
11-
import nekiplay.meteorplus.MeteorPlusAddon;
1211
import net.minecraft.entity.player.PlayerEntity;
1312
import net.minecraft.network.packet.s2c.common.DisconnectS2CPacket;
1413
import net.minecraft.text.Text;
@@ -59,7 +58,8 @@ public void onEntityAdded(EntityAddedEvent event) {
5958
ChatUtils.sendPlayerMsg(command_str.get());
6059
info((String.format("player §c%s§r was detected", event.entity.getName())));
6160
} else {
62-
mc.world.disconnect();
61+
assert mc.world != null;
62+
mc.world.disconnect(Text.of(""));
6363
mc.player.networkHandler.onDisconnect(new DisconnectS2CPacket(Text.literal(String.format("[§dAuto Leaeve§r] player %s was detected", event.entity.getName()))));
6464
}
6565
if (AutoDisable.get()) this.toggle();

src/main/java/nekiplay/meteorplus/features/modules/movement/InventoryMovePlus.java

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

src/main/java/nekiplay/meteorplus/mixin/meteorclient/modules/BetterTooltipsMixin.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package nekiplay.meteorplus.mixin.meteorclient.modules;
22

3-
import meteordevelopment.meteorclient.MeteorClient;
43
import meteordevelopment.meteorclient.events.render.TooltipDataEvent;
5-
import meteordevelopment.meteorclient.settings.BoolSetting;
64
import meteordevelopment.meteorclient.settings.Setting;
75
import meteordevelopment.meteorclient.settings.SettingGroup;
86
import meteordevelopment.meteorclient.systems.modules.Category;
@@ -17,7 +15,6 @@
1715
import net.minecraft.item.ItemStack;
1816
import net.minecraft.item.Items;
1917
import net.minecraft.text.Text;
20-
import net.minecraft.util.Formatting;
2118
import org.spongepowered.asm.mixin.Final;
2219
import org.spongepowered.asm.mixin.Mixin;
2320
import org.spongepowered.asm.mixin.Shadow;

src/main/java/nekiplay/meteorplus/mixin/minecraft/hud/InGameHudMixin.java

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,7 @@ private void onRenderHealthBar(DrawContext context, PlayerEntity player, int x,
2020
ci.cancel();
2121
}
2222
}
23-
@Inject(method = "renderExperienceBar", at = @At("HEAD"), cancellable = true)
24-
private void onRenderExperienceBar(DrawContext context, int x, CallbackInfo ci) {
25-
RenderExperienceBarEvent renderExperienceBarEvent = RenderExperienceBarEvent.get(context, x);
26-
MeteorClient.EVENT_BUS.post(renderExperienceBarEvent);
27-
if (renderExperienceBarEvent.isCancelled()) {
28-
ci.cancel();
29-
}
30-
}
31-
@Inject(method = "renderExperienceLevel", at = @At("HEAD"), cancellable = true)
32-
private void onRenderExperienceBar(DrawContext context, RenderTickCounter tickCounter, CallbackInfo ci) {
33-
RenderExperienceLevelEvent renderExperienceLevelEvent = RenderExperienceLevelEvent.get(context, tickCounter);
34-
MeteorClient.EVENT_BUS.post(renderExperienceLevelEvent);
35-
if (renderExperienceLevelEvent.isCancelled()) {
36-
ci.cancel();
37-
}
38-
}
23+
3924
@Inject(method = "renderFood", at = @At("HEAD"), cancellable = true)
4025
private void onRenderFoodBar(DrawContext context, PlayerEntity player, int top, int right, CallbackInfo ci) {
4126
RenderFoodBarEvent renderFoodBarEvent = RenderFoodBarEvent.get(context, player, top, right);

src/main/java/nekiplay/meteorplus/settings/ConfigModifier.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
import java.util.stream.Collectors;
3636

3737
import static meteordevelopment.meteorclient.MeteorClient.mc;
38+
import static meteordevelopment.meteorclient.utils.misc.MeteorStarscript.popIdentifier;
39+
import static meteordevelopment.meteorclient.utils.misc.MeteorStarscript.wrap;
3840

3941
public class ConfigModifier {
4042
private static ConfigModifier INSTANCE;

src/main/java/nekiplay/meteorplus/utils/RaycastUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static EntityHitResult raycastEntity(final double range, final float yaw,
3535
return ProjectileUtil.raycast(camera, cameraVec, vec3d3, box, new Predicate<Entity>() {
3636
@Override
3737
public boolean test(Entity entity) {
38-
return !entity.isSpectator() && entity.isCollidable();
38+
return !entity.isSpectator() && entity.isCollidable(mc.player);
3939
}
4040
}, 0);
4141
}

0 commit comments

Comments
 (0)