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

Commit 8e9dad2

Browse files
author
Snoworange420
committed
big chungus
1 parent 5447ebf commit 8e9dad2

34 files changed

+577
-322
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.lwjgl.input.Keyboard;
2323
import org.lwjgl.opengl.Display;
2424

25-
25+
//hi
2626
@Mod(modid = Main.MOD_ID, name = Main.NAME, version = Main.VERSION, acceptedMinecraftVersions = "[1.12.2]")
2727
public class Main {
2828

@@ -38,7 +38,7 @@ public class Main {
3838

3939
public static final String MOD_ID = "mousse";
4040
public static final String NAME = "Mousse";
41-
public static final String VERSION = "v0.7.4";
41+
public static final String VERSION = "v0.8.0";
4242

4343
public static Minecraft mc = Minecraft.getMinecraft();
4444

@@ -66,7 +66,7 @@ public void init(FMLPreInitializationEvent event) {
6666
themeManager = new ThemeManager();
6767

6868
ClickGUI = new KeyBinding("ClickGUI", Keyboard.KEY_NONE, "Mousse");
69-
ShulkerPeek = new KeyBinding("ShulkerPreview Peek Binding", Keyboard.KEY_RCONTROL, "Mousse");
69+
ShulkerPeek = new KeyBinding("ShulkerPreview Peek Binding", Keyboard.KEY_NONE, "Mousse");
7070

7171
ClientRegistry.registerKeyBinding(ClickGUI);
7272
ClientRegistry.registerKeyBinding(ShulkerPeek);
@@ -104,7 +104,7 @@ public static void sendMessage(String msg) {
104104

105105
if (Minecraft.getMinecraft().world == null || Minecraft.getMinecraft().player == null) return;
106106

107-
Minecraft.getMinecraft().player.sendMessage(new TextComponentString( ChatFormatting.RESET + "[" + Main.NAME + "] " + msg));
107+
Minecraft.getMinecraft().player.sendMessage(new TextComponentString( ChatFormatting.DARK_GREEN + "[" + Main.NAME + "] " + ChatFormatting.RESET + msg));
108108
}
109109

110110
@SubscribeEvent

‎src/main/java/com/snoworange/mousse/event/listeners/RenderPortalOverlayEvent.java‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
package com.snoworange.mousse.event.listeners;
2+
3+
import net.minecraft.client.gui.ScaledResolution;
4+
import net.minecraftforge.fml.common.eventhandler.Cancelable;
5+
import net.minecraftforge.fml.common.eventhandler.Event;
6+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
7+
8+
@Cancelable
9+
public class RenderPortalOverlayEvent extends Event {
10+
11+
public float timeInPortal;
12+
public ScaledResolution scaledRes;
13+
public CallbackInfo ci;
14+
15+
public RenderPortalOverlayEvent(float timeInPortal, ScaledResolution scaledRes, CallbackInfo ci) {
16+
this.timeInPortal = timeInPortal;
17+
this.scaledRes = scaledRes;
18+
this.ci = ci;
19+
}
20+
}

‎src/main/java/com/snoworange/mousse/mixin/mixins/MixinGuiChat.java‎

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

3+
import com.snoworange.mousse.Main;
34
import com.snoworange.mousse.command.CommandManager;
5+
import com.snoworange.mousse.module.modules.render.CleanGUI;
46
import com.snoworange.mousse.util.render.RenderUtils2;
7+
import net.minecraft.client.gui.Gui;
58
import net.minecraft.client.gui.GuiChat;
69
import org.spongepowered.asm.mixin.injection.At;
710
import org.spongepowered.asm.mixin.injection.Inject;
11+
import org.spongepowered.asm.mixin.injection.Redirect;
812
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
913
import org.spongepowered.asm.mixin.Shadow;
1014
import net.minecraft.client.gui.GuiTextField;
@@ -23,4 +27,11 @@ public void drawScreen(final int mouseX, final int mouseY, final float partialTi
2327
RenderUtils2.drawChatboxOutline();
2428
}
2529
}
30+
31+
@Redirect(method = "drawChat", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiNewChat;drawRect(IIIII)V"))
32+
private void drawRectBackgroundClean(int left, int top, int right, int bottom, int color) {
33+
if (!Main.moduleManager.getModule("CleanGUI").isEnabled()) {
34+
Gui.drawRect(left, top, right, bottom, color);
35+
}
36+
}
2637
}

‎src/main/java/com/snoworange/mousse/mixin/mixins/MixinGuiIngame.java‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
package com.snoworange.mousse.mixin.mixins;
2+
3+
import com.snoworange.mousse.event.listeners.RenderPortalOverlayEvent;
4+
import net.minecraft.client.gui.GuiIngame;
5+
import net.minecraft.client.gui.ScaledResolution;
6+
import net.minecraftforge.common.MinecraftForge;
7+
import org.spongepowered.asm.mixin.Mixin;
8+
import org.spongepowered.asm.mixin.injection.At;
9+
import org.spongepowered.asm.mixin.injection.Inject;
10+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
11+
12+
@Mixin({GuiIngame.class})
13+
public class MixinGuiIngame {
14+
15+
@Inject(at = @At("HEAD"), method = {"renderPortal"}, cancellable = true)
16+
public void onRenderPortalOverlay(float timeInPortal, ScaledResolution scaledRes, CallbackInfo ci) {
17+
final RenderPortalOverlayEvent event = new RenderPortalOverlayEvent(timeInPortal, scaledRes, ci);
18+
MinecraftForge.EVENT_BUS.post(event);
19+
if (event.isCanceled()) {
20+
ci.cancel();
21+
}
22+
}
23+
}

‎src/main/java/com/snoworange/mousse/mixin/mixins/MixinGuiMainMenu.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ public class MixinGuiMainMenu extends GuiScreen {
1414
@Inject(method = {"drawScreen"}, at = {@At("TAIL")}, cancellable = true)
1515
public void drawText(int mouseX, int mouseY, float partialTicks, CallbackInfo ci) {
1616
FontRenderer fr = mc.fontRenderer;
17-
fr.drawStringWithShadow(Main.NAME + " by Jonakip, Snoworange & Huub", 2, 12, -1);
17+
fr.drawStringWithShadow(Main.NAME + " by Snoworange and Huub", 2, 12, -1);
1818
}
1919
}

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

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

33
import com.snoworange.mousse.Main;
4-
import com.snoworange.mousse.module.modules.render.ShulkerPreview;
4+
import com.snoworange.mousse.module.modules.misc.Tooltip;
55
import com.snoworange.mousse.util.render.ParticleUtils;
66
import net.minecraft.client.Minecraft;
77
import net.minecraft.client.gui.GuiScreen;
@@ -45,8 +45,8 @@ private void drawWorldBackgroundWrapper(final int tint, final CallbackInfo ci) {
4545

4646
@Inject(method = { "renderToolTip" }, at = { @At("HEAD") }, cancellable = true)
4747
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);
48+
if (Main.moduleManager.getModule("Tooltip").isEnabled() && Tooltip.shulker.isEnable()) {
49+
Tooltip.renderShulker(itemStack, x, y, ci);
5050
}
5151
}
5252
}

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

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package com.snoworange.mousse.mixin.mixins;
2+
3+
import com.snoworange.mousse.Main;
4+
import com.snoworange.mousse.module.modules.misc.Tooltip;
5+
import net.minecraft.item.Item;
6+
import net.minecraft.item.ItemStack;
7+
import org.spongepowered.asm.mixin.Mixin;
8+
import org.spongepowered.asm.mixin.Shadow;
9+
import org.spongepowered.asm.mixin.injection.At;
10+
import org.spongepowered.asm.mixin.injection.Inject;
11+
import org.spongepowered.asm.mixin.injection.Redirect;
12+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
13+
14+
@Mixin(ItemStack.class)
15+
public class MixinItemStack {
16+
17+
//Impact skid lmfao
18+
19+
@Redirect(
20+
method = {"getTooltip"},
21+
at = @At(
22+
value = "INVOKE",
23+
target = "net/minecraft/item/ItemStack.isItemDamaged()Z"
24+
)
25+
)
26+
private boolean isItemDamaged(ItemStack itemStack) {
27+
try {
28+
if (Main.moduleManager.getModule("Tooltip").isEnabled() && Tooltip.alwaysDura.isEnable()) {
29+
return true;
30+
}
31+
} catch (NullPointerException nullPointerException) {
32+
Main.sendMessage(nullPointerException.toString());
33+
nullPointerException.printStackTrace();
34+
}
35+
36+
return itemStack.isItemDamaged();
37+
}
38+
}
39+
//moice

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

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import com.mojang.realmsclient.gui.ChatFormatting;
44
import com.snoworange.mousse.Main;
55
import com.snoworange.mousse.setting.Setting;
6+
import com.snoworange.mousse.util.chat.ChatUtils;
67
import net.minecraft.client.Minecraft;
8+
import net.minecraft.util.text.TextFormatting;
79
import net.minecraftforge.common.MinecraftForge;
810

