diff --git a/.gradle/8.5/checksums/checksums.lock b/.gradle/8.5/checksums/checksums.lock index d8c8f82fbaef1435e130a92e6308c94bfd85221d..6f7ec924cd840926f8022156dac144755da9f716 100644 Binary files a/.gradle/8.5/checksums/checksums.lock and b/.gradle/8.5/checksums/checksums.lock differ diff --git a/.gradle/8.5/checksums/md5-checksums.bin b/.gradle/8.5/checksums/md5-checksums.bin index 9271dc2d1552ee5af4fd38c45cdb68e405b22d88..ba7bc5ba7e231b374566e0ffb87ffaf27862c368 100644 Binary files a/.gradle/8.5/checksums/md5-checksums.bin and b/.gradle/8.5/checksums/md5-checksums.bin differ diff --git a/.gradle/8.5/checksums/sha1-checksums.bin b/.gradle/8.5/checksums/sha1-checksums.bin index 0bd6024242cc0374923987475cf5e8aa54dce97a..d1f5af1608dcd632fab17d55f1ed3fede8c336e0 100644 Binary files a/.gradle/8.5/checksums/sha1-checksums.bin and b/.gradle/8.5/checksums/sha1-checksums.bin differ diff --git a/.gradle/8.5/executionHistory/executionHistory.bin b/.gradle/8.5/executionHistory/executionHistory.bin index d6e7062547cc771ca03b88e2ea190905c31ac651..746b260a5d3fd53296ea793d499a6bbc9da9517e 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.bin and b/.gradle/8.5/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.5/executionHistory/executionHistory.lock b/.gradle/8.5/executionHistory/executionHistory.lock index 13044cf6db4f0f076787d6070c707efe97c58779..64d85103fe16a3a5738c1e67645b28a92df84401 100644 Binary files a/.gradle/8.5/executionHistory/executionHistory.lock and b/.gradle/8.5/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.5/fileHashes/fileHashes.bin b/.gradle/8.5/fileHashes/fileHashes.bin index 98ec10851976f1471ff9568a399987add143afa8..8f6f7a896bb1e02150949724b12e6448ea91d2eb 100644 Binary files a/.gradle/8.5/fileHashes/fileHashes.bin and b/.gradle/8.5/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.5/fileHashes/fileHashes.lock b/.gradle/8.5/fileHashes/fileHashes.lock index e1f5654bf0e481809ab3e6e941ab591a2cffdbc0..080993a19d3a3a653d068f2659c625ec712d55a2 100644 Binary files a/.gradle/8.5/fileHashes/fileHashes.lock and b/.gradle/8.5/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.5/fileHashes/resourceHashesCache.bin b/.gradle/8.5/fileHashes/resourceHashesCache.bin index 7d7629d72d2a67dbc2b73f28ce9624c55974ece6..971f922c75a975dad2143d41f8f7cc869a333538 100644 Binary files a/.gradle/8.5/fileHashes/resourceHashesCache.bin and b/.gradle/8.5/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index a19a03a656648920de786383761ff4bf14bb33c3..38847464eeb81c527633ea8ac60711c0d8bffbf8 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/build/classes/java/main/CropHarvester/CropHarvester.class b/build/classes/java/main/CropHarvester/CropHarvester.class new file mode 100644 index 0000000000000000000000000000000000000000..ff85e91168e5b5b70b515f32babb8f58b18f07d0 Binary files /dev/null and b/build/classes/java/main/CropHarvester/CropHarvester.class differ diff --git a/build/classes/java/main/DisableCommands/CommandDisable.class b/build/classes/java/main/DisableCommands/CommandDisable.class deleted file mode 100644 index 0c9d6ffd47f18337208981a6b0da6c555dcf1c5a..0000000000000000000000000000000000000000 Binary files a/build/classes/java/main/DisableCommands/CommandDisable.class and /dev/null differ diff --git a/build/classes/java/main/DisableCommands/TabCompleteDisable.class b/build/classes/java/main/DisableCommands/TabCompleteDisable.class deleted file mode 100644 index cbf0e2a03cca8b2c63bdf3b59231cd03c7bd2744..0000000000000000000000000000000000000000 Binary files a/build/classes/java/main/DisableCommands/TabCompleteDisable.class and /dev/null differ diff --git a/build/classes/java/main/org/fsi/pixelcampusessentials/Pixelcampusessentials.class b/build/classes/java/main/org/fsi/pixelcampusessentials/Pixelcampusessentials.class index 6b88bbec443f4393981fdcf7ff90267b3d5aedbd..9a40f5fa5e4bd51fb7a1b98eb1de8501645eec5f 100644 Binary files a/build/classes/java/main/org/fsi/pixelcampusessentials/Pixelcampusessentials.class and b/build/classes/java/main/org/fsi/pixelcampusessentials/Pixelcampusessentials.class differ diff --git a/build/libs/pixelcampusessentials-1.0.jar b/build/libs/pixelcampusessentials-1.0.jar index 94e5cf1bb969db16692c46e462f484866133078f..9d491d233a51ab1cf8f2ece025f575072dfe4eda 100644 Binary files a/build/libs/pixelcampusessentials-1.0.jar and b/build/libs/pixelcampusessentials-1.0.jar differ diff --git a/build/resources/main/config.yml b/build/resources/main/config.yml index 981eb25ab0ecbe86b971d63dbfe0e2d8f5635311..864209062cfd5ad5e564857d3251709df0d413c0 100644 --- a/build/resources/main/config.yml +++ b/build/resources/main/config.yml @@ -3,12 +3,4 @@ max-plot-size: 62500 #Chop Radius for Trees chop-radius: 4 #Name of Lobby Server in the Proxy Network -proxy-hub-name: lobby -#Disables Command for People without the nessecary Permission. The Plugin compares these Strings using startsWith() -disabled_commands: - - /pl - - /? - - /ver - - /bukkit - - /luckperms - - /worldedit \ No newline at end of file +proxy-hub-name: lobby \ No newline at end of file diff --git a/build/resources/main/plugin.yml b/build/resources/main/plugin.yml index bbab36cadbf36e410392ca2a4d954015be20a2a2..3c96f98da8445f98ea1c75798791db2f107cbc92 100644 --- a/build/resources/main/plugin.yml +++ b/build/resources/main/plugin.yml @@ -26,6 +26,6 @@ permissions: pixelcampusessentials.ladder: description: speed ladder default: op - pixelcampusessentials.admin: - description: commands only admins can enter + pixelcampusessentials.chop: + description: Timber default: op diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CommandDisable.class.uniqueId3 b/build/tmp/compileJava/compileTransaction/stash-dir/CommandDisable.class.uniqueId3 deleted file mode 100644 index 0c9d6ffd47f18337208981a6b0da6c555dcf1c5a..0000000000000000000000000000000000000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/CommandDisable.class.uniqueId3 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/CropHarvester.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/CropHarvester.class.uniqueId0 new file mode 100644 index 0000000000000000000000000000000000000000..38173e9f7a6f1d44394c579b4294e5e48d31301c Binary files /dev/null and b/build/tmp/compileJava/compileTransaction/stash-dir/CropHarvester.class.uniqueId0 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId4 b/build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId1 similarity index 83% rename from build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId4 rename to build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId1 index 5f8f3a6e4b7dee7b3142acbe06de8e875c529550..9a40f5fa5e4bd51fb7a1b98eb1de8501645eec5f 100644 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId4 and b/build/tmp/compileJava/compileTransaction/stash-dir/Pixelcampusessentials.class.uniqueId1 differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Plots.class.uniqueId2 b/build/tmp/compileJava/compileTransaction/stash-dir/Plots.class.uniqueId2 deleted file mode 100644 index 39eb1e1cc809c7a63c5133102feef8ad40f1a6b7..0000000000000000000000000000000000000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/Plots.class.uniqueId2 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/TabCompleteDisable.class.uniqueId1 b/build/tmp/compileJava/compileTransaction/stash-dir/TabCompleteDisable.class.uniqueId1 deleted file mode 100644 index 6efe3646b6b99c2eea34ac847aa6d0b4a68a7d63..0000000000000000000000000000000000000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/TabCompleteDisable.class.uniqueId1 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Timber$1.class.uniqueId5 b/build/tmp/compileJava/compileTransaction/stash-dir/Timber$1.class.uniqueId5 deleted file mode 100644 index 6e1f678fcaf2e34428da57720d90a42ce6504652..0000000000000000000000000000000000000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/Timber$1.class.uniqueId5 and /dev/null differ diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/Timber.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/Timber.class.uniqueId0 deleted file mode 100644 index 69a8eb3ee202bb623424e19c725718d7d0e76e26..0000000000000000000000000000000000000000 Binary files a/build/tmp/compileJava/compileTransaction/stash-dir/Timber.class.uniqueId0 and /dev/null differ diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index 01a30e093805469f9a9cef556a78b1316050b83b..b425c846d180f8670e01980d6e2ae99d89bfc727 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/src/main/java/CropHarvester/CropHarvester.java b/src/main/java/CropHarvester/CropHarvester.java new file mode 100644 index 0000000000000000000000000000000000000000..961ed5ccd4f5f5e562fd4729146fecf9413c2cbc --- /dev/null +++ b/src/main/java/CropHarvester/CropHarvester.java @@ -0,0 +1,48 @@ +package CropHarvester; + +import org.bukkit.Sound; +import org.bukkit.Tag; +import org.bukkit.block.Block; +import org.bukkit.block.data.Ageable; +import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.Listener; +import org.bukkit.event.block.Action; +import org.bukkit.event.player.PlayerInteractEvent; + +import java.util.Objects; + +public class CropHarvester implements Listener { + + @EventHandler + public void playerRightClick(PlayerInteractEvent e){ + + if(!Objects.requireNonNull(e.getHand()).isHand())return; + if(!checkForFullGrownCrop(e))return; + + Player player = e.getPlayer(); + + player.sendMessage(Objects.requireNonNull(e.getClickedBlock()).getType().toString()); + + e.getClickedBlock().breakNaturally(); + player.playSound(e.getClickedBlock().getLocation(), Sound.BLOCK_CROP_BREAK,1,1); + } + + + //returns false on fail + private boolean checkForFullGrownCrop(PlayerInteractEvent e){ + + if(!e.getAction().equals(Action.RIGHT_CLICK_BLOCK))return false; //check for right click on a block + + Block clickedBlock = e.getClickedBlock(); + + if(!Tag.CROPS.isTagged(Objects.requireNonNull(clickedBlock).getType()))return false; //check if the clicked block is a type of crop + + Ageable ageable = (Ageable) clickedBlock.getBlockData(); + if(ageable.getAge() != ageable.getMaximumAge())return false; + + + return true; + } + +} diff --git a/src/main/java/org/fsi/pixelcampusessentials/Pixelcampusessentials.java b/src/main/java/org/fsi/pixelcampusessentials/Pixelcampusessentials.java index 91e6e8534b43027d3b3a15d373e9f563fbd2863d..925552b1c2d8e54ee647b4cae845b5d3a62b4500 100644 --- a/src/main/java/org/fsi/pixelcampusessentials/Pixelcampusessentials.java +++ b/src/main/java/org/fsi/pixelcampusessentials/Pixelcampusessentials.java @@ -1,5 +1,6 @@ package org.fsi.pixelcampusessentials; +import CropHarvester.CropHarvester; import FunAndElse.FreezePlayer; import FunAndElse.Fullbright; import FunAndElse.PlayerStats; @@ -25,6 +26,7 @@ public final class Pixelcampusessentials extends JavaPlugin { getServer().getPluginManager().registerEvents(new Timber(),this); getServer().getPluginManager().registerEvents(new SpeedLadder(),this); getServer().getPluginManager().registerEvents(new FreezePlayer(),this); + getServer().getPluginManager().registerEvents(new CropHarvester(),this); try { getCommand("plot").setExecutor(new Plots()); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 5f5e29c5a9db8b291a792f4e088fa37d84ac4923..14ea60aadd58e5edce4c3910a1dd4e3b45e6d0e5 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -26,6 +26,6 @@ permissions: pixelcampusessentials.ladder: description: speed ladder default: op - pixelcampusessentials.admin: - description: commands only admins can enter + pixelcampusessentials.chop: + description: Timber default: op