Merge pull request #279 from MrJeremyFisher/mc/sah-1.20

SimpleAdminHacks 1.20.4
CivMC · Feb 22, 2024 · e792c54 · e792c54
2 parents 511ea19 + bfb1972
commit e792c54
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 14 deletions.
diff --git a/plugins/simpleadminhacks-paper/build.gradle.kts b/plugins/simpleadminhacks-paper/build.gradle.kts
@@ -5,7 +5,9 @@ plugins {
 version = "2.2.5"
 
 dependencies {
-	paperDevBundle("1.18.2-R0.1-SNAPSHOT")
+	paperweight {
+		paperDevBundle("1.20.4-R0.1-SNAPSHOT")
+	}
 
 	compileOnly(project(":plugins:civmodcore-paper"))
 	compileOnly(project(":plugins:namelayer-paper"))

diff --git a/...cks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/DisableAI.java b/...cks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/DisableAI.java
@@ -6,7 +6,7 @@
 import com.programmerdan.minecraft.simpleadminhacks.framework.SimpleHack;
 import net.minecraft.nbt.CompoundTag;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.craftbukkit.v1_18_R2.persistence.CraftPersistentDataContainer;
+import org.bukkit.craftbukkit.v1_20_R3.persistence.CraftPersistentDataContainer;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;

diff --git a/...ks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/InvControl.java b/...ks-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/InvControl.java
@@ -16,8 +16,8 @@
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.craftbukkit.v1_18_R2.CraftServer;
-import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftInventoryPlayer;
+import org.bukkit.craftbukkit.v1_20_R3.CraftServer;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventoryPlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.event.inventory.InventoryCloseEvent;

diff --git a/...s-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/SaplingHack.java b/...s-paper/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/SaplingHack.java
@@ -64,7 +64,8 @@ public void onLeafDecay(LeavesDecayEvent event) {
 
 	private boolean checkIfLeafBlock(Block block) {
 		return switch (block.getType()) {
-			case OAK_LEAVES, BIRCH_LEAVES, SPRUCE_LEAVES, JUNGLE_LEAVES, ACACIA_LEAVES, DARK_OAK_LEAVES -> true;
+			case OAK_LEAVES, BIRCH_LEAVES, SPRUCE_LEAVES, JUNGLE_LEAVES, ACACIA_LEAVES, DARK_OAK_LEAVES,
+					MANGROVE_LEAVES, CHERRY_LEAVES -> true;
 			default -> false;
 		};
 	}
@@ -84,6 +85,8 @@ private Material getSaplingMaterial(Material material) {
 			case JUNGLE_LEAVES -> Material.JUNGLE_SAPLING;
 			case ACACIA_LEAVES -> Material.ACACIA_SAPLING;
 			case DARK_OAK_LEAVES -> Material.DARK_OAK_SAPLING;
+			case MANGROVE_LEAVES -> Material.MANGROVE_PROPAGULE;
+			case CHERRY_LEAVES -> Material.CHERRY_SAPLING;
 			//We set this to air so nothing will drop if it comes to erroring
 			default -> Material.AIR;
 		};

diff --git a/...src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/AntiFastBreak.java b/...src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/AntiFastBreak.java
@@ -20,8 +20,8 @@
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftItemStack;
-import org.bukkit.craftbukkit.v1_18_R2.util.CraftMagicNumbers;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftItemStack;
+import org.bukkit.craftbukkit.v1_20_R3.util.CraftMagicNumbers;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

diff --git a/...er/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/BeeKeeping.java b/...er/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/BeeKeeping.java
@@ -28,9 +28,9 @@
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
-import org.bukkit.craftbukkit.v1_18_R2.CraftWorld;
-import org.bukkit.craftbukkit.v1_18_R2.block.CraftBlock;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_20_R3.CraftWorld;
+import org.bukkit.craftbukkit.v1_20_R3.block.CraftBlock;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;

diff --git a/...per/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/DebugWand.java b/...per/src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/DebugWand.java
@@ -14,7 +14,7 @@
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.block.data.BlockData;
-import org.bukkit.craftbukkit.v1_18_R2.entity.CraftEntity;
+import org.bukkit.craftbukkit.v1_20_R3.entity.CraftEntity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;

diff --git a/...main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/MapCopyProtection.java b/...main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/MapCopyProtection.java
@@ -10,7 +10,7 @@
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftInventoryCrafting;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventoryCrafting;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.inventory.InventoryClickEvent;

diff --git a/...src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/OldEnchanting.java b/...src/main/java/com/programmerdan/minecraft/simpleadminhacks/hacks/basic/OldEnchanting.java
@@ -25,7 +25,7 @@
 import org.bukkit.Sound;
 import org.bukkit.block.Block;
 import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.craftbukkit.v1_18_R2.inventory.CraftInventoryView;
+import org.bukkit.craftbukkit.v1_20_R3.inventory.CraftInventoryView;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;

diff --git a/plugins/simpleadminhacks-paper/src/main/resources/plugin.yml b/plugins/simpleadminhacks-paper/src/main/resources/plugin.yml
@@ -5,7 +5,7 @@ authors: [ProgrammerDan, Maxopoly]
 version: ${version}
 depend: [CivModCore]
 softdepend: [CombatTagPlus, NameLayer, Citadel, ProtocolLib, BanStick, ExilePearl]
-api-version: 1.18
+api-version: 1.20
 commands:
   hacks:
     description: Shows the various hacks and fixes supported by this plugin and controls them