Upstream/Jobs
1
0
Fork 0
mirror of https://github.com/Zrips/Jobs.git synced 2024-11-29 22:13:25 +01:00
Code Issues Projects Releases Wiki Activity

Fixing name translation and material recognition in some particular

Browse Source 
situations
This commit is contained in:
Zrips 2020-02-15 18:33:18 +02:00
parent c38fe742b4
commit d9791c51fa
4 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/gamingmesh/jobs/CMILib/CMIMaterial.java
View File

@ -10,6 +10,7 @@ import org.bukkit.block.Block;
import org.bukkit.block.Skull; import org.bukkit.block.Skull;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import com.gamingmesh.jobs.Jobs;
import com.gamingmesh.jobs.CMILib.ItemManager.SlabType; import com.gamingmesh.jobs.CMILib.ItemManager.SlabType;
import com.gamingmesh.jobs.CMILib.VersionChecker.Version; import com.gamingmesh.jobs.CMILib.VersionChecker.Version;
import com.gamingmesh.jobs.stuff.Debug; import com.gamingmesh.jobs.stuff.Debug;
@ -1059,7 +1060,7 @@ public enum CMIMaterial {
LEGACY_DIODE_BLOCK_OFF(93, 0, null, "Diode Block Off"), LEGACY_DIODE_BLOCK_OFF(93, 0, null, "Diode Block Off"),
LEGACY_DIODE_BLOCK_ON(94, 0, null, "Diode Block On"), LEGACY_DIODE_BLOCK_ON(94, 0, null, "Diode Block On"),
LEGACY_BREWING_STAND(117, null, null, "LEGACY_BREWING_STAND"), LEGACY_BREWING_STAND(117, null, null, "LEGACY_BREWING_STAND"),
// LEGACY_CAULDRON(118, 0, null, "LEGACY_CAULDRON", ""), // LEGACY_CAULDRON(118, 0, null, "LEGACY_CAULDRON", ""),
// LEGACY_REDSTONE_LAMP_ON(124, null, null, "LEGACY_REDSTONE_LAMP_ON", ""), // LEGACY_REDSTONE_LAMP_ON(124, null, null, "LEGACY_REDSTONE_LAMP_ON", ""),
// LEGACY_WOOD_DOUBLE_STEP(125, null, null, "LEGACY_WOOD_DOUBLE_STEP", ""), // LEGACY_WOOD_DOUBLE_STEP(125, null, null, "LEGACY_WOOD_DOUBLE_STEP", ""),
@ -1288,6 +1289,8 @@ public enum CMIMaterial {
try { try {
ids = Integer.parseInt(id.split(":")[0]); ids = Integer.parseInt(id.split(":")[0]);
data = Integer.parseInt(id.split(":")[1]); data = Integer.parseInt(id.split(":")[1]);
if (ids <= 0)
return CMIMaterial.NONE;
return get(ids, data); return get(ids, data);
} catch (Exception ex) { } catch (Exception ex) {
} }
@ -1300,7 +1303,7 @@ public enum CMIMaterial {
return mat; return mat;
} }
CMIMaterial mat1 = ItemManager.byName.get(id); CMIMaterial mat1 = ItemManager.byName.get(id);
if (mat1 != null) { if (mat1 != null && mat1.getLegacyId() > 0) {
mat = get(mat1.getLegacyId(), data); mat = get(mat1.getLegacyId(), data);
if (mat != null) { if (mat != null) {
return mat; return mat;

1
src/main/java/com/gamingmesh/jobs/commands/JobsCommands.java
View File

@ -24,6 +24,7 @@ import com.gamingmesh.jobs.container.JobInfo;
import com.gamingmesh.jobs.container.JobProgression; import com.gamingmesh.jobs.container.JobProgression;
import com.gamingmesh.jobs.container.JobsPlayer; import com.gamingmesh.jobs.container.JobsPlayer;
import com.gamingmesh.jobs.container.Title; import com.gamingmesh.jobs.container.Title;
import com.gamingmesh.jobs.stuff.Debug;
import com.gamingmesh.jobs.stuff.PageInfo; import com.gamingmesh.jobs.stuff.PageInfo;
import com.gamingmesh.jobs.stuff.Sorting; import com.gamingmesh.jobs.stuff.Sorting;
import com.gamingmesh.jobs.stuff.Util; import com.gamingmesh.jobs.stuff.Util;

1
src/main/java/com/gamingmesh/jobs/config/ConfigManager.java
View File

@ -1161,6 +1161,7 @@ public class ConfigManager {
} }
} }
} }
break; break;
default: default:
break; break;

7
src/main/java/com/gamingmesh/jobs/config/NameTranslatorManager.java
View File

@ -51,12 +51,13 @@ public class NameTranslatorManager {
case BREW: case BREW:
case FISH: case FISH:
case STRIPLOGS: case STRIPLOGS:
materialName = materialName.replace(" ", "");
CMIMaterial mat = CMIMaterial.get(materialName); CMIMaterial mat = CMIMaterial.get(materialName.replace(" ", ""));
NameList nameLs = ListOfNames.get(mat); NameList nameLs = ListOfNames.get(mat);
if (nameLs == null) { if (nameLs == null) {
return mat.getName(); return mat.getName();
} }
if (meta != null && !meta.isEmpty()) { if (meta != null && !meta.isEmpty()) {
mat = CMIMaterial.get(materialName + ":" + meta); mat = CMIMaterial.get(materialName + ":" + meta);
@ -66,7 +67,7 @@ public class NameTranslatorManager {
} }
} }
if (id != null && meta != null && !meta.isEmpty()) { if (id != null && id > 0 && meta != null && !meta.isEmpty()) {
mat = CMIMaterial.get(id + ":" + meta); mat = CMIMaterial.get(id + ":" + meta);
nameLs = ListOfNames.get(mat); nameLs = ListOfNames.get(mat);
if (nameLs == null) { if (nameLs == null) {