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

Commit c332a4d

Browse files
Madmegsox1Madmegsox1
authored
Merge pull request #167 from WurstPlus/0.6.0
0.6.0
2 parents 9517bf8 + 8a3e1f7 commit c332a4d

223 files changed

Lines changed: 5178 additions & 1878 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/gradle.yml‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
name: Gradle Build
2+
3+
# thx moondark for making this a thing
4+
5+
on:
6+
push:
7+
branches: [ 0.6.0 ]
8+
pull_request:
9+
branches: [ 0.6.0 ]
10+
11+
jobs:
12+
build:
13+
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
- name: Set up JDK 1.8
19+
uses: actions/setup-java@v1
20+
with:
21+
java-version: 1.8
22+
- name: Grant execute permission for gradlew
23+
run: chmod +x gradlew
24+
- name: Build with Gradle
25+
run: |
26+
./gradlew setupDecompWorkspace
27+
./gradlew build
28+
- name: List files
29+
run: ls
30+
- name: Upload a Build Artifact
31+
uses: actions/upload-artifact@v2
32+
with:
33+
# Artifact name
34+
name: WurstPlus3
35+
# A file, directory or wildcard pattern that describes what to upload
36+
path: ./build/libs/*-release.jar
37+
- name: Prepare Artifact for Discord upload
38+
env:
39+
RUN_ID: ${{ github.run_number }}
40+
run: cp ./build/libs/*-release.jar ./build/libs/wurst-plus-three-TEST-${RUN_ID}.jar
41+
- name: Upload Artifact to Discord
42+
uses: sinshutu/upload-to-discord@master
43+
env:
44+
DISCORD_WEBHOOK: ${{ secrets.discordwebhook }}
45+
with:
46+
args: ./build/libs/wurst-plus-three-TEST-*.jar
47+
- uses: WurstPlus/action-discord-notifier@v1
48+
with:
49+
message-title: A new test version has been released
50+
webhook: ${{ secrets.discordwebhook }}

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ Before you contribute you must test your code for bugs!
1616

1717
Please try to do small contributions so merging is easier!
1818

19+
Please use the active brach that is not main e.g. 0.6.0 because if there was a file edited in that branch that was editied in you PR we cannot accept the PR
20+
1921
Also join the discord to see the #todo section
2022

2123
Finally, please don't write china code!!!!!

‎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.5.0"
25+
version "0.6.0"
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.5.0
3+
modVersion=0.6.0
44
modBaseName=wurstplusthree
55
forgeVersion=1.12.2-14.23.5.2768
66
mcpVersion=stable_39

‎src/main/java/me/travis/wurstplusthree/RPC.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
public class RPC {
99

10-
private static String discordID = "838078740344471623"; //change to whatever u wamt
10+
private static String discordID = "838078740344471623"; //change to whatever u want
1111
private static DiscordRichPresence discordRichPresence = new DiscordRichPresence();
1212
private static DiscordRPC discordRPC = DiscordRPC.INSTANCE;
1313

@@ -24,7 +24,7 @@ public static void startRPC() {
2424
discordRichPresence.largeImageKey = "logo";
2525
discordRichPresence.largeImageText = "With the_fellas";
2626
discordRichPresence.smallImageKey = "small";
27-
discordRichPresence.smallImageText = "discord.gg/wurst";
27+
discordRichPresence.smallImageText = "discord.gg/VGMVaMN6ka";
2828
discordRichPresence.state = null;
2929
discordRPC.Discord_UpdatePresence(discordRichPresence);
3030
}
@@ -33,4 +33,4 @@ public static void stopRPC() {
3333
discordRPC.Discord_Shutdown();
3434
discordRPC.Discord_ClearPresence();
3535
}
36-
}
36+
}

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

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@
22

33
import me.travis.wurstplusthree.command.Commands;
44
import me.travis.wurstplusthree.event.Events;
5-
import me.travis.wurstplusthree.guirewrite.WurstplusGuiNew;
5+
import me.travis.wurstplusthree.event.processor.EventProcessor;
6+
import me.travis.wurstplusthree.gui.WurstplusGuiNew;
67
import me.travis.wurstplusthree.hack.Hacks;
78
import me.travis.wurstplusthree.manager.*;
89
import me.travis.wurstplusthree.manager.fonts.DonatorFont;
910
import me.travis.wurstplusthree.manager.fonts.GuiFont;
1011
import me.travis.wurstplusthree.manager.fonts.MenuFont;
12+
import me.travis.wurstplusthree.networking.handler.ChatHandling;
13+
import me.travis.wurstplusthree.networking.handler.ClientHandling;
1114
import me.travis.wurstplusthree.setting.Settings;
1215
import me.travis.wurstplusthree.util.RenderUtil2D;
1316
import net.minecraftforge.fml.common.Mod;
@@ -25,12 +28,13 @@ public class WurstplusThree {
2528

2629
public static final String MODID = "wurstplusthree";
2730
public static final String MODNAME = "Wurst+3";
28-
public static final String MODVER = "0.5.0";
31+
public static final String MODVER = "0.6.0";
2932

3033
public static final Logger LOGGER = LogManager.getLogger(MODID);
3134

3235
// events
3336
public static Events EVENTS;
37+
public static EventProcessor EVENT_PROCESSOR;
3438

3539
// commands
3640
public static Commands COMMANDS;
@@ -59,6 +63,8 @@ public class WurstplusThree {
5963
public static CapeManager CAPE_MANAGER;
6064
public static CosmeticManager COSMETIC_MANAGER;
6165
public static AltManager ALT_MANAGER;
66+
public static ClientHandling CLIENT_HANDLING;
67+
public static ChatHandling CHAT_HANDLING;
6268

6369
// megs weird thingy
6470
public static RenderUtil2D RENDER_UTIL_2D;
@@ -79,12 +85,15 @@ public void init(FMLInitializationEvent event) {
7985
}
8086

8187
public void load() {
88+
EVENT_PROCESSOR = new EventProcessor();
8289
EVENTS = new Events();
8390
SETTINGS = new Settings();
8491
RENDER_UTIL_2D = new RenderUtil2D();
8592
COMMANDS = new Commands();
8693
HACKS = new Hacks();
8794
this.loadManagers();
95+
CLIENT_HANDLING = new ClientHandling();
96+
CHAT_HANDLING = new ChatHandling();
8897
CONFIG_MANAGER.loadConfig();
8998
GUI2 = new WurstplusGuiNew();
9099
}

‎src/main/java/me/travis/wurstplusthree/command/Commands.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ public Commands() {
3131
this.commands.add(new ReloadCosmeticsCommand());
3232
this.commands.add(new NameMcCommand());
3333
this.commands.add(new BurrowBlockCommand());
34+
this.commands.add(new ConfigCommand());
35+
this.commands.add(new IrcChat());
36+
this.commands.add(new ClipBind());
37+
this.commands.add(new Debug());
3438
}
3539

3640
public static String[] removeElement(String[] input, int indexToDelete) {
@@ -42,13 +46,6 @@ public static String[] removeElement(String[] input, int indexToDelete) {
4246
return result.toArray(input);
4347
}
4448

45-
private static String strip(String str, String key) {
46-
if (str.startsWith(key) && str.endsWith(key)) {
47-
return str.substring(key.length(), str.length() - key.length());
48-
}
49-
return str;
50-
}
51-
5249
public void executeCommand(String command) {
5350
String[] split = command.split(" (?=(?:[^\"]*\"[^\"]*\")*[^\"]*$)");
5451
String command1 = split[0];

‎src/main/java/me/travis/wurstplusthree/command/commands/BurrowBlockCommand.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import me.travis.wurstplusthree.WurstplusThree;
44
import me.travis.wurstplusthree.command.Command;
55
import me.travis.wurstplusthree.hack.combat.Burrow;
6-
import me.travis.wurstplusthree.manager.ConfigManager;
76
import me.travis.wurstplusthree.util.ClientMessage;
87
import me.travis.wurstplusthree.util.WhitelistUtil;
98
import net.minecraft.block.Block;

‎src/main/java/me/travis/wurstplusthree/command/commands/ClipBind.java‎

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
package me.travis.wurstplusthree.command.commands;
2+
3+
import me.travis.wurstplusthree.command.Command;
4+
import me.travis.wurstplusthree.util.ClientMessage;
5+
6+
import java.awt.event.KeyEvent;
7+
import java.util.ArrayList;
8+
import java.util.List;
9+
10+
/**
11+
* @author Madmegsox1
12+
* @since 01/06/2021
13+
* - shit code from my old client
14+
*/
15+
16+
public class ClipBind extends Command {
17+
static List<Integer> keys = new ArrayList<>();
18+
19+
public ClipBind() {
20+
super("clipbind", "bindclip");
21+
}
22+
23+
@Override
24+
public void execute(String[] message) {
25+
keys.clear();
26+
int key = 0;
27+
String keylist = "";
28+
for (String s : message) { // cba changing this to a switch statement lol
29+
if (s.toLowerCase().equals("shift")) {
30+
key = KeyEvent.VK_SHIFT;
31+
} else if (s.toLowerCase().equals("alt")) {
32+
key = KeyEvent.VK_ALT;
33+
} else if (s.toLowerCase().equals("ctrl")) {
34+
key = KeyEvent.VK_CONTROL;
35+
} else if (s.toLowerCase().equals("f1")) {
36+
key = KeyEvent.VK_F1;
37+
} else if (s.toLowerCase().equals("f2")) {
38+
key = KeyEvent.VK_F2;
39+
} else if (s.toLowerCase().equals("f3")) {
40+
key = KeyEvent.VK_F3;
41+
} else if (s.toLowerCase().equals("f4")) {
42+
key = KeyEvent.VK_F4;
43+
} else if (s.toLowerCase().equals("f5")) {
44+
key = KeyEvent.VK_F5;
45+
} else if (s.toLowerCase().equals("f6")) {
46+
key = KeyEvent.VK_F6;
47+
} else if (s.toLowerCase().equals("f7")) {
48+
key = KeyEvent.VK_F7;
49+
} else if (s.toLowerCase().equals("f8")) {
50+
key = KeyEvent.VK_F8;
51+
} else if (s.toLowerCase().equals("f9")) {
52+
key = KeyEvent.VK_F9;
53+
} else if (s.toLowerCase().equals("f10")) {
54+
key = KeyEvent.VK_F10;
55+
} else if (s.toLowerCase().equals("f11")) {
56+
key = KeyEvent.VK_F11;
57+
} else if (s.toLowerCase().equals("f12")) {
58+
key = KeyEvent.VK_F12;
59+
} else if (s.toLowerCase().equals("q")) {
60+
key = KeyEvent.VK_Q;
61+
} else if (s.toLowerCase().equals("w")) {
62+
key = KeyEvent.VK_W;
63+
} else if (s.toLowerCase().equals("e")) {
64+
key = KeyEvent.VK_E;
65+
} else if (s.toLowerCase().equals("r")) {
66+
key = KeyEvent.VK_R;
67+
} else if (s.toLowerCase().equals("t")) {
68+
key = KeyEvent.VK_T;
69+
} else if (s.toLowerCase().equals("y")) {
70+
key = KeyEvent.VK_Y;
71+
} else if (s.toLowerCase().equals("u")) {
72+
key = KeyEvent.VK_U;
73+
} else if (s.toLowerCase().equals("i")) {
74+
key = KeyEvent.VK_I;
75+
} else if (s.toLowerCase().equals("o")) {
76+
key = KeyEvent.VK_O;
77+
} else if (s.toLowerCase().equals("p")) {
78+
key = KeyEvent.VK_P;
79+
} else if (s.toLowerCase().equals("a")) {
80+
key = KeyEvent.VK_A;
81+
} else if (s.toLowerCase().equals("s")) {
82+
key = KeyEvent.VK_S;
83+
} else if (s.toLowerCase().equals("d")) {
84+
key = KeyEvent.VK_D;
85+
} else if (s.toLowerCase().equals("f")) {
86+
key = KeyEvent.VK_F;
87+
} else if (s.toLowerCase().equals("g")) {
88+
key = KeyEvent.VK_G;
89+
} else if (s.toLowerCase().equals("h")) {
90+
key = KeyEvent.VK_H;
91+
} else if (s.toLowerCase().equals("j")) {
92+
key = KeyEvent.VK_J;
93+
} else if (s.toLowerCase().equals("k")) {
94+
key = KeyEvent.VK_K;
95+
} else if (s.toLowerCase().equals("l")) {
96+
key = KeyEvent.VK_L;
97+
} else if (s.toLowerCase().equals("z")) {
98+
key = KeyEvent.VK_Z;
99+
} else if (s.toLowerCase().equals("x")) {
100+
key = KeyEvent.VK_X;
101+
} else if (s.toLowerCase().equals("c")) {
102+
key = KeyEvent.VK_C;
103+
} else if (s.toLowerCase().equals("v")) {
104+
key = KeyEvent.VK_V;
105+
} else if (s.toLowerCase().equals("b")) {
106+
key = KeyEvent.VK_B;
107+
} else if (s.toLowerCase().equals("n")) {
108+
key = KeyEvent.VK_N;
109+
} else if (s.toLowerCase().equals("m")) {
110+
key = KeyEvent.VK_M;
111+
} else if (s.toLowerCase().equals(",")) {
112+
key = KeyEvent.VK_COMMA;
113+
} else if (s.toLowerCase().equals(".")) {
114+
key = KeyEvent.VK_PERIOD;
115+
} else if (s.toLowerCase().equals(";")) {
116+
key = KeyEvent.VK_SEMICOLON;
117+
} else if (s.toLowerCase().equals("1")) {
118+
key = KeyEvent.VK_1;
119+
} else if (s.toLowerCase().equals("2")) {
120+
key = KeyEvent.VK_2;
121+
} else if (s.toLowerCase().equals("3")) {
122+
key = KeyEvent.VK_3;
123+
} else if (s.toLowerCase().equals("4")) {
124+
key = KeyEvent.VK_4;
125+
} else if (s.toLowerCase().equals("5")) {
126+
key = KeyEvent.VK_5;
127+
} else if (s.toLowerCase().equals("6")) {
128+
key = KeyEvent.VK_6;
129+
} else if (s.toLowerCase().equals("7")) {
130+
key = KeyEvent.VK_7;
131+
} else if (s.toLowerCase().equals("8")) {
132+
key = KeyEvent.VK_8;
133+
} else if (s.toLowerCase().equals("9")) {
134+
key = KeyEvent.VK_9;
135+
} else if (s.toLowerCase().equals("0")) {
136+
key = KeyEvent.VK_0;
137+
} else if (s.toLowerCase().equals("=")) {
138+
key = KeyEvent.VK_EQUALS;
139+
} else if (s.toLowerCase().equals("-")) {
140+
key = KeyEvent.VK_MINUS;
141+
} else {
142+
ClientMessage.sendErrorMessage("Error key not supported");
143+
return;
144+
}
145+
keys.add(key);
146+
keylist += s + " ";
147+
}
148+
ClientMessage.sendMessage("Bind set to " + keylist);
149+
}
150+
151+
public static List<Integer> getKeys(){
152+
return keys;
153+
}
154+
155+
public static void setKeys(List<Integer> keyArray){
156+
keys.clear();
157+
keys = keyArray;
158+
}
159+
}

‎src/main/java/me/travis/wurstplusthree/command/commands/ConfigCommand.java‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
package me.travis.wurstplusthree.command.commands;
2+
3+
import com.mojang.realmsclient.gui.ChatFormatting;
4+
import me.travis.wurstplusthree.WurstplusThree;
5+
import me.travis.wurstplusthree.command.Command;
6+
import me.travis.wurstplusthree.util.ClientMessage;
7+
8+
public class ConfigCommand extends Command {
9+
10+
public ConfigCommand() {
11+
super("Config", "C");
12+
}
13+
14+
@Override
15+
public void execute(String[] message) {
16+
String folder = message[0].replaceAll("_", " ") + "/";
17+
if (folder.equalsIgnoreCase("/")) {
18+
ClientMessage.sendErrorMessage("Invalid Folder");
19+
return;
20+
}
21+
WurstplusThree.CONFIG_MANAGER.setActiveConfigFolder(folder);
22+
ClientMessage.sendMessage("Set config folder to " + ChatFormatting.BOLD + folder.substring(0, folder.length() - 1));
23+
}
24+
25+
}

0 commit comments

Comments
 (0)