Skip to content

Commit

Permalink
Changeable AdaptBlock
Browse files Browse the repository at this point in the history
  • Loading branch information
NextdoorPsycho committed Sep 4, 2022
1 parent ff435c4 commit c5c6a75
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions src/main/java/com/volmit/adapt/AdaptConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public class AdaptConfig {
private double playerXpPerSkillLevelUpLevelMultiplier = 44;
private double powerPerLevel = 0.73;
public boolean debug = false;
public String adaptActivatorBlock = "BOOKSHELF";

@Getter
public static class ValueConfig {
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/volmit/adapt/api/skill/SkillRegistry.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

package com.volmit.adapt.api.skill;

import com.volmit.adapt.Adapt;
import com.volmit.adapt.AdaptConfig;
import com.volmit.adapt.api.recipe.AdaptRecipe;
import com.volmit.adapt.api.tick.TickedObject;
import com.volmit.adapt.api.world.AdaptPlayer;
Expand Down Expand Up @@ -88,7 +90,7 @@ public void on(PlayerExpChangeEvent e) {
@EventHandler(priority = EventPriority.MONITOR)
public void on(PlayerInteractEvent e) {
if(!e.getBlockFace().equals(BlockFace.UP) && !e.getBlockFace().equals(BlockFace.DOWN) && !e.getPlayer().isSneaking() && e.getAction().equals(Action.RIGHT_CLICK_BLOCK)
&& e.getClickedBlock().getType().equals(Material.BOOKSHELF) && (e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.AIR)
&& e.getClickedBlock().getType().equals(Material.valueOf(AdaptConfig.get().adaptActivatorBlock)) && (e.getPlayer().getInventory().getItemInMainHand().getType().equals(Material.AIR)
|| !e.getPlayer().getInventory().getItemInMainHand().getType().isBlock()) &&
(e.getPlayer().getInventory().getItemInOffHand().getType().equals(Material.AIR) || !e.getPlayer().getInventory().getItemInOffHand().getType().isBlock())) {
e.getClickedBlock().getWorld().playSound(e.getClickedBlock().getLocation(), Sound.ITEM_BOOK_PAGE_TURN, 1.1f, 0.72f);
Expand Down

0 comments on commit c5c6a75

Please sign in to comment.