Skip to content

Commit

Permalink
Added item mapping for torchflower seeds
Browse files Browse the repository at this point in the history
  • Loading branch information
Intelli committed Jul 12, 2023
1 parent b046992 commit d414db1
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 16 deletions.
21 changes: 21 additions & 0 deletions src/main/java/net/coreprotect/bukkit/BukkitAdapter.java
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,25 @@ public int getColor(Sign sign, boolean isFront) {
return 0;
}

@Override
public Material getPlantSeeds(Material material) {
switch (material) {
case WHEAT:
material = Material.WHEAT_SEEDS;
break;
case PUMPKIN_STEM:
material = Material.PUMPKIN_SEEDS;
break;
case MELON_STEM:
material = Material.MELON_SEEDS;
break;
case BEETROOTS:
material = Material.BEETROOT_SEEDS;
break;
default:
}

return material;
}

}
2 changes: 2 additions & 0 deletions src/main/java/net/coreprotect/bukkit/BukkitInterface.java
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,6 @@ public interface BukkitInterface {

public int getColor(Sign sign, boolean isFront);

public Material getPlantSeeds(Material material);

}
24 changes: 24 additions & 0 deletions src/main/java/net/coreprotect/bukkit/Bukkit_v1_20.java
Original file line number Diff line number Diff line change
Expand Up @@ -68,4 +68,28 @@ public boolean isWaxed(Sign sign) {
return sign.isWaxed();
}

@Override
public Material getPlantSeeds(Material material) {
switch (material) {
case WHEAT:
material = Material.WHEAT_SEEDS;
break;
case PUMPKIN_STEM:
material = Material.PUMPKIN_SEEDS;
break;
case MELON_STEM:
material = Material.MELON_SEEDS;
break;
case BEETROOTS:
material = Material.BEETROOT_SEEDS;
break;
case TORCHFLOWER_CROP:
material = Material.TORCHFLOWER_SEEDS;
break;
default:
}

return material;
}

}
17 changes: 1 addition & 16 deletions src/main/java/net/coreprotect/utility/Util.java
Original file line number Diff line number Diff line change
Expand Up @@ -1207,22 +1207,7 @@ public static Material itemFilter(Material material, boolean blockTable) {
return material;
}

switch (material) {
case WHEAT:
material = Material.WHEAT_SEEDS;
break;
case PUMPKIN_STEM:
material = Material.PUMPKIN_SEEDS;
break;
case MELON_STEM:
material = Material.MELON_SEEDS;
break;
case BEETROOTS:
material = Material.BEETROOT_SEEDS;
break;
default:
}

material = BukkitAdapter.ADAPTER.getPlantSeeds(material);
if (material.name().contains("WALL_")) {
material = Material.valueOf(material.name().replace("WALL_", ""));
}
Expand Down

0 comments on commit d414db1

Please sign in to comment.