Compare commits

..

2 Commits

Author SHA1 Message Date
Tobias Ottenweller
d5d079bfcf Merge pull request #39 from craftinc/bugfix/serialization
fixed broken location/exit serialization of gates.
2017-01-01 19:19:13 +01:00
Tobias Ottenweller
f20882e03a Merge pull request #38 from craftinc/feature/command_cleanup
Command cleanup
2017-01-01 15:29:44 +01:00

View File

@ -33,7 +33,7 @@ public class GateMaterial {
case "grass": case "grass":
material = Material.LONG_GRASS; material = Material.LONG_GRASS;
break; break;
case "dead-bush": case "dead bush":
material = Material.DEAD_BUSH; material = Material.DEAD_BUSH;
break; break;
case "dandelion": case "dandelion":
@ -42,49 +42,46 @@ public class GateMaterial {
case "poppy": case "poppy":
material = Material.RED_ROSE; material = Material.RED_ROSE;
break; break;
case "brown-mushroom": case "brown mushroom":
material = Material.BROWN_MUSHROOM; material = Material.BROWN_MUSHROOM;
break; break;
case "red-mushroom": case "red mushroom":
material = Material.RED_MUSHROOM; material = Material.RED_MUSHROOM;
break; break;
case "torch": case "torch":
material = Material.TORCH; material = Material.TORCH;
break; break;
case "redstone-torch-off": case "redstone torch (off)":
material = Material.REDSTONE_TORCH_OFF; material = Material.REDSTONE_TORCH_OFF;
break; break;
case "redstone-torch-on": case "redstone torch (on)":
material = Material.REDSTONE_TORCH_ON; material = Material.REDSTONE_TORCH_ON;
break; break;
case "fence": case "fence":
material = Material.FENCE; material = Material.FENCE;
break; break;
case "nether-portal":
material = Material.PORTAL;
break;
case "nether portal": case "nether portal":
material = Material.PORTAL; material = Material.PORTAL;
break; break;
case "iron-bars": case "iron bars":
material = Material.IRON_FENCE; material = Material.IRON_FENCE;
break; break;
case "glass-pane": case "glass pane":
material = Material.THIN_GLASS; material = Material.THIN_GLASS;
break; break;
case "fence-gate": case "fence gate":
material = Material.FENCE_GATE; material = Material.FENCE_GATE;
break; break;
case "nether-brick-fence": case "nether brick fence":
material = Material.NETHER_FENCE; material = Material.NETHER_FENCE;
break; break;
case "nether-wart": case "nether wart":
material = Material.NETHER_WARTS; material = Material.NETHER_WARTS;
break; break;
case "end-portal": case "end portal":
material = Material.ENDER_PORTAL; material = Material.ENDER_PORTAL;
break; break;
case "cobblestone-wall": case "cobblestone wall":
material = Material.COBBLE_WALL; material = Material.COBBLE_WALL;
break; break;
default: default:
@ -110,41 +107,41 @@ public class GateMaterial {
case LONG_GRASS: case LONG_GRASS:
return "grass"; return "grass";
case DEAD_BUSH: case DEAD_BUSH:
return "dead-bush"; return "dead bush";
case YELLOW_FLOWER: case YELLOW_FLOWER:
return "dandelion"; return "dandelion";
case RED_ROSE: case RED_ROSE:
return "poppy"; return "poppy";
case BROWN_MUSHROOM: case BROWN_MUSHROOM:
return "brown-mushroom"; return "brown mushroom";
case RED_MUSHROOM: case RED_MUSHROOM:
return "red-mushroom"; return "red mushroom";
case TORCH: case TORCH:
return "torch"; return "torch";
case REDSTONE_TORCH_OFF: case REDSTONE_TORCH_OFF:
return "redstone-torch-off"; return "redstone torch (off)";
case REDSTONE_TORCH_ON: case REDSTONE_TORCH_ON:
return "redstone-torch-on"; return "redstone torch (on)";
case FENCE: case FENCE:
return "fence"; return "fence";
case PORTAL: case PORTAL:
return "nether-portal"; return "nether portal";
case IRON_FENCE: case IRON_FENCE:
return "iron-bars"; return "iron bars";
case THIN_GLASS: case THIN_GLASS:
return "glass-pane"; return "glass pane";
case FENCE_GATE: case FENCE_GATE:
return "fence-gate"; return "fence gate";
case NETHER_FENCE: case NETHER_FENCE:
return "nether-brick-fence"; return "nether brick fence";
case NETHER_WARTS: case NETHER_WARTS:
return "nether-wart"; return "nether wart";
case ENDER_PORTAL: case ENDER_PORTAL:
return "end-portal"; return "end portal";
case COBBLE_WALL: case COBBLE_WALL:
return "cobblestone-wall"; return "cobblestone wall";
default: default:
return "nether-portal"; return "nether portal";
} }
} }