Skip to content

Commit f92a1fc

Browse files
committed
Even even even more work
1 parent ebedee6 commit f92a1fc

File tree

3 files changed

+163
-177
lines changed

3 files changed

+163
-177
lines changed

patches/removed/server/0012-Colored-signs.patch renamed to patches/server/0012-Colored-signs.patch

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22
From: Pascalpex <[email protected]>
3-
Date: Sat, 19 Feb 2022 13:46:33 +0100
3+
Date: Mon, 21 Mar 2022 15:43:24 +0100
44
Subject: [PATCH] Colored signs
55

66

77
diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
8-
index 00779ca84c604885a6ea3741ca46db55a67d8510..34787745614afa5ec519326ce585dc9d6b3a1e89 100644
8+
index bff6d3d6a4a1c8e51ec8cdd4bd55ad5e14b5e05e..0c580ad88c47860f2e247b6429eec02dfe760c6c 100644
99
--- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
1010
+++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
11-
@@ -151,6 +151,7 @@ import net.minecraft.world.phys.Vec3;
11+
@@ -152,6 +152,7 @@ import net.minecraft.world.phys.Vec3;
1212
import net.minecraft.world.phys.shapes.BooleanOp;
1313
import net.minecraft.world.phys.shapes.Shapes;
1414
import net.minecraft.world.phys.shapes.VoxelShape;
1515
+import net.pascalpex.deepslatemc.Config;
1616
import org.apache.commons.lang3.StringUtils;
17-
import org.apache.logging.log4j.LogManager;
18-
import org.apache.logging.log4j.Logger;
19-
@@ -3175,6 +3176,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
17+
import org.slf4j.Logger;
18+
19+
@@ -3201,6 +3202,17 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
2020
// Purpur end
2121
}
2222
SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.player.getBukkitEntity(), lines);
@@ -34,7 +34,7 @@ index 00779ca84c604885a6ea3741ca46db55a67d8510..34787745614afa5ec519326ce585dc9d
3434
this.cserver.getPluginManager().callEvent(event);
3535

3636
if (!event.isCancelled()) {
37-
@@ -3192,6 +3204,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
37+
@@ -3218,6 +3230,37 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Ser
3838

3939
}
4040

@@ -73,23 +73,23 @@ index 00779ca84c604885a6ea3741ca46db55a67d8510..34787745614afa5ec519326ce585dc9d
7373
public void handleKeepAlive(ServerboundKeepAlivePacket packet) {
7474
// Purpur start
7575
diff --git a/src/main/java/net/pascalpex/deepslatemc/Config.java b/src/main/java/net/pascalpex/deepslatemc/Config.java
76-
index 6008a38b1f0b51a9b85911d605d1bd455367de77..f000d7c2ea4f496aac16cab1e302a01e4c9bab1a 100644
76+
index 145f6d6739f997a334cd30e7ce093947cba46ab8..e1858918fc0940270369fc517d3477a73497be1e 100644
7777
--- a/src/main/java/net/pascalpex/deepslatemc/Config.java
7878
+++ b/src/main/java/net/pascalpex/deepslatemc/Config.java
79-
@@ -35,6 +35,10 @@ public class Config {
80-
if(!config.contains("preventKnowledgebookClick")) {
81-
config.set("preventKnowledgebookClick", false);
79+
@@ -41,6 +41,10 @@ public class Config {
80+
if(!config.contains("preventKnowledgebookClick")) {
81+
config.set("preventKnowledgebookClick", false);
82+
}
83+
+ if(!config.contains("coloredSigns")) {
84+
+ config.set("coloredSigns" + ".enabled", false);
85+
+ config.set("coloredSigns" + ".usePermission", true);
86+
+ }
87+
save();
88+
} catch (IOException | InvalidConfigurationException e) {
89+
e.printStackTrace();
90+
@@ -55,6 +59,14 @@ public class Config {
8291
}
83-
+ if(!config.contains("coloredSigns")) {
84-
+ config.set("coloredSigns" + ".enabled", false);
85-
+ config.set("coloredSigns" + ".usePermission", true);
86-
+ }
87-
save();
88-
} catch (IOException | InvalidConfigurationException e) {
89-
e.printStackTrace();
90-
@@ -49,6 +53,14 @@ public class Config {
9192
}
92-
}
9393

9494
+ public static boolean getColoredSignsEnabled() {
9595
+ return config.getBoolean("coloredSigns" + ".enabled");
@@ -100,5 +100,5 @@ index 6008a38b1f0b51a9b85911d605d1bd455367de77..f000d7c2ea4f496aac16cab1e302a01e
100100
+ }
101101
+
102102
public static boolean getPreventKnowledgebookClick() {
103-
return config.getBoolean("preventKnowledgebookClick");
104-
}
103+
return config.getBoolean("preventKnowledgebookClick");
104+
}

0 commit comments

Comments
 (0)