Skip to content
This repository was archived by the owner on Oct 22, 2022. It is now read-only.

Commit 66036ff

Browse files
committed
bug fixes and such
1 parent c332a4d commit 66036ff

35 files changed

+65
-150
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ apply plugin: 'kotlin'
2222
apply plugin: 'org.spongepowered.mixin'
2323
apply plugin: 'com.github.johnrengelman.shadow'
2424

25-
version "0.6.0"
25+
version "0.6.1"
2626
group project.modGroup
2727

2828
sourceCompatibility = targetCompatibility = '1.8'

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
org.gradle.jvmargs=-Xmx3G
22
modGroup=me.travis
3-
modVersion=0.6.0
3+
modVersion=0.6.1
44
modBaseName=wurstplusthree
55
forgeVersion=1.12.2-14.23.5.2768
66
mcpVersion=stable_39

src/main/java/me/travis/wurstplusthree/WurstplusThree.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class WurstplusThree {
2828

2929
public static final String MODID = "wurstplusthree";
3030
public static final String MODNAME = "Wurst+3";
31-
public static final String MODVER = "0.6.0";
31+
public static final String MODVER = "0.6.1";
3232

3333
public static final Logger LOGGER = LogManager.getLogger(MODID);
3434

src/main/java/me/travis/wurstplusthree/command/commands/Debug.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
import me.travis.wurstplusthree.event.processor.CommitEvent;
88
import me.travis.wurstplusthree.event.processor.EventPriority;
99
import me.travis.wurstplusthree.hack.client.Hud;
10-
import me.travis.wurstplusthree.mixin.mixins.MixinAbstractClientPlayer;
1110
import me.travis.wurstplusthree.util.ClientMessage;
1211
import me.travis.wurstplusthree.util.logview.Threads;
1312

src/main/java/me/travis/wurstplusthree/event/Events.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
import me.travis.wurstplusthree.util.Globals;
1212
import me.travis.wurstplusthree.util.elements.GLUProjection;
1313
import me.travis.wurstplusthree.util.elements.Timer;
14-
import net.minecraft.client.gui.*;
14+
import net.minecraft.client.gui.GuiMainMenu;
15+
import net.minecraft.client.gui.GuiScreen;
16+
import net.minecraft.client.gui.ScaledResolution;
1517
import net.minecraft.client.renderer.GLAllocation;
1618
import net.minecraft.client.renderer.GlStateManager;
1719
import net.minecraft.entity.player.EntityPlayer;

src/main/java/me/travis/wurstplusthree/event/processor/EventProcessor.java

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

33
import org.jetbrains.annotations.NotNull;
44

5+
import java.lang.reflect.InvocationTargetException;
56
import java.lang.reflect.Method;
67
import java.util.ArrayList;
78
import java.util.Arrays;
@@ -15,7 +16,7 @@
1516

1617
public final class EventProcessor {
1718

18-
private final List<Listener> events;
19+
private List<Listener> events;
1920

2021
public EventProcessor() {
2122
events = new ArrayList<>();
@@ -58,16 +59,18 @@ private void getEvents(@NotNull Object object) {
5859
* @return if the event was posted or not at a boolean
5960
*/
6061
public final boolean postEvent(@NotNull Event event) {
61-
events.spliterator().forEachRemaining(listener -> {
62+
List<Listener> eventClone = new ArrayList<>(events);
63+
eventClone.spliterator().forEachRemaining(listener -> {
6264
if(listener != null && listener.event != null && listener.event == event.getClass()){
65+
listener.method.setAccessible(true);
6366
try {
64-
listener.method.setAccessible(true);
6567
listener.method.invoke(listener.object, event);
66-
} catch (Exception e) {
68+
} catch (IllegalAccessException | InvocationTargetException e) {
6769
e.printStackTrace();
6870
}
6971
}
7072
});
73+
events = eventClone;
7174
return true;
7275
}
7376

src/main/java/me/travis/wurstplusthree/gui/alt/Objects/AccountData.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package me.travis.wurstplusthree.gui.alt.Objects;
22

3-
import me.travis.wurstplusthree.gui.alt.tools.EncryptionTools;
4-
53
import java.io.Serializable;
64

75
/**

src/main/java/me/travis/wurstplusthree/gui/alt/tools/EncryptionTools.java

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
package me.travis.wurstplusthree.gui.alt.tools;
22

3-
import javax.crypto.*;
4-
import javax.crypto.spec.SecretKeySpec;
5-
import java.io.IOException;
6-
import java.io.UnsupportedEncodingException;
7-
import java.security.InvalidKeyException;
8-
import java.security.MessageDigest;
9-
import java.security.NoSuchAlgorithmException;
10-
import java.util.Arrays;
11-
import java.util.Base64;
12-
133
/**
144
* @author Madmegsox1
155
* @since 23/05/2021

src/main/java/me/travis/wurstplusthree/gui/component/components/ShownComponent.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public void renderComponent(int mouseX, int mouseY) {
3838
module = this.parent.mod;
3939
RenderUtil2D.drawRectMC(parent.parent.getX() + WurstplusGuiNew.SETTING_OFFSET, parent.parent.getY() + offset + WurstplusGuiNew.MODULE_OFFSET, parent.parent.getX() + parent.parent.getWidth() - WurstplusGuiNew.SETTING_OFFSET, parent.parent.getY() + offset + WurstplusGuiNew.HEIGHT + WurstplusGuiNew.MODULE_OFFSET, this.isHovered ? WurstplusGuiNew.GUI_HOVERED_COLOR() : WurstplusGuiNew.GUI_COLOR());
4040
if (Gui.INSTANCE.customFont.getValue()) {
41-
WurstplusThree.GUI_FONT_MANAGER.drawStringWithShadow("Shown: " + (this.module.getShown() ? "True" : "False"), parent.parent.getX() + WurstplusGuiNew.SUB_FONT_SIZE, parent.parent.getY() + offset + 3 + WurstplusGuiNew.MODULE_OFFSET, Gui.INSTANCE.fontColor.getValue().hashCode());
41+
WurstplusThree.GUI_FONT_MANAGER.drawStringWithShadow("Shown: " + (this.module.isNotification() ? "True" : "False"), parent.parent.getX() + WurstplusGuiNew.SUB_FONT_SIZE, parent.parent.getY() + offset + 3 + WurstplusGuiNew.MODULE_OFFSET, Gui.INSTANCE.fontColor.getValue().hashCode());
4242
} else {
43-
mc.fontRenderer.drawStringWithShadow("Shown: " + (this.module.getShown() ? "True" : "False"), parent.parent.getX() + WurstplusGuiNew.SUB_FONT_SIZE, parent.parent.getY() + offset + 3 + WurstplusGuiNew.MODULE_OFFSET, Gui.INSTANCE.fontColor.getValue().hashCode());
43+
mc.fontRenderer.drawStringWithShadow("Shown: " + (this.module.isNotification() ? "True" : "False"), parent.parent.getX() + WurstplusGuiNew.SUB_FONT_SIZE, parent.parent.getY() + offset + 3 + WurstplusGuiNew.MODULE_OFFSET, Gui.INSTANCE.fontColor.getValue().hashCode());
4444
}
4545
}
4646

@@ -63,7 +63,7 @@ public boolean isMouseOnButton(int x, int y) {
6363
@Override
6464
public void mouseClicked(int mouseX, int mouseY, int button) {
6565
if (isMouseOnButton(mouseX, mouseY) && button == 0 && this.parent.isOpen) {
66-
this.module.setShown(!this.module.getShown());
66+
this.module.setNotification(!this.module.isNotification());
6767
}
6868
}
6969

src/main/java/me/travis/wurstplusthree/gui/component/components/SliderComponent.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import me.travis.wurstplusthree.hack.client.Gui;
99
import me.travis.wurstplusthree.setting.type.DoubleSetting;
1010
import me.travis.wurstplusthree.setting.type.IntSetting;
11-
import me.travis.wurstplusthree.util.ColorUtil;
1211
import me.travis.wurstplusthree.util.MathsUtil;
1312
import me.travis.wurstplusthree.util.RenderUtil2D;
1413

0 commit comments

Comments
 (0)