CivMC/Civ
1
0
Fork 0
mirror of https://github.com/CivMC/Civ.git synced 2026-07-18 00:20:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added ability to specify reinforcement and flash materials by number

Browse Source 
(not X123, just 123).
Damage values are not supported.

This is mostly for enabling items from mods to be used as reinforcement
materials, as those don't show up in the Materials enum.
This commit is contained in:
anovak
2012-09-06 02:04:22 -07:00
parent 74a5661be5
commit 7113a0de65
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/citadel-paper/src/com/untamedears/citadel/entity/ReinforcementMaterial.java
View File

@@ -37,18 +37,25 @@ public class ReinforcementMaterial implements Comparable<ReinforcementMaterial>
private int flasherMaterialId;
public ReinforcementMaterial(LinkedHashMap map) {
Material material = Material.getMaterial((String) map.get("name"));
if (material == null) {
throw new IllegalArgumentException("Supplied name value is not a valid material.");
// Materials may be specified by name or by integer value
Material material = Material.getMaterial(map.get("name").toString());
if (material != null) {
materialId = material.getId();
} else {
materialId = Integer.parseInt(map.get("name").toString()); // Non-existent (Forge) materials
}
materialId = material.getId();
strength = (Integer) map.get("strength");
requirements = (Integer) map.get("requirements");
material = Material.getMaterial((String) map.get("flasher"));
if (material == null || !material.isBlock()) {
throw new IllegalArgumentException("Supplied flasher value is not a valid block material.");
material = Material.getMaterial(map.get("flasher").toString());
if (material != null) {
if(!material.isBlock()) {
throw new IllegalArgumentException("Supplied flasher value is a non-block material.");
}
flasherMaterialId = material.getId();
} else {
flasherMaterialId = Integer.parseInt((map.get("flasher").toString()));
}
flasherMaterialId = material.getId();
}
public ReinforcementMaterial(int materialId, int strength, int requirements, int flasherMaterialId) {