Skip to content

Commit

Permalink
Make MaterialConverter type safe
Browse files Browse the repository at this point in the history
  • Loading branch information
@Brokkonaut
Brokkonaut committed Jul 20, 2020
1 parent a63c97b commit 5c22beb
Show file tree
Hide file tree
Showing 5 changed files with 33 additions and 33 deletions.
14 changes: 6 additions & 8 deletions src/main/java/de/diddiz/LogBlock/Consumer.java
View file
Expand Up @@ -230,7 +230,7 @@ public void queueChestAccess(Actor actor, BlockState container, ItemStack itemSt
* true if the item was removed
*/
public void queueChestAccess(Actor actor, Location loc, BlockData type, ItemStack itemStack, boolean remove) {
queueBlock(actor, loc, type, type, null, null, new ChestAccess(itemStack, remove, MaterialConverter.getOrAddMaterialId(itemStack.getType().getKey())));
queueBlock(actor, loc, type, type, null, null, new ChestAccess(itemStack, remove, MaterialConverter.getOrAddMaterialId(itemStack.getType())));
}

/**
Expand Down Expand Up @@ -327,7 +327,7 @@ public void queueKill(Location location, Actor killer, Actor victim, ItemStack w
if (victim == null || !isLogged(location.getWorld())) {
return;
}
addQueueLast(new KillRow(location, killer == null ? null : killer, victim, weapon == null ? 0 : MaterialConverter.getOrAddMaterialId(weapon.getType().getKey().toString())));
addQueueLast(new KillRow(location, killer == null ? null : killer, victim, weapon == null ? 0 : MaterialConverter.getOrAddMaterialId(weapon.getType())));
}

/**
Expand Down Expand Up @@ -718,12 +718,10 @@ private void queueBlock(Actor actor, Location loc, BlockData typeBefore, BlockDa
return;
}

String replacedString = typeBefore.getAsString();
int replacedMaterialId = MaterialConverter.getOrAddMaterialId(replacedString);
int replacedStateId = MaterialConverter.getOrAddBlockStateId(replacedString);
String typeString = typeAfter.getAsString();
int typeMaterialId = MaterialConverter.getOrAddMaterialId(typeString);
int typeStateId = MaterialConverter.getOrAddBlockStateId(typeString);
int replacedMaterialId = MaterialConverter.getOrAddMaterialId(typeBefore);
int replacedStateId = MaterialConverter.getOrAddBlockStateId(typeBefore);
int typeMaterialId = MaterialConverter.getOrAddMaterialId(typeAfter);
int typeStateId = MaterialConverter.getOrAddBlockStateId(typeAfter);

addQueueLast(new BlockRow(loc, actor, replacedMaterialId, replacedStateId, Utils.serializeYamlConfiguration(stateBefore), typeMaterialId, typeStateId, Utils.serializeYamlConfiguration(stateAfter), ca));
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/de/diddiz/LogBlock/LogBlock.java
View file
Expand Up @@ -91,7 +91,7 @@ public void onEnable() {
Updater updater = new Updater(this);
updater.checkTables();
MaterialConverter.initializeMaterials(getConnection());
MaterialConverter.getOrAddMaterialId(Material.AIR.getKey()); // AIR must be the first entry
MaterialConverter.getOrAddMaterialId(Material.AIR); // AIR must be the first entry
EntityTypeConverter.initializeEntityTypes(getConnection());
if (updater.update()) {
load(this);
Expand Down
20 changes: 11 additions & 9 deletions src/main/java/de/diddiz/LogBlock/MaterialConverter.java
View file
Expand Up @@ -11,7 +11,6 @@

import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.NamespacedKey;
import org.bukkit.block.data.BlockData;

public class MaterialConverter {
Expand All @@ -31,16 +30,15 @@ public class MaterialConverter {
}
}

public static int getOrAddMaterialId(NamespacedKey nameSpaceKey) {
return getOrAddMaterialId(nameSpaceKey.toString());
public static int getOrAddMaterialId(BlockData blockData) {
return getOrAddMaterialId(blockData == null ? Material.AIR : blockData.getMaterial());
}

public static int getOrAddMaterialId(String blockDataString) {
String materialString = blockDataString;
int dataPart = blockDataString.indexOf("[");
if (dataPart >= 0) {
materialString = blockDataString.substring(0, dataPart);
public static int getOrAddMaterialId(Material material) {
if (material == null) {
material = Material.AIR;
}
String materialString = material.getKey().toString();
Integer key = materialToID.get(materialString);
int tries = 0;
while (key == null && tries < 10) {
Expand Down Expand Up @@ -78,7 +76,11 @@ public static int getOrAddMaterialId(String blockDataString) {
return key.intValue();
}

public static int getOrAddBlockStateId(String blockDataString) {
public static int getOrAddBlockStateId(BlockData blockData) {
if (blockData == null) {
blockData = Material.AIR.createBlockData();
}
String blockDataString = blockData.getAsString();
int dataPart = blockDataString.indexOf("[");
if (dataPart < 0) {
return -1;
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/de/diddiz/LogBlock/QueryParams.java
View file
Expand Up @@ -756,7 +756,7 @@ public void parseArgs(CommandSender sender, List<String> args, boolean validate)
throw new IllegalArgumentException("No material matching: '" + weaponName + "'");
}
types.add(mat);
typeIds.add(MaterialConverter.getOrAddMaterialId(mat.getKey()));
typeIds.add(MaterialConverter.getOrAddMaterialId(mat));
}
needWeapon = true;
} else if (param.equals("block") || param.equals("type")) {
Expand All @@ -778,7 +778,7 @@ public void parseArgs(CommandSender sender, List<String> args, boolean validate)
}
}
for (Material mat : tag.getValues()) {
typeIds.add(MaterialConverter.getOrAddMaterialId(mat.getKey()));
typeIds.add(MaterialConverter.getOrAddMaterialId(mat));
}
typeTags.add(tag);
} else if (blockName.contains("*")) {
Expand Down Expand Up @@ -807,15 +807,15 @@ public void parseArgs(CommandSender sender, List<String> args, boolean validate)
}
for (Material mat : matched) {
types.add(mat);
typeIds.add(MaterialConverter.getOrAddMaterialId(mat.getKey()));
typeIds.add(MaterialConverter.getOrAddMaterialId(mat));
}
} else {
final Material mat = Material.matchMaterial(blockName);
if (mat == null) {
throw new IllegalArgumentException("No material matching: '" + blockName + "'");
}
types.add(mat);
typeIds.add(MaterialConverter.getOrAddMaterialId(mat.getKey()));
typeIds.add(MaterialConverter.getOrAddMaterialId(mat));
}
}
} else if (param.equals("area")) {
Expand Down
22 changes: 11 additions & 11 deletions src/main/java/de/diddiz/LogBlock/Updater.java
View file
Expand Up @@ -454,8 +454,8 @@ boolean update() {
}

try {
String replacedBlockData = materialUpdater.getBlockData(replaced, data).getAsString();
String setBlockData = materialUpdater.getBlockData(type, data).getAsString();
BlockData replacedBlockData = materialUpdater.getBlockData(replaced, data);
BlockData setBlockData = materialUpdater.getBlockData(type, data);

int newReplacedId = MaterialConverter.getOrAddMaterialId(replacedBlockData);
int newReplacedData = MaterialConverter.getOrAddBlockStateId(replacedBlockData);
Expand Down Expand Up @@ -536,7 +536,7 @@ boolean update() {
insertChestData.setInt(1, id);
insertChestData.setBytes(2, Utils.saveItemStack(stack));
insertChestData.setInt(3, amount >= 0 ? 0 : 1);
insertChestData.setInt(4, MaterialConverter.getOrAddMaterialId(weaponMaterial.getKey()));
insertChestData.setInt(4, MaterialConverter.getOrAddMaterialId(weaponMaterial));
insertChestData.addBatch();

deleteChest.setInt(1, id);
Expand Down Expand Up @@ -592,7 +592,7 @@ boolean update() {
if (weaponMaterial == null) {
weaponMaterial = Material.AIR;
}
int newWeapon = MaterialConverter.getOrAddMaterialId(weaponMaterial.getKey());
int newWeapon = MaterialConverter.getOrAddMaterialId(weaponMaterial);
if (newWeapon != weapon) {
anyUpdate = true;
updateWeaponStatement.setInt(1, newWeapon);
Expand Down Expand Up @@ -860,19 +860,19 @@ private void updateMaterialsPost1_13() {

if (comparablePreviousMinecraftVersion.compareTo("1.14") < 0 && comparableCurrentMinecraftVersion.compareTo("1.14") >= 0) {
logblock.getLogger().info("[Updater] Upgrading Materials to 1.14");
renameMaterial("minecraft:sign", "minecraft:oak_sign");
renameMaterial("minecraft:wall_sign", "minecraft:oak_wall_sign");
renameMaterial("minecraft:stone_slab", "minecraft:smooth_stone_slab");
renameMaterial("minecraft:rose_red", "minecraft:red_dye");
renameMaterial("minecraft:dandelion_yellow", "minecraft:yellow_dye");
renameMaterial("minecraft:cactus_green", "minecraft:green_dye");
renameMaterial("minecraft:sign", Material.OAK_SIGN);
renameMaterial("minecraft:wall_sign", Material.OAK_WALL_SIGN);
renameMaterial("minecraft:stone_slab", Material.SMOOTH_STONE_SLAB);
renameMaterial("minecraft:rose_red", Material.RED_DYE);
renameMaterial("minecraft:dandelion_yellow", Material.YELLOW_DYE);
renameMaterial("minecraft:cactus_green", Material.GREEN_DYE);
}

config.set("previousMinecraftVersion", currentMinecraftVersion);
logblock.saveConfig();
}

private void renameMaterial(String oldName, String newName) {
private void renameMaterial(String oldName, Material newName) {
final Connection conn = logblock.getConnection();
try {
conn.setAutoCommit(false);
Expand Down

0 comments on commit 5c22beb

Please sign in to comment.