Move Uberbukkit config entries from PoseidonConfig to UberbukkitConfig

src/main/java/com/legacyminecraft/poseidon/PoseidonConfig.java

@@ -169,72 +169,6 @@ private void write() {
         generateConfigOption("settings.check-username-validity.regex", "[a-zA-Z0-9_?]*");
         generateConfigOption("settings.check-username-validity.max-length", 16);
         generateConfigOption("settings.check-username-validity.min-length", 3);
-
-        generateConfigOption("settings.exempt-staff-from-flight-kick", false);
-
-        // Uberbukkit settings
-        generateConfigOption("version.worldgen.cocoabeans_loot", true);
-        generateConfigOption("version.worldgen.pre_b1_2_ore_generation", false);
-        generateConfigOption("version.worldgen.pre_b1_2_tree_generation", false);
-        generateConfigOption("version.worldgen.generate_sandstone", true);
-        generateConfigOption("version.worldgen.biomes.generate_spruces", true);
-        generateConfigOption("version.worldgen.biomes.generate_birches", true);
-        generateConfigOption("version.worldgen.generate_steveco_chests", false);
-        generateConfigOption("version.worldgen.generate_lapis_ores", true);
-        generateConfigOption("version.worldgen.generate_tallgrass", true);
-        generateConfigOption("version.worldgen.ores.world.custom_seed", false);
-        generateConfigOption("version.worldgen.ores.world.seed", 0L);
-
-        generateConfigOption("version.mechanics.tile_grass_drop_seeds", false);
-        generateConfigOption("version.mechanics.flammable_fences_stairs", true);
-        generateConfigOption("version.mechanics.glowstone_pre1_6_6", false);
-        generateConfigOption("version.mechanics.wool_recipe_pre1_6_6", false);
-        generateConfigOption("version.mechanics.allow_grow_tallgrass", true);
-        generateConfigOption("version.mechanics.allow_1_7_fence_placement", true);
-        generateConfigOption("version.mechanics.tnt_require_lighter", true);
-        generateConfigOption("version.mechanics.sheep_drop_wool_on_punch", false);
-        generateConfigOption("version.mechanics.mushroom_spread", true);
-        generateConfigOption("version.mechanics.ice_generate_only_when_snowing", false);
-        generateConfigOption("version.mechanics.pre_1_6_fire", false);
-        generateConfigOption("version.mechanics.nether_bed_explode", true);
-        generateConfigOption("version.mechanics.arrows_pickup_by_others", true);
-        generateConfigOption("version.mechanics.allow_minecart_boosters", false);
-        generateConfigOption("version.mechanics.spawn_squids", true);
-        generateConfigOption("version.mechanics.spawn_wolves", true);
-        generateConfigOption("version.mechanics.spawn_slimes", true);
-        generateConfigOption("version.mechanics.do_weather", true);
-        generateConfigOption("version.mechanics.allow_ladder_gap", false);
-        generateConfigOption("version.mechanics.old_slab_recipe", false);
-        generateConfigOption("version.mechanics.burning_pig_drop_cooked_meat", true);
-        generateConfigOption("version.mechanics.spawn_sheep_with_shades_of_black", true);
-        generateConfigOption("version.mechanics.spawn_brown_and_pink_sheep", true);
-        generateConfigOption("version.mechanics.drop_saplings_of_leaf_type", true);
-        generateConfigOption("version.mechanics.spiders_trample_crops", false);
-        generateConfigOption("version.mechanics.spiders_climb_walls", true);
-        generateConfigOption("version.mechanics.allow_blocks_at_y_127", false);
-        generateConfigOption("version.mechanics.drop_lapis_as_b1_2", false);
-        generateConfigOption("version.mechanics.allow_milking_squids", false);
-        generateConfigOption("version.mechanics.pre_b1_6_block_opacity", false);
-        generateConfigOption("version.mechanics.pre_b1_5_pumpkins", false);
-        generateConfigOption("version.mechanics.allow_bone_meal_on_grass", true);
-        generateConfigOption("version.mechanics.beds_pre_b1_6_5", false);
-        generateConfigOption("version.mechanics.pre_b1_5_block_placement_rules", false);
-        generateConfigOption("version.mechanics.trample_farmland_above_fence", false);
-        generateConfigOption("version.mechanics.seeds_replace_blocks", false);
-
-        generateConfigOption("version.mechanics.boats.drop_boat_not_wood", false);
-        generateConfigOption("version.mechanics.boats.break_boat_on_collision", true);
-
-        generateConfigOption("version.experimental.force_fix_chunk_coords_corruption", false);
-        generateConfigOption("version.allow_join.protocol", "14");
-        generateConfigOption("version.allow_join.info", "Specify client versions to accept (separated by commas - first PVN is treated as target PVN of the server)");
-        generateConfigOption("version.allow_join.pvns_of_versions", "6 - a1.2.3_05 to a1.2.6; 7 - b1.0 to b1.1_02; 8 - b1.2 to b1.2_02; 9 - b1.3(_01); 10 - b1.4(_01); 11 - b1.5(_01); 12 - b1.6_test_build_3; 13 - b1.6 to b1.6.6, 14 - b1.7 to b1.7.3");
-        generateConfigOption("version.mechanics.beds_set_spawnpoint", true);
-
-        generateConfigOption("fix.illegal-container-interaction.info", "Prevents interactions in a container if the player is farther away than the max distance.");
-        generateConfigOption("fix.illegal-container-interaction.max-distance", 4);
-        generateConfigOption("fix.illegal-container-interaction.log-violation", false);
-
         generateConfigOption("emergency.debug.regenerate-corrupt-chunks.enable", false);
         generateConfigOption("emergency.debug.regenerate-corrupt-chunks.info", "This setting allows you to automatically regenerate corrupt chunks. This is useful after a ungraceful shutdown while a file is being written to or out of memory exception.");
 

src/main/java/me/devcody/uberbukkit/nms/patch/IllegalContainerInteractionFix.java

@@ -1,14 +1,14 @@
 package me.devcody.uberbukkit.nms.patch;
 
-import com.legacyminecraft.poseidon.PoseidonConfig;
 import me.devcody.uberbukkit.util.math.Vec3i;
 import net.minecraft.server.EntityPlayer;
+import uk.betacraft.uberbukkit.UberbukkitConfig;
 
 import java.util.logging.Logger;
 
 public class IllegalContainerInteractionFix {
-    public static final int MAX_DISTANCE = PoseidonConfig.getInstance().getInt("fix.illegal-container-interaction.max-distance", 4);
-    public static final boolean LOG_VIOLATION = PoseidonConfig.getInstance().getBoolean("fix.illegal-container-interaction.log-violation", false);
+    public static final int MAX_DISTANCE = UberbukkitConfig.getInstance().getInt("fix.illegal-container-interaction.max-distance", 4);
+    public static final boolean LOG_VIOLATION = UberbukkitConfig.getInstance().getBoolean("fix.illegal-container-interaction.log-violation", false);
 
     public static boolean checkForViolations(Vec3i containerPosition, EntityPlayer player) {
         if (containerPosition == null || player == null) {

src/main/java/net/minecraft/server/BiomeBase.java

@@ -4,7 +4,7 @@
 import java.util.List;
 import java.util.Random;
 
-import com.legacyminecraft.poseidon.PoseidonConfig;
+import uk.betacraft.uberbukkit.UberbukkitConfig;
 
 public class BiomeBase {
 
@@ -50,10 +50,10 @@ protected BiomeBase() {
         this.t.add(new BiomeMeta(EntityChicken.class, 10));
         this.t.add(new BiomeMeta(EntityCow.class, 8));
         // uberbukkit
-        if (PoseidonConfig.getInstance().getBoolean("version.mechanics.spawn_squids", true))
+        if (UberbukkitConfig.getInstance().getBoolean("mechanics.spawn_squids", true))
             this.u.add(new BiomeMeta(EntitySquid.class, 10));
 
-        if (PoseidonConfig.getInstance().getBoolean("version.mechanics.spawn_slimes", true))
+        if (UberbukkitConfig.getInstance().getBoolean("mechanics.spawn_slimes", true))
             this.s.add(new BiomeMeta(EntitySlime.class, 10));
     }
 

src/main/java/net/minecraft/server/BiomeForest.java

@@ -2,19 +2,19 @@
 
 import java.util.Random;
 
-import com.legacyminecraft.poseidon.PoseidonConfig;
+import uk.betacraft.uberbukkit.UberbukkitConfig;
 
 public class BiomeForest extends BiomeBase {
 
     public BiomeForest() {
         // uberbukkit
-        if (PoseidonConfig.getInstance().getBoolean("version.mechanics.spawn_wolves", true))
+        if (UberbukkitConfig.getInstance().getBoolean("mechanics.spawn_wolves", true))
             this.t.add(new BiomeMeta(EntityWolf.class, 2));
     }
 
     public WorldGenerator a(Random random) {
         // uberbukkit
-        if (PoseidonConfig.getInstance().getBoolean("version.worldgen.biomes.generate_birches", true) && random.nextInt(5) == 0) {
+        if (UberbukkitConfig.getInstance().getBoolean("worldgen.biomes.generate_birches", true) && random.nextInt(5) == 0) {
             return new WorldGenForest();
         } else if (random.nextInt(3) == 0) {
             return new WorldGenBigTree();

src/main/java/net/minecraft/server/BiomeTaiga.java

@@ -2,19 +2,19 @@
 
 import java.util.Random;
 
-import com.legacyminecraft.poseidon.PoseidonConfig;
+import uk.betacraft.uberbukkit.UberbukkitConfig;
 
 public class BiomeTaiga extends BiomeBase {
 
     public BiomeTaiga() {
         // uberbukkit
-        if (PoseidonConfig.getInstance().getBoolean("version.mechanics.spawn_wolves", true))
+        if (UberbukkitConfig.getInstance().getBoolean("mechanics.spawn_wolves", true))
             this.t.add(new BiomeMeta(EntityWolf.class, 2));
     }
 
     public WorldGenerator a(Random random) {
         // uberbukkit
-        if (!PoseidonConfig.getInstance().getBoolean("version.worldgen.biomes.generate_spruces", true))
+        if (!UberbukkitConfig.getInstance().getBoolean("worldgen.biomes.generate_spruces", true))
             return super.a(random);
 
         return (WorldGenerator) (random.nextInt(3) == 0 ? new WorldGenTaiga1() : new WorldGenTaiga2());

src/main/java/net/minecraft/server/Block.java

@@ -1,6 +1,7 @@
 package net.minecraft.server;
 
 import com.legacyminecraft.poseidon.PoseidonConfig;
+import uk.betacraft.uberbukkit.UberbukkitConfig;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -116,14 +117,14 @@ public class Block {
     public static final Block NETHERRACK = (new BlockBloodStone(87, 103)).c(0.4F).a(h).a("hellrock");
     public static final Block SOUL_SAND = (new BlockSlowSand(88, 104)).c(0.5F).a(l).a("hellsand");
     // uberbukkit
-    public static final Block GLOWSTONE = !PoseidonConfig.getInstance().getBoolean("version.mechanics.glowstone_pre1_6_6", false) ? (new BlockLightStone(89, 105, Material.STONE)).c(0.3F).a(j).a(1.0F).a("lightgem") : (new BlockLightStone(89, 105, Material.SHATTERABLE)).c(0.3F).a(j).a(1.0F).a("lightgem");
+    public static final Block GLOWSTONE = !UberbukkitConfig.getInstance().getBoolean("mechanics.glowstone_pre1_6_6", false) ? (new BlockLightStone(89, 105, Material.STONE)).c(0.3F).a(j).a(1.0F).a("lightgem") : (new BlockLightStone(89, 105, Material.SHATTERABLE)).c(0.3F).a(j).a(1.0F).a("lightgem");
     public static final BlockPortal PORTAL = (BlockPortal) (new BlockPortal(90, 14)).c(-1.0F).a(j).a(0.75F).a("portal");
     public static final Block JACK_O_LANTERN = (new BlockPumpkin(91, 102, true)).c(1.0F).a(e).a(1.0F).a("litpumpkin").g();
     public static final Block CAKE_BLOCK = (new BlockCake(92, 121)).c(0.5F).a(k).a("cake").n().g();
     public static final Block DIODE_OFF = (new BlockDiode(93, false)).c(0.0F).a(e).a("diode").n().g();
     public static final Block DIODE_ON = (new BlockDiode(94, true)).c(0.0F).a(0.625F).a(e).a("diode").n().g();
     // uberbukkit
-    public static final Block LOCKED_CHEST = !PoseidonConfig.getInstance().getBoolean("version.worldgen.generate_steveco_chests", false) ? (new BlockLockedChest(95)).c(0.0F).a(1.0F).a(e).a("lockedchest").a(true).g() : (new BlockLockedChest(95)).c(-1.0F).a(1.0F).a(e).a("lockedchest").g();
+    public static final Block LOCKED_CHEST = !UberbukkitConfig.getInstance().getBoolean("worldgen.generate_steveco_chests", false) ? (new BlockLockedChest(95)).c(0.0F).a(1.0F).a(e).a("lockedchest").a(true).g() : (new BlockLockedChest(95)).c(-1.0F).a(1.0F).a(e).a("lockedchest").g();
     public static final Block TRAP_DOOR = (new BlockTrapdoor(96, Material.WOOD)).c(3.0F).a(e).a("trapdoor").n().g();
     public static final List<Integer> leafDecayBlacklist = Arrays.asList(PoseidonConfig.getInstance().getTreeBlacklistIDs());
     public int textureId;

src/main/java/net/minecraft/server/BlockBed.java

@@ -2,13 +2,10 @@
 
 import org.bukkit.event.entity.EntityDamageEvent;
 
-import java.util.ArrayList;
 import java.util.Iterator;
-import java.util.List;
-import java.util.Optional;
 import java.util.Random;
 
-import com.legacyminecraft.poseidon.PoseidonConfig;
+import uk.betacraft.uberbukkit.UberbukkitConfig;
 
 public class BlockBed extends Block {
 
@@ -38,7 +35,7 @@ public boolean interact(World world, int i, int j, int k, EntityHuman entityhuma
             }
 
             // uberbukkit
-            if (!world.worldProvider.d() && PoseidonConfig.getInstance().getBoolean("version.mechanics.nether_bed_explode", true)) {
+            if (!world.worldProvider.d() && UberbukkitConfig.getInstance().getBoolean("mechanics.nether_bed_explode", true)) {
                 double d0 = (double) i + 0.5D;
                 double d1 = (double) j + 0.5D;
                 double d2 = (double) k + 0.5D;

src/main/java/net/minecraft/server/BlockFence.java

@@ -1,6 +1,7 @@
 package net.minecraft.server;
 
 import com.legacyminecraft.poseidon.PoseidonConfig;
+import uk.betacraft.uberbukkit.UberbukkitConfig;
 
 public class BlockFence extends Block {
     private boolean modernFencingBounding = false;
@@ -13,7 +14,7 @@ public BlockFence(int i, int j) {
     public boolean canPlace(World world, int i, int j, int k) {
         return world.getTypeId(i, j - 1, k) == this.id ?
             // uberbukkit
-            PoseidonConfig.getInstance().getBoolean("version.mechanics.allow_1_7_fence_placement", true) : (!world.getMaterial(i, j - 1, k).isBuildable() ? false : super.canPlace(world, i, j, k));
+            UberbukkitConfig.getInstance().getBoolean("mechanics.allow_1_7_fence_placement", true) : (!world.getMaterial(i, j - 1, k).isBuildable() ? false : super.canPlace(world, i, j, k));
     }
 
     public AxisAlignedBB e(World world, int i, int j, int k) {

src/main/java/net/minecraft/server/BlockFire.java

@@ -8,9 +8,8 @@
 import org.bukkit.event.block.BlockSpreadEvent;
 import org.bukkit.material.MaterialData;
 
-import com.legacyminecraft.poseidon.PoseidonConfig;
-
 import uk.betacraft.uberbukkit.Uberbukkit;
+import uk.betacraft.uberbukkit.UberbukkitConfig;
 
 // CraftBukkit start
 // CraftBukkit end
@@ -35,7 +34,7 @@ public void h() {
         this.a(Block.WOOL.id, 30, 60);
 
         // uberbukkit
-        if (PoseidonConfig.getInstance().getBoolean("version.mechanics.flammable_fences_stairs", true)) {
+        if (UberbukkitConfig.getInstance().getBoolean("mechanics.flammable_fences_stairs", true)) {
             this.a(Block.FENCE.id, 5, 20);
             this.a(Block.WOOD_STAIRS.id, 5, 20);
         }
@@ -64,15 +63,15 @@ public int a(Random random) {
 
     public int c() {
         // uberbukkit
-        return PoseidonConfig.getInstance().getBoolean("version.mechanics.pre_1_6_fire", false) ? 10 : 40;
+        return UberbukkitConfig.getInstance().getBoolean("mechanics.pre_1_6_fire", false) ? 10 : 40;
     }
 
     public void a(World world, int i, int j, int k, Random random) {
         boolean flag = world.getTypeId(i, j - 1, k) == Block.NETHERRACK.id;
-        boolean oldfire = PoseidonConfig.getInstance().getBoolean("version.mechanics.pre_1_6_fire", false);
+        boolean oldFire = UberbukkitConfig.getInstance().getBoolean("mechanics.pre_1_6_fire", false);
 
         // uberbukkit
-        if (!oldfire && !this.canPlace(world, i, j, k)) {
+        if (!oldFire && !this.canPlace(world, i, j, k)) {
             world.setTypeId(i, j, k, 0);
         }
 
@@ -82,7 +81,7 @@ public void a(World world, int i, int j, int k, Random random) {
             int l = world.getData(i, j, k);
 
             // uberbukkit - fire
-            if (oldfire) {
+            if (oldFire) {
                 if (l < 15) {
                     world.setData(i, j, k, l + 1);
                     world.c(i, j, k, this.id, this.c());
@@ -112,7 +111,7 @@ public void a(World world, int i, int j, int k, Random random) {
                 // CraftBukkit end
 
                 // uberbukkit
-                if (oldfire) {
+                if (oldFire) {
                     if (l % 2 == 0 && l > 2) {
                         this.a(world, i + 1, j, k, 300, random, l);
                         this.a(world, i - 1, j, k, 300, random, l);
@@ -221,7 +220,7 @@ public void a(World world, int i, int j, int k, Random random) {
                     }
                 }
 
-                if (oldfire && l == 15) {
+                if (oldFire && l == 15) {
                     this.a(world, i + 1, j, k, 1, random, 0);
                     this.a(world, i - 1, j, k, 1, random, 0);
                     this.a(world, i, j - 1, k, 1, random, 0);
@@ -250,7 +249,7 @@ private void a(World world, int i, int j, int k, int l, Random random, int i1) {
             // CraftBukkit end
 
             // uberbukkit
-            if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.pre_1_6_fire", false)) {
+            if (!UberbukkitConfig.getInstance().getBoolean("mechanics.pre_1_6_fire", false)) {
                 if (random.nextInt(i1 + 10) < 5 && !world.s(i, j, k)) {
                     int k1 = i1 + random.nextInt(5) / 4;
 

src/main/java/net/minecraft/server/BlockLeaves.java

@@ -2,7 +2,7 @@
 
 import org.bukkit.event.block.LeavesDecayEvent;
 
-import com.legacyminecraft.poseidon.PoseidonConfig;
+import uk.betacraft.uberbukkit.UberbukkitConfig;
 
 import java.util.Random;
 
@@ -130,7 +130,7 @@ private void g(World world, int i, int j, int k) {
 
         int data = world.getData(i, j, k);
         // uberbukkit
-        if (data > 0 && !PoseidonConfig.getInstance().getBoolean("version.mechanics.drop_saplings_of_leaf_type", true)) {
+        if (data > 0 && !UberbukkitConfig.getInstance().getBoolean("mechanics.drop_saplings_of_leaf_type", true)) {
             data = 0;
         }
 
@@ -157,7 +157,7 @@ public void a(World world, EntityHuman entityhuman, int i, int j, int k, int l)
 
     protected int a_(int i) {
         // uberbukkit
-        if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.drop_saplings_of_leaf_type", true)) {
+        if (!UberbukkitConfig.getInstance().getBoolean("mechanics.drop_saplings_of_leaf_type", true)) {
             return 0;
         } else {
             return i & 3;

src/main/java/net/minecraft/server/BlockLightStone.java

@@ -2,7 +2,7 @@
 
 import java.util.Random;
 
-import com.legacyminecraft.poseidon.PoseidonConfig;
+import uk.betacraft.uberbukkit.UberbukkitConfig;
 
 public class BlockLightStone extends Block {
 
@@ -12,7 +12,7 @@ public BlockLightStone(int i, int j, Material material) {
 
     public int a(Random random) {
         // uberbukkit
-        if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.glowstone_pre1_6_6", false))
+        if (!UberbukkitConfig.getInstance().getBoolean("mechanics.glowstone_pre1_6_6", false))
             return 2 + random.nextInt(3);
 
         return super.a(random);

src/main/java/net/minecraft/server/BlockLockedChest.java

@@ -2,7 +2,7 @@
 
 import java.util.Random;
 
-import com.legacyminecraft.poseidon.PoseidonConfig;
+import uk.betacraft.uberbukkit.UberbukkitConfig;
 
 public class BlockLockedChest extends Block {
 
@@ -17,7 +17,7 @@ public int a(int i) {
 
     public boolean canPlace(World world, int i, int j, int k) {
         // uberbukkit
-        if (!PoseidonConfig.getInstance().getBoolean("version.worldgen.generate_steveco_chests", true)) {
+        if (!UberbukkitConfig.getInstance().getBoolean("worldgen.generate_steveco_chests", true)) {
             return true;
         }
 
@@ -48,7 +48,7 @@ private boolean g(World world, int i, int j, int k) {
 
     public void a(World world, int i, int j, int k, Random random) {
         // uberbukkit
-        if (!PoseidonConfig.getInstance().getBoolean("version.worldgen.generate_steveco_chests", true))
+        if (!UberbukkitConfig.getInstance().getBoolean("worldgen.generate_steveco_chests", true))
             world.setTypeId(i, j, k, 0);
     }
 }

src/main/java/net/minecraft/server/BlockMushroom.java

@@ -2,7 +2,7 @@
 
 import org.bukkit.event.block.BlockSpreadEvent;
 
-import com.legacyminecraft.poseidon.PoseidonConfig;
+import uk.betacraft.uberbukkit.UberbukkitConfig;
 
 import java.util.Random;
 
@@ -18,7 +18,7 @@ protected BlockMushroom(int i, int j) {
 
     public void a(World world, int i, int j, int k, Random random) {
         // uberbukkit
-        if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.mushroom_spread", true)) return;
+        if (!UberbukkitConfig.getInstance().getBoolean("mechanics.mushroom_spread", true)) return;
 
         if (random.nextInt(100) == 0) {
             int l = i + random.nextInt(3) - 1;