Skip to content

Support for Minecraft 1.20.6 and Beyond #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
LOOHP wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Support for Minecraft 1.20.6 and Beyond #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be49cb1
Minecraft 1.20.6
LOOHP May 29, 2024
7af62aa
sleepCounter field name changed
LOOHP Jun 1, 2024
62b6d00
Update config.yml
BlackCatTB Mar 30, 2025
42e7e92
Merge pull request #1 from BlackCatTB/patch-1
LOOHP Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<repositories>
<repository>
<id>purpur</id>
<url>https://repo.pl3x.net/</url>
<url>https://repo.purpurmc.org/snapshots</url>
</repository>
<repository>
<id>sonatype</id>
Expand All @@ -82,15 +82,20 @@
</repository>
<repository>
<id>placeholderapi</id>
<url>http://repo.extendedclip.com/content/repositories/placeholderapi/</url>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
</repository>
<repository>
<id>maven_central</id>
<name>Maven Central</name>
<url>https://repo.maven.apache.org/maven2/</url>
</repository>
</repositories>

<dependencies>
<dependency>
<groupId>net.pl3x.purpur</groupId>
<groupId>org.purpurmc.purpur</groupId>
<artifactId>purpur-api</artifactId>
<version>1.16.2-R0.1-SNAPSHOT</version>
<version>1.20.6-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
Expand All @@ -102,19 +107,19 @@
<dependency>
<groupId>org.bstats</groupId>
<artifactId>bstats-bukkit</artifactId>
<version>1.7</version>
<version>3.0.2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>2.10.6</version>
<version>2.11.6</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.zrips</groupId>
<artifactId>cmi-api</artifactId>
<version>7.6.2.0</version>
<groupId>CMI-API</groupId>
<artifactId>CMI-API</artifactId>
<version>9.7.0.8</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/luffbox/smoothsleep/PlayerData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ private String subStr(String template) {
public void setSleepTicks(long ticks) {
try {
Object nmsPlr = ReflectUtil.invokeMethod(plr, "getHandle");
ReflectUtil.setValue(nmsPlr, false, "sleepTicks", (int) ticks);
ReflectUtil.setValue(nmsPlr, false, "sleepCounter", (int) ticks);
} catch (Exception e) { e.printStackTrace(); }
}
}
12 changes: 6 additions & 6 deletions src/main/java/com/luffbox/smoothsleep/lib/ConfigHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ public class ConfigHelper {
private final ConfigHelper conf;
public Map<World, WorldSettings> worlds = new HashMap<>();

public static Set<PotionEffectType> negativeEffects = Stream.of(BLINDNESS, CONFUSION, HARM, HUNGER, LEVITATION,
POISON, SLOW, SLOW_DIGGING, UNLUCK, WEAKNESS, WITHER, UNLUCK).collect(Collectors.toSet());
public static Set<PotionEffectType> positiveEffects = Stream.of(ABSORPTION, DAMAGE_RESISTANCE, FAST_DIGGING,
FIRE_RESISTANCE, GLOWING, HEAL, HEALTH_BOOST, INCREASE_DAMAGE, INVISIBILITY, JUMP, NIGHT_VISION,
public static Set<PotionEffectType> negativeEffects = Stream.of(BLINDNESS, NAUSEA, INSTANT_DAMAGE, HUNGER, LEVITATION,
POISON, SLOWNESS, MINING_FATIGUE, UNLUCK, WEAKNESS, WITHER, UNLUCK).collect(Collectors.toSet());
public static Set<PotionEffectType> positiveEffects = Stream.of(ABSORPTION, RESISTANCE, HASTE,
FIRE_RESISTANCE, GLOWING, INSTANT_HEALTH, HEALTH_BOOST, STRENGTH, INVISIBILITY, JUMP_BOOST, NIGHT_VISION,
REGENERATION, SATURATION, SPEED, WATER_BREATHING, LUCK).collect(Collectors.toSet());
public static Set<Particle> requiresData = Stream.of(REDSTONE, BLOCK_CRACK, BLOCK_DUST, FALLING_DUST, ITEM_CRACK,
SPELL_MOB, SPELL_MOB_AMBIENT).collect(Collectors.toSet());
public static Set<Particle> requiresData = Stream.of(DUST, BLOCK, DUST_PILLAR, FALLING_DUST, ITEM,
WITCH, BLOCK_MARKER, SHRIEK, SCULK_CHARGE, VIBRATION, DUST_COLOR_TRANSITION, ENTITY_EFFECT).collect(Collectors.toSet());
public static boolean firstRun;

private static String validBarColors, validBarStyles, validParticlePatternTypes;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/luffbox/smoothsleep/lib/MiscUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.luffbox.smoothsleep.lib;

import com.luffbox.smoothsleep.SmoothSleep;
import org.apache.commons.lang.text.StrSubstitutor;
import org.apache.commons.lang3.text.StrSubstitutor;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.World;
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ worlds:
heal-slept-villagers: true
morning-sound: 'ENTITY_PLAYER_LEVELUP'
morning-particle-options:
particle: 'VILLAGER_HAPPY'
particle: 'HAPPY_VILLAGER'
amount: 20
radius: 0.5
enabled: true
Expand Down Expand Up @@ -69,4 +69,4 @@ worlds:
show-if-awake: true
color: 'BLUE'
style: 'SOLID'
title: '&a{SLEEPERS}/{TOTAL} Sleeping &3- &b{12H}:{MIN} {MER_UPPER}'
title: '&a{SLEEPERS}/{TOTAL} Sleeping &3- &b{12H}:{MIN} {MER_UPPER}'