911
import java.util.ArrayList;
@@ -19,7 +21,7 @@ public abstract class Module {
1921
public boolean toggled;
2022

2123
public int type;
22-
public List<Setting> settings = new ArrayList<Setting>();
24+
public List<Setting<?>> settings = new ArrayList<Setting<?>>();
2325

2426
public Minecraft mc = Minecraft.getMinecraft();
2527

@@ -121,15 +123,23 @@ public final void toggle() {
121123

122124
public void onEnable() {
123125
MinecraftForge.EVENT_BUS.register(this);
126+
124127
if (Main.moduleManager.getModule("Announcer").isToggled() && !Objects.equals(this.name, "ShulkerPeek") && !Objects.equals(this.name, "GuiTheme")) {
125-
Main.sendMessage(this.name + ChatFormatting.GREEN + " enabled." + ChatFormatting.RESET);
128+
129+
if (mc.world != null) {
130+
ChatUtils.sendMessage("{}" + TextFormatting.GREEN + " enabled.", this.name);
131+
}
126132
}
127133
}
128134

129135
public void onDisable() {
130136
MinecraftForge.EVENT_BUS.register(this);
137+
131138
if (Main.moduleManager.getModule("Announcer").isToggled() && !Objects.equals(this.name, "ShulkerPeek") && !Objects.equals(this.name, "GuiTheme")) {
132-
Main.sendMessage(this.name + ChatFormatting.RED + " disabled." + ChatFormatting.RESET);
139+
140+
if (mc.world != null) {
141+
ChatUtils.sendMessage("{}" + TextFormatting.RED + " disabled.", this.name);
142+
}
133143
}
134144
}
135145

@@ -171,7 +181,11 @@ public void init() {
171181

172182
}
173183

184+
public Setting getSettingByName(final String s) {
185+
return this.settings.stream().findFirst().orElse(null);
186+
}
187+
174188
public void addSetting(Setting... settings) {
175-
this.settings.addAll(Arrays.asList(settings));
189+
this.settings.addAll(Arrays.<Setting<?>>asList(settings));
176190
}
177-
}
191+
}

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.snoworange.mousse.module.modules.movement.*;
1010
import com.snoworange.mousse.module.modules.player.*;
1111
import com.snoworange.mousse.module.modules.render.*;
12+
import com.snoworange.mousse.module.modules.system.GuiTheme;
1213
import com.snoworange.mousse.module.modules.system.HUD;
1314
import net.minecraft.client.Minecraft;
1415
import net.minecraft.entity.Entity;
@@ -46,6 +47,7 @@ public ModuleManager() {
4647
modules.add(new ThreadAura());
4748
modules.add(new Info32k());
4849
modules.add(new AutoCrystal());
50+
modules.add(new AutoTotem());
4951

5052
//EXPLOIT
5153
modules.add(new SecretClose());
@@ -76,8 +78,7 @@ public ModuleManager() {
7678
modules.add(new DiscordRPC());
7779
modules.add(new Announcer());
7880
modules.add(new GuiTheme());
79-
//modules.add(new TrueDurability());
80-
//modules.add(new DebugModule());
81+
modules.add(new Tooltip());
8182

8283
//RENDER
8384
modules.add(new ShulkerPeek());
@@ -86,7 +87,7 @@ public ModuleManager() {
8687
modules.add(new LightningBolt());
8788
modules.add(new HopperRadius());
8889
modules.add(new Particles());
89-
modules.add(new ShulkerPreview());
90+
modules.add(new SelectionHighlight());
9091

9192
//WORK IN PROGRESS
9293

@@ -129,11 +130,16 @@ public static List<Module> getModulesByCategory(Category c) {
129130

130131
@SubscribeEvent
131132
public void onTick(TickEvent.ClientTickEvent event) {
132-
modules.forEach(module -> {
133-
if (module.isEnabled()) {
134-
module.onTick();
135-
}
136-
});
133+
try {
134+
modules.forEach(module -> {
135+
if (module.isEnabled()) {
136+
module.onTick();
137+
}
138+
});
139+
} catch (Exception e) {
140+
e.printStackTrace();
141+
Main.sendMessage(e.toString());
142+
}
137143
}
138144

139145
@SubscribeEvent

‎src/main/java/com/snoworange/mousse/module/modules/combat/AimDispenser32k.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
public class AimDispenser32k extends Module {
3232

3333
public AimDispenser32k() {
34-
super("AimDispenser32k", "old auto32k lol", Category.COMBAT);
34+
super("Aim32k", "old auto32k lol", Category.COMBAT);
3535
}
3636

3737
BlockPos obsidianPos;

0 commit comments

Comments
 (0)