From 4c5ef5cb433715c9ba8f257ed41975aab78ac102 Mon Sep 17 00:00:00 2001 From: Moresteck Date: Sat, 14 Dec 2024 10:25:31 +0000 Subject: [PATCH 1/4] Move Uberbukkit entries from PoseidonConfig to UberbukkitConfig --- .../poseidon/PoseidonConfig.java | 59 -------- .../java/net/minecraft/server/BiomeBase.java | 6 +- .../net/minecraft/server/BiomeForest.java | 6 +- .../java/net/minecraft/server/BiomeTaiga.java | 6 +- src/main/java/net/minecraft/server/Block.java | 5 +- .../java/net/minecraft/server/BlockBed.java | 7 +- .../java/net/minecraft/server/BlockFence.java | 3 +- .../java/net/minecraft/server/BlockFire.java | 19 ++- .../net/minecraft/server/BlockLeaves.java | 6 +- .../net/minecraft/server/BlockLightStone.java | 4 +- .../minecraft/server/BlockLockedChest.java | 6 +- .../net/minecraft/server/BlockMushroom.java | 4 +- .../java/net/minecraft/server/BlockOre.java | 4 +- .../net/minecraft/server/BlockPumpkin.java | 5 +- .../net/minecraft/server/BlockSapling.java | 8 +- .../java/net/minecraft/server/BlockTNT.java | 4 +- .../java/net/minecraft/server/BlockTorch.java | 4 +- .../java/net/minecraft/server/ChunkCache.java | 4 +- .../server/ChunkProviderGenerate.java | 15 +- .../net/minecraft/server/CraftingManager.java | 11 +- .../java/net/minecraft/server/Entity.java | 4 +- .../net/minecraft/server/EntityArrow.java | 4 +- .../java/net/minecraft/server/EntityBoat.java | 8 +- .../net/minecraft/server/EntityLiving.java | 4 +- .../net/minecraft/server/EntityMinecart.java | 4 +- .../java/net/minecraft/server/EntityPig.java | 5 +- .../net/minecraft/server/EntityPlayer.java | 5 +- .../net/minecraft/server/EntitySheep.java | 8 +- .../net/minecraft/server/EntitySpider.java | 6 +- .../net/minecraft/server/EntitySquid.java | 4 +- .../java/net/minecraft/server/ItemBlock.java | 4 +- .../java/net/minecraft/server/ItemDye.java | 6 +- .../java/net/minecraft/server/ItemHoe.java | 4 +- .../java/net/minecraft/server/ItemSeeds.java | 4 +- .../net/minecraft/server/MinecraftServer.java | 3 +- src/main/java/net/minecraft/server/World.java | 11 +- .../minecraft/server/WorldGenDungeons.java | 4 +- .../net/minecraft/server/WorldGenMinable.java | 8 +- .../net/minecraft/server/WorldServer.java | 4 +- .../craftbukkit/util/LongHashtable.java | 6 +- .../uk/betacraft/uberbukkit/Uberbukkit.java | 5 +- .../uberbukkit/UberbukkitConfig.java | 131 ++++++++++++++++++ 42 files changed, 248 insertions(+), 180 deletions(-) create mode 100644 src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java diff --git a/src/main/java/com/legacyminecraft/poseidon/PoseidonConfig.java b/src/main/java/com/legacyminecraft/poseidon/PoseidonConfig.java index fe93bd28..21b34417 100644 --- a/src/main/java/com/legacyminecraft/poseidon/PoseidonConfig.java +++ b/src/main/java/com/legacyminecraft/poseidon/PoseidonConfig.java @@ -172,65 +172,6 @@ private void write() { 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); diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java index ef1b7b4a..0d010355 100644 --- a/src/main/java/net/minecraft/server/BiomeBase.java +++ b/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)); } diff --git a/src/main/java/net/minecraft/server/BiomeForest.java b/src/main/java/net/minecraft/server/BiomeForest.java index 351645c5..15ef101f 100644 --- a/src/main/java/net/minecraft/server/BiomeForest.java +++ b/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(); diff --git a/src/main/java/net/minecraft/server/BiomeTaiga.java b/src/main/java/net/minecraft/server/BiomeTaiga.java index 122f16b6..cec60bda 100644 --- a/src/main/java/net/minecraft/server/BiomeTaiga.java +++ b/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()); diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java index 03040956..3358d1a3 100644 --- a/src/main/java/net/minecraft/server/Block.java +++ b/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 leafDecayBlacklist = Arrays.asList(PoseidonConfig.getInstance().getTreeBlacklistIDs()); public int textureId; diff --git a/src/main/java/net/minecraft/server/BlockBed.java b/src/main/java/net/minecraft/server/BlockBed.java index 451a12ae..fb79e632 100644 --- a/src/main/java/net/minecraft/server/BlockBed.java +++ b/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; diff --git a/src/main/java/net/minecraft/server/BlockFence.java b/src/main/java/net/minecraft/server/BlockFence.java index 24d00798..a28530a1 100644 --- a/src/main/java/net/minecraft/server/BlockFence.java +++ b/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) { diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java index affb058e..da7214ca 100644 --- a/src/main/java/net/minecraft/server/BlockFire.java +++ b/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; diff --git a/src/main/java/net/minecraft/server/BlockLeaves.java b/src/main/java/net/minecraft/server/BlockLeaves.java index d620dfdd..d78b669c 100644 --- a/src/main/java/net/minecraft/server/BlockLeaves.java +++ b/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; diff --git a/src/main/java/net/minecraft/server/BlockLightStone.java b/src/main/java/net/minecraft/server/BlockLightStone.java index b633b591..ce76da94 100644 --- a/src/main/java/net/minecraft/server/BlockLightStone.java +++ b/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); diff --git a/src/main/java/net/minecraft/server/BlockLockedChest.java b/src/main/java/net/minecraft/server/BlockLockedChest.java index bf6c7aff..21fcd263 100644 --- a/src/main/java/net/minecraft/server/BlockLockedChest.java +++ b/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); } } diff --git a/src/main/java/net/minecraft/server/BlockMushroom.java b/src/main/java/net/minecraft/server/BlockMushroom.java index fc761868..8fad4b88 100644 --- a/src/main/java/net/minecraft/server/BlockMushroom.java +++ b/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; diff --git a/src/main/java/net/minecraft/server/BlockOre.java b/src/main/java/net/minecraft/server/BlockOre.java index 3da7ba17..7e9594cc 100644 --- a/src/main/java/net/minecraft/server/BlockOre.java +++ b/src/main/java/net/minecraft/server/BlockOre.java @@ -2,7 +2,7 @@ import java.util.Random; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class BlockOre extends Block { @@ -16,7 +16,7 @@ public int a(int i, Random random) { public int a(Random random) { if (this.id == Block.LAPIS_ORE.id) { - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.drop_lapis_as_b1_2", false)) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.drop_lapis_as_b1_2", false)) { return 1; } return 4 + random.nextInt(5); diff --git a/src/main/java/net/minecraft/server/BlockPumpkin.java b/src/main/java/net/minecraft/server/BlockPumpkin.java index db6aa8cb..7902e4a2 100644 --- a/src/main/java/net/minecraft/server/BlockPumpkin.java +++ b/src/main/java/net/minecraft/server/BlockPumpkin.java @@ -1,7 +1,8 @@ package net.minecraft.server; import org.bukkit.event.block.BlockRedstoneEvent; -import com.legacyminecraft.poseidon.PoseidonConfig; + +import uk.betacraft.uberbukkit.UberbukkitConfig; public class BlockPumpkin extends Block { @@ -46,7 +47,7 @@ public boolean canPlace(World world, int i, int j, int k) { public void postPlace(World world, int i, int j, int k, EntityLiving entityliving) { double dt = 2.5D; - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.pre_b1_5_pumpkins", false)) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.pre_b1_5_pumpkins", false)) { dt = 0.5D; } int l = MathHelper.floor((double) (entityliving.yaw * 4.0F / 360.0F) + dt) & 3; diff --git a/src/main/java/net/minecraft/server/BlockSapling.java b/src/main/java/net/minecraft/server/BlockSapling.java index 8744f9a5..dd1ed4c9 100644 --- a/src/main/java/net/minecraft/server/BlockSapling.java +++ b/src/main/java/net/minecraft/server/BlockSapling.java @@ -2,7 +2,7 @@ import org.bukkit.BlockChangeDelegate; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; import java.util.Random; @@ -45,9 +45,9 @@ public void b(World world, int i, int j, int k, Random random) { BlockChangeWithNotify delegate = new BlockChangeWithNotify(world); // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.worldgen.biomes.generate_spruces", true) && l == 1) { + if (l == 1 && UberbukkitConfig.getInstance().getBoolean("worldgen.biomes.generate_spruces", true)) { grownTree = new WorldGenTaiga2().generate(delegate, random, i, j, k); - } else if (PoseidonConfig.getInstance().getBoolean("version.worldgen.biomes.generate_birches", true) && l == 2) { + } else if (l == 2 && UberbukkitConfig.getInstance().getBoolean("worldgen.biomes.generate_birches", true)) { grownTree = new WorldGenForest().generate(delegate, random, i, j, k); } else { if (random.nextInt(10) == 0) { @@ -65,7 +65,7 @@ public void b(World world, int i, int j, int k, Random random) { 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; diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java index e0930f87..e712a9c3 100644 --- a/src/main/java/net/minecraft/server/BlockTNT.java +++ b/src/main/java/net/minecraft/server/BlockTNT.java @@ -2,7 +2,7 @@ import java.util.Random; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class BlockTNT extends Block { @@ -57,7 +57,7 @@ public void postBreak(World world, int i, int j, int k, int l) { public void b(World world, int i, int j, int k, EntityHuman entityhuman) { // uberbukkit - if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.tnt_require_lighter", true)) { + if (!UberbukkitConfig.getInstance().getBoolean("mechanics.tnt_require_lighter", true)) { world.setRawData(i, j, k, 1); } diff --git a/src/main/java/net/minecraft/server/BlockTorch.java b/src/main/java/net/minecraft/server/BlockTorch.java index 0a31f083..23155b03 100644 --- a/src/main/java/net/minecraft/server/BlockTorch.java +++ b/src/main/java/net/minecraft/server/BlockTorch.java @@ -2,7 +2,7 @@ import java.util.Random; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class BlockTorch extends Block { @@ -26,7 +26,7 @@ public boolean b() { private boolean g(World world, int i, int j, int k) { return world.e(i, j, k) || // uberbukkit - (PoseidonConfig.getInstance().getBoolean("version.mechanics.allow_1_7_fence_placement", true) && world.getTypeId(i, j, k) == Block.FENCE.id); + (UberbukkitConfig.getInstance().getBoolean("mechanics.allow_1_7_fence_placement", true) && world.getTypeId(i, j, k) == Block.FENCE.id); } public boolean canPlace(World world, int i, int j, int k) { diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java index c75d55be..92a859e0 100644 --- a/src/main/java/net/minecraft/server/ChunkCache.java +++ b/src/main/java/net/minecraft/server/ChunkCache.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class ChunkCache implements IBlockAccess { @@ -77,7 +77,7 @@ public boolean p(int i, int j, int k) { } public boolean e(int i, int j, int k) { - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.pre_b1_6_block_opacity", false)) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.pre_b1_6_block_opacity", false)) { return this.p(i, j, k); } Block block = Block.byId[this.getTypeId(i, j, k)]; diff --git a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java index 6add6c8c..2f0aff41 100644 --- a/src/main/java/net/minecraft/server/ChunkProviderGenerate.java +++ b/src/main/java/net/minecraft/server/ChunkProviderGenerate.java @@ -1,9 +1,8 @@ package net.minecraft.server; -import java.util.Calendar; import java.util.Random; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class ChunkProviderGenerate implements IChunkProvider { @@ -182,7 +181,7 @@ public void a(int i, int j, byte[] abyte, BiomeBase[] abiomebase) { --j1; abyte[l1] = b2; // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.worldgen.generate_sandstone", true) && j1 == 0 && b2 == Block.SAND.id) { + if (UberbukkitConfig.getInstance().getBoolean("worldgen.generate_sandstone", true) && j1 == 0 && b2 == Block.SAND.id) { j1 = this.j.nextInt(4); b2 = (byte) Block.SANDSTONE.id; } @@ -423,7 +422,7 @@ public void getChunkAt(IChunkProvider ichunkprovider, int i, int j) { } // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.worldgen.generate_lapis_ores", true)) { + if (UberbukkitConfig.getInstance().getBoolean("worldgen.generate_lapis_ores", true)) { for (k1 = 0; k1 < 1; ++k1) { l1 = k + this.j.nextInt(16); i2 = this.j.nextInt(16) + this.j.nextInt(16); @@ -469,7 +468,7 @@ public void getChunkAt(IChunkProvider ichunkprovider, int i, int j) { // uberbukkit Object object = biomebase.a(this.j); - if (PoseidonConfig.getInstance().getBoolean("version.worldgen.pre_b1_2_tree_generation", false)) { + if (UberbukkitConfig.getInstance().getBoolean("worldgen.pre_b1_2_tree_generation", false)) { object = new WorldGenTrees(); if (this.j.nextInt(10) == 0) { object = new WorldGenBigTree(); @@ -546,7 +545,7 @@ public void getChunkAt(IChunkProvider ichunkprovider, int i, int j) { int k3; // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.worldgen.generate_tallgrass", true)) { + if (UberbukkitConfig.getInstance().getBoolean("worldgen.generate_tallgrass", true)) { for (k2 = 0; k2 < b1; ++k2) { byte b2 = 1; @@ -567,7 +566,7 @@ public void getChunkAt(IChunkProvider ichunkprovider, int i, int j) { } // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.worldgen.generate_tallgrass", true)) { + if (UberbukkitConfig.getInstance().getBoolean("worldgen.generate_tallgrass", true)) { for (k2 = 0; k2 < b1; ++k2) { i3 = k + this.j.nextInt(16) + 8; l2 = this.j.nextInt(128); @@ -653,7 +652,7 @@ public void getChunkAt(IChunkProvider ichunkprovider, int i, int j) { } // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.worldgen.generate_steveco_chests", false)) { + if (UberbukkitConfig.getInstance().getBoolean("worldgen.generate_steveco_chests", false)) { k2 = k + this.j.nextInt(16) + 8; l2 = this.j.nextInt(128); i3 = l + this.j.nextInt(16) + 8; diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java index e9548336..38327cf5 100644 --- a/src/main/java/net/minecraft/server/CraftingManager.java +++ b/src/main/java/net/minecraft/server/CraftingManager.java @@ -5,9 +5,8 @@ import java.util.HashMap; import java.util.List; -import com.legacyminecraft.poseidon.PoseidonConfig; - import uk.betacraft.uberbukkit.Uberbukkit; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class CraftingManager { @@ -61,19 +60,19 @@ private CraftingManager() { this.registerShapedRecipe(new ItemStack(Block.PISTON_STICKY, 1), new Object[] { "S", "P", Character.valueOf('S'), Item.SLIME_BALL, Character.valueOf('P'), Block.PISTON }); } - if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.glowstone_pre1_6_6", false)) { + if (!UberbukkitConfig.getInstance().getBoolean("mechanics.glowstone_pre1_6_6", false)) { this.registerShapedRecipe(new ItemStack(Block.GLOWSTONE, 1), new Object[] { "##", "##", Character.valueOf('#'), Item.GLOWSTONE_DUST }); } else { this.registerShapedRecipe(new ItemStack(Block.GLOWSTONE, 1), new Object[] { "###", "###", "###", Character.valueOf('#'), Item.GLOWSTONE_DUST }); } - if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.wool_recipe_pre1_6_6", false)) { + if (!UberbukkitConfig.getInstance().getBoolean("mechanics.wool_recipe_pre1_6_6", false)) { this.registerShapedRecipe(new ItemStack(Block.WOOL, 1), new Object[] { "##", "##", Character.valueOf('#'), Item.STRING }); } else { this.registerShapedRecipe(new ItemStack(Block.WOOL, 1), new Object[] { "###", "###", "###", Character.valueOf('#'), Item.STRING }); } - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.old_slab_recipe", false)) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.old_slab_recipe", false)) { this.registerShapedRecipe(new ItemStack(Block.STEP, 3, 0), new Object[] { "###", Character.valueOf('#'), Block.COBBLESTONE }); if (Uberbukkit.getTargetPVN() >= 9) { this.registerShapedRecipe(new ItemStack(Block.STEP, 3, 1), new Object[] { "###", Character.valueOf('#'), Block.SANDSTONE }); @@ -100,7 +99,7 @@ private CraftingManager() { // uberbukkit ItemStack ladder = new ItemStack(Block.LADDER, 2); - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.allow_ladder_gap", false)) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.allow_ladder_gap", false)) { ladder = new ItemStack(Block.LADDER, 1); } this.registerShapedRecipe(ladder, new Object[] { "# #", "###", "# #", Character.valueOf('#'), Item.STICK }); diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java index 7d81132b..6b17dc47 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -12,7 +12,7 @@ import org.bukkit.event.vehicle.VehicleBlockCollisionEvent; import org.bukkit.event.vehicle.VehicleExitEvent; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; import java.util.List; import java.util.Random; @@ -39,7 +39,7 @@ public synchronized void setSeed(long seed) { }; // Poseidon end // uberbukkit - private static boolean trampleFarmlandAboveFence = PoseidonConfig.getInstance().getBoolean("version.mechanics.trample_farmland_above_fence", false); + private static final boolean trampleFarmlandAboveFence = UberbukkitConfig.getInstance().getBoolean("mechanics.trample_farmland_above_fence", false); private static int entityCount = 0; public int id; diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java index dcbb4614..2e0ff2a2 100644 --- a/src/main/java/net/minecraft/server/EntityArrow.java +++ b/src/main/java/net/minecraft/server/EntityArrow.java @@ -7,7 +7,7 @@ import org.bukkit.event.entity.ProjectileHitEvent; import org.bukkit.event.player.PlayerPickupItemEvent; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; import java.util.List; @@ -298,7 +298,7 @@ public void b(EntityHuman entityhuman) { if (!this.world.isStatic) { // uberbukkit - if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.arrows_pickup_by_others", true)) { + if (!UberbukkitConfig.getInstance().getBoolean("mechanics.arrows_pickup_by_others", true)) { if (this.shooter != entityhuman) { return; } diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java index be8abcdb..e66830b1 100644 --- a/src/main/java/net/minecraft/server/EntityBoat.java +++ b/src/main/java/net/minecraft/server/EntityBoat.java @@ -4,7 +4,7 @@ import org.bukkit.entity.Vehicle; import org.bukkit.event.vehicle.*; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; import java.util.List; @@ -123,7 +123,7 @@ public boolean damageEntity(Entity entity, int i) { } // uberbukkit - drop boat on damage, not planks & sticks - if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.boats.drop_boat_not_wood", false)) { + if (!UberbukkitConfig.getInstance().getBoolean("mechanics.boats.drop_boat_not_wood", false)) { int j; for (j = 0; j < 3; ++j) { @@ -291,11 +291,11 @@ public void m_() { if (this.positionChanged && d4 > 0.15D) { if (!this.world.isStatic) { - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.boat.break_boat_on_collision", true)) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.boat.break_boat_on_collision", true)) { this.die(); // uberbukkit - drop boat on damage, not planks & sticks - if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.boats.drop_boat_not_wood", false)) { + if (!UberbukkitConfig.getInstance().getBoolean("mechanics.boats.drop_boat_not_wood", false)) { int k; for (k = 0; k < 3; ++k) { diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java index 13267015..c49c3675 100644 --- a/src/main/java/net/minecraft/server/EntityLiving.java +++ b/src/main/java/net/minecraft/server/EntityLiving.java @@ -9,7 +9,7 @@ import org.bukkit.event.entity.EntityRegainHealthEvent; import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; import java.util.List; @@ -620,7 +620,7 @@ public boolean p() { return this.world.getTypeId(i, j, k) == Block.LADDER.id || // uberbukkit - (PoseidonConfig.getInstance().getBoolean("version.mechanics.allow_ladder_gap", false) && this.world.getTypeId(i, j + 1, k) == Block.LADDER.id); + (UberbukkitConfig.getInstance().getBoolean("mechanics.allow_ladder_gap", false) && this.world.getTypeId(i, j + 1, k) == Block.LADDER.id); } public void b(NBTTagCompound nbttagcompound) { diff --git a/src/main/java/net/minecraft/server/EntityMinecart.java b/src/main/java/net/minecraft/server/EntityMinecart.java index 91a5e3ae..8f8c2628 100644 --- a/src/main/java/net/minecraft/server/EntityMinecart.java +++ b/src/main/java/net/minecraft/server/EntityMinecart.java @@ -4,7 +4,7 @@ import org.bukkit.entity.Vehicle; import org.bukkit.event.vehicle.*; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; import java.util.List; @@ -754,7 +754,7 @@ public void collide(Entity entity) { d1 *= 0.5D; if (entity instanceof EntityMinecart) { // uberbukkit - if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.allow_minecart_boosters", false)) { + if (!UberbukkitConfig.getInstance().getBoolean("mechanics.allow_minecart_boosters", false)) { double d4 = entity.locX - this.locX; double d5 = entity.locZ - this.locZ; double d6 = d4 * entity.motZ + d5 * entity.lastX; diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java index 98a2c69c..f8b75dc9 100644 --- a/src/main/java/net/minecraft/server/EntityPig.java +++ b/src/main/java/net/minecraft/server/EntityPig.java @@ -4,9 +4,8 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason; -import com.legacyminecraft.poseidon.PoseidonConfig; - import org.bukkit.event.entity.PigZapEvent; +import uk.betacraft.uberbukkit.UberbukkitConfig; // CraftBukkit end public class EntityPig extends EntityAnimal { @@ -54,7 +53,7 @@ public boolean a(EntityHuman entityhuman) { protected int j() { // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.burning_pig_drop_cooked_meat", true) && this.fireTicks > 0) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.burning_pig_drop_cooked_meat", true) && this.fireTicks > 0) { return Item.GRILLED_PORK.id; } else { return Item.PORK.id; diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index a9d79e28..c52c0900 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -21,6 +21,7 @@ import com.projectposeidon.api.PoseidonUUID; import me.devcody.uberbukkit.util.math.Vec3i; +import uk.betacraft.uberbukkit.UberbukkitConfig; import uk.betacraft.uberbukkit.alpha.inventory.ProcessPacket5; import uk.betacraft.uberbukkit.packet.Packet62Sound; import uk.betacraft.uberbukkit.protocol.Protocol; @@ -437,7 +438,7 @@ public EnumBedError a(int i, int j, int k) { entitytracker.a(this, packet17); // uberbukkit - beds (b1.3 - b1.6.4) - if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.beds_pre_b1_6_5", false)) + if (!UberbukkitConfig.getInstance().getBoolean("mechanics.beds_pre_b1_6_5", false)) this.netServerHandler.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch); this.netServerHandler.sendPacket(packet17); @@ -641,7 +642,7 @@ public void C() { public void a(String s) { // uberbukkit - fix for multiple bed alerts (b1.3 - b1.6.4) - if (this.netServerHandler.networkManager.pvn <= 11 || PoseidonConfig.getInstance().getBoolean("version.mechanics.beds_pre_b1_6_5", false)) + if (this.netServerHandler.networkManager.pvn <= 11 || UberbukkitConfig.getInstance().getBoolean("mechanics.beds_pre_b1_6_5", false)) return; StatisticStorage statisticstorage = StatisticStorage.a(); diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java index e1ee854e..8a33236a 100644 --- a/src/main/java/net/minecraft/server/EntitySheep.java +++ b/src/main/java/net/minecraft/server/EntitySheep.java @@ -2,7 +2,7 @@ import java.util.Random; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class EntitySheep extends EntityAnimal { @@ -21,7 +21,7 @@ protected void b() { public boolean damageEntity(Entity entity, int i) { // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.sheep_drop_wool_on_punch", false)) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.sheep_drop_wool_on_punch", false)) { if (!this.world.isStatic && !this.isSheared() && entity instanceof EntityLiving) { this.setSheared(true); int j = 1 + this.random.nextInt(3); @@ -136,8 +136,8 @@ public static int a(Random random) { int i = random.nextInt(100); // uberbukkit - boolean spawn_black = PoseidonConfig.getInstance().getBoolean("version.mechanics.spawn_sheep_with_shades_of_black", true); - boolean spawn_brown_pink = PoseidonConfig.getInstance().getBoolean("version.mechanics.spawn_brown_and_pink_sheep", true); + boolean spawn_black = UberbukkitConfig.getInstance().getBoolean("mechanics.spawn_sheep_with_shades_of_black", true); + boolean spawn_brown_pink = UberbukkitConfig.getInstance().getBoolean("mechanics.spawn_brown_and_pink_sheep", true); if (i < 5 && spawn_black) { return 15; diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java index b85fc01d..010b4eb1 100644 --- a/src/main/java/net/minecraft/server/EntitySpider.java +++ b/src/main/java/net/minecraft/server/EntitySpider.java @@ -7,7 +7,7 @@ // CraftBukkit end //uberbukkit start -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; //uberbukkit end public class EntitySpider extends EntityMonster { @@ -24,7 +24,7 @@ public double m() { } protected boolean n() { - return PoseidonConfig.getInstance().getBoolean("version.mechanics.spiders_trample_crops", false); + return UberbukkitConfig.getInstance().getBoolean("mechanics.spiders_trample_crops", false); } protected Entity findTarget() { @@ -98,6 +98,6 @@ protected int j() { } public boolean p() { - return PoseidonConfig.getInstance().getBoolean("version.mechanics.spiders_climb_walls", true) ? this.positionChanged : super.p(); + return UberbukkitConfig.getInstance().getBoolean("mechanics.spiders_climb_walls", true) ? this.positionChanged : super.p(); } } diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java index 179d3ff1..42f554b2 100644 --- a/src/main/java/net/minecraft/server/EntitySquid.java +++ b/src/main/java/net/minecraft/server/EntitySquid.java @@ -6,7 +6,7 @@ import org.bukkit.event.entity.EntityDeathEvent; import org.bukkit.event.player.PlayerBucketFillEvent; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class EntitySquid extends EntityWaterAnimal { @@ -83,7 +83,7 @@ protected void q() { public boolean a(EntityHuman entityhuman) { // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.allow_milking_squids", false)) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.allow_milking_squids", false)) { ItemStack itemstack = entityhuman.inventory.getItemInHand(); if (itemstack != null && itemstack.id == Item.BUCKET.id) { diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java index a45c2ccb..4d7fa77c 100644 --- a/src/main/java/net/minecraft/server/ItemBlock.java +++ b/src/main/java/net/minecraft/server/ItemBlock.java @@ -7,7 +7,7 @@ import org.bukkit.event.block.BlockPlaceEvent; // CraftBukkit end -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class ItemBlock extends Item { @@ -52,7 +52,7 @@ public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int if (itemstack.count == 0) { return false; - } else if (!PoseidonConfig.getInstance().getBoolean("version.mechanics.allow_blocks_at_y_127", false) && j == 127 && Block.byId[this.id].material.isBuildable()) { + } else if (!UberbukkitConfig.getInstance().getBoolean("mechanics.allow_blocks_at_y_127", false) && j == 127 && Block.byId[this.id].material.isBuildable()) { return false; } else if (world.a(this.id, i, j, k, false, l)) { Block block = Block.byId[this.id]; diff --git a/src/main/java/net/minecraft/server/ItemDye.java b/src/main/java/net/minecraft/server/ItemDye.java index 956da60e..b5556f17 100644 --- a/src/main/java/net/minecraft/server/ItemDye.java +++ b/src/main/java/net/minecraft/server/ItemDye.java @@ -1,6 +1,6 @@ package net.minecraft.server; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class ItemDye extends Item { @@ -35,7 +35,7 @@ public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int return true; } - if (i1 == Block.GRASS.id && PoseidonConfig.getInstance().getBoolean("version.mechanics.allow_bone_meal_on_grass", true)) { + if (i1 == Block.GRASS.id && UberbukkitConfig.getInstance().getBoolean("mechanics.allow_bone_meal_on_grass", true)) { if (!world.isStatic) { --itemstack.count; @@ -56,7 +56,7 @@ public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int if (world.getTypeId(k1, l1, i2) == 0) { // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.allow_grow_tallgrass", true) && b.nextInt(10) != 0) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.allow_grow_tallgrass", true) && b.nextInt(10) != 0) { world.setTypeIdAndData(k1, l1, i2, Block.LONG_GRASS.id, 1); } else if (b.nextInt(3) != 0) { world.setTypeId(k1, l1, i2, Block.YELLOW_FLOWER.id); diff --git a/src/main/java/net/minecraft/server/ItemHoe.java b/src/main/java/net/minecraft/server/ItemHoe.java index 2d785570..3746206f 100644 --- a/src/main/java/net/minecraft/server/ItemHoe.java +++ b/src/main/java/net/minecraft/server/ItemHoe.java @@ -7,7 +7,7 @@ import org.bukkit.event.block.BlockPlaceEvent; // CraftBukkit end -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class ItemHoe extends Item { @@ -46,7 +46,7 @@ public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int itemstack.damage(1, entityhuman); // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.tile_grass_drop_seeds", false)) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.tile_grass_drop_seeds", false)) { if (world.random.nextInt(8) == 0 && i1 == Block.GRASS.id) { byte b0 = 1; diff --git a/src/main/java/net/minecraft/server/ItemSeeds.java b/src/main/java/net/minecraft/server/ItemSeeds.java index ddb15ddf..09a8059c 100644 --- a/src/main/java/net/minecraft/server/ItemSeeds.java +++ b/src/main/java/net/minecraft/server/ItemSeeds.java @@ -7,7 +7,7 @@ import org.bukkit.event.block.BlockPlaceEvent; // CraftBukkit end -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class ItemSeeds extends Item { @@ -27,7 +27,7 @@ public boolean a(ItemStack itemstack, EntityHuman entityhuman, World world, int // uberbukkit start boolean isEmptyFlag = world.isEmpty(i, j + 1, k); - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.seeds_replace_blocks", false)) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.seeds_replace_blocks", false)) { isEmptyFlag = true; } diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java index 7688332a..471bc3bb 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -19,6 +19,7 @@ import org.bukkit.event.world.WorldSaveEvent; import org.bukkit.generator.ChunkGenerator; import org.bukkit.plugin.PluginLoadOrder; +import uk.betacraft.uberbukkit.UberbukkitConfig; import java.io.File; import java.io.IOException; @@ -113,7 +114,7 @@ private boolean init() throws UnknownHostException { // CraftBukkit - added thro net.minecraft.server.ModLoader.Init(this); } - log.info("Starting minecraft server... Accepting PVNs: " + String.join(", ", PoseidonConfig.getInstance().getString("version.allow_join.protocol", "14").split(","))); + log.info("Starting minecraft server... Accepting PVNs: " + String.join(", ", UberbukkitConfig.getInstance().getString("client.allowed_protocols.value", "14").split(","))); if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) { log.warning("**** NOT ENOUGH RAM!"); log.warning("To start the server with more ram, launch it as \"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\""); diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index bb4640c4..4da4ec4d 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -30,9 +30,8 @@ import org.bukkit.event.weather.WeatherChangeEvent; import org.bukkit.generator.ChunkGenerator; -import com.legacyminecraft.poseidon.PoseidonConfig; - import uk.betacraft.uberbukkit.Uberbukkit; +import uk.betacraft.uberbukkit.UberbukkitConfig; // CraftBukkit start // CraftBukkit end @@ -40,7 +39,7 @@ public class World implements IBlockAccess { // uberbukkit - private static boolean pre1_5_placement_rules = PoseidonConfig.getInstance().getBoolean("version.mechanics.pre_b1_5_block_placement_rules", false); + private static final boolean pre1_5_placement_rules = UberbukkitConfig.getInstance().getBoolean("mechanics.pre_b1_5_block_placement_rules", false); public boolean a = false; private List C = new ArrayList(); @@ -1633,7 +1632,7 @@ public boolean p(int i, int j, int k) { } public boolean e(int i, int j, int k) { - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.pre_b1_6_block_opacity", false)) { + if (UberbukkitConfig.getInstance().getBoolean("mechanics.pre_b1_6_block_opacity", false)) { return this.p(i, j, k); } Block block = Block.byId[this.getTypeId(i, j, k)]; @@ -1993,7 +1992,7 @@ protected void j() { } // uberbukkit - boolean blocked = PoseidonConfig.getInstance().getBoolean("version.mechanics.ice_generate_only_when_snowing", false) && !this.v(); + boolean blocked = UberbukkitConfig.getInstance().getBoolean("mechanics.ice_generate_only_when_snowing", false) && !this.v(); // CraftBukkit start if (!blocked && l1 == Block.STATIONARY_WATER.id && chunk.getData(l, k1 - 1, j1) == 0) { @@ -2456,7 +2455,7 @@ public boolean u() { public boolean v() { // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.mechanics.do_weather", true)) + if (UberbukkitConfig.getInstance().getBoolean("mechanics.do_weather", true)) return (double) this.d(1.0F) > 0.2D; return false; diff --git a/src/main/java/net/minecraft/server/WorldGenDungeons.java b/src/main/java/net/minecraft/server/WorldGenDungeons.java index 4fb2d9bf..d1977176 100644 --- a/src/main/java/net/minecraft/server/WorldGenDungeons.java +++ b/src/main/java/net/minecraft/server/WorldGenDungeons.java @@ -2,7 +2,7 @@ import java.util.Random; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class WorldGenDungeons extends WorldGenerator { @@ -159,7 +159,7 @@ private ItemStack a(Random random) { } case 10: { // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.worldgen.cocoabeans_loot", true)) { + if (UberbukkitConfig.getInstance().getBoolean("worldgen.cocoabeans_loot", true)) { return new ItemStack(Item.INK_SACK, 1, 3); } } diff --git a/src/main/java/net/minecraft/server/WorldGenMinable.java b/src/main/java/net/minecraft/server/WorldGenMinable.java index 0c6ec132..b466fc47 100644 --- a/src/main/java/net/minecraft/server/WorldGenMinable.java +++ b/src/main/java/net/minecraft/server/WorldGenMinable.java @@ -2,7 +2,7 @@ import java.util.Random; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; public class WorldGenMinable extends WorldGenerator { @@ -15,8 +15,8 @@ public WorldGenMinable(int i, int j) { } public boolean a(World world, Random random, int i, int j, int k) { - if (PoseidonConfig.getInstance().getBoolean("version.worldgen.ores." + world.worldData.name + ".custom_seed", false)) { - String text = PoseidonConfig.getInstance().getString("version.worldgen.ores." + world.worldData.name + ".seed"); + if (UberbukkitConfig.getInstance().getBoolean("worldgen.ores." + world.worldData.name + ".custom_seed", false)) { + String text = UberbukkitConfig.getInstance().getString("worldgen.ores." + world.worldData.name + ".seed"); long seed = 0L; if (text != null) { seed = Long.parseLong(text); @@ -41,7 +41,7 @@ public boolean a(World world, Random random, int i, int j, int k) { double d11 = (double) (MathHelper.sin((float) l * 3.1415927F / (float) this.b) + 1.0F) * d9 + 1.0D; // uberbukkit - if (PoseidonConfig.getInstance().getBoolean("version.worldgen.pre_b1_2_ore_generation", false)) { + if (UberbukkitConfig.getInstance().getBoolean("worldgen.pre_b1_2_ore_generation", false)) { for (int i1 = (int) (d6 - d10 / 2.0D); i1 <= (int) (d6 + d10 / 2.0D); ++i1) { for (int j1 = (int) (d7 - d11 / 2.0D); j1 <= (int) (d7 + d11 / 2.0D); ++j1) { for (int k1 = (int) (d8 - d10 / 2.0D); k1 <= (int) (d8 + d10 / 2.0D); ++k1) { diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java index ecf6875e..51c775fe 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -6,7 +6,7 @@ import org.bukkit.event.weather.LightningStrikeEvent; import org.bukkit.generator.ChunkGenerator; -import com.legacyminecraft.poseidon.PoseidonConfig; +import uk.betacraft.uberbukkit.UberbukkitConfig; import java.util.ArrayList; import java.util.List; @@ -121,7 +121,7 @@ public boolean strikeLightning(Entity entity) { this.getServer().getPluginManager().callEvent(lightning); // uberbukkit - if (lightning.isCancelled() || !PoseidonConfig.getInstance().getBoolean("version.mechanics.do_weather", true)) { + if (lightning.isCancelled() || !UberbukkitConfig.getInstance().getBoolean("mechanics.do_weather", true)) { return false; } diff --git a/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java b/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java index 55d914fe..04860a19 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java +++ b/src/main/java/org/bukkit/craftbukkit/util/LongHashtable.java @@ -4,11 +4,11 @@ import java.util.ArrayList; -import com.legacyminecraft.poseidon.PoseidonConfig; - import net.minecraft.server.Chunk; import net.minecraft.server.MinecraftServer; +import uk.betacraft.uberbukkit.UberbukkitConfig; + public class LongHashtable extends LongHash { Object[][][] values = new Object[256][][]; Entry cache = null; @@ -33,7 +33,7 @@ public V get(int msw, int lsw) { if (msw != c.x || lsw != c.z) { MinecraftServer.log.info("Chunk (" + c.x + ", " + c.z + ") stored at (" + msw + ", " + lsw + ")"); - if (PoseidonConfig.getInstance().getBoolean("version.experimental.force_fix_chunk_coords_corruption", false)) { + if (UberbukkitConfig.getInstance().getBoolean("experimental.force_fix_chunk_coords_corruption", false)) { c.x = msw; c.z = lsw; } else { diff --git a/src/main/java/uk/betacraft/uberbukkit/Uberbukkit.java b/src/main/java/uk/betacraft/uberbukkit/Uberbukkit.java index 222db4fd..53bc338a 100644 --- a/src/main/java/uk/betacraft/uberbukkit/Uberbukkit.java +++ b/src/main/java/uk/betacraft/uberbukkit/Uberbukkit.java @@ -1,6 +1,5 @@ package uk.betacraft.uberbukkit; -import com.legacyminecraft.poseidon.PoseidonConfig; import net.minecraft.server.MinecraftServer; import org.bukkit.Bukkit; import uk.betacraft.uberbukkit.protocol.Protocol; @@ -17,7 +16,7 @@ public class Uberbukkit { public static int getTargetPVN() { if (pvn != null) return pvn; - String pvnstr = PoseidonConfig.getInstance().getString("version.allow_join.protocol", "14"); + String pvnstr = UberbukkitConfig.getInstance().getString("client.allowed_protocols.value", "14"); // separate target version from other allowed PVNs int commaIndex = pvnstr.indexOf(","); @@ -40,7 +39,7 @@ public static int getTargetPVN() { public static List getAllowedPVNs() { if (pvns != null) return pvns; - String[] pvnstrs = PoseidonConfig.getInstance().getString("version.allow_join.protocol", "14").split(","); + String[] pvnstrs = UberbukkitConfig.getInstance().getString("client.allowed_protocols.value", "14").split(","); pvns = new LinkedList<>(); diff --git a/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java b/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java new file mode 100644 index 00000000..86ab82d7 --- /dev/null +++ b/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java @@ -0,0 +1,131 @@ +package uk.betacraft.uberbukkit; + +import com.legacyminecraft.poseidon.PoseidonConfig; +import org.bukkit.util.config.Configuration; + +import java.io.File; +import java.util.List; + +public class UberbukkitConfig extends Configuration { + private static UberbukkitConfig singleton; + private static final int CONFIG_VERSION = 1; + + public synchronized static UberbukkitConfig getInstance() { + if (singleton == null) { + singleton = new UberbukkitConfig(); + } + return singleton; + } + + public UberbukkitConfig() { + super(new File("uberbukkit.yml")); + + this.init(); + } + + public void init() { + this.load(); + this.writeDefaults(); + this.save(); + } + + private void migrateByKey(String oldKey, String newKey) { + List versionKeys = PoseidonConfig.getInstance().getKeys(oldKey); + if (versionKeys == null) + return; + + for (String key : versionKeys) { + Object property = PoseidonConfig.getInstance().getProperty(oldKey + "." + key); + if (property != null) { + // move the entry to uberbukkit.yml + this.setProperty(newKey + "." + key, property); + // remove the entry from poseidon.yml + PoseidonConfig.getInstance().removeProperty(oldKey + "." + key); + } + } + } + + private void migrateFromPoseidonConfig() { + migrateByKey("version.mechanics", "mechanics"); + migrateByKey("version.mechanics.boats", "mechanics.boats"); + migrateByKey("version.worldgen", "worldgen"); + migrateByKey("version.worldgen.biomes", "worldgen.biomes"); + migrateByKey("version.worldgen.ores.world", "worldgen.ores.world"); + migrateByKey("version.experimental", "experimental"); + + String pvns = PoseidonConfig.getInstance().getString("version.allow_join.protocol"); + this.setProperty("client.allowed_protocols.value", pvns); + } + + private void writeDefaults() { + if (this.getString("config-version") == null || Integer.valueOf(this.getString("config-version")) < CONFIG_VERSION) { + System.out.println("[Uberbukkit] Converting from config version " + (this.getString("config-version") == null ? "0" : this.getString("config-version")) + " to " + CONFIG_VERSION); + migrateFromPoseidonConfig(); + this.setProperty("config-version", CONFIG_VERSION); + } + + writeDefault("worldgen.cocoabeans_loot", true); + writeDefault("worldgen.pre_b1_2_ore_generation", false); + writeDefault("worldgen.pre_b1_2_tree_generation", false); + writeDefault("worldgen.generate_sandstone", true); + writeDefault("worldgen.biomes.generate_spruces", true); + writeDefault("worldgen.biomes.generate_birches", true); + writeDefault("worldgen.generate_steveco_chests", false); + writeDefault("worldgen.generate_lapis_ores", true); + writeDefault("worldgen.generate_tallgrass", true); + writeDefault("worldgen.ores.world.custom_seed", false); + writeDefault("worldgen.ores.world.seed", 0L); + + writeDefault("mechanics.tile_grass_drop_seeds", false); + writeDefault("mechanics.flammable_fences_stairs", true); + writeDefault("mechanics.glowstone_pre1_6_6", false); + writeDefault("mechanics.wool_recipe_pre1_6_6", false); + writeDefault("mechanics.allow_grow_tallgrass", true); + writeDefault("mechanics.allow_1_7_fence_placement", true); + writeDefault("mechanics.tnt_require_lighter", true); + writeDefault("mechanics.sheep_drop_wool_on_punch", false); + writeDefault("mechanics.mushroom_spread", true); + writeDefault("mechanics.ice_generate_only_when_snowing", false); + writeDefault("mechanics.pre_1_6_fire", false); + writeDefault("mechanics.nether_bed_explode", true); + writeDefault("mechanics.arrows_pickup_by_others", true); + writeDefault("mechanics.allow_minecart_boosters", false); + writeDefault("mechanics.spawn_squids", true); + writeDefault("mechanics.spawn_wolves", true); + writeDefault("mechanics.spawn_slimes", true); + writeDefault("mechanics.do_weather", true); + writeDefault("mechanics.allow_ladder_gap", false); + writeDefault("mechanics.old_slab_recipe", false); + writeDefault("mechanics.burning_pig_drop_cooked_meat", true); + writeDefault("mechanics.spawn_sheep_with_shades_of_black", true); + writeDefault("mechanics.spawn_brown_and_pink_sheep", true); + writeDefault("mechanics.drop_saplings_of_leaf_type", true); + writeDefault("mechanics.spiders_trample_crops", false); + writeDefault("mechanics.spiders_climb_walls", true); + writeDefault("mechanics.allow_blocks_at_y_127", false); + writeDefault("mechanics.drop_lapis_as_b1_2", false); + writeDefault("mechanics.allow_milking_squids", false); + writeDefault("mechanics.pre_b1_6_block_opacity", false); + writeDefault("mechanics.pre_b1_5_pumpkins", false); + writeDefault("mechanics.allow_bone_meal_on_grass", true); + writeDefault("mechanics.beds_pre_b1_6_5", false); + writeDefault("mechanics.beds_set_spawnpoint", true); + writeDefault("mechanics.pre_b1_5_block_placement_rules", false); + writeDefault("mechanics.trample_farmland_above_fence", false); + writeDefault("mechanics.seeds_replace_blocks", false); + writeDefault("mechanics.boats.drop_boat_not_wood", false); + writeDefault("mechanics.boats.break_boat_on_collision", true); + + writeDefault("experimental.force_fix_chunk_coords_corruption", false); + + writeDefault("client.allowed_protocols.value", "14"); + writeDefault("client.allowed_protocols.info1", "Specify client versions to accept (separated by commas - first PVN is treated as target PVN of the server)"); + writeDefault("client.allowed_protocols.info2", "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"); + } + + private void writeDefault(String key, Object defaultValue) { + if (this.getProperty(key) == null) { + this.setProperty(key, defaultValue); + } + } +} From 82f624af7dceb7c2d3874f2295874140798ce800 Mon Sep 17 00:00:00 2001 From: github-actions <> Date: Sat, 14 Dec 2024 10:42:16 +0000 Subject: [PATCH 2/4] IntelliJ Code Format --- src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java b/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java index 86ab82d7..15dc81e7 100644 --- a/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java +++ b/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java @@ -31,8 +31,7 @@ public void init() { private void migrateByKey(String oldKey, String newKey) { List versionKeys = PoseidonConfig.getInstance().getKeys(oldKey); - if (versionKeys == null) - return; + if (versionKeys == null) return; for (String key : versionKeys) { Object property = PoseidonConfig.getInstance().getProperty(oldKey + "." + key); From 060baed0debafef710512d6f0dd5bd71000b43c3 Mon Sep 17 00:00:00 2001 From: Moresteck Date: Sat, 14 Dec 2024 14:21:07 +0000 Subject: [PATCH 3/4] Include other previously missed Uberbukkit settings --- .../poseidon/PoseidonConfig.java | 7 ---- .../patch/IllegalContainerInteractionFix.java | 6 ++-- .../minecraft/server/NetServerHandler.java | 3 +- .../uberbukkit/UberbukkitConfig.java | 32 +++++++++++++------ 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/legacyminecraft/poseidon/PoseidonConfig.java b/src/main/java/com/legacyminecraft/poseidon/PoseidonConfig.java index 21b34417..48ace929 100644 --- a/src/main/java/com/legacyminecraft/poseidon/PoseidonConfig.java +++ b/src/main/java/com/legacyminecraft/poseidon/PoseidonConfig.java @@ -169,13 +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); - - 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."); diff --git a/src/main/java/me/devcody/uberbukkit/nms/patch/IllegalContainerInteractionFix.java b/src/main/java/me/devcody/uberbukkit/nms/patch/IllegalContainerInteractionFix.java index 086cd258..7e484302 100644 --- a/src/main/java/me/devcody/uberbukkit/nms/patch/IllegalContainerInteractionFix.java +++ b/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) { diff --git a/src/main/java/net/minecraft/server/NetServerHandler.java b/src/main/java/net/minecraft/server/NetServerHandler.java index 784fca5a..3cd848e9 100644 --- a/src/main/java/net/minecraft/server/NetServerHandler.java +++ b/src/main/java/net/minecraft/server/NetServerHandler.java @@ -41,13 +41,14 @@ import com.projectposeidon.ConnectionType; import me.devcody.uberbukkit.nms.patch.IllegalContainerInteractionFix; +import uk.betacraft.uberbukkit.UberbukkitConfig; import uk.betacraft.uberbukkit.packet.Packet62Sound; import uk.betacraft.uberbukkit.packet.Packet63Digging; import uk.betacraft.uberbukkit.protocol.Protocol; public class NetServerHandler extends NetHandler implements ICommandListener { - private static boolean isStaffExemptFromFlyKick = PoseidonConfig.getInstance().getBoolean("settings.exempt-staff-from-flight-kick", false); + private static boolean isStaffExemptFromFlyKick = UberbukkitConfig.getInstance().getBoolean("settings.exempt-staff-from-flight-kick", false); public static Logger a = Logger.getLogger("Minecraft"); public NetworkManager networkManager; public boolean disconnected = false; diff --git a/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java b/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java index 15dc81e7..f781a303 100644 --- a/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java +++ b/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java @@ -34,16 +34,23 @@ private void migrateByKey(String oldKey, String newKey) { if (versionKeys == null) return; for (String key : versionKeys) { - Object property = PoseidonConfig.getInstance().getProperty(oldKey + "." + key); - if (property != null) { - // move the entry to uberbukkit.yml - this.setProperty(newKey + "." + key, property); - // remove the entry from poseidon.yml - PoseidonConfig.getInstance().removeProperty(oldKey + "." + key); - } + this.migrateExact(oldKey + "." + key, newKey + "." + key, Object.class); } } + private void migrateExact(String oldKey, String newKey, Class clazz) { + Object val = PoseidonConfig.getInstance().getProperty(oldKey); + + if (clazz.isInstance(val)) { + this.setProperty(newKey, val); + PoseidonConfig.getInstance().removeProperty(oldKey); + } + } + + private void migrateExact(String key, Class clazz) { + this.migrateExact(key, key, clazz); + } + private void migrateFromPoseidonConfig() { migrateByKey("version.mechanics", "mechanics"); migrateByKey("version.mechanics.boats", "mechanics.boats"); @@ -51,9 +58,10 @@ private void migrateFromPoseidonConfig() { migrateByKey("version.worldgen.biomes", "worldgen.biomes"); migrateByKey("version.worldgen.ores.world", "worldgen.ores.world"); migrateByKey("version.experimental", "experimental"); + migrateByKey("fix.illegal-container-interaction", "fix.illegal-container-interaction"); - String pvns = PoseidonConfig.getInstance().getString("version.allow_join.protocol"); - this.setProperty("client.allowed_protocols.value", pvns); + migrateExact("settings.exempt-staff-from-flight-kick", Boolean.class); + migrateExact("version.allow_join.protocol", "client.allowed_protocols.value", String.class); } private void writeDefaults() { @@ -115,6 +123,12 @@ private void writeDefaults() { writeDefault("mechanics.boats.drop_boat_not_wood", false); writeDefault("mechanics.boats.break_boat_on_collision", true); + writeDefault("settings.exempt-staff-from-flight-kick", false); + + writeDefault("fix.illegal-container-interaction.info", "Prevents interactions in a container if the player is farther away than the max distance."); + writeDefault("fix.illegal-container-interaction.max-distance", 4); + writeDefault("fix.illegal-container-interaction.log-violation", false); + writeDefault("experimental.force_fix_chunk_coords_corruption", false); writeDefault("client.allowed_protocols.value", "14"); From e1bea956d9b01904fa31436df79d95feff2bb20d Mon Sep 17 00:00:00 2001 From: Moresteck Date: Tue, 17 Dec 2024 12:38:58 +0000 Subject: [PATCH 4/4] Perform proper cleanup after migration --- .../uberbukkit/UberbukkitConfig.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java b/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java index f781a303..1d563ff5 100644 --- a/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java +++ b/src/main/java/uk/betacraft/uberbukkit/UberbukkitConfig.java @@ -29,13 +29,15 @@ public void init() { this.save(); } - private void migrateByKey(String oldKey, String newKey) { - List versionKeys = PoseidonConfig.getInstance().getKeys(oldKey); - if (versionKeys == null) return; + private void migrateSubKeys(String oldKey, String newKey) { + List subKeys = PoseidonConfig.getInstance().getKeys(oldKey); + if (subKeys == null) return; - for (String key : versionKeys) { + for (String key : subKeys) { this.migrateExact(oldKey + "." + key, newKey + "." + key, Object.class); } + + PoseidonConfig.getInstance().removeProperty(oldKey); } private void migrateExact(String oldKey, String newKey, Class clazz) { @@ -52,16 +54,20 @@ private void migrateExact(String key, Class clazz) { } private void migrateFromPoseidonConfig() { - migrateByKey("version.mechanics", "mechanics"); - migrateByKey("version.mechanics.boats", "mechanics.boats"); - migrateByKey("version.worldgen", "worldgen"); - migrateByKey("version.worldgen.biomes", "worldgen.biomes"); - migrateByKey("version.worldgen.ores.world", "worldgen.ores.world"); - migrateByKey("version.experimental", "experimental"); - migrateByKey("fix.illegal-container-interaction", "fix.illegal-container-interaction"); + migrateSubKeys("version.mechanics", "mechanics"); + migrateSubKeys("version.mechanics.boats", "mechanics.boats"); + migrateSubKeys("version.worldgen", "worldgen"); + migrateSubKeys("version.worldgen.biomes", "worldgen.biomes"); + migrateSubKeys("version.worldgen.ores.world", "worldgen.ores.world"); + migrateSubKeys("version.experimental", "experimental"); + migrateSubKeys("fix.illegal-container-interaction", "fix.illegal-container-interaction"); migrateExact("settings.exempt-staff-from-flight-kick", Boolean.class); migrateExact("version.allow_join.protocol", "client.allowed_protocols.value", String.class); + + PoseidonConfig.getInstance().removeProperty("version"); + + PoseidonConfig.getInstance().save(); } private void writeDefaults() {