Skip to content

Commit 19e6f4d

Browse files
TheVoidBlockTheVoidBlock
committed
Refactored class locations
1 parent 09ed375 commit 19e6f4d

File tree

13 files changed

+133
-147
lines changed

13 files changed

+133
-147
lines changed

‎src/main/java/com/thevoidblock/syncac/KeyBindings.java‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package com.thevoidblock.syncac;
22

3-
import com.thevoidblock.syncac.client.SyncacClient;
4-
import com.thevoidblock.syncac.config.ModConfig;
53
import com.thevoidblock.syncac.gui.ConfigScreen;
64
import me.shedaniel.autoconfig.AutoConfig;
75
import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
@@ -24,7 +22,7 @@ public static void registerModKeybindings() {
2422
ClientTickEvents.END_CLIENT_TICK.register(
2523
client -> {
2624
while(openMenu.wasPressed()) {
27-
SyncacClient.CLIENT.setScreen(ConfigScreen.getConfigScreen(client.currentScreen));
25+
Syncac.CLIENT.setScreen(ConfigScreen.getConfigScreen(client.currentScreen));
2826
}
2927

3028
}
@@ -34,13 +32,13 @@ public static void registerModKeybindings() {
3432
ClientTickEvents.END_CLIENT_TICK.register(
3533
client -> {
3634
while(toggleMod.wasPressed()) {
37-
AutoConfig.getConfigHolder(ModConfig.class).getConfig().MOD_ENABLED = !AutoConfig.getConfigHolder(ModConfig.class).getConfig().MOD_ENABLED;
38-
AutoConfig.getConfigHolder(ModConfig.class).save();
35+
AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().MOD_ENABLED = !AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().MOD_ENABLED;
36+
AutoConfig.getConfigHolder(SyncacConfig.class).save();
3937

4038
assert client.player != null;
4139
client.player.sendMessage(Text.literal(
4240
String.format("Mod Enabled: %s",
43-
Boolean.toString(AutoConfig.getConfigHolder(ModConfig.class).getConfig().MOD_ENABLED).toUpperCase()
41+
Boolean.toString(AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().MOD_ENABLED).toUpperCase()
4442
)
4543
), true);
4644
}
@@ -52,14 +50,14 @@ public static void registerModKeybindings() {
5250
ClientTickEvents.END_CLIENT_TICK.register(
5351
client -> {
5452
while(toggleAttack.wasPressed()) {
55-
AutoConfig.getConfigHolder(ModConfig.class).getConfig().ATTACK_ENABLED = !AutoConfig.getConfigHolder(ModConfig.class).getConfig().ATTACK_ENABLED;
56-
AutoConfig.getConfigHolder(ModConfig.class).save();
53+
AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().ATTACK_ENABLED = !AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().ATTACK_ENABLED;
54+
AutoConfig.getConfigHolder(SyncacConfig.class).save();
5755

5856
assert client.player != null;
5957
client.player.sendMessage(Text.literal(
6058
String.format("Attack Mode: %s, With an Interval of: %s",
61-
AutoConfig.getConfigHolder(ModConfig.class).getConfig().ATTACK_ENABLED.toString().toUpperCase(),
62-
AutoConfig.getConfigHolder(ModConfig.class).getConfig().ATTACK_INTERVAL
59+
AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().ATTACK_ENABLED.toString().toUpperCase(),
60+
AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().ATTACK_INTERVAL
6361
)
6462
), true);
6563
}
@@ -71,14 +69,14 @@ public static void registerModKeybindings() {
7169
ClientTickEvents.END_CLIENT_TICK.register(
7270
client -> {
7371
while(toggleUse.wasPressed()) {
74-
AutoConfig.getConfigHolder(ModConfig.class).getConfig().USE_ENABLED = !AutoConfig.getConfigHolder(ModConfig.class).getConfig().USE_ENABLED;
75-
AutoConfig.getConfigHolder(ModConfig.class).save();
72+
AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().USE_ENABLED = !AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().USE_ENABLED;
73+
AutoConfig.getConfigHolder(SyncacConfig.class).save();
7674

7775
assert client.player != null;
7876
client.player.sendMessage(Text.literal(
7977
String.format("Use Mode: %s, With an Interval of: %s",
80-
AutoConfig.getConfigHolder(ModConfig.class).getConfig().USE_ENABLED.toString().toUpperCase(),
81-
AutoConfig.getConfigHolder(ModConfig.class).getConfig().USE_INTERVAL
78+
AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().USE_ENABLED.toString().toUpperCase(),
79+
AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().USE_INTERVAL
8280
)
8381
), true);
8482
}

‎src/main/java/com/thevoidblock/syncac/Syncac.java‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,26 @@
11
package com.thevoidblock.syncac;
22

3-
import com.thevoidblock.syncac.config.ModConfig;
3+
import com.thevoidblock.syncac.util.AutoClicker;
44
import me.shedaniel.autoconfig.AutoConfig;
55
import me.shedaniel.autoconfig.serializer.JanksonConfigSerializer;
6-
import net.fabricmc.api.ModInitializer;
6+
import net.fabricmc.api.ClientModInitializer;
7+
import net.minecraft.client.MinecraftClient;
78
import org.slf4j.Logger;
89
import org.slf4j.LoggerFactory;
910

10-
public class Syncac implements ModInitializer {
11+
public class Syncac implements ClientModInitializer {
1112
public static final String MOD_ID = "syncac";
1213
public static final Logger LOGGER = LoggerFactory.getLogger(MOD_ID);
14+
public static final MinecraftClient CLIENT = MinecraftClient.getInstance();
1315

1416
@Override
15-
public void onInitialize() {
17+
public void onInitializeClient() {
1618

17-
AutoConfig.register(ModConfig.class, JanksonConfigSerializer::new);
18-
LOGGER.info(AutoConfig.getConfigHolder(ModConfig.class).getConfig().toString());
19+
AutoConfig.register(SyncacConfig.class, JanksonConfigSerializer::new);
1920

20-
LOGGER.info(String.format("clickity clack clack (%s initialized)", MOD_ID));
21+
AutoClicker.registerAutoClickers();
22+
KeyBindings.registerModKeybindings();
23+
24+
LOGGER.info(String.format("%s initialized!", MOD_ID));
2125
}
2226
}

src/main/java/com/thevoidblock/syncac/config/ModConfig.java renamed to src/main/java/com/thevoidblock/syncac/SyncacConfig.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
1-
package com.thevoidblock.syncac.config;
1+
package com.thevoidblock.syncac;
22

3-
import com.thevoidblock.syncac.Syncac;
43
import me.shedaniel.autoconfig.ConfigData;
54
import me.shedaniel.autoconfig.annotation.Config;
65

76
@Config(name = Syncac.MOD_ID)
8-
public class ModConfig implements ConfigData {
7+
public class SyncacConfig implements ConfigData {
98
public boolean MOD_ENABLED = true;
109

1110
public Boolean ATTACK_ENABLED = false;

‎src/main/java/com/thevoidblock/syncac/autoclicker/AttackAutoClicker.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package com.thevoidblock.syncac.autoclicker;
2+
3+
import com.thevoidblock.syncac.SyncacConfig;
4+
import com.thevoidblock.syncac.Syncac;
5+
import me.shedaniel.autoconfig.AutoConfig;
6+
import net.minecraft.util.Hand;
7+
8+
public class AttackAutoClicker extends AutoClickerConfig {
9+
10+
@Override
11+
public boolean isEnabled() {
12+
return AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().ATTACK_ENABLED;
13+
}
14+
15+
@Override
16+
public int getInterval() {
17+
return AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().ATTACK_INTERVAL;
18+
}
19+
20+
@Override
21+
public boolean isSync() {
22+
return AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().ATTACK_SYNC_ENABLED;
23+
}
24+
25+
@Override
26+
public void run() {
27+
if(Syncac.CLIENT.player != null) {
28+
if (Syncac.CLIENT.targetedEntity != null) {
29+
assert Syncac.CLIENT.interactionManager != null;
30+
Syncac.CLIENT.interactionManager.attackEntity(Syncac.CLIENT.player, Syncac.CLIENT.targetedEntity);
31+
}
32+
Syncac.CLIENT.player.swingHand(Hand.MAIN_HAND);
33+
}
34+
}
35+
}

src/main/java/com/thevoidblock/syncac/config/AutoClickerConfig.java renamed to src/main/java/com/thevoidblock/syncac/autoclicker/AutoClickerConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.thevoidblock.syncac.config;
1+
package com.thevoidblock.syncac.autoclicker;
22

33
public abstract class AutoClickerConfig {
44

‎src/main/java/com/thevoidblock/syncac/autoclicker/UseAutoClicker.java‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
package com.thevoidblock.syncac.autoclicker;
2+
3+
import com.thevoidblock.syncac.SyncacConfig;
4+
import com.thevoidblock.syncac.Syncac;
5+
import com.thevoidblock.syncac.mixin.MinecraftClientInvoker;
6+
import me.shedaniel.autoconfig.AutoConfig;
7+
8+
public class UseAutoClicker extends AutoClickerConfig {
9+
10+
@Override
11+
public boolean isEnabled() {
12+
return AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().USE_ENABLED;
13+
}
14+
15+
@Override
16+
public int getInterval() {
17+
return AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().USE_INTERVAL;
18+
}
19+
20+
@Override
21+
public boolean isSync() {
22+
return AutoConfig.getConfigHolder(SyncacConfig.class).getConfig().USE_SYNC_ENABLED;
23+
}
24+
25+
@Override
26+
public void run() {
27+
if (Syncac.CLIENT.player != null)
28+
((MinecraftClientInvoker) Syncac.CLIENT).invokeDoItemUse();
29+
}
30+
}

‎src/main/java/com/thevoidblock/syncac/client/SyncacClient.java‎

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

‎src/main/java/com/thevoidblock/syncac/config/AttackAutoClicker.java‎

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

‎src/main/java/com/thevoidblock/syncac/config/UseAutoClicker.java‎

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

0 commit comments

Comments
 (0)