feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Update for 1.12 (#694)

Browse Source
This commit is contained in:
Niklas
2017-06-10 00:27:28 +02:00
committed by md-5
parent 207c66809f
commit 80de6eb383
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>de.diddiz</groupId> <groupId>de.diddiz</groupId>
<artifactId>logblock</artifactId> <artifactId>logblock</artifactId>
<version>1.11-SNAPSHOT</version> <version>1.12-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>LogBlock</name> <name>LogBlock</name>
@ -42,7 +42,7 @@
<dependency> <dependency>
<groupId>org.bukkit</groupId> <groupId>org.bukkit</groupId>
<artifactId>bukkit</artifactId> <artifactId>bukkit</artifactId>
<version>1.11-R0.1-SNAPSHOT</version> <version>1.12-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

1
src/main/java/de/diddiz/util/BukkitUtils.java
View File

@ -95,6 +95,7 @@ public class BukkitUtils {
relativeTopFallables.add(Material.GRAVEL); relativeTopFallables.add(Material.GRAVEL);
relativeTopFallables.add(Material.DRAGON_EGG); relativeTopFallables.add(Material.DRAGON_EGG);
relativeTopFallables.add(Material.ANVIL); relativeTopFallables.add(Material.ANVIL);
relativeTopFallables.add(Material.CONCRETE_POWDER);
// Blocks that break falling entities // Blocks that break falling entities
fallingEntityKillers = new HashSet<Material>(32); fallingEntityKillers = new HashSet<Material>(32);

6
src/main/java/de/diddiz/util/MaterialName.java
View File

@ -178,10 +178,12 @@ public class MaterialName {
for (byte i = 0; i < 16; i++) { for (byte i = 0; i < 16; i++) {
cfg.set("351." + i, toReadable(Material.INK_SACK.getNewData(i))); cfg.set("351." + i, toReadable(Material.INK_SACK.getNewData(i)));
cfg.set("35." + i, COLORS[i] + " wool"); cfg.set("35." + i, COLORS[i] + " wool");
cfg.set("159." + i, COLORS[i] + " stained clay"); cfg.set("159." + i, COLORS[i] + " stained terracotta");
cfg.set("95." + i, COLORS[i] + " stained glass"); cfg.set("95." + i, COLORS[i] + " stained glass");
cfg.set("160." + i, COLORS[i] + " stained glass pane"); cfg.set("160." + i, COLORS[i] + " stained glass pane");
cfg.set("171." + i, COLORS[i] + " carpet"); cfg.set("171." + i, COLORS[i] + " carpet");
cfg.set("251." + i, COLORS[i] + " concrete");
cfg.set("252." + i, COLORS[i] + " concrete powder");
} }
for (byte i = 0; i < 6; i++) { for (byte i = 0; i < 6; i++) {
cfg.set("125." + i, toReadable(Material.WOOD_DOUBLE_STEP.getNewData(i))); cfg.set("125." + i, toReadable(Material.WOOD_DOUBLE_STEP.getNewData(i)));
@ -194,7 +196,7 @@ public class MaterialName {
getLogger().log(Level.WARNING, "Unable to save material.yml: ", ex); getLogger().log(Level.WARNING, "Unable to save material.yml: ", ex);
} }
} }
if (cfg.getString("263.1") == null) { if (cfg.getString("252.1") == null) {
getLogger().info("[Logblock-names] Logblock's default materials.yml file has been updated with more names"); getLogger().info("[Logblock-names] Logblock's default materials.yml file has been updated with more names");
getLogger().info("[Logblock-names] Consider deleting your current materials.yml file to allow it to be recreated"); getLogger().info("[Logblock-names] Consider deleting your current materials.yml file to allow it to be recreated");
} }