exituser/Brewery
1
0
Fork 0
mirror of https://github.com/exituser/Brewery.git synced 2026-09-17 08:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

1.16 Wood types for Barrels #330

Browse Source
This commit is contained in:
Sn0wStorm
2020-11-08 15:53:14 +01:00
parent 3fa16414d0
commit e28cd72af9
12 changed files with 60 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/dre/brewery/Barrel.java
+2 -1
View File
@@ -405,12 +405,13 @@ public class Barrel implements InventoryHolder {
}
}
if (event.willDropItems()) {
byte wood = body.getWood();
for (ItemStack item : items) {
if (item != null) {
Brew brew = Brew.get(item);
if (brew != null) {
// Brew before throwing
brew.age(item, time, body.getWood());
brew.age(item, time, wood);
PotionMeta meta = (PotionMeta) item.getItemMeta();
if (BrewLore.hasColorLore(meta)) {
BrewLore lore = new BrewLore(brew, meta);
src/com/dre/brewery/utility/LegacyUtil.java
+48 -31
View File
@@ -50,6 +50,25 @@ public class LegacyUtil {
}
PLANKS = planks;
Set<Material> woodStairs = EnumSet.noneOf(Material.class);
Material[] gotStairs = {
get("OAK_STAIRS", "WOOD_STAIRS"),
get("SPRUCE_STAIRS", "SPRUCE_WOOD_STAIRS"),
get("BIRCH_STAIRS", "BIRCH_WOOD_STAIRS"),
get("JUNGLE_STAIRS", "JUNGLE_WOOD_STAIRS"),
get("ACACIA_STAIRS"),
get("DARK_OAK_STAIRS"),
get("CRIMSON_STAIRS"),
get("WARPED_STAIRS"),
};
for (Material stair : gotStairs) {
if (stair != null) {
woodStairs.add(stair);
}
}
WOOD_STAIRS = woodStairs;
Set<Material> fences = EnumSet.noneOf(Material.class);
for (Material m : Material.values()) {
if (m.name().endsWith("FENCE")) {
@@ -64,13 +83,8 @@ public class LegacyUtil {
public static final Material SOUL_CAMPFIRE = get("SOUL_CAMPFIRE");
public static final Material SOUL_FIRE = get("SOUL_FIRE");
public static final Material CLOCK = get("CLOCK", "WATCH");
public static final Material OAK_STAIRS = get("OAK_STAIRS", "WOOD_STAIRS");
public static final Material SPRUCE_STAIRS = get("SPRUCE_STAIRS", "SPRUCE_WOOD_STAIRS");
public static final Material BIRCH_STAIRS = get("BIRCH_STAIRS", "BIRCH_WOOD_STAIRS");
public static final Material JUNGLE_STAIRS = get("JUNGLE_STAIRS", "JUNGLE_WOOD_STAIRS");
public static final Material ACACIA_STAIRS = get("ACACIA_STAIRS");
public static final Material DARK_OAK_STAIRS = get("DARK_OAK_STAIRS");
public static final Set<Material> PLANKS;
public static final Set<Material> WOOD_STAIRS;
public static final Set<Material> FENCES;
// Materials removed in 1.13
@@ -99,8 +113,7 @@ public class LegacyUtil {
}
public static boolean isWoodStairs(Material type) {
return type == OAK_STAIRS || type == SPRUCE_STAIRS || type == BIRCH_STAIRS || type == JUNGLE_STAIRS
|| (type == ACACIA_STAIRS && ACACIA_STAIRS != null) || (type == DARK_OAK_STAIRS && DARK_OAK_STAIRS != null);
return WOOD_STAIRS.contains(type);
}
public static boolean isFence(Material type) {
@@ -153,22 +166,25 @@ public class LegacyUtil {
}
public static byte getWoodType(Block wood) throws NoSuchFieldError, NoClassDefFoundError {
TreeSpecies woodType;
if (P.use1_13 || isWoodStairs(wood.getType())) {
String material = wood.getType().name();
if (material.startsWith("OAK")) {
woodType = TreeSpecies.GENERIC;
return 2;
} else if (material.startsWith("SPRUCE")) {
woodType = TreeSpecies.REDWOOD;
return 4;
} else if (material.startsWith("BIRCH")) {
woodType = TreeSpecies.BIRCH;
return 1;
} else if (material.startsWith("JUNGLE")) {
woodType = TreeSpecies.JUNGLE;
return 3;
} else if (material.startsWith("ACACIA")) {
woodType = TreeSpecies.ACACIA;
return 5;
} else if (material.startsWith("DARK_OAK")) {
woodType = TreeSpecies.DARK_OAK;
return 6;
} else if (material.startsWith("CRIMSON")) {
return 7;
} else if (material.startsWith("WARPED")) {
return 8;
} else {
return 0;
}
@@ -176,6 +192,7 @@ public class LegacyUtil {
} else {
@SuppressWarnings("deprecation")
MaterialData data = wood.getState().getData();
TreeSpecies woodType;
if (data instanceof Tree) {
woodType = ((Tree) data).getSpecies();
} else if (data instanceof Wood) {
@@ -183,23 +200,23 @@ public class LegacyUtil {
} else {
return 0;
}
}
switch (woodType) {
case GENERIC:
return 2;
case REDWOOD:
return 4;
case BIRCH:
return 1;
case JUNGLE:
return 3;
case ACACIA:
return 5;
case DARK_OAK:
return 6;
default:
return 0;
switch (woodType) {
case GENERIC:
return 2;
case REDWOOD:
return 4;
case BIRCH:
return 1;
case JUNGLE:
return 3;
case ACACIA:
return 5;
case DARK_OAK:
return 6;
default:
return 0;
}
}
}