Skip to content

Commit f7c2593

Browse files
authored
GH-1088 Remove catboy configuration (#1089)
1 parent 6dc5ac8 commit f7c2593

File tree

4 files changed

+5
-31
lines changed

4 files changed

+5
-31
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
*.iws
55
.idea/
66
.gradle/
7+
.kotlin/
78
run/
89
out/
910
build/

eternalcore-core/src/main/java/com/eternalcode/core/configuration/implementation/PluginConfiguration.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import com.eternalcode.core.feature.afk.AfkConfig;
66
import com.eternalcode.core.feature.automessage.AutoMessageConfig;
77
import com.eternalcode.core.feature.butcher.ButcherConfig;
8-
import com.eternalcode.core.feature.fun.catboy.CatboyConfig;
98
import com.eternalcode.core.feature.chat.ChatConfig;
109
import com.eternalcode.core.feature.helpop.HelpOpConfig;
1110
import com.eternalcode.core.feature.home.HomesConfig;
@@ -205,12 +204,6 @@ public static class Items extends OkaeriConfig {
205204
@Comment("# Settings for player jail system")
206205
public JailConfig jail = new JailConfig();
207206

208-
@Bean
209-
@Comment("")
210-
@Comment("# Catboy Configuration")
211-
@Comment("# Settings for catboy feature")
212-
public CatboyConfig catboy = new CatboyConfig();
213-
214207
@Bean
215208
@Comment("")
216209
@Comment("# Lightning Configuration")

eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyConfig.java

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

eternalcore-core/src/main/java/com/eternalcode/core/feature/fun/catboy/CatboyServiceImpl.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.eternalcode.core.feature.fun.catboy;
22

3-
import com.eternalcode.commons.bukkit.scheduler.MinecraftScheduler;
43
import com.eternalcode.core.event.EventCaller;
54
import com.eternalcode.core.feature.catboy.Catboy;
65
import com.eternalcode.core.feature.catboy.CatboyService;
@@ -21,25 +20,22 @@
2120
@Service
2221
class CatboyServiceImpl implements CatboyService {
2322

23+
private static final float CATBOY_WALK_SPEED = 0.4F;
2424
private static final float DEFAULT_WALK_SPEED = 0.2F;
25+
2526
private final Map<UUID, Catboy> catboys = new HashMap<>();
2627
private final EventCaller eventCaller;
2728

2829
private final CatBoyEntityService catBoyEntityService;
29-
private final CatboySettings catboySettings;
30-
private final MinecraftScheduler scheduler;
3130

3231
@Inject
3332
CatboyServiceImpl(
3433
EventCaller eventCaller,
3534
CatBoyEntityService catBoyEntityService,
36-
CatboySettings catboySettings,
37-
MinecraftScheduler scheduler
35+
CatboySettings catboySettings
3836
) {
3937
this.eventCaller = eventCaller;
4038
this.catBoyEntityService = catBoyEntityService;
41-
this.catboySettings = catboySettings;
42-
this.scheduler = scheduler;
4339
}
4440

4541
@Override
@@ -49,7 +45,7 @@ public void markAsCatboy(Player player, Cat.Type type) {
4945

5046
Cat cat = this.catBoyEntityService.createCatboyEntity(player, type);
5147
player.addPassenger(cat);
52-
player.setWalkSpeed(this.catboySettings.catboyWalkSpeed());
48+
player.setWalkSpeed(CATBOY_WALK_SPEED);
5349
this.eventCaller.callEvent(new CatboySwitchEvent(player, true));
5450
}
5551

0 commit comments

Comments
 (0)