Skip to content
This repository was archived by the owner on Mar 23, 2023. It is now read-only.

Commit 0fe948c

Browse files
author
Snoworange420
committed
shulkerpreview
1 parent c633d8d commit 0fe948c

31 files changed

+920
-549
lines changed

src/main/java/com/snoworange/mousse/Main.java

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

33
import com.mojang.realmsclient.gui.ChatFormatting;
44
import com.snoworange.mousse.command.CommandManager;
5-
import com.snoworange.mousse.event.ForgeEventHandeler;
65
import com.snoworange.mousse.module.Module;
76
import com.snoworange.mousse.module.ModuleManager;
87
import com.snoworange.mousse.ui.ClickGui;
@@ -24,7 +23,7 @@
2423
import org.lwjgl.opengl.Display;
2524

2625

27-
@Mod(modid = Main.MOD_ID, name = Main.NAME, version = Main.VERSION)
26+
@Mod(modid = Main.MOD_ID, name = Main.NAME, version = Main.VERSION, acceptedMinecraftVersions = "[1.12.2]")
2827
public class Main {
2928

3029
public static ModuleManager moduleManager;
@@ -33,13 +32,12 @@ public class Main {
3332
public static ThemeManager themeManager;
3433
public static CommandManager commandManager;
3534
public static ClickGui clickgui;
36-
public static ForgeEventHandeler forgeEventHandeler;
3735

3836
//
3937

4038
public static final String MOD_ID = "mousse";
4139
public static final String NAME = "Mousse";
42-
public static final String VERSION = "v0.6.0";
40+
public static final String VERSION = "v0.6.2";
4341

4442
public static Minecraft mc = Minecraft.getMinecraft();
4543

@@ -65,7 +63,6 @@ public void init(FMLPreInitializationEvent event) {
6563
hud = new Hud();
6664
clickgui = new ClickGui();
6765
themeManager = new ThemeManager();
68-
forgeEventHandeler = new ForgeEventHandeler();
6966

7067
ClickGUI = new KeyBinding("ClickGUI", Keyboard.KEY_NONE, "Mousse");
7168
ClientRegistry.registerKeyBinding(ClickGUI);

src/main/java/com/snoworange/mousse/event/ForgeEventHandeler.java

Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.snoworange.mousse.event.listeners;
2+
3+
import net.minecraft.entity.player.EntityPlayer;
4+
import net.minecraftforge.fml.common.eventhandler.Event;
5+
6+
public class TotemPopEvent extends Event {
7+
8+
private final EntityPlayer player;
9+
10+
public TotemPopEvent(EntityPlayer player) {
11+
this.player = player;
12+
}
13+
14+
public EntityPlayer getPlayer() {
15+
return player;
16+
}
17+
}

src/main/java/com/snoworange/mousse/mixin/mixins/MixinGuiScreen.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package com.snoworange.mousse.mixin.mixins;
22

33
import com.snoworange.mousse.Main;
4+
import com.snoworange.mousse.module.modules.render.ShulkerPreview;
45
import com.snoworange.mousse.util.render.ParticleUtils;
56
import net.minecraft.client.Minecraft;
67
import net.minecraft.client.gui.GuiScreen;
78
import net.minecraft.client.gui.ScaledResolution;
9+
import net.minecraft.item.ItemStack;
810
import org.lwjgl.input.Mouse;
911
import org.spongepowered.asm.mixin.Mixin;
1012
import org.spongepowered.asm.mixin.Shadow;
@@ -40,4 +42,11 @@ private void drawWorldBackgroundWrapper(final int tint, final CallbackInfo ci) {
4042
}
4143
}
4244
}
45+
46+
@Inject(method = { "renderToolTip" }, at = { @At("HEAD") }, cancellable = true)
47+
public void renderToolTip(final ItemStack itemStack, final int x, final int y, final CallbackInfo ci) {
48+
if (Main.moduleManager.getModule("ShulkerPreview").isEnabled()) {
49+
ShulkerPreview.renderToolTip(itemStack, x, y, ci);
50+
}
51+
}
4352
}

src/main/java/com/snoworange/mousse/mixin/mixins/MixinItemStack.java

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

src/main/java/com/snoworange/mousse/module/Module.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,22 @@ public void onPlayerTick() {
123123

124124
}
125125

126+
public void onFastTick() {
127+
128+
}
129+
126130
public void onUpdate() {
127131

128132
}
129133

