Upstream/Brewery
1
0
Fork 1
mirror of https://github.com/DieReicheErethons/Brewery.git synced 2025-01-24 21:31:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add 1.16 Item Definitions. Soul Fire etc.

Browse Source
This commit is contained in:
Sn0wStorm 2020-10-31 14:05:33 +01:00
parent 1aae3340a3
commit 7c3d231b34
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -211,7 +211,7 @@
<dependency> <dependency>
<groupId>com.github.TheBusyBiscuit</groupId> <groupId>com.github.TheBusyBiscuit</groupId>
<artifactId>Slimefun4</artifactId> <artifactId>Slimefun4</artifactId>
<version>156683f318</version> <version>RC-17</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--<dependency> <!--<dependency>

7
src/com/dre/brewery/utility/LegacyUtil.java
View File

@ -61,6 +61,8 @@ public class LegacyUtil {
public static final Material MAGMA_BLOCK = get("MAGMA_BLOCK", "MAGMA"); public static final Material MAGMA_BLOCK = get("MAGMA_BLOCK", "MAGMA");
public static final Material CAMPFIRE = get("CAMPFIRE"); public static final Material CAMPFIRE = get("CAMPFIRE");
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 CLOCK = get("CLOCK", "WATCH");
public static final Material OAK_STAIRS = get("OAK_STAIRS", "WOOD_STAIRS"); 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 SPRUCE_STAIRS = get("SPRUCE_STAIRS", "SPRUCE_WOOD_STAIRS");
@ -111,7 +113,7 @@ public class LegacyUtil {
public static boolean isFireForCauldron(Block block) { public static boolean isFireForCauldron(Block block) {
Material type = block.getType(); Material type = block.getType();
return type != null && (type == Material.FIRE || type == MAGMA_BLOCK || litCampfire(block) || isLava(type)); return type != null && (type == Material.FIRE || type == SOUL_FIRE || type == MAGMA_BLOCK || litCampfire(block) || isLava(type));
} }
// LAVA and STATIONARY_LAVA are merged as of 1.13 // LAVA and STATIONARY_LAVA are merged as of 1.13
@ -120,7 +122,7 @@ public class LegacyUtil {
} }
public static boolean litCampfire(Block block) { public static boolean litCampfire(Block block) {
if (block.getType() == CAMPFIRE) { if (block.getType() == CAMPFIRE || block.getType() == SOUL_CAMPFIRE) {
BlockData data = block.getBlockData(); BlockData data = block.getBlockData();
if (data instanceof org.bukkit.block.data.Lightable) { if (data instanceof org.bukkit.block.data.Lightable) {
return ((org.bukkit.block.data.Lightable) data).isLit(); return ((org.bukkit.block.data.Lightable) data).isLit();
@ -135,6 +137,7 @@ public class LegacyUtil {
if (type == Material.LINGERING_POTION || type == Material.SPLASH_POTION) return true; if (type == Material.LINGERING_POTION || type == Material.SPLASH_POTION) return true;
if (!P.use1_13) return false; if (!P.use1_13) return false;
if (type == Material.EXPERIENCE_BOTTLE) return true; if (type == Material.EXPERIENCE_BOTTLE) return true;
if (type.name().equals("DRAGON_BREATH")) return true;
return type.name().equals("HONEY_BOTTLE"); return type.name().equals("HONEY_BOTTLE");
} }