Skip to content
This repository was archived by the owner on Jul 7, 2023. It is now read-only.

Commit 855d872

Browse files
prosavageprosavage
committed
All multiversion materials from conf now work.
1 parent 075264b commit 855d872

File tree

2 files changed

+42
-32
lines changed

2 files changed

+42
-32
lines changed

‎src/main/java/com/massivecraft/factions/Conf.java

+19-18
Original file line numberDiff line numberDiff line change
@@ -345,53 +345,54 @@ public class Conf {
345345
territoryEnemyDenyCommands.add("tpa");
346346

347347

348-
//territoryProtectedMaterials.add(Material.LEGACY_WOODEN_DOOR);
349-
//territoryProtectedMaterials.add(Material.LEGACY_TRAP_DOOR);
350-
//territoryProtectedMaterials.add(Material.LEGACY_FENCE_GATE);
348+
349+
territoryProtectedMaterials.add(P.p.WOODEN_DOOR);
350+
territoryProtectedMaterials.add(P.p.TRAP_DOOR);
351+
territoryProtectedMaterials.add(P.p.FENCE_GATE);
351352
territoryProtectedMaterials.add(Material.DISPENSER);
352353
territoryProtectedMaterials.add(Material.CHEST);
353354
territoryProtectedMaterials.add(Material.FURNACE);
354-
//territoryProtectedMaterials.add(Material.LEGACY_BURNING_FURNACE);
355-
//territoryProtectedMaterials.add(Material.LEGACY_DIODE_BLOCK_OFF);
356-
//territoryProtectedMaterials.add(Material.LEGACY_DIODE_BLOCK_ON);
355+
territoryProtectedMaterials.add(P.p.BURNING_FURNACE);
356+
territoryProtectedMaterials.add(P.p.DIODE_BLOCK_OFF);
357+
territoryProtectedMaterials.add(P.p.DIODE_BLOCK_ON);
357358
territoryProtectedMaterials.add(Material.JUKEBOX);
358359
territoryProtectedMaterials.add(Material.BREWING_STAND);
359-
//territoryProtectedMaterials.add(Material.LEGACY_ENCHANTMENT_TABLE);
360+
territoryProtectedMaterials.add(P.p.ENCHANTMENT_TABLE);
360361
territoryProtectedMaterials.add(Material.CAULDRON);
361-
//territoryProtectedMaterials.add(Material.LEGACY_SOIL);
362+
territoryProtectedMaterials.add(P.p.ENCHANTMENT_TABLE);
362363
territoryProtectedMaterials.add(Material.BEACON);
363364
territoryProtectedMaterials.add(Material.ANVIL);
364365
territoryProtectedMaterials.add(Material.TRAPPED_CHEST);
365366
territoryProtectedMaterials.add(Material.DROPPER);
366367
territoryProtectedMaterials.add(Material.HOPPER);
367368

368-
//territoryDenyUseageMaterials.add(Material.LEGACY_FIREBALL);
369+
territoryDenyUseageMaterials.add(P.p.FIREBALL);
369370
territoryDenyUseageMaterials.add(Material.FLINT_AND_STEEL);
370371
territoryDenyUseageMaterials.add(Material.BUCKET);
371372
territoryDenyUseageMaterials.add(Material.WATER_BUCKET);
372373
territoryDenyUseageMaterials.add(Material.LAVA_BUCKET);
373374

374-
// territoryProtectedMaterialsWhenOffline.add(Material.LEGACY_WOODEN_DOOR);
375-
// territoryProtectedMaterialsWhenOffline.add(Material.LEGACY_TRAP_DOOR);
376-
//territoryProtectedMaterialsWhenOffline.add(Material.LEGACY_FENCE_GATE);
375+
territoryProtectedMaterialsWhenOffline.add(P.p.WOODEN_DOOR);
376+
territoryProtectedMaterialsWhenOffline.add(P.p.TRAP_DOOR);
377+
territoryProtectedMaterialsWhenOffline.add(P.p.FENCE_GATE);
377378
territoryProtectedMaterialsWhenOffline.add(Material.DISPENSER);
378379
territoryProtectedMaterialsWhenOffline.add(Material.CHEST);
379380
territoryProtectedMaterialsWhenOffline.add(Material.FURNACE);
380-
// territoryProtectedMaterialsWhenOffline.add(Material.LEGACY_BURNING_FURNACE);
381-
// territoryProtectedMaterialsWhenOffline.add(Material.LEGACY_DIODE_BLOCK_OFF);
382-
// territoryProtectedMaterialsWhenOffline.add(Material.LEGACY_DIODE_BLOCK_ON);
381+
territoryProtectedMaterialsWhenOffline.add(P.p.BURNING_FURNACE);
382+
territoryProtectedMaterialsWhenOffline.add(P.p.DIODE_BLOCK_OFF);
383+
territoryProtectedMaterialsWhenOffline.add(P.p.DIODE_BLOCK_OFF);
383384
territoryProtectedMaterialsWhenOffline.add(Material.JUKEBOX);
384385
territoryProtectedMaterialsWhenOffline.add(Material.BREWING_STAND);
385-
// territoryProtectedMaterialsWhenOffline.add(Material.LEGACY_ENCHANTMENT_TABLE);
386+
territoryProtectedMaterialsWhenOffline.add(P.p.ENCHANTMENT_TABLE);
386387
territoryProtectedMaterialsWhenOffline.add(Material.CAULDRON);
387-
// territoryProtectedMaterialsWhenOffline.add(Material.LEGACY_SOIL);
388+
territoryProtectedMaterialsWhenOffline.add(P.p.SOIL);
388389
territoryProtectedMaterialsWhenOffline.add(Material.BEACON);
389390
territoryProtectedMaterialsWhenOffline.add(Material.ANVIL);
390391
territoryProtectedMaterialsWhenOffline.add(Material.TRAPPED_CHEST);
391392
territoryProtectedMaterialsWhenOffline.add(Material.DROPPER);
392393
territoryProtectedMaterialsWhenOffline.add(Material.HOPPER);
393394

394-
// territoryDenyUseageMaterialsWhenOffline.add(Material.LEGACY_FIREBALL);
395+
territoryDenyUseageMaterialsWhenOffline.add(P.p.FIREBALL);
395396
territoryDenyUseageMaterialsWhenOffline.add(Material.FLINT_AND_STEEL);
396397
territoryDenyUseageMaterialsWhenOffline.add(Material.BUCKET);
397398
territoryDenyUseageMaterialsWhenOffline.add(Material.WATER_BUCKET);

‎src/main/java/com/massivecraft/factions/P.java

+23-14
Original file line numberDiff line numberDiff line change
@@ -212,20 +212,12 @@ public void onEnable() {
212212

213213

214214
//multiversion material fields
215-
public Material SUGAR_CANE_BLOCK;
216-
public Material BANNER;
217-
public Material CROPS;
218-
public Material REDSTONE_LAMP_ON;
219-
public Material STAINED_GLASS;
220-
public Material STATIONARY_WATER;
221-
public Material STAINED_CLAY;
222-
public Material WOOD_BUTTON;
223-
public Material SOIL;
224-
public Material MOB_SPANWER;
225-
public Material THIN_GLASS;
226-
public Material IRON_FENCE;
227-
public Material NETHER_FENCE;
228-
public Material FENCE;
215+
public Material SUGAR_CANE_BLOCK, BANNER, CROPS, REDSTONE_LAMP_ON,
216+
STAINED_GLASS, STATIONARY_WATER, STAINED_CLAY, WOOD_BUTTON,
217+
SOIL, MOB_SPANWER, THIN_GLASS, IRON_FENCE, NETHER_FENCE, FENCE,
218+
WOODEN_DOOR, TRAP_DOOR, FENCE_GATE, BURNING_FURNACE, DIODE_BLOCK_OFF,
219+
DIODE_BLOCK_ON, ENCHANTMENT_TABLE, FIREBALL;
220+
229221

230222
private void setupMultiversionMaterials() {
231223
if (mc113) {
@@ -243,6 +235,15 @@ private void setupMultiversionMaterials() {
243235
IRON_FENCE = Material.valueOf("LEGACY_IRON_FENCE");
244236
NETHER_FENCE = Material.valueOf("LEGACY_NETHER_FENCE");
245237
FENCE = Material.valueOf("LEGACY_FENCE");
238+
WOODEN_DOOR = Material.valueOf("LEGACY_WOODEN_DOOR");
239+
TRAP_DOOR = Material.valueOf("LEGACY_TRAP_DOOR");
240+
FENCE_GATE = Material.valueOf("LEGACY_FENCE_GATE");
241+
BURNING_FURNACE = Material.valueOf("LEGACY_BURNING_FURNACE");
242+
DIODE_BLOCK_OFF = Material.valueOf("LEGACY_DIODE_BLOCK_OFF");
243+
DIODE_BLOCK_ON = Material.valueOf("LEGACY_DIODE_BLOCK_ON");
244+
ENCHANTMENT_TABLE = Material.valueOf("LEGACY_ENCHANTMENT_TABLE");
245+
FIREBALL = Material.valueOf("LEGACY_FIREBALL");
246+
246247
} else {
247248
BANNER = Material.valueOf("BANNER");
248249
CROPS = Material.valueOf("CROPS");
@@ -258,6 +259,14 @@ private void setupMultiversionMaterials() {
258259
IRON_FENCE = Material.valueOf("IRON_FENCE");
259260
NETHER_FENCE = Material.valueOf("NETHER_FENCE");
260261
FENCE = Material.valueOf("FENCE");
262+
WOODEN_DOOR = Material.valueOf("WOODEN_DOOR");
263+
TRAP_DOOR = Material.valueOf("TRAP_DOOR");
264+
FENCE_GATE = Material.valueOf("FENCE_GATE");
265+
BURNING_FURNACE = Material.valueOf("BURNING_FURNACE");
266+
DIODE_BLOCK_OFF = Material.valueOf("DIODE_BLOCK_OFF");
267+
DIODE_BLOCK_ON = Material.valueOf("DIODE_BLOCK_ON");
268+
ENCHANTMENT_TABLE = Material.valueOf("ENCHANTMENT_TABLE");
269+
FIREBALL = Material.valueOf("FIREBALL");
261270
}
262271

263272

0 commit comments

Comments
 (0)