134+
public void onRender2d() {
135+
136+
}
137+
138+
public void onRender3d() {
139+
140+
}
141+
130142
public void enable() {
131143
this.onEnable();
132144
this.toggled = true;

src/main/java/com/snoworange/mousse/module/ModuleManager.java

Lines changed: 76 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,29 @@
11
package com.snoworange.mousse.module;
22

33
import com.snoworange.mousse.Main;
4+
import com.snoworange.mousse.event.listeners.PacketEvent;
5+
import com.snoworange.mousse.event.listeners.TotemPopEvent;
46
import com.snoworange.mousse.module.modules.combat.*;
57
import com.snoworange.mousse.module.modules.exploit.*;
68
import com.snoworange.mousse.module.modules.misc.*;
79
import com.snoworange.mousse.module.modules.movement.*;
810
import com.snoworange.mousse.module.modules.player.*;
911
import com.snoworange.mousse.module.modules.render.*;
12+
import net.minecraft.client.Minecraft;
13+
import net.minecraft.entity.Entity;
14+
import net.minecraft.entity.player.EntityPlayer;
15+
import net.minecraft.network.play.server.SPacketEntityStatus;
16+
import net.minecraftforge.common.MinecraftForge;
17+
import net.minecraftforge.event.entity.living.LivingEvent;
18+
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
19+
import net.minecraftforge.fml.common.gameevent.TickEvent;
1020

1121
import java.util.*;
1222
import java.util.function.Predicate;
1323
import java.util.stream.Collectors;
1424

25+
import static com.snoworange.mousse.Main.mc;
26+
1527
public class ModuleManager {
1628

1729
public static ModuleManager instance;
@@ -22,8 +34,6 @@ public ModuleManager() {
2234
(modules = new ArrayList<Module>()).clear();
2335

2436
//COMBAT
25-
26-
modules.add(new Auto32k());
2737
modules.add(new Dispenser32k());
2838
modules.add(new AutoXP());
2939
modules.add(new AutoEz());
@@ -32,8 +42,10 @@ public ModuleManager() {
3242
modules.add(new FastAura());
3343
modules.add(new AutoAuto32k());
3444
modules.add(new Grab32k());
35-
modules.add(new SelfBow());
3645
modules.add(new Auto32k2019());
46+
modules.add(new Notify32k());
47+
//modules.add(new Dispenser32kRewrite());
48+
modules.add(new ThreadAura());
3749

3850
//EXPLOIT
3951
modules.add(new SecretClose());
@@ -74,6 +86,7 @@ public ModuleManager() {
7486
modules.add(new LightningBolt());
7587
modules.add(new HopperRadius());
7688
modules.add(new Particles());
89+
modules.add(new ShulkerPreview());
7790

7891
//WORK IN PROGRESS
7992

@@ -109,4 +122,64 @@ public static List<Module> getModulesByCategory(Category c) {
109122
}
110123
return modules;
111124
}
125+
126+
@SubscribeEvent
127+
public void onTick(TickEvent.ClientTickEvent event) {
128+
modules.forEach(module -> {
129+
if (module.isEnabled()) {
130+
module.onTick();
131+
}
132+
});
133+
}
134+
135+
@SubscribeEvent
136+
public void onPlayerTick(TickEvent.PlayerTickEvent event) {
137+
modules.forEach(module -> {
138+
if (module.isEnabled()) {
139+
module.onPlayerTick();
140+
}
141+
});
142+
}
143+
144+
@SubscribeEvent
145+
public void onFastTick(TickEvent event) {
146+
modules.forEach(m -> {
147+
if (mc.world != null && mc.player != null) {
148+
try {
149+
m.onFastTick();
150+
} catch (Exception e) {
151+
e.printStackTrace();
152+
}
153+
}
154+
});
155+
}
156+
157+
@SubscribeEvent
158+
public void onUpdate(LivingEvent.LivingUpdateEvent event) {
159+
modules.forEach(m -> {
160+
if (event.getEntityLiving() instanceof EntityPlayer) {
161+
if (mc.world != null && mc.player != null) {
162+
try {
163+
m.onUpdate();
164+
} catch (Exception e) {
165+
e.printStackTrace();
166+
}
167+
}
168+
}
169+
});
170+
}
171+
172+
@SubscribeEvent
173+
public void onPacket(PacketEvent.Receive event) {
174+
if (mc.world == null) return;
175+
if (event.getPacket() instanceof SPacketEntityStatus) {
176+
SPacketEntityStatus packet = (SPacketEntityStatus) event.getPacket();
177+
if (packet.getOpCode() == 35) {
178+
Entity entity = packet.getEntity(Minecraft.getMinecraft().world);
179+
if (!(entity instanceof EntityPlayer) || entity.getName().equalsIgnoreCase(Minecraft.getMinecraft().player.getName()))
180+
return;
181+
MinecraftForge.EVENT_BUS.post(new TotemPopEvent((EntityPlayer) entity));
182+
}
183+
}
184+
}
112185
}

src/main/java/com/snoworange/mousse/module/modules/aura/Attack1.java

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

src/main/java/com/snoworange/mousse/module/modules/aura/Attack2.java

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

src/main/java/com/snoworange/mousse/module/modules/aura/Attack3.java

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

0 commit comments

Comments
 (0)