diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6dd29b7 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +bin/ \ No newline at end of file diff --git a/.gradle/8.0/executionHistory/executionHistory.bin b/.gradle/8.0/executionHistory/executionHistory.bin index dcc6f54..6ca322b 100644 Binary files a/.gradle/8.0/executionHistory/executionHistory.bin and b/.gradle/8.0/executionHistory/executionHistory.bin differ diff --git a/.gradle/8.0/executionHistory/executionHistory.lock b/.gradle/8.0/executionHistory/executionHistory.lock index dd16752..76f1936 100644 Binary files a/.gradle/8.0/executionHistory/executionHistory.lock and b/.gradle/8.0/executionHistory/executionHistory.lock differ diff --git a/.gradle/8.0/fileHashes/fileHashes.bin b/.gradle/8.0/fileHashes/fileHashes.bin index 1bf557f..baa1a76 100644 Binary files a/.gradle/8.0/fileHashes/fileHashes.bin and b/.gradle/8.0/fileHashes/fileHashes.bin differ diff --git a/.gradle/8.0/fileHashes/fileHashes.lock b/.gradle/8.0/fileHashes/fileHashes.lock index 43257a1..422c309 100644 Binary files a/.gradle/8.0/fileHashes/fileHashes.lock and b/.gradle/8.0/fileHashes/fileHashes.lock differ diff --git a/.gradle/8.0/fileHashes/resourceHashesCache.bin b/.gradle/8.0/fileHashes/resourceHashesCache.bin index 02c0e40..ec5d7e5 100644 Binary files a/.gradle/8.0/fileHashes/resourceHashesCache.bin and b/.gradle/8.0/fileHashes/resourceHashesCache.bin differ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index f5834ed..a56806e 100644 Binary files a/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/.gradle/file-system.probe b/.gradle/file-system.probe new file mode 100644 index 0000000..82b3db8 Binary files /dev/null and b/.gradle/file-system.probe differ diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b589d56..fcb19bf 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 18ad7e3..8bddb52 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index a1aba14..6fee058 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,5 @@ plugins { id "java" - id "application" } sourceSets { @@ -24,18 +23,3 @@ tasks.withType(JavaCompile) { dependencies { implementation fileTree(dir: './lwjgl-rundir/', include: '*.jar') } - -distributions { - main { - contents { - from file("$projectDir/lwjgl-rundir/resources") - into('/') - } - } - -} - -application { - mainClass = 'net.lax1dude.eaglercraft.MinecraftMain' - applicationDefaultJvmArgs = ['-Djava.library.path=lwjgl-rundir'] -} diff --git a/build/classes/java/main/net/minecraft/src/BehaviorDefaultDispenseItem.class b/build/classes/java/main/net/minecraft/src/BehaviorDefaultDispenseItem.class index 7a8d07d..57d94b8 100644 Binary files a/build/classes/java/main/net/minecraft/src/BehaviorDefaultDispenseItem.class and b/build/classes/java/main/net/minecraft/src/BehaviorDefaultDispenseItem.class differ diff --git a/build/classes/java/main/net/minecraft/src/BiomeDecorator.class b/build/classes/java/main/net/minecraft/src/BiomeDecorator.class index ecc775d..41dd4c0 100644 Binary files a/build/classes/java/main/net/minecraft/src/BiomeDecorator.class and b/build/classes/java/main/net/minecraft/src/BiomeDecorator.class differ diff --git a/build/classes/java/main/net/minecraft/src/BiomeEndDecorator.class b/build/classes/java/main/net/minecraft/src/BiomeEndDecorator.class index e08807b..a523a44 100644 Binary files a/build/classes/java/main/net/minecraft/src/BiomeEndDecorator.class and b/build/classes/java/main/net/minecraft/src/BiomeEndDecorator.class differ diff --git a/build/classes/java/main/net/minecraft/src/BiomeGenBase.class b/build/classes/java/main/net/minecraft/src/BiomeGenBase.class index 271b781..eb42ac4 100644 Binary files a/build/classes/java/main/net/minecraft/src/BiomeGenBase.class and b/build/classes/java/main/net/minecraft/src/BiomeGenBase.class differ diff --git a/build/classes/java/main/net/minecraft/src/BiomeGenDesert.class b/build/classes/java/main/net/minecraft/src/BiomeGenDesert.class index d8d85a1..3d7848c 100644 Binary files a/build/classes/java/main/net/minecraft/src/BiomeGenDesert.class and b/build/classes/java/main/net/minecraft/src/BiomeGenDesert.class differ diff --git a/build/classes/java/main/net/minecraft/src/BiomeGenForest.class b/build/classes/java/main/net/minecraft/src/BiomeGenForest.class index 3a66d71..b960924 100644 Binary files a/build/classes/java/main/net/minecraft/src/BiomeGenForest.class and b/build/classes/java/main/net/minecraft/src/BiomeGenForest.class differ diff --git a/build/classes/java/main/net/minecraft/src/BiomeGenHills.class b/build/classes/java/main/net/minecraft/src/BiomeGenHills.class index c097d89..a6687bc 100644 Binary files a/build/classes/java/main/net/minecraft/src/BiomeGenHills.class and b/build/classes/java/main/net/minecraft/src/BiomeGenHills.class differ diff --git a/build/classes/java/main/net/minecraft/src/BiomeGenJungle.class b/build/classes/java/main/net/minecraft/src/BiomeGenJungle.class index a9b6be0..57b16a3 100644 Binary files a/build/classes/java/main/net/minecraft/src/BiomeGenJungle.class and b/build/classes/java/main/net/minecraft/src/BiomeGenJungle.class differ diff --git a/build/classes/java/main/net/minecraft/src/BiomeGenSwamp.class b/build/classes/java/main/net/minecraft/src/BiomeGenSwamp.class index e34411e..ad00200 100644 Binary files a/build/classes/java/main/net/minecraft/src/BiomeGenSwamp.class and b/build/classes/java/main/net/minecraft/src/BiomeGenSwamp.class differ diff --git a/build/classes/java/main/net/minecraft/src/BiomeGenTaiga.class b/build/classes/java/main/net/minecraft/src/BiomeGenTaiga.class index 1563983..71d64bc 100644 Binary files a/build/classes/java/main/net/minecraft/src/BiomeGenTaiga.class and b/build/classes/java/main/net/minecraft/src/BiomeGenTaiga.class differ diff --git a/build/classes/java/main/net/minecraft/src/Block.class b/build/classes/java/main/net/minecraft/src/Block.class index 78ea0ce..8d41251 100644 Binary files a/build/classes/java/main/net/minecraft/src/Block.class and b/build/classes/java/main/net/minecraft/src/Block.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockBasePressurePlate.class b/build/classes/java/main/net/minecraft/src/BlockBasePressurePlate.class index 90c7a2e..df236e9 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockBasePressurePlate.class and b/build/classes/java/main/net/minecraft/src/BlockBasePressurePlate.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockBed.class b/build/classes/java/main/net/minecraft/src/BlockBed.class index e36d725..799ef25 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockBed.class and b/build/classes/java/main/net/minecraft/src/BlockBed.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockBookshelf.class b/build/classes/java/main/net/minecraft/src/BlockBookshelf.class index b4f8444..e95aa70 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockBookshelf.class and b/build/classes/java/main/net/minecraft/src/BlockBookshelf.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockBrewingStand.class b/build/classes/java/main/net/minecraft/src/BlockBrewingStand.class index f43ecd0..1448f35 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockBrewingStand.class and b/build/classes/java/main/net/minecraft/src/BlockBrewingStand.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockButton.class b/build/classes/java/main/net/minecraft/src/BlockButton.class index 2820c23..6618354 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockButton.class and b/build/classes/java/main/net/minecraft/src/BlockButton.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockCactus.class b/build/classes/java/main/net/minecraft/src/BlockCactus.class index d866c93..c09f3f2 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockCactus.class and b/build/classes/java/main/net/minecraft/src/BlockCactus.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockCake.class b/build/classes/java/main/net/minecraft/src/BlockCake.class index ad1a0d1..ecf2663 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockCake.class and b/build/classes/java/main/net/minecraft/src/BlockCake.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockCauldron.class b/build/classes/java/main/net/minecraft/src/BlockCauldron.class index faf6a8a..6d85363 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockCauldron.class and b/build/classes/java/main/net/minecraft/src/BlockCauldron.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockChest.class b/build/classes/java/main/net/minecraft/src/BlockChest.class index 35701c4..0f6d597 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockChest.class and b/build/classes/java/main/net/minecraft/src/BlockChest.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockClay.class b/build/classes/java/main/net/minecraft/src/BlockClay.class index 86394a5..96d1685 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockClay.class and b/build/classes/java/main/net/minecraft/src/BlockClay.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockCocoa.class b/build/classes/java/main/net/minecraft/src/BlockCocoa.class index fece6c6..f84f41d 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockCocoa.class and b/build/classes/java/main/net/minecraft/src/BlockCocoa.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockCommandBlock.class b/build/classes/java/main/net/minecraft/src/BlockCommandBlock.class index a08a9a7..3d2c8ee 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockCommandBlock.class and b/build/classes/java/main/net/minecraft/src/BlockCommandBlock.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockComparator.class b/build/classes/java/main/net/minecraft/src/BlockComparator.class index c416d3c..3b83962 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockComparator.class and b/build/classes/java/main/net/minecraft/src/BlockComparator.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockCrops.class b/build/classes/java/main/net/minecraft/src/BlockCrops.class index a2fa298..03ee0a5 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockCrops.class and b/build/classes/java/main/net/minecraft/src/BlockCrops.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockDaylightDetector.class b/build/classes/java/main/net/minecraft/src/BlockDaylightDetector.class index 9b0c3b3..d4e77ff 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockDaylightDetector.class and b/build/classes/java/main/net/minecraft/src/BlockDaylightDetector.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockDeadBush.class b/build/classes/java/main/net/minecraft/src/BlockDeadBush.class index 8a7a067..7a9b7c1 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockDeadBush.class and b/build/classes/java/main/net/minecraft/src/BlockDeadBush.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockDetectorRail.class b/build/classes/java/main/net/minecraft/src/BlockDetectorRail.class index a9cc617..d5fb4a4 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockDetectorRail.class and b/build/classes/java/main/net/minecraft/src/BlockDetectorRail.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockDispenser.class b/build/classes/java/main/net/minecraft/src/BlockDispenser.class index e9c4581..f9abff1 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockDispenser.class and b/build/classes/java/main/net/minecraft/src/BlockDispenser.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockDoor.class b/build/classes/java/main/net/minecraft/src/BlockDoor.class index 9b0c7ce..a5278c9 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockDoor.class and b/build/classes/java/main/net/minecraft/src/BlockDoor.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockDragonEgg.class b/build/classes/java/main/net/minecraft/src/BlockDragonEgg.class index b0a530b..96c0ecd 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockDragonEgg.class and b/build/classes/java/main/net/minecraft/src/BlockDragonEgg.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockEnchantmentTable.class b/build/classes/java/main/net/minecraft/src/BlockEnchantmentTable.class index 51eb413..cf4a77d 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockEnchantmentTable.class and b/build/classes/java/main/net/minecraft/src/BlockEnchantmentTable.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockEndPortal.class b/build/classes/java/main/net/minecraft/src/BlockEndPortal.class index 7d67777..a73a2c1 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockEndPortal.class and b/build/classes/java/main/net/minecraft/src/BlockEndPortal.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockEndPortalFrame.class b/build/classes/java/main/net/minecraft/src/BlockEndPortalFrame.class index 92c3d55..c99db1f 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockEndPortalFrame.class and b/build/classes/java/main/net/minecraft/src/BlockEndPortalFrame.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockEnderChest.class b/build/classes/java/main/net/minecraft/src/BlockEnderChest.class index 40c2e7a..58546b8 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockEnderChest.class and b/build/classes/java/main/net/minecraft/src/BlockEnderChest.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockFarmland.class b/build/classes/java/main/net/minecraft/src/BlockFarmland.class index 1f8349e..0b82554 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockFarmland.class and b/build/classes/java/main/net/minecraft/src/BlockFarmland.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockFire.class b/build/classes/java/main/net/minecraft/src/BlockFire.class index 1100781..1fea06e 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockFire.class and b/build/classes/java/main/net/minecraft/src/BlockFire.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockFlower.class b/build/classes/java/main/net/minecraft/src/BlockFlower.class index 5ee60ef..9794268 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockFlower.class and b/build/classes/java/main/net/minecraft/src/BlockFlower.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockFlowerPot.class b/build/classes/java/main/net/minecraft/src/BlockFlowerPot.class index 8837fb7..35bbae4 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockFlowerPot.class and b/build/classes/java/main/net/minecraft/src/BlockFlowerPot.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockFlowing.class b/build/classes/java/main/net/minecraft/src/BlockFlowing.class index 4491ba4..1cdf037 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockFlowing.class and b/build/classes/java/main/net/minecraft/src/BlockFlowing.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockFluid.class b/build/classes/java/main/net/minecraft/src/BlockFluid.class index 73be772..f15ff96 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockFluid.class and b/build/classes/java/main/net/minecraft/src/BlockFluid.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockFurnace.class b/build/classes/java/main/net/minecraft/src/BlockFurnace.class index 797b3c9..88b9892 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockFurnace.class and b/build/classes/java/main/net/minecraft/src/BlockFurnace.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockGlass.class b/build/classes/java/main/net/minecraft/src/BlockGlass.class index 0ca005d..3b0c681 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockGlass.class and b/build/classes/java/main/net/minecraft/src/BlockGlass.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockGlowStone.class b/build/classes/java/main/net/minecraft/src/BlockGlowStone.class index 52a6719..5056120 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockGlowStone.class and b/build/classes/java/main/net/minecraft/src/BlockGlowStone.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockGrass.class b/build/classes/java/main/net/minecraft/src/BlockGrass.class index 880845e..c054bd0 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockGrass.class and b/build/classes/java/main/net/minecraft/src/BlockGrass.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockGravel.class b/build/classes/java/main/net/minecraft/src/BlockGravel.class index 695b5b5..7fa764b 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockGravel.class and b/build/classes/java/main/net/minecraft/src/BlockGravel.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockHalfSlab.class b/build/classes/java/main/net/minecraft/src/BlockHalfSlab.class index d0b1495..27b0e14 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockHalfSlab.class and b/build/classes/java/main/net/minecraft/src/BlockHalfSlab.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockHopper.class b/build/classes/java/main/net/minecraft/src/BlockHopper.class index 1ea1060..046144a 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockHopper.class and b/build/classes/java/main/net/minecraft/src/BlockHopper.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockIce.class b/build/classes/java/main/net/minecraft/src/BlockIce.class index 4fc4c07..7a19bcf 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockIce.class and b/build/classes/java/main/net/minecraft/src/BlockIce.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockJukeBox.class b/build/classes/java/main/net/minecraft/src/BlockJukeBox.class index 8e97472..4fe230d 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockJukeBox.class and b/build/classes/java/main/net/minecraft/src/BlockJukeBox.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockLadder.class b/build/classes/java/main/net/minecraft/src/BlockLadder.class index c674e3e..c538d78 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockLadder.class and b/build/classes/java/main/net/minecraft/src/BlockLadder.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockLeaves.class b/build/classes/java/main/net/minecraft/src/BlockLeaves.class index 4282998..108c4e6 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockLeaves.class and b/build/classes/java/main/net/minecraft/src/BlockLeaves.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockLockedChest.class b/build/classes/java/main/net/minecraft/src/BlockLockedChest.class index 6d31d52..3d014a1 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockLockedChest.class and b/build/classes/java/main/net/minecraft/src/BlockLockedChest.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockLog.class b/build/classes/java/main/net/minecraft/src/BlockLog.class index ee50d08..7120c8d 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockLog.class and b/build/classes/java/main/net/minecraft/src/BlockLog.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockMelon.class b/build/classes/java/main/net/minecraft/src/BlockMelon.class index 397942d..a35a51b 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockMelon.class and b/build/classes/java/main/net/minecraft/src/BlockMelon.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockMobSpawner.class b/build/classes/java/main/net/minecraft/src/BlockMobSpawner.class index 5bdecd6..8f910e6 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockMobSpawner.class and b/build/classes/java/main/net/minecraft/src/BlockMobSpawner.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockMushroom.class b/build/classes/java/main/net/minecraft/src/BlockMushroom.class index 901bd53..3ef3679 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockMushroom.class and b/build/classes/java/main/net/minecraft/src/BlockMushroom.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockMushroomCap.class b/build/classes/java/main/net/minecraft/src/BlockMushroomCap.class index 6348871..851c457 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockMushroomCap.class and b/build/classes/java/main/net/minecraft/src/BlockMushroomCap.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockMycelium.class b/build/classes/java/main/net/minecraft/src/BlockMycelium.class index b51b190..7429916 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockMycelium.class and b/build/classes/java/main/net/minecraft/src/BlockMycelium.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockNetherStalk.class b/build/classes/java/main/net/minecraft/src/BlockNetherStalk.class index 9ca9b25..41d1490 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockNetherStalk.class and b/build/classes/java/main/net/minecraft/src/BlockNetherStalk.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockObsidian.class b/build/classes/java/main/net/minecraft/src/BlockObsidian.class index cef503a..af37783 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockObsidian.class and b/build/classes/java/main/net/minecraft/src/BlockObsidian.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockOre.class b/build/classes/java/main/net/minecraft/src/BlockOre.class index d387ae7..f18f04a 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockOre.class and b/build/classes/java/main/net/minecraft/src/BlockOre.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockPane.class b/build/classes/java/main/net/minecraft/src/BlockPane.class index 8d71220..45520e2 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockPane.class and b/build/classes/java/main/net/minecraft/src/BlockPane.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockPistonBase.class b/build/classes/java/main/net/minecraft/src/BlockPistonBase.class index 1abe870..d65f57c 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockPistonBase.class and b/build/classes/java/main/net/minecraft/src/BlockPistonBase.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockPistonExtension.class b/build/classes/java/main/net/minecraft/src/BlockPistonExtension.class index 88521cc..5066fbc 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockPistonExtension.class and b/build/classes/java/main/net/minecraft/src/BlockPistonExtension.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockPistonMoving.class b/build/classes/java/main/net/minecraft/src/BlockPistonMoving.class index 04f2247..2f3fdae 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockPistonMoving.class and b/build/classes/java/main/net/minecraft/src/BlockPistonMoving.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockPortal.class b/build/classes/java/main/net/minecraft/src/BlockPortal.class index 6ab8266..c61f7dc 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockPortal.class and b/build/classes/java/main/net/minecraft/src/BlockPortal.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockPotato.class b/build/classes/java/main/net/minecraft/src/BlockPotato.class index 5ac790c..898f333 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockPotato.class and b/build/classes/java/main/net/minecraft/src/BlockPotato.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockPumpkin.class b/build/classes/java/main/net/minecraft/src/BlockPumpkin.class index c74f4e0..15dfd19 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockPumpkin.class and b/build/classes/java/main/net/minecraft/src/BlockPumpkin.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockRailBase.class b/build/classes/java/main/net/minecraft/src/BlockRailBase.class index 578de3a..d5868e0 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockRailBase.class and b/build/classes/java/main/net/minecraft/src/BlockRailBase.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockRedstoneLight.class b/build/classes/java/main/net/minecraft/src/BlockRedstoneLight.class index c2e6d86..a10ba4c 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockRedstoneLight.class and b/build/classes/java/main/net/minecraft/src/BlockRedstoneLight.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockRedstoneLogic.class b/build/classes/java/main/net/minecraft/src/BlockRedstoneLogic.class index d9fc9a4..49e6bae 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockRedstoneLogic.class and b/build/classes/java/main/net/minecraft/src/BlockRedstoneLogic.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockRedstoneOre.class b/build/classes/java/main/net/minecraft/src/BlockRedstoneOre.class index f178aba..2fa4a1c 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockRedstoneOre.class and b/build/classes/java/main/net/minecraft/src/BlockRedstoneOre.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockRedstoneRepeater.class b/build/classes/java/main/net/minecraft/src/BlockRedstoneRepeater.class index e0e1657..686ce00 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockRedstoneRepeater.class and b/build/classes/java/main/net/minecraft/src/BlockRedstoneRepeater.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockRedstoneTorch.class b/build/classes/java/main/net/minecraft/src/BlockRedstoneTorch.class index 7902bca..3170f23 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockRedstoneTorch.class and b/build/classes/java/main/net/minecraft/src/BlockRedstoneTorch.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockRedstoneWire.class b/build/classes/java/main/net/minecraft/src/BlockRedstoneWire.class index 667d62f..875b2b8 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockRedstoneWire.class and b/build/classes/java/main/net/minecraft/src/BlockRedstoneWire.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockReed.class b/build/classes/java/main/net/minecraft/src/BlockReed.class index 5e281a6..eff98ed 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockReed.class and b/build/classes/java/main/net/minecraft/src/BlockReed.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockSand.class b/build/classes/java/main/net/minecraft/src/BlockSand.class index b75c6d5..4dc05ed 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockSand.class and b/build/classes/java/main/net/minecraft/src/BlockSand.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockSapling.class b/build/classes/java/main/net/minecraft/src/BlockSapling.class index 89d9fc1..c214d9e 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockSapling.class and b/build/classes/java/main/net/minecraft/src/BlockSapling.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockSign.class b/build/classes/java/main/net/minecraft/src/BlockSign.class index 24ef3db..980ec22 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockSign.class and b/build/classes/java/main/net/minecraft/src/BlockSign.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockSilverfish.class b/build/classes/java/main/net/minecraft/src/BlockSilverfish.class index 7c99b30..191e9a1 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockSilverfish.class and b/build/classes/java/main/net/minecraft/src/BlockSilverfish.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockSkull.class b/build/classes/java/main/net/minecraft/src/BlockSkull.class index a2e2561..3fe2c0e 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockSkull.class and b/build/classes/java/main/net/minecraft/src/BlockSkull.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockSnow.class b/build/classes/java/main/net/minecraft/src/BlockSnow.class index 9f57445..701157f 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockSnow.class and b/build/classes/java/main/net/minecraft/src/BlockSnow.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockSnowBlock.class b/build/classes/java/main/net/minecraft/src/BlockSnowBlock.class index ef53809..4e1c4f8 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockSnowBlock.class and b/build/classes/java/main/net/minecraft/src/BlockSnowBlock.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockStairs.class b/build/classes/java/main/net/minecraft/src/BlockStairs.class index e24a4a2..4c33e11 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockStairs.class and b/build/classes/java/main/net/minecraft/src/BlockStairs.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockStationary.class b/build/classes/java/main/net/minecraft/src/BlockStationary.class index 2ec163d..12fa080 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockStationary.class and b/build/classes/java/main/net/minecraft/src/BlockStationary.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockStem.class b/build/classes/java/main/net/minecraft/src/BlockStem.class index 9eee3d8..2cfb476 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockStem.class and b/build/classes/java/main/net/minecraft/src/BlockStem.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockStep.class b/build/classes/java/main/net/minecraft/src/BlockStep.class index 44c6630..bb37ce9 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockStep.class and b/build/classes/java/main/net/minecraft/src/BlockStep.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockStone.class b/build/classes/java/main/net/minecraft/src/BlockStone.class index def1fdf..bafa4d9 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockStone.class and b/build/classes/java/main/net/minecraft/src/BlockStone.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockTNT.class b/build/classes/java/main/net/minecraft/src/BlockTNT.class index 42e85da..7e87ae6 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockTNT.class and b/build/classes/java/main/net/minecraft/src/BlockTNT.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockTallGrass.class b/build/classes/java/main/net/minecraft/src/BlockTallGrass.class index 5ba18ce..7e0ba85 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockTallGrass.class and b/build/classes/java/main/net/minecraft/src/BlockTallGrass.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockTorch.class b/build/classes/java/main/net/minecraft/src/BlockTorch.class index 0f713f6..f1e51fd 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockTorch.class and b/build/classes/java/main/net/minecraft/src/BlockTorch.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockTripWire.class b/build/classes/java/main/net/minecraft/src/BlockTripWire.class index f14eeff..9e2a8a5 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockTripWire.class and b/build/classes/java/main/net/minecraft/src/BlockTripWire.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockTripWireSource.class b/build/classes/java/main/net/minecraft/src/BlockTripWireSource.class index 3ff274b..3f706eb 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockTripWireSource.class and b/build/classes/java/main/net/minecraft/src/BlockTripWireSource.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockVine.class b/build/classes/java/main/net/minecraft/src/BlockVine.class index 62da0c3..c479cd6 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockVine.class and b/build/classes/java/main/net/minecraft/src/BlockVine.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockWeb.class b/build/classes/java/main/net/minecraft/src/BlockWeb.class index b5a9aa8..aa5864c 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockWeb.class and b/build/classes/java/main/net/minecraft/src/BlockWeb.class differ diff --git a/build/classes/java/main/net/minecraft/src/BlockWoodSlab.class b/build/classes/java/main/net/minecraft/src/BlockWoodSlab.class index de6a21c..ffd1c54 100644 Binary files a/build/classes/java/main/net/minecraft/src/BlockWoodSlab.class and b/build/classes/java/main/net/minecraft/src/BlockWoodSlab.class differ diff --git a/build/classes/java/main/net/minecraft/src/Chunk.class b/build/classes/java/main/net/minecraft/src/Chunk.class index 0c4c084..9b4c7ab 100644 Binary files a/build/classes/java/main/net/minecraft/src/Chunk.class and b/build/classes/java/main/net/minecraft/src/Chunk.class differ diff --git a/build/classes/java/main/net/minecraft/src/ChunkProviderEnd.class b/build/classes/java/main/net/minecraft/src/ChunkProviderEnd.class index 5298cbe..3d5fe89 100644 Binary files a/build/classes/java/main/net/minecraft/src/ChunkProviderEnd.class and b/build/classes/java/main/net/minecraft/src/ChunkProviderEnd.class differ diff --git a/build/classes/java/main/net/minecraft/src/ChunkProviderFlat.class b/build/classes/java/main/net/minecraft/src/ChunkProviderFlat.class index d7713df..fe5a7be 100644 Binary files a/build/classes/java/main/net/minecraft/src/ChunkProviderFlat.class and b/build/classes/java/main/net/minecraft/src/ChunkProviderFlat.class differ diff --git a/build/classes/java/main/net/minecraft/src/ChunkProviderGenerate.class b/build/classes/java/main/net/minecraft/src/ChunkProviderGenerate.class index 433d048..6104adb 100644 Binary files a/build/classes/java/main/net/minecraft/src/ChunkProviderGenerate.class and b/build/classes/java/main/net/minecraft/src/ChunkProviderGenerate.class differ diff --git a/build/classes/java/main/net/minecraft/src/ChunkProviderHell.class b/build/classes/java/main/net/minecraft/src/ChunkProviderHell.class index 8758dbe..4f47541 100644 Binary files a/build/classes/java/main/net/minecraft/src/ChunkProviderHell.class and b/build/classes/java/main/net/minecraft/src/ChunkProviderHell.class differ diff --git a/build/classes/java/main/net/minecraft/src/CommandSpreadPlayers.class b/build/classes/java/main/net/minecraft/src/CommandSpreadPlayers.class index b7cede1..568fcd7 100644 Binary files a/build/classes/java/main/net/minecraft/src/CommandSpreadPlayers.class and b/build/classes/java/main/net/minecraft/src/CommandSpreadPlayers.class differ diff --git a/build/classes/java/main/net/minecraft/src/CommandSpreadPlayersPosition.class b/build/classes/java/main/net/minecraft/src/CommandSpreadPlayersPosition.class index 011e679..65c3eb8 100644 Binary files a/build/classes/java/main/net/minecraft/src/CommandSpreadPlayersPosition.class and b/build/classes/java/main/net/minecraft/src/CommandSpreadPlayersPosition.class differ diff --git a/build/classes/java/main/net/minecraft/src/CommandWeather.class b/build/classes/java/main/net/minecraft/src/CommandWeather.class index ab9e538..f6e908b 100644 Binary files a/build/classes/java/main/net/minecraft/src/CommandWeather.class and b/build/classes/java/main/net/minecraft/src/CommandWeather.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentMineshaftCorridor.class b/build/classes/java/main/net/minecraft/src/ComponentMineshaftCorridor.class index a5b9c78..cf5f8ca 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentMineshaftCorridor.class and b/build/classes/java/main/net/minecraft/src/ComponentMineshaftCorridor.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentMineshaftCross.class b/build/classes/java/main/net/minecraft/src/ComponentMineshaftCross.class index 905bc4f..1a23bed 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentMineshaftCross.class and b/build/classes/java/main/net/minecraft/src/ComponentMineshaftCross.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentMineshaftRoom.class b/build/classes/java/main/net/minecraft/src/ComponentMineshaftRoom.class index 95f4efd..e4673d1 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentMineshaftRoom.class and b/build/classes/java/main/net/minecraft/src/ComponentMineshaftRoom.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentMineshaftStairs.class b/build/classes/java/main/net/minecraft/src/ComponentMineshaftStairs.class index 61cc044..aa723f0 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentMineshaftStairs.class and b/build/classes/java/main/net/minecraft/src/ComponentMineshaftStairs.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor.class index 4ea157c..c47ead1 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor2.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor2.class index 19c0101..9f98ddb 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor2.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor2.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor3.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor3.class index 4cb94ce..3abab6a 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor3.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor3.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor4.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor4.class index 69f5977..17f47bf 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor4.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor4.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor5.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor5.class index df54d3d..7cf94f4 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor5.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCorridor5.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCrossing.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCrossing.class index 1484fd8..675addb 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCrossing.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCrossing.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCrossing2.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCrossing2.class index b27dfd1..4a86550 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCrossing2.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCrossing2.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCrossing3.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCrossing3.class index 9aeaabf..f0a0b0f 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCrossing3.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeCrossing3.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeEnd.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeEnd.class index 6dcdc5b..24be992 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeEnd.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeEnd.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeEntrance.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeEntrance.class index 511ea58..0938aa6 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeEntrance.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeEntrance.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeNetherStalkRoom.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeNetherStalkRoom.class index a2cee41..e99a0d2 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeNetherStalkRoom.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeNetherStalkRoom.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgePiece.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgePiece.class index 8a248a9..537cefc 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgePiece.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgePiece.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeStairs.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeStairs.class index 4867c62..55fcb28 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeStairs.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeStairs.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeStartPiece.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeStartPiece.class index c775272..2820ee9 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeStartPiece.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeStartPiece.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeStraight.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeStraight.class index 4ac5370..d92dd14 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeStraight.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeStraight.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeThrone.class b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeThrone.class index fbb43e2..86c33cd 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeThrone.class and b/build/classes/java/main/net/minecraft/src/ComponentNetherBridgeThrone.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentScatteredFeature.class b/build/classes/java/main/net/minecraft/src/ComponentScatteredFeature.class index 10f47b2..754971c 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentScatteredFeature.class and b/build/classes/java/main/net/minecraft/src/ComponentScatteredFeature.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.class b/build/classes/java/main/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.class index 8c49ab9..53b3276 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.class and b/build/classes/java/main/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.class b/build/classes/java/main/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.class index d6788b4..6fd1356 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.class and b/build/classes/java/main/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentScatteredFeatureSwampHut.class b/build/classes/java/main/net/minecraft/src/ComponentScatteredFeatureSwampHut.class index 65579a4..3e1fd58 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentScatteredFeatureSwampHut.class and b/build/classes/java/main/net/minecraft/src/ComponentScatteredFeatureSwampHut.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStronghold.class b/build/classes/java/main/net/minecraft/src/ComponentStronghold.class index 8499483..65c0008 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStronghold.class and b/build/classes/java/main/net/minecraft/src/ComponentStronghold.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdChestCorridor.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdChestCorridor.class index b1fea18..486d792 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdChestCorridor.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdChestCorridor.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdCorridor.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdCorridor.class index 02c5547..cbad7cf 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdCorridor.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdCorridor.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdCrossing.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdCrossing.class index 6706122..785da1f 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdCrossing.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdCrossing.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdLeftTurn.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdLeftTurn.class index 7ca9cab..958c3d7 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdLeftTurn.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdLeftTurn.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdLibrary.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdLibrary.class index 22540f6..62400da 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdLibrary.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdLibrary.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdPortalRoom.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdPortalRoom.class index 4786b32..fd63278 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdPortalRoom.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdPortalRoom.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdPrison.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdPrison.class index ee7d6ae..ddbdc55 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdPrison.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdPrison.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdRightTurn.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdRightTurn.class index db2e3ff..1a1cd47 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdRightTurn.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdRightTurn.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdRoomCrossing.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdRoomCrossing.class index 788691f..020246e 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdRoomCrossing.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdRoomCrossing.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdStairs.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdStairs.class index e5274fb..845981c 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdStairs.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdStairs.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdStairs2.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdStairs2.class index 11e7c86..e871387 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdStairs2.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdStairs2.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdStairsStraight.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdStairsStraight.class index 92507eb..ff0ca89 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdStairsStraight.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdStairsStraight.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentStrongholdStraight.class b/build/classes/java/main/net/minecraft/src/ComponentStrongholdStraight.class index 6b124d7..1a65629 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentStrongholdStraight.class and b/build/classes/java/main/net/minecraft/src/ComponentStrongholdStraight.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillage.class b/build/classes/java/main/net/minecraft/src/ComponentVillage.class index 299912d..c2f1d27 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillage.class and b/build/classes/java/main/net/minecraft/src/ComponentVillage.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillageChurch.class b/build/classes/java/main/net/minecraft/src/ComponentVillageChurch.class index fa282cf..f918ae0 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillageChurch.class and b/build/classes/java/main/net/minecraft/src/ComponentVillageChurch.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillageField.class b/build/classes/java/main/net/minecraft/src/ComponentVillageField.class index c77791d..f7e3c86 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillageField.class and b/build/classes/java/main/net/minecraft/src/ComponentVillageField.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillageField2.class b/build/classes/java/main/net/minecraft/src/ComponentVillageField2.class index caaa536..81f8a67 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillageField2.class and b/build/classes/java/main/net/minecraft/src/ComponentVillageField2.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillageHall.class b/build/classes/java/main/net/minecraft/src/ComponentVillageHall.class index 4418671..a2741e1 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillageHall.class and b/build/classes/java/main/net/minecraft/src/ComponentVillageHall.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillageHouse1.class b/build/classes/java/main/net/minecraft/src/ComponentVillageHouse1.class index 0d816fd..b2cec64 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillageHouse1.class and b/build/classes/java/main/net/minecraft/src/ComponentVillageHouse1.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillageHouse2.class b/build/classes/java/main/net/minecraft/src/ComponentVillageHouse2.class index e30812f..2d90350 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillageHouse2.class and b/build/classes/java/main/net/minecraft/src/ComponentVillageHouse2.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillageHouse3.class b/build/classes/java/main/net/minecraft/src/ComponentVillageHouse3.class index b4460ea..a25925c 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillageHouse3.class and b/build/classes/java/main/net/minecraft/src/ComponentVillageHouse3.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillageHouse4_Garden.class b/build/classes/java/main/net/minecraft/src/ComponentVillageHouse4_Garden.class index 98c7136..90f44f8 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillageHouse4_Garden.class and b/build/classes/java/main/net/minecraft/src/ComponentVillageHouse4_Garden.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillagePathGen.class b/build/classes/java/main/net/minecraft/src/ComponentVillagePathGen.class index d6e512e..ecd25d5 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillagePathGen.class and b/build/classes/java/main/net/minecraft/src/ComponentVillagePathGen.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillageStartPiece.class b/build/classes/java/main/net/minecraft/src/ComponentVillageStartPiece.class index d43a7d5..1255fee 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillageStartPiece.class and b/build/classes/java/main/net/minecraft/src/ComponentVillageStartPiece.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillageTorch.class b/build/classes/java/main/net/minecraft/src/ComponentVillageTorch.class index c88999e..5949770 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillageTorch.class and b/build/classes/java/main/net/minecraft/src/ComponentVillageTorch.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillageWell.class b/build/classes/java/main/net/minecraft/src/ComponentVillageWell.class index 65833b6..4d5f48b 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillageWell.class and b/build/classes/java/main/net/minecraft/src/ComponentVillageWell.class differ diff --git a/build/classes/java/main/net/minecraft/src/ComponentVillageWoodHut.class b/build/classes/java/main/net/minecraft/src/ComponentVillageWoodHut.class index 6aaff02..cc06955 100644 Binary files a/build/classes/java/main/net/minecraft/src/ComponentVillageWoodHut.class and b/build/classes/java/main/net/minecraft/src/ComponentVillageWoodHut.class differ diff --git a/build/classes/java/main/net/minecraft/src/ContainerEnchantment.class b/build/classes/java/main/net/minecraft/src/ContainerEnchantment.class index fe5a0a0..8299140 100644 Binary files a/build/classes/java/main/net/minecraft/src/ContainerEnchantment.class and b/build/classes/java/main/net/minecraft/src/ContainerEnchantment.class differ diff --git a/build/classes/java/main/net/minecraft/src/ContainerRepairINNER2.class b/build/classes/java/main/net/minecraft/src/ContainerRepairINNER2.class index a68667c..b569895 100644 Binary files a/build/classes/java/main/net/minecraft/src/ContainerRepairINNER2.class and b/build/classes/java/main/net/minecraft/src/ContainerRepairINNER2.class differ diff --git a/build/classes/java/main/net/minecraft/src/DedicatedServer.class b/build/classes/java/main/net/minecraft/src/DedicatedServer.class index cdf4a5f..42e92bf 100644 Binary files a/build/classes/java/main/net/minecraft/src/DedicatedServer.class and b/build/classes/java/main/net/minecraft/src/DedicatedServer.class differ diff --git a/build/classes/java/main/net/minecraft/src/DispenserBehaviorFire.class b/build/classes/java/main/net/minecraft/src/DispenserBehaviorFire.class index 3442f61..4124836 100644 Binary files a/build/classes/java/main/net/minecraft/src/DispenserBehaviorFire.class and b/build/classes/java/main/net/minecraft/src/DispenserBehaviorFire.class differ diff --git a/build/classes/java/main/net/minecraft/src/DispenserBehaviorFireball.class b/build/classes/java/main/net/minecraft/src/DispenserBehaviorFireball.class index 0fd5504..42c5b71 100644 Binary files a/build/classes/java/main/net/minecraft/src/DispenserBehaviorFireball.class and b/build/classes/java/main/net/minecraft/src/DispenserBehaviorFireball.class differ diff --git a/build/classes/java/main/net/minecraft/src/EffectRenderer.class b/build/classes/java/main/net/minecraft/src/EffectRenderer.class index 0853d49..1226026 100644 Binary files a/build/classes/java/main/net/minecraft/src/EffectRenderer.class and b/build/classes/java/main/net/minecraft/src/EffectRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/EmptyChunk.class b/build/classes/java/main/net/minecraft/src/EmptyChunk.class index b88a9f1..0818374 100644 Binary files a/build/classes/java/main/net/minecraft/src/EmptyChunk.class and b/build/classes/java/main/net/minecraft/src/EmptyChunk.class differ diff --git a/build/classes/java/main/net/minecraft/src/EnchantmentDurability.class b/build/classes/java/main/net/minecraft/src/EnchantmentDurability.class index 49a66c1..f0fc145 100644 Binary files a/build/classes/java/main/net/minecraft/src/EnchantmentDurability.class and b/build/classes/java/main/net/minecraft/src/EnchantmentDurability.class differ diff --git a/build/classes/java/main/net/minecraft/src/EnchantmentHelper.class b/build/classes/java/main/net/minecraft/src/EnchantmentHelper.class index 2789f95..dc8f3d1 100644 Binary files a/build/classes/java/main/net/minecraft/src/EnchantmentHelper.class and b/build/classes/java/main/net/minecraft/src/EnchantmentHelper.class differ diff --git a/build/classes/java/main/net/minecraft/src/EnchantmentNameParts.class b/build/classes/java/main/net/minecraft/src/EnchantmentNameParts.class index e4f0b35..a33820f 100644 Binary files a/build/classes/java/main/net/minecraft/src/EnchantmentNameParts.class and b/build/classes/java/main/net/minecraft/src/EnchantmentNameParts.class differ diff --git a/build/classes/java/main/net/minecraft/src/EnchantmentThorns.class b/build/classes/java/main/net/minecraft/src/EnchantmentThorns.class index 2a83bdd..2d422dc 100644 Binary files a/build/classes/java/main/net/minecraft/src/EnchantmentThorns.class and b/build/classes/java/main/net/minecraft/src/EnchantmentThorns.class differ diff --git a/build/classes/java/main/net/minecraft/src/Entity.class b/build/classes/java/main/net/minecraft/src/Entity.class index 3c7e193..7ae8996 100644 Binary files a/build/classes/java/main/net/minecraft/src/Entity.class and b/build/classes/java/main/net/minecraft/src/Entity.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIAttackOnCollide.class b/build/classes/java/main/net/minecraft/src/EntityAIAttackOnCollide.class index 1eb5e02..f44b721 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIAttackOnCollide.class and b/build/classes/java/main/net/minecraft/src/EntityAIAttackOnCollide.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIBeg.class b/build/classes/java/main/net/minecraft/src/EntityAIBeg.class index ac3bb68..24a4dd0 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIBeg.class and b/build/classes/java/main/net/minecraft/src/EntityAIBeg.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIBreakDoor.class b/build/classes/java/main/net/minecraft/src/EntityAIBreakDoor.class index 8f87e80..4ef6d11 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIBreakDoor.class and b/build/classes/java/main/net/minecraft/src/EntityAIBreakDoor.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIControlledByPlayer.class b/build/classes/java/main/net/minecraft/src/EntityAIControlledByPlayer.class index e24471a..0b353a0 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIControlledByPlayer.class and b/build/classes/java/main/net/minecraft/src/EntityAIControlledByPlayer.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIDefendVillage.class b/build/classes/java/main/net/minecraft/src/EntityAIDefendVillage.class index e140861..c4b5765 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIDefendVillage.class and b/build/classes/java/main/net/minecraft/src/EntityAIDefendVillage.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIEatGrass.class b/build/classes/java/main/net/minecraft/src/EntityAIEatGrass.class index d9122ff..4af9b6f 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIEatGrass.class and b/build/classes/java/main/net/minecraft/src/EntityAIEatGrass.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIFleeSun.class b/build/classes/java/main/net/minecraft/src/EntityAIFleeSun.class index 4d09fc7..fc14448 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIFleeSun.class and b/build/classes/java/main/net/minecraft/src/EntityAIFleeSun.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIFollowGolem.class b/build/classes/java/main/net/minecraft/src/EntityAIFollowGolem.class index e32c4d6..ea1b2c3 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIFollowGolem.class and b/build/classes/java/main/net/minecraft/src/EntityAIFollowGolem.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAILeapAtTarget.class b/build/classes/java/main/net/minecraft/src/EntityAILeapAtTarget.class index 46e207f..9063ec6 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAILeapAtTarget.class and b/build/classes/java/main/net/minecraft/src/EntityAILeapAtTarget.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAILookAtVillager.class b/build/classes/java/main/net/minecraft/src/EntityAILookAtVillager.class index 663d31d..bf97b58 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAILookAtVillager.class and b/build/classes/java/main/net/minecraft/src/EntityAILookAtVillager.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAILookIdle.class b/build/classes/java/main/net/minecraft/src/EntityAILookIdle.class index 8fef983..4a777e5 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAILookIdle.class and b/build/classes/java/main/net/minecraft/src/EntityAILookIdle.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIMate.class b/build/classes/java/main/net/minecraft/src/EntityAIMate.class index 4f6d1d7..6027756 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIMate.class and b/build/classes/java/main/net/minecraft/src/EntityAIMate.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIMoveIndoors.class b/build/classes/java/main/net/minecraft/src/EntityAIMoveIndoors.class index a305fc7..c273cf6 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIMoveIndoors.class and b/build/classes/java/main/net/minecraft/src/EntityAIMoveIndoors.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAINearestAttackableTarget.class b/build/classes/java/main/net/minecraft/src/EntityAINearestAttackableTarget.class index a773c90..76440c3 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAINearestAttackableTarget.class and b/build/classes/java/main/net/minecraft/src/EntityAINearestAttackableTarget.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIOcelotSit.class b/build/classes/java/main/net/minecraft/src/EntityAIOcelotSit.class index 31ba821..36a77df 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIOcelotSit.class and b/build/classes/java/main/net/minecraft/src/EntityAIOcelotSit.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIPlay.class b/build/classes/java/main/net/minecraft/src/EntityAIPlay.class index 56282e9..9757363 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIPlay.class and b/build/classes/java/main/net/minecraft/src/EntityAIPlay.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIRunAroundLikeCrazy.class b/build/classes/java/main/net/minecraft/src/EntityAIRunAroundLikeCrazy.class index 8a378bc..9cff11d 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIRunAroundLikeCrazy.class and b/build/classes/java/main/net/minecraft/src/EntityAIRunAroundLikeCrazy.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAISwimming.class b/build/classes/java/main/net/minecraft/src/EntityAISwimming.class index 16b1ec6..09e16e0 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAISwimming.class and b/build/classes/java/main/net/minecraft/src/EntityAISwimming.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAITarget.class b/build/classes/java/main/net/minecraft/src/EntityAITarget.class index f1ed731..03b5504 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAITarget.class and b/build/classes/java/main/net/minecraft/src/EntityAITarget.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIVillagerMate.class b/build/classes/java/main/net/minecraft/src/EntityAIVillagerMate.class index 9eaec81..fa36e5a 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIVillagerMate.class and b/build/classes/java/main/net/minecraft/src/EntityAIVillagerMate.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIWander.class b/build/classes/java/main/net/minecraft/src/EntityAIWander.class index 38ea66a..12908e4 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIWander.class and b/build/classes/java/main/net/minecraft/src/EntityAIWander.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAIWatchClosest.class b/build/classes/java/main/net/minecraft/src/EntityAIWatchClosest.class index 3c649d0..d7a308a 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAIWatchClosest.class and b/build/classes/java/main/net/minecraft/src/EntityAIWatchClosest.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAnimal.class b/build/classes/java/main/net/minecraft/src/EntityAnimal.class index a314ec0..8c3251c 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAnimal.class and b/build/classes/java/main/net/minecraft/src/EntityAnimal.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityArrow.class b/build/classes/java/main/net/minecraft/src/EntityArrow.class index 7fca975..d6c629c 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityArrow.class and b/build/classes/java/main/net/minecraft/src/EntityArrow.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityAuraFX.class b/build/classes/java/main/net/minecraft/src/EntityAuraFX.class index 37628ef..885d9b0 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityAuraFX.class and b/build/classes/java/main/net/minecraft/src/EntityAuraFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityBat.class b/build/classes/java/main/net/minecraft/src/EntityBat.class index 781627b..8acbe4a 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityBat.class and b/build/classes/java/main/net/minecraft/src/EntityBat.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityBlaze.class b/build/classes/java/main/net/minecraft/src/EntityBlaze.class index 7c84be6..b9ce603 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityBlaze.class and b/build/classes/java/main/net/minecraft/src/EntityBlaze.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityBoat.class b/build/classes/java/main/net/minecraft/src/EntityBoat.class index aef1ff7..5d63a96 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityBoat.class and b/build/classes/java/main/net/minecraft/src/EntityBoat.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityBubbleFX.class b/build/classes/java/main/net/minecraft/src/EntityBubbleFX.class index ba5bb99..ad4bb68 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityBubbleFX.class and b/build/classes/java/main/net/minecraft/src/EntityBubbleFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityChicken.class b/build/classes/java/main/net/minecraft/src/EntityChicken.class index af7569c..7a32e4d 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityChicken.class and b/build/classes/java/main/net/minecraft/src/EntityChicken.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityCow.class b/build/classes/java/main/net/minecraft/src/EntityCow.class index acb3dca..c1e1fcd 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityCow.class and b/build/classes/java/main/net/minecraft/src/EntityCow.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityCreature.class b/build/classes/java/main/net/minecraft/src/EntityCreature.class index 3b6df23..1979886 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityCreature.class and b/build/classes/java/main/net/minecraft/src/EntityCreature.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityCreeper.class b/build/classes/java/main/net/minecraft/src/EntityCreeper.class index c500665..2bbaea1 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityCreeper.class and b/build/classes/java/main/net/minecraft/src/EntityCreeper.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityCrit2FX.class b/build/classes/java/main/net/minecraft/src/EntityCrit2FX.class index 91a134d..3a230a8 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityCrit2FX.class and b/build/classes/java/main/net/minecraft/src/EntityCrit2FX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityDragon.class b/build/classes/java/main/net/minecraft/src/EntityDragon.class index 55bf360..4cc1881 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityDragon.class and b/build/classes/java/main/net/minecraft/src/EntityDragon.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityEgg.class b/build/classes/java/main/net/minecraft/src/EntityEgg.class index 7abbbdd..67c5be3 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityEgg.class and b/build/classes/java/main/net/minecraft/src/EntityEgg.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityEnchantmentTableParticleFX.class b/build/classes/java/main/net/minecraft/src/EntityEnchantmentTableParticleFX.class index 33a194a..d34da98 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityEnchantmentTableParticleFX.class and b/build/classes/java/main/net/minecraft/src/EntityEnchantmentTableParticleFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityEnderCrystal.class b/build/classes/java/main/net/minecraft/src/EntityEnderCrystal.class index 9926979..414eb6b 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityEnderCrystal.class and b/build/classes/java/main/net/minecraft/src/EntityEnderCrystal.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityEnderEye.class b/build/classes/java/main/net/minecraft/src/EntityEnderEye.class index 9baf58d..5de7344 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityEnderEye.class and b/build/classes/java/main/net/minecraft/src/EntityEnderEye.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityEnderPearl.class b/build/classes/java/main/net/minecraft/src/EntityEnderPearl.class index c122aa4..87fa2a8 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityEnderPearl.class and b/build/classes/java/main/net/minecraft/src/EntityEnderPearl.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityEnderman.class b/build/classes/java/main/net/minecraft/src/EntityEnderman.class index 81d99aa..98116de 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityEnderman.class and b/build/classes/java/main/net/minecraft/src/EntityEnderman.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityExpBottle.class b/build/classes/java/main/net/minecraft/src/EntityExpBottle.class index 91f807c..db24f69 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityExpBottle.class and b/build/classes/java/main/net/minecraft/src/EntityExpBottle.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityExplodeFX.class b/build/classes/java/main/net/minecraft/src/EntityExplodeFX.class index 55ea846..e228622 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityExplodeFX.class and b/build/classes/java/main/net/minecraft/src/EntityExplodeFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityFX.class b/build/classes/java/main/net/minecraft/src/EntityFX.class index 624e4e7..d7e980a 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityFX.class and b/build/classes/java/main/net/minecraft/src/EntityFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityFallingSand.class b/build/classes/java/main/net/minecraft/src/EntityFallingSand.class index afe425b..988260f 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityFallingSand.class and b/build/classes/java/main/net/minecraft/src/EntityFallingSand.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityFireball.class b/build/classes/java/main/net/minecraft/src/EntityFireball.class index 3ad0d4a..fd0dfc1 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityFireball.class and b/build/classes/java/main/net/minecraft/src/EntityFireball.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityFireworkRocket.class b/build/classes/java/main/net/minecraft/src/EntityFireworkRocket.class index 908f99b..426e244 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityFireworkRocket.class and b/build/classes/java/main/net/minecraft/src/EntityFireworkRocket.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityFireworkSparkFX.class b/build/classes/java/main/net/minecraft/src/EntityFireworkSparkFX.class index 20e1c79..3063479 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityFireworkSparkFX.class and b/build/classes/java/main/net/minecraft/src/EntityFireworkSparkFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityFireworkStarterFX.class b/build/classes/java/main/net/minecraft/src/EntityFireworkStarterFX.class index 9852930..94802c3 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityFireworkStarterFX.class and b/build/classes/java/main/net/minecraft/src/EntityFireworkStarterFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityFishHook.class b/build/classes/java/main/net/minecraft/src/EntityFishHook.class index 0cd576a..4aa93e2 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityFishHook.class and b/build/classes/java/main/net/minecraft/src/EntityFishHook.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityFlameFX.class b/build/classes/java/main/net/minecraft/src/EntityFlameFX.class index 9037d30..1e1939d 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityFlameFX.class and b/build/classes/java/main/net/minecraft/src/EntityFlameFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityGhast.class b/build/classes/java/main/net/minecraft/src/EntityGhast.class index a3f3a4b..60186ab 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityGhast.class and b/build/classes/java/main/net/minecraft/src/EntityGhast.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityHorse.class b/build/classes/java/main/net/minecraft/src/EntityHorse.class index f76eafc..a551a78 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityHorse.class and b/build/classes/java/main/net/minecraft/src/EntityHorse.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityHugeExplodeFX.class b/build/classes/java/main/net/minecraft/src/EntityHugeExplodeFX.class index d3c389a..ec9e3f0 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityHugeExplodeFX.class and b/build/classes/java/main/net/minecraft/src/EntityHugeExplodeFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityIronGolem.class b/build/classes/java/main/net/minecraft/src/EntityIronGolem.class index 480deea..fbbbc32 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityIronGolem.class and b/build/classes/java/main/net/minecraft/src/EntityIronGolem.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityItem.class b/build/classes/java/main/net/minecraft/src/EntityItem.class index 37225ea..578d489 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityItem.class and b/build/classes/java/main/net/minecraft/src/EntityItem.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityItemFrame.class b/build/classes/java/main/net/minecraft/src/EntityItemFrame.class index 8981d5d..fa5d12a 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityItemFrame.class and b/build/classes/java/main/net/minecraft/src/EntityItemFrame.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityLargeExplodeFX.class b/build/classes/java/main/net/minecraft/src/EntityLargeExplodeFX.class index 03ee70c..3a4b004 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityLargeExplodeFX.class and b/build/classes/java/main/net/minecraft/src/EntityLargeExplodeFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityLavaFX.class b/build/classes/java/main/net/minecraft/src/EntityLavaFX.class index af53af1..8d6223b 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityLavaFX.class and b/build/classes/java/main/net/minecraft/src/EntityLavaFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityLightningBolt.class b/build/classes/java/main/net/minecraft/src/EntityLightningBolt.class index 1cc97a7..0f28924 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityLightningBolt.class and b/build/classes/java/main/net/minecraft/src/EntityLightningBolt.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityLiving.class b/build/classes/java/main/net/minecraft/src/EntityLiving.class index 1e13887..e63ec53 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityLiving.class and b/build/classes/java/main/net/minecraft/src/EntityLiving.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityLivingBase.class b/build/classes/java/main/net/minecraft/src/EntityLivingBase.class index 67a4edb..2a33773 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityLivingBase.class and b/build/classes/java/main/net/minecraft/src/EntityLivingBase.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityMagmaCube.class b/build/classes/java/main/net/minecraft/src/EntityMagmaCube.class index 43d195a..ffea04b 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityMagmaCube.class and b/build/classes/java/main/net/minecraft/src/EntityMagmaCube.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityMinecartContainer.class b/build/classes/java/main/net/minecraft/src/EntityMinecartContainer.class index f8aa6ed..f98e143 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityMinecartContainer.class and b/build/classes/java/main/net/minecraft/src/EntityMinecartContainer.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityMinecartFurnace.class b/build/classes/java/main/net/minecraft/src/EntityMinecartFurnace.class index fb48a50..211dc44 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityMinecartFurnace.class and b/build/classes/java/main/net/minecraft/src/EntityMinecartFurnace.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityMinecartTNT.class b/build/classes/java/main/net/minecraft/src/EntityMinecartTNT.class index 320d2c8..de57490 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityMinecartTNT.class and b/build/classes/java/main/net/minecraft/src/EntityMinecartTNT.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityMob.class b/build/classes/java/main/net/minecraft/src/EntityMob.class index f8958f4..2bfdb71 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityMob.class and b/build/classes/java/main/net/minecraft/src/EntityMob.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityOcelot.class b/build/classes/java/main/net/minecraft/src/EntityOcelot.class index 3125274..afbf4db 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityOcelot.class and b/build/classes/java/main/net/minecraft/src/EntityOcelot.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityPainting.class b/build/classes/java/main/net/minecraft/src/EntityPainting.class index 22c4353..9c81613 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityPainting.class and b/build/classes/java/main/net/minecraft/src/EntityPainting.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityPig.class b/build/classes/java/main/net/minecraft/src/EntityPig.class index 91c201f..08b63e5 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityPig.class and b/build/classes/java/main/net/minecraft/src/EntityPig.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityPigZombie.class b/build/classes/java/main/net/minecraft/src/EntityPigZombie.class index 69d164e..8781730 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityPigZombie.class and b/build/classes/java/main/net/minecraft/src/EntityPigZombie.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityPlayer.class b/build/classes/java/main/net/minecraft/src/EntityPlayer.class index 15b190b..feb6475 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityPlayer.class and b/build/classes/java/main/net/minecraft/src/EntityPlayer.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityPlayerMP.class b/build/classes/java/main/net/minecraft/src/EntityPlayerMP.class index a37f820..2e74cca 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityPlayerMP.class and b/build/classes/java/main/net/minecraft/src/EntityPlayerMP.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityPlayerSP.class b/build/classes/java/main/net/minecraft/src/EntityPlayerSP.class index a4dbc79..63ba93b 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityPlayerSP.class and b/build/classes/java/main/net/minecraft/src/EntityPlayerSP.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityPortalFX.class b/build/classes/java/main/net/minecraft/src/EntityPortalFX.class index f976cb8..46d65f5 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityPortalFX.class and b/build/classes/java/main/net/minecraft/src/EntityPortalFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityRainFX.class b/build/classes/java/main/net/minecraft/src/EntityRainFX.class index cfe318a..a777337 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityRainFX.class and b/build/classes/java/main/net/minecraft/src/EntityRainFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityRenderer.class b/build/classes/java/main/net/minecraft/src/EntityRenderer.class index f4d0477..8ae1783 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityRenderer.class and b/build/classes/java/main/net/minecraft/src/EntityRenderer.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntitySheep.class b/build/classes/java/main/net/minecraft/src/EntitySheep.class index 8157a55..d0b396e 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntitySheep.class and b/build/classes/java/main/net/minecraft/src/EntitySheep.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntitySilverfish.class b/build/classes/java/main/net/minecraft/src/EntitySilverfish.class index 9940af5..16afc44 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntitySilverfish.class and b/build/classes/java/main/net/minecraft/src/EntitySilverfish.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntitySkeleton.class b/build/classes/java/main/net/minecraft/src/EntitySkeleton.class index c7414fa..f236073 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntitySkeleton.class and b/build/classes/java/main/net/minecraft/src/EntitySkeleton.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntitySlime.class b/build/classes/java/main/net/minecraft/src/EntitySlime.class index 2cf51b5..ab512cc 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntitySlime.class and b/build/classes/java/main/net/minecraft/src/EntitySlime.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntitySnowman.class b/build/classes/java/main/net/minecraft/src/EntitySnowman.class index f4ccb30..eb844fa 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntitySnowman.class and b/build/classes/java/main/net/minecraft/src/EntitySnowman.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntitySpider.class b/build/classes/java/main/net/minecraft/src/EntitySpider.class index e1ad61c..c0d2eb4 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntitySpider.class and b/build/classes/java/main/net/minecraft/src/EntitySpider.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntitySquid.class b/build/classes/java/main/net/minecraft/src/EntitySquid.class index 91df6b2..bea573e 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntitySquid.class and b/build/classes/java/main/net/minecraft/src/EntitySquid.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntitySuspendFX.class b/build/classes/java/main/net/minecraft/src/EntitySuspendFX.class index 9741317..fa61478 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntitySuspendFX.class and b/build/classes/java/main/net/minecraft/src/EntitySuspendFX.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityTameable.class b/build/classes/java/main/net/minecraft/src/EntityTameable.class index 0d5eb70..321ae72 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityTameable.class and b/build/classes/java/main/net/minecraft/src/EntityTameable.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityThrowable.class b/build/classes/java/main/net/minecraft/src/EntityThrowable.class index 5ae57fd..1721d45 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityThrowable.class and b/build/classes/java/main/net/minecraft/src/EntityThrowable.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityVillager.class b/build/classes/java/main/net/minecraft/src/EntityVillager.class index 0a4aef4..6af4c3d 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityVillager.class and b/build/classes/java/main/net/minecraft/src/EntityVillager.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityWaterMob.class b/build/classes/java/main/net/minecraft/src/EntityWaterMob.class index 9390c1a..e14190b 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityWaterMob.class and b/build/classes/java/main/net/minecraft/src/EntityWaterMob.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityWitch.class b/build/classes/java/main/net/minecraft/src/EntityWitch.class index ee31bb1..5741a7f 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityWitch.class and b/build/classes/java/main/net/minecraft/src/EntityWitch.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityWither.class b/build/classes/java/main/net/minecraft/src/EntityWither.class index 17f7efb..4cd5eab 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityWither.class and b/build/classes/java/main/net/minecraft/src/EntityWither.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityWolf.class b/build/classes/java/main/net/minecraft/src/EntityWolf.class index 4bde093..be164ab 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityWolf.class and b/build/classes/java/main/net/minecraft/src/EntityWolf.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityXPOrb.class b/build/classes/java/main/net/minecraft/src/EntityXPOrb.class index 1dd2778..e38cb63 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityXPOrb.class and b/build/classes/java/main/net/minecraft/src/EntityXPOrb.class differ diff --git a/build/classes/java/main/net/minecraft/src/EntityZombie.class b/build/classes/java/main/net/minecraft/src/EntityZombie.class index 43016a5..7a5d4ce 100644 Binary files a/build/classes/java/main/net/minecraft/src/EntityZombie.class and b/build/classes/java/main/net/minecraft/src/EntityZombie.class differ diff --git a/build/classes/java/main/net/minecraft/src/Explosion.class b/build/classes/java/main/net/minecraft/src/Explosion.class index 08a32aa..e68409c 100644 Binary files a/build/classes/java/main/net/minecraft/src/Explosion.class and b/build/classes/java/main/net/minecraft/src/Explosion.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiAchievements.class b/build/classes/java/main/net/minecraft/src/GuiAchievements.class index 3c3abb0..bd4c94d 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiAchievements.class and b/build/classes/java/main/net/minecraft/src/GuiAchievements.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiCreateWorld.class b/build/classes/java/main/net/minecraft/src/GuiCreateWorld.class index 7c6ba89..48b1e07 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiCreateWorld.class and b/build/classes/java/main/net/minecraft/src/GuiCreateWorld.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiEnchantment.class b/build/classes/java/main/net/minecraft/src/GuiEnchantment.class index c1fd5c6..bb4b45f 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiEnchantment.class and b/build/classes/java/main/net/minecraft/src/GuiEnchantment.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiIngame.class b/build/classes/java/main/net/minecraft/src/GuiIngame.class index 1bf8c0e9..b0898ae 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiIngame.class and b/build/classes/java/main/net/minecraft/src/GuiIngame.class differ diff --git a/build/classes/java/main/net/minecraft/src/GuiWinGame.class b/build/classes/java/main/net/minecraft/src/GuiWinGame.class index 56aa7c0..56fdf1e 100644 Binary files a/build/classes/java/main/net/minecraft/src/GuiWinGame.class and b/build/classes/java/main/net/minecraft/src/GuiWinGame.class differ diff --git a/build/classes/java/main/net/minecraft/src/Item.class b/build/classes/java/main/net/minecraft/src/Item.class index a9a334b..b3f2c44 100644 Binary files a/build/classes/java/main/net/minecraft/src/Item.class and b/build/classes/java/main/net/minecraft/src/Item.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemBow.class b/build/classes/java/main/net/minecraft/src/ItemBow.class index 7c5b720..bf791a2 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemBow.class and b/build/classes/java/main/net/minecraft/src/ItemBow.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemBucket.class b/build/classes/java/main/net/minecraft/src/ItemBucket.class index f97082f..d559bd8 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemBucket.class and b/build/classes/java/main/net/minecraft/src/ItemBucket.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemDye.class b/build/classes/java/main/net/minecraft/src/ItemDye.class index 1ddda4e..08171c7 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemDye.class and b/build/classes/java/main/net/minecraft/src/ItemDye.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemEgg.class b/build/classes/java/main/net/minecraft/src/ItemEgg.class index e1b6fe8..95e7957 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemEgg.class and b/build/classes/java/main/net/minecraft/src/ItemEgg.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemEnchantedBook.class b/build/classes/java/main/net/minecraft/src/ItemEnchantedBook.class index fa03a50..f1f9fed 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemEnchantedBook.class and b/build/classes/java/main/net/minecraft/src/ItemEnchantedBook.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemEnderEye.class b/build/classes/java/main/net/minecraft/src/ItemEnderEye.class index 09daa1e..2f2ec70 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemEnderEye.class and b/build/classes/java/main/net/minecraft/src/ItemEnderEye.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemEnderPearl.class b/build/classes/java/main/net/minecraft/src/ItemEnderPearl.class index ab6a73b..8a2f994 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemEnderPearl.class and b/build/classes/java/main/net/minecraft/src/ItemEnderPearl.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemExpBottle.class b/build/classes/java/main/net/minecraft/src/ItemExpBottle.class index 4f649bb..fa599cb 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemExpBottle.class and b/build/classes/java/main/net/minecraft/src/ItemExpBottle.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemFireball.class b/build/classes/java/main/net/minecraft/src/ItemFireball.class index 90f70ec..1f826ae 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemFireball.class and b/build/classes/java/main/net/minecraft/src/ItemFireball.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemFishingRod.class b/build/classes/java/main/net/minecraft/src/ItemFishingRod.class index bce932c..393b1a5 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemFishingRod.class and b/build/classes/java/main/net/minecraft/src/ItemFishingRod.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemFlintAndSteel.class b/build/classes/java/main/net/minecraft/src/ItemFlintAndSteel.class index d6e951a..30effca 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemFlintAndSteel.class and b/build/classes/java/main/net/minecraft/src/ItemFlintAndSteel.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemFood.class b/build/classes/java/main/net/minecraft/src/ItemFood.class index f38cb7c..496041d 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemFood.class and b/build/classes/java/main/net/minecraft/src/ItemFood.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemMonsterPlacer.class b/build/classes/java/main/net/minecraft/src/ItemMonsterPlacer.class index a788c8f..d1938c2 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemMonsterPlacer.class and b/build/classes/java/main/net/minecraft/src/ItemMonsterPlacer.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemPotion.class b/build/classes/java/main/net/minecraft/src/ItemPotion.class index 9c628b5..88e6b72 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemPotion.class and b/build/classes/java/main/net/minecraft/src/ItemPotion.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemSnowball.class b/build/classes/java/main/net/minecraft/src/ItemSnowball.class index 9f2df02..2ff0ce1 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemSnowball.class and b/build/classes/java/main/net/minecraft/src/ItemSnowball.class differ diff --git a/build/classes/java/main/net/minecraft/src/ItemStack.class b/build/classes/java/main/net/minecraft/src/ItemStack.class index 82bcf37..33c8747 100644 Binary files a/build/classes/java/main/net/minecraft/src/ItemStack.class and b/build/classes/java/main/net/minecraft/src/ItemStack.class differ diff --git a/build/classes/java/main/net/minecraft/src/MapGenBase.class b/build/classes/java/main/net/minecraft/src/MapGenBase.class index b1fffdb..d8ab388 100644 Binary files a/build/classes/java/main/net/minecraft/src/MapGenBase.class and b/build/classes/java/main/net/minecraft/src/MapGenBase.class differ diff --git a/build/classes/java/main/net/minecraft/src/MapGenCaves.class b/build/classes/java/main/net/minecraft/src/MapGenCaves.class index 71b0617..b98457d 100644 Binary files a/build/classes/java/main/net/minecraft/src/MapGenCaves.class and b/build/classes/java/main/net/minecraft/src/MapGenCaves.class differ diff --git a/build/classes/java/main/net/minecraft/src/MapGenCavesHell.class b/build/classes/java/main/net/minecraft/src/MapGenCavesHell.class index b65fc2e..78d8a96 100644 Binary files a/build/classes/java/main/net/minecraft/src/MapGenCavesHell.class and b/build/classes/java/main/net/minecraft/src/MapGenCavesHell.class differ diff --git a/build/classes/java/main/net/minecraft/src/MapGenMineshaft.class b/build/classes/java/main/net/minecraft/src/MapGenMineshaft.class index 1d67ae3..ba9ba1a 100644 Binary files a/build/classes/java/main/net/minecraft/src/MapGenMineshaft.class and b/build/classes/java/main/net/minecraft/src/MapGenMineshaft.class differ diff --git a/build/classes/java/main/net/minecraft/src/MapGenNetherBridge.class b/build/classes/java/main/net/minecraft/src/MapGenNetherBridge.class index 2bf1ee4..136a84d 100644 Binary files a/build/classes/java/main/net/minecraft/src/MapGenNetherBridge.class and b/build/classes/java/main/net/minecraft/src/MapGenNetherBridge.class differ diff --git a/build/classes/java/main/net/minecraft/src/MapGenRavine.class b/build/classes/java/main/net/minecraft/src/MapGenRavine.class index cf4d9ac..4947945 100644 Binary files a/build/classes/java/main/net/minecraft/src/MapGenRavine.class and b/build/classes/java/main/net/minecraft/src/MapGenRavine.class differ diff --git a/build/classes/java/main/net/minecraft/src/MapGenScatteredFeature.class b/build/classes/java/main/net/minecraft/src/MapGenScatteredFeature.class index abef0e6..2c997ed 100644 Binary files a/build/classes/java/main/net/minecraft/src/MapGenScatteredFeature.class and b/build/classes/java/main/net/minecraft/src/MapGenScatteredFeature.class differ diff --git a/build/classes/java/main/net/minecraft/src/MapGenStronghold.class b/build/classes/java/main/net/minecraft/src/MapGenStronghold.class index 293425a..fec3a3a 100644 Binary files a/build/classes/java/main/net/minecraft/src/MapGenStronghold.class and b/build/classes/java/main/net/minecraft/src/MapGenStronghold.class differ diff --git a/build/classes/java/main/net/minecraft/src/MapGenStructure.class b/build/classes/java/main/net/minecraft/src/MapGenStructure.class index ea7856b..63747da 100644 Binary files a/build/classes/java/main/net/minecraft/src/MapGenStructure.class and b/build/classes/java/main/net/minecraft/src/MapGenStructure.class differ diff --git a/build/classes/java/main/net/minecraft/src/MapGenVillage.class b/build/classes/java/main/net/minecraft/src/MapGenVillage.class index 0945764..dd58906 100644 Binary files a/build/classes/java/main/net/minecraft/src/MapGenVillage.class and b/build/classes/java/main/net/minecraft/src/MapGenVillage.class differ diff --git a/build/classes/java/main/net/minecraft/src/MathHelper.class b/build/classes/java/main/net/minecraft/src/MathHelper.class index dcebcae..1f539d7 100644 Binary files a/build/classes/java/main/net/minecraft/src/MathHelper.class and b/build/classes/java/main/net/minecraft/src/MathHelper.class differ diff --git a/build/classes/java/main/net/minecraft/src/MobSpawnerBaseLogic.class b/build/classes/java/main/net/minecraft/src/MobSpawnerBaseLogic.class index b0b19ba..a416d02 100644 Binary files a/build/classes/java/main/net/minecraft/src/MobSpawnerBaseLogic.class and b/build/classes/java/main/net/minecraft/src/MobSpawnerBaseLogic.class differ diff --git a/build/classes/java/main/net/minecraft/src/ModelBase.class b/build/classes/java/main/net/minecraft/src/ModelBase.class index 3135740..1c84826 100644 Binary files a/build/classes/java/main/net/minecraft/src/ModelBase.class and b/build/classes/java/main/net/minecraft/src/ModelBase.class differ diff --git a/build/classes/java/main/net/minecraft/src/ModelGhast.class b/build/classes/java/main/net/minecraft/src/ModelGhast.class index 94aafb1..382b042 100644 Binary files a/build/classes/java/main/net/minecraft/src/ModelGhast.class and b/build/classes/java/main/net/minecraft/src/ModelGhast.class differ diff --git a/build/classes/java/main/net/minecraft/src/NetClientHandler.class b/build/classes/java/main/net/minecraft/src/NetClientHandler.class index 16c3d72..b46f6cb 100644 Binary files a/build/classes/java/main/net/minecraft/src/NetClientHandler.class and b/build/classes/java/main/net/minecraft/src/NetClientHandler.class differ diff --git a/build/classes/java/main/net/minecraft/src/NetLoginHandler.class b/build/classes/java/main/net/minecraft/src/NetLoginHandler.class index 7158a4e..0448f3e 100644 Binary files a/build/classes/java/main/net/minecraft/src/NetLoginHandler.class and b/build/classes/java/main/net/minecraft/src/NetLoginHandler.class differ diff --git a/build/classes/java/main/net/minecraft/src/NetServerHandler.class b/build/classes/java/main/net/minecraft/src/NetServerHandler.class index a9d9b90..2900d27 100644 Binary files a/build/classes/java/main/net/minecraft/src/NetServerHandler.class and b/build/classes/java/main/net/minecraft/src/NetServerHandler.class differ diff --git a/build/classes/java/main/net/minecraft/src/NoiseGeneratorOctaves.class b/build/classes/java/main/net/minecraft/src/NoiseGeneratorOctaves.class index fd85eaa..eb882c2 100644 Binary files a/build/classes/java/main/net/minecraft/src/NoiseGeneratorOctaves.class and b/build/classes/java/main/net/minecraft/src/NoiseGeneratorOctaves.class differ diff --git a/build/classes/java/main/net/minecraft/src/NoiseGeneratorPerlin.class b/build/classes/java/main/net/minecraft/src/NoiseGeneratorPerlin.class index b0fae0d..7e28709 100644 Binary files a/build/classes/java/main/net/minecraft/src/NoiseGeneratorPerlin.class and b/build/classes/java/main/net/minecraft/src/NoiseGeneratorPerlin.class differ diff --git a/build/classes/java/main/net/minecraft/src/RConThreadQueryAuth.class b/build/classes/java/main/net/minecraft/src/RConThreadQueryAuth.class index 9e025ae..61bc434 100644 Binary files a/build/classes/java/main/net/minecraft/src/RConThreadQueryAuth.class and b/build/classes/java/main/net/minecraft/src/RConThreadQueryAuth.class differ diff --git a/build/classes/java/main/net/minecraft/src/RandomPositionGenerator.class b/build/classes/java/main/net/minecraft/src/RandomPositionGenerator.class index 74d650a..892cfd2 100644 Binary files a/build/classes/java/main/net/minecraft/src/RandomPositionGenerator.class and b/build/classes/java/main/net/minecraft/src/RandomPositionGenerator.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderDragon.class b/build/classes/java/main/net/minecraft/src/RenderDragon.class index 6ee53e6..2417e9c 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderDragon.class and b/build/classes/java/main/net/minecraft/src/RenderDragon.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderEndPortal.class b/build/classes/java/main/net/minecraft/src/RenderEndPortal.class index 8214abd..d27be25 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderEndPortal.class and b/build/classes/java/main/net/minecraft/src/RenderEndPortal.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderEnderman.class b/build/classes/java/main/net/minecraft/src/RenderEnderman.class index 981dd82..4190311 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderEnderman.class and b/build/classes/java/main/net/minecraft/src/RenderEnderman.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderGlobal.class b/build/classes/java/main/net/minecraft/src/RenderGlobal.class index acdf806..dc7a17a 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderGlobal.class and b/build/classes/java/main/net/minecraft/src/RenderGlobal.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderItem.class b/build/classes/java/main/net/minecraft/src/RenderItem.class index 98445dc..54c5440 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderItem.class and b/build/classes/java/main/net/minecraft/src/RenderItem.class differ diff --git a/build/classes/java/main/net/minecraft/src/RenderLightningBolt.class b/build/classes/java/main/net/minecraft/src/RenderLightningBolt.class index 6a9c5a3..678aa94 100644 Binary files a/build/classes/java/main/net/minecraft/src/RenderLightningBolt.class and b/build/classes/java/main/net/minecraft/src/RenderLightningBolt.class differ diff --git a/build/classes/java/main/net/minecraft/src/RendererLivingEntity.class b/build/classes/java/main/net/minecraft/src/RendererLivingEntity.class index de133ab..8c095bb 100644 Binary files a/build/classes/java/main/net/minecraft/src/RendererLivingEntity.class and b/build/classes/java/main/net/minecraft/src/RendererLivingEntity.class differ diff --git a/build/classes/java/main/net/minecraft/src/SoundPool.class b/build/classes/java/main/net/minecraft/src/SoundPool.class index 0c45b96..351a68a 100644 Binary files a/build/classes/java/main/net/minecraft/src/SoundPool.class and b/build/classes/java/main/net/minecraft/src/SoundPool.class differ diff --git a/build/classes/java/main/net/minecraft/src/SpawnerAnimals.class b/build/classes/java/main/net/minecraft/src/SpawnerAnimals.class index a08fb65..eab9258 100644 Binary files a/build/classes/java/main/net/minecraft/src/SpawnerAnimals.class and b/build/classes/java/main/net/minecraft/src/SpawnerAnimals.class differ diff --git a/build/classes/java/main/net/minecraft/src/SpiderEffectsGroupData.class b/build/classes/java/main/net/minecraft/src/SpiderEffectsGroupData.class index 88fd230..d3191ca 100644 Binary files a/build/classes/java/main/net/minecraft/src/SpiderEffectsGroupData.class and b/build/classes/java/main/net/minecraft/src/SpiderEffectsGroupData.class differ diff --git a/build/classes/java/main/net/minecraft/src/StringTranslate.class b/build/classes/java/main/net/minecraft/src/StringTranslate.class index 5d794d4..d3be821 100644 Binary files a/build/classes/java/main/net/minecraft/src/StringTranslate.class and b/build/classes/java/main/net/minecraft/src/StringTranslate.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureComponent.class b/build/classes/java/main/net/minecraft/src/StructureComponent.class index 0ace1f4..28cca2f 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureComponent.class and b/build/classes/java/main/net/minecraft/src/StructureComponent.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureMineshaftPieces.class b/build/classes/java/main/net/minecraft/src/StructureMineshaftPieces.class index 20c6deb..e0e92da 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureMineshaftPieces.class and b/build/classes/java/main/net/minecraft/src/StructureMineshaftPieces.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureMineshaftStart.class b/build/classes/java/main/net/minecraft/src/StructureMineshaftStart.class index a0300ba..9270854 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureMineshaftStart.class and b/build/classes/java/main/net/minecraft/src/StructureMineshaftStart.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureNetherBridgePieces.class b/build/classes/java/main/net/minecraft/src/StructureNetherBridgePieces.class index c0f63d5..472db10 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureNetherBridgePieces.class and b/build/classes/java/main/net/minecraft/src/StructureNetherBridgePieces.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureNetherBridgeStart.class b/build/classes/java/main/net/minecraft/src/StructureNetherBridgeStart.class index e22a5a2..fba02a9 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureNetherBridgeStart.class and b/build/classes/java/main/net/minecraft/src/StructureNetherBridgeStart.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructurePieceBlockSelector.class b/build/classes/java/main/net/minecraft/src/StructurePieceBlockSelector.class index b4ee2b3..80696a9 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructurePieceBlockSelector.class and b/build/classes/java/main/net/minecraft/src/StructurePieceBlockSelector.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureScatteredFeatureStart.class b/build/classes/java/main/net/minecraft/src/StructureScatteredFeatureStart.class index 59b59b3..b73af8a 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureScatteredFeatureStart.class and b/build/classes/java/main/net/minecraft/src/StructureScatteredFeatureStart.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureScatteredFeatureStones.class b/build/classes/java/main/net/minecraft/src/StructureScatteredFeatureStones.class index c5f7edc..f1421f9 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureScatteredFeatureStones.class and b/build/classes/java/main/net/minecraft/src/StructureScatteredFeatureStones.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureStart.class b/build/classes/java/main/net/minecraft/src/StructureStart.class index a6819df..b92177f 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureStart.class and b/build/classes/java/main/net/minecraft/src/StructureStart.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureStrongholdPieces.class b/build/classes/java/main/net/minecraft/src/StructureStrongholdPieces.class index 7a727bf..4df4343 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureStrongholdPieces.class and b/build/classes/java/main/net/minecraft/src/StructureStrongholdPieces.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureStrongholdStart.class b/build/classes/java/main/net/minecraft/src/StructureStrongholdStart.class index 3a3ba80..9b822b1 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureStrongholdStart.class and b/build/classes/java/main/net/minecraft/src/StructureStrongholdStart.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureStrongholdStones.class b/build/classes/java/main/net/minecraft/src/StructureStrongholdStones.class index 49c634f..34072a2 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureStrongholdStones.class and b/build/classes/java/main/net/minecraft/src/StructureStrongholdStones.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureVillagePieces.class b/build/classes/java/main/net/minecraft/src/StructureVillagePieces.class index 51cfdc6..1bdd53e 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureVillagePieces.class and b/build/classes/java/main/net/minecraft/src/StructureVillagePieces.class differ diff --git a/build/classes/java/main/net/minecraft/src/StructureVillageStart.class b/build/classes/java/main/net/minecraft/src/StructureVillageStart.class index 11e3d8b..e5d0c2a 100644 Binary files a/build/classes/java/main/net/minecraft/src/StructureVillageStart.class and b/build/classes/java/main/net/minecraft/src/StructureVillageStart.class differ diff --git a/build/classes/java/main/net/minecraft/src/Teleporter.class b/build/classes/java/main/net/minecraft/src/Teleporter.class index 745457c..fa6bd34 100644 Binary files a/build/classes/java/main/net/minecraft/src/Teleporter.class and b/build/classes/java/main/net/minecraft/src/Teleporter.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntityChest.class b/build/classes/java/main/net/minecraft/src/TileEntityChest.class index a41fc9d..a705e9b 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntityChest.class and b/build/classes/java/main/net/minecraft/src/TileEntityChest.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntityDispenser.class b/build/classes/java/main/net/minecraft/src/TileEntityDispenser.class index 6cb054d..a66686e 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntityDispenser.class and b/build/classes/java/main/net/minecraft/src/TileEntityDispenser.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntityEnchantmentTable.class b/build/classes/java/main/net/minecraft/src/TileEntityEnchantmentTable.class index 7bb82e2..11071ef 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntityEnchantmentTable.class and b/build/classes/java/main/net/minecraft/src/TileEntityEnchantmentTable.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntityEnderChest.class b/build/classes/java/main/net/minecraft/src/TileEntityEnderChest.class index 4fbdd84..7f2daac 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntityEnderChest.class and b/build/classes/java/main/net/minecraft/src/TileEntityEnderChest.class differ diff --git a/build/classes/java/main/net/minecraft/src/TileEntityHopper.class b/build/classes/java/main/net/minecraft/src/TileEntityHopper.class index d8477b6..237a38a 100644 Binary files a/build/classes/java/main/net/minecraft/src/TileEntityHopper.class and b/build/classes/java/main/net/minecraft/src/TileEntityHopper.class differ diff --git a/build/classes/java/main/net/minecraft/src/Village.class b/build/classes/java/main/net/minecraft/src/Village.class index e54e0c3..947c619 100644 Binary files a/build/classes/java/main/net/minecraft/src/Village.class and b/build/classes/java/main/net/minecraft/src/Village.class differ diff --git a/build/classes/java/main/net/minecraft/src/VillageSiege.class b/build/classes/java/main/net/minecraft/src/VillageSiege.class index 867a504..4a70b9d 100644 Binary files a/build/classes/java/main/net/minecraft/src/VillageSiege.class and b/build/classes/java/main/net/minecraft/src/VillageSiege.class differ diff --git a/build/classes/java/main/net/minecraft/src/WeightedRandom.class b/build/classes/java/main/net/minecraft/src/WeightedRandom.class index 41383c2..13399e3 100644 Binary files a/build/classes/java/main/net/minecraft/src/WeightedRandom.class and b/build/classes/java/main/net/minecraft/src/WeightedRandom.class differ diff --git a/build/classes/java/main/net/minecraft/src/WeightedRandomChestContent.class b/build/classes/java/main/net/minecraft/src/WeightedRandomChestContent.class index e886d74..5e162db 100644 Binary files a/build/classes/java/main/net/minecraft/src/WeightedRandomChestContent.class and b/build/classes/java/main/net/minecraft/src/WeightedRandomChestContent.class differ diff --git a/build/classes/java/main/net/minecraft/src/World.class b/build/classes/java/main/net/minecraft/src/World.class index 67bfa7f..520586a 100644 Binary files a/build/classes/java/main/net/minecraft/src/World.class and b/build/classes/java/main/net/minecraft/src/World.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldChunkManager.class b/build/classes/java/main/net/minecraft/src/WorldChunkManager.class index d151fe3..1d5f609 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldChunkManager.class and b/build/classes/java/main/net/minecraft/src/WorldChunkManager.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldChunkManagerHell.class b/build/classes/java/main/net/minecraft/src/WorldChunkManagerHell.class index 0b388ce..1f0ddf8 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldChunkManagerHell.class and b/build/classes/java/main/net/minecraft/src/WorldChunkManagerHell.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldClient.class b/build/classes/java/main/net/minecraft/src/WorldClient.class index 8b611a3..79bf202 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldClient.class and b/build/classes/java/main/net/minecraft/src/WorldClient.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenBigMushroom.class b/build/classes/java/main/net/minecraft/src/WorldGenBigMushroom.class index 75e15cf..22908e1 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenBigMushroom.class and b/build/classes/java/main/net/minecraft/src/WorldGenBigMushroom.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenBigTree.class b/build/classes/java/main/net/minecraft/src/WorldGenBigTree.class index bafef50..adb87ad 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenBigTree.class and b/build/classes/java/main/net/minecraft/src/WorldGenBigTree.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenCactus.class b/build/classes/java/main/net/minecraft/src/WorldGenCactus.class index 23bdf1a..84312d9 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenCactus.class and b/build/classes/java/main/net/minecraft/src/WorldGenCactus.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenClay.class b/build/classes/java/main/net/minecraft/src/WorldGenClay.class index bab1730..71e8dbf 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenClay.class and b/build/classes/java/main/net/minecraft/src/WorldGenClay.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenDeadBush.class b/build/classes/java/main/net/minecraft/src/WorldGenDeadBush.class index bb09cdc..63f0d0a 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenDeadBush.class and b/build/classes/java/main/net/minecraft/src/WorldGenDeadBush.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenDesertWells.class b/build/classes/java/main/net/minecraft/src/WorldGenDesertWells.class index 953016c..4089133 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenDesertWells.class and b/build/classes/java/main/net/minecraft/src/WorldGenDesertWells.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenDungeons.class b/build/classes/java/main/net/minecraft/src/WorldGenDungeons.class index d484904..b0b4cb7 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenDungeons.class and b/build/classes/java/main/net/minecraft/src/WorldGenDungeons.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenFire.class b/build/classes/java/main/net/minecraft/src/WorldGenFire.class index 8fba7bb..6b93dc8 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenFire.class and b/build/classes/java/main/net/minecraft/src/WorldGenFire.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenFlowers.class b/build/classes/java/main/net/minecraft/src/WorldGenFlowers.class index 6aaa213..d68f343 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenFlowers.class and b/build/classes/java/main/net/minecraft/src/WorldGenFlowers.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenForest.class b/build/classes/java/main/net/minecraft/src/WorldGenForest.class index aa2caf1..69630a4 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenForest.class and b/build/classes/java/main/net/minecraft/src/WorldGenForest.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenGlowStone1.class b/build/classes/java/main/net/minecraft/src/WorldGenGlowStone1.class index d8326a0..ecb21ea 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenGlowStone1.class and b/build/classes/java/main/net/minecraft/src/WorldGenGlowStone1.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenGlowStone2.class b/build/classes/java/main/net/minecraft/src/WorldGenGlowStone2.class index 887d2a6..a7d1210 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenGlowStone2.class and b/build/classes/java/main/net/minecraft/src/WorldGenGlowStone2.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenHellLava.class b/build/classes/java/main/net/minecraft/src/WorldGenHellLava.class index 66d55d9..31ff6b3 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenHellLava.class and b/build/classes/java/main/net/minecraft/src/WorldGenHellLava.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenHugeTrees.class b/build/classes/java/main/net/minecraft/src/WorldGenHugeTrees.class index c6e93f1..029e983 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenHugeTrees.class and b/build/classes/java/main/net/minecraft/src/WorldGenHugeTrees.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenLakes.class b/build/classes/java/main/net/minecraft/src/WorldGenLakes.class index eb5f7c3..6a3c53d 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenLakes.class and b/build/classes/java/main/net/minecraft/src/WorldGenLakes.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenLiquids.class b/build/classes/java/main/net/minecraft/src/WorldGenLiquids.class index 7b7a016..349a808 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenLiquids.class and b/build/classes/java/main/net/minecraft/src/WorldGenLiquids.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenMinable.class b/build/classes/java/main/net/minecraft/src/WorldGenMinable.class index 439cbb9..6527a50 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenMinable.class and b/build/classes/java/main/net/minecraft/src/WorldGenMinable.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenPumpkin.class b/build/classes/java/main/net/minecraft/src/WorldGenPumpkin.class index 3ffe0a2..7d7bb9c 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenPumpkin.class and b/build/classes/java/main/net/minecraft/src/WorldGenPumpkin.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenReed.class b/build/classes/java/main/net/minecraft/src/WorldGenReed.class index 028204e..3d65d9c 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenReed.class and b/build/classes/java/main/net/minecraft/src/WorldGenReed.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenSand.class b/build/classes/java/main/net/minecraft/src/WorldGenSand.class index c48797b..dc02655 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenSand.class and b/build/classes/java/main/net/minecraft/src/WorldGenSand.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenShrub.class b/build/classes/java/main/net/minecraft/src/WorldGenShrub.class index 32f5b2b..0bcf133 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenShrub.class and b/build/classes/java/main/net/minecraft/src/WorldGenShrub.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenSpikes.class b/build/classes/java/main/net/minecraft/src/WorldGenSpikes.class index c74d60b..1dadce1 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenSpikes.class and b/build/classes/java/main/net/minecraft/src/WorldGenSpikes.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenSwamp.class b/build/classes/java/main/net/minecraft/src/WorldGenSwamp.class index 535c3e6..201c79b 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenSwamp.class and b/build/classes/java/main/net/minecraft/src/WorldGenSwamp.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenTaiga1.class b/build/classes/java/main/net/minecraft/src/WorldGenTaiga1.class index 31e0c12..1309367 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenTaiga1.class and b/build/classes/java/main/net/minecraft/src/WorldGenTaiga1.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenTaiga2.class b/build/classes/java/main/net/minecraft/src/WorldGenTaiga2.class index 367f287..c74fe14 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenTaiga2.class and b/build/classes/java/main/net/minecraft/src/WorldGenTaiga2.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenTallGrass.class b/build/classes/java/main/net/minecraft/src/WorldGenTallGrass.class index 29530d6..87f0f22 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenTallGrass.class and b/build/classes/java/main/net/minecraft/src/WorldGenTallGrass.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenTrees.class b/build/classes/java/main/net/minecraft/src/WorldGenTrees.class index 837caa4..6cbf38a 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenTrees.class and b/build/classes/java/main/net/minecraft/src/WorldGenTrees.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenVines.class b/build/classes/java/main/net/minecraft/src/WorldGenVines.class index b0354c9..59d7d09 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenVines.class and b/build/classes/java/main/net/minecraft/src/WorldGenVines.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenWaterlily.class b/build/classes/java/main/net/minecraft/src/WorldGenWaterlily.class index 127c89d..bf2a936 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenWaterlily.class and b/build/classes/java/main/net/minecraft/src/WorldGenWaterlily.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGenerator.class b/build/classes/java/main/net/minecraft/src/WorldGenerator.class index 32598fd..fc85fe9 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGenerator.class and b/build/classes/java/main/net/minecraft/src/WorldGenerator.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldGeneratorBonusChest.class b/build/classes/java/main/net/minecraft/src/WorldGeneratorBonusChest.class index c8a539f..d9c7178 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldGeneratorBonusChest.class and b/build/classes/java/main/net/minecraft/src/WorldGeneratorBonusChest.class differ diff --git a/build/classes/java/main/net/minecraft/src/WorldServer.class b/build/classes/java/main/net/minecraft/src/WorldServer.class index c7a1554..9fba6a7 100644 Binary files a/build/classes/java/main/net/minecraft/src/WorldServer.class and b/build/classes/java/main/net/minecraft/src/WorldServer.class differ diff --git a/build/distributions/eaglercraft.tar b/build/distributions/eaglercraft.tar deleted file mode 100644 index 22fd5a5..0000000 Binary files a/build/distributions/eaglercraft.tar and /dev/null differ diff --git a/build/libs/eaglercraft.jar b/build/libs/eaglercraft.jar index a01635a..506e9c1 100644 Binary files a/build/libs/eaglercraft.jar and b/build/libs/eaglercraft.jar differ diff --git a/build/scripts/eaglercraft b/build/scripts/eaglercraft deleted file mode 100755 index bb88756..0000000 --- a/build/scripts/eaglercraft +++ /dev/null @@ -1,243 +0,0 @@ -#!/bin/sh - -# -# Copyright © 2015-2021 the original authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -# -# eaglercraft start up script for POSIX generated by Gradle. -# -# Important for running: -# -# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is -# noncompliant, but you have some other compliant shell such as ksh or -# bash, then to run this script, type that shell name before the whole -# command line, like: -# -# ksh eaglercraft -# -# Busybox and similar reduced shells will NOT work, because this script -# requires all of these POSIX shell features: -# * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». -# -# Important for patching: -# -# (2) This script targets any POSIX shell, so it avoids extensions provided -# by Bash, Ksh, etc; in particular arrays are avoided. -# -# The "traditional" practice of packing multiple parameters into a -# space-separated string is a well documented source of bugs and security -# problems, so this is (mostly) avoided, by progressively accumulating -# options in "$@", and eventually passing that to Java. -# -# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, -# and EAGLERCRAFT_OPTS) rely on word-splitting, this is performed explicitly; -# see the in-line comments for details. -# -# There are tweaks for specific operating systems such as AIX, CygWin, -# Darwin, MinGW, and NonStop. -# -# (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt -# within the Gradle project. -# -# You can find Gradle at https://github.com/gradle/gradle/. -# -############################################################################## - -# Attempt to set APP_HOME - -# Resolve links: $0 may be a link -app_path=$0 - -# Need this for daisy-chained symlinks. -while - APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path - [ -h "$app_path" ] -do - ls=$( ls -ld "$app_path" ) - link=${ls#*' -> '} - case $link in #( - /*) app_path=$link ;; #( - *) app_path=$APP_HOME$link ;; - esac -done - -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} -APP_HOME=$( cd "${APP_HOME:-./}.." && pwd -P ) || exit - -# Add default JVM options here. You can also use JAVA_OPTS and EAGLERCRAFT_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Djava.library.path=lwjgl-rundir"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD=maximum - -warn () { - echo "$*" -} >&2 - -die () { - echo - echo "$*" - echo - exit 1 -} >&2 - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "$( uname )" in #( - CYGWIN* ) cygwin=true ;; #( - Darwin* ) darwin=true ;; #( - MSYS* | MINGW* ) msys=true ;; #( - NONSTOP* ) nonstop=true ;; -esac - -CLASSPATH=$APP_HOME/lib/eaglercraft.jar:$APP_HOME/lib/commons-lang3-3.1.jar:$APP_HOME/lib/bcprov-jdk15on-1.47.jar:$APP_HOME/lib/codecjorbis-20101023.jar:$APP_HOME/lib/librarylwjglopenal-20100824.jar:$APP_HOME/lib/lwjgl_util-2.9.0.jar:$APP_HOME/lib/libraryjavasound-20101123.jar:$APP_HOME/lib/codecwav-20101023.jar:$APP_HOME/lib/guava-14.0.jar:$APP_HOME/lib/eaglercraft.jar:$APP_HOME/lib/soundsystem-20120107.jar:$APP_HOME/lib/lwjgl-platform-2.9.0-natives-linux.jar:$APP_HOME/lib/gson-2.2.2.jar:$APP_HOME/lib/java-websocket.jar:$APP_HOME/lib/argo-2.25_fixed.jar:$APP_HOME/lib/commons-io-2.4.jar:$APP_HOME/lib/lwjgl-2.9.0.jar - - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD=$JAVA_HOME/jre/sh/java - else - JAVACMD=$JAVA_HOME/bin/java - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then - case $MAX_FD in #( - max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - MAX_FD=$( ulimit -H -n ) || - warn "Could not query maximum file descriptor limit" - esac - case $MAX_FD in #( - '' | soft) :;; #( - *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 - ulimit -n "$MAX_FD" || - warn "Could not set maximum file descriptor limit to $MAX_FD" - esac -fi - -# Collect all arguments for the java command, stacking in reverse order: -# * args from the command line -# * the main class name -# * -classpath -# * -D...appname settings -# * --module-path (only if needed) -# * DEFAULT_JVM_OPTS, JAVA_OPTS, and EAGLERCRAFT_OPTS environment variables. - -# For Cygwin or MSYS, switch paths to Windows format before running java -if "$cygwin" || "$msys" ; then - APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) - CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) - - JAVACMD=$( cygpath --unix "$JAVACMD" ) - - # Now convert the arguments - kludge to limit ourselves to /bin/sh - for arg do - if - case $arg in #( - -*) false ;; # don't mess with options #( - /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath - [ -e "$t" ] ;; #( - *) false ;; - esac - then - arg=$( cygpath --path --ignore --mixed "$arg" ) - fi - # Roll the args list around exactly as many times as the number of - # args, so each arg winds up back in the position where it started, but - # possibly modified. - # - # NB: a `for` loop captures its iteration list before it begins, so - # changing the positional parameters here affects neither the number of - # iterations, nor the values presented in `arg`. - shift # remove old arg - set -- "$@" "$arg" # push replacement arg - done -fi - -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $EAGLERCRAFT_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. - -set -- \ - -classpath "$CLASSPATH" \ - net.lax1dude.eaglercraft.MinecraftMain \ - "$@" - -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - -# Use "xargs" to parse quoted args. -# -# With -n1 it outputs one arg per line, with the quotes and backslashes removed. -# -# In Bash we could simply go: -# -# readarray ARGS < <( xargs -n1 <<<"$var" ) && -# set -- "${ARGS[@]}" "$@" -# -# but POSIX shell has neither arrays nor command substitution, so instead we -# post-process each arg (as a line of input to sed) to backslash-escape any -# character that might be a shell metacharacter, then use eval to reverse -# that process (while maintaining the separation between arguments), and wrap -# the whole thing up as a single "set" statement. -# -# This will of course break if any of these variables contains a newline or -# an unmatched quote. -# - -eval "set -- $( - printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $EAGLERCRAFT_OPTS" | - xargs -n1 | - sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | - tr '\n' ' ' - )" '"$@"' - -exec "$JAVACMD" "$@" diff --git a/build/scripts/eaglercraft.bat b/build/scripts/eaglercraft.bat deleted file mode 100644 index d9764b0..0000000 --- a/build/scripts/eaglercraft.bat +++ /dev/null @@ -1,92 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem eaglercraft startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME%.. - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and EAGLERCRAFT_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Djava.library.path=lwjgl-rundir" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\lib\eaglercraft.jar;%APP_HOME%\lib\commons-lang3-3.1.jar;%APP_HOME%\lib\bcprov-jdk15on-1.47.jar;%APP_HOME%\lib\codecjorbis-20101023.jar;%APP_HOME%\lib\librarylwjglopenal-20100824.jar;%APP_HOME%\lib\lwjgl_util-2.9.0.jar;%APP_HOME%\lib\libraryjavasound-20101123.jar;%APP_HOME%\lib\codecwav-20101023.jar;%APP_HOME%\lib\guava-14.0.jar;%APP_HOME%\lib\eaglercraft.jar;%APP_HOME%\lib\soundsystem-20120107.jar;%APP_HOME%\lib\lwjgl-platform-2.9.0-natives-linux.jar;%APP_HOME%\lib\gson-2.2.2.jar;%APP_HOME%\lib\java-websocket.jar;%APP_HOME%\lib\argo-2.25_fixed.jar;%APP_HOME%\lib\commons-io-2.4.jar;%APP_HOME%\lib\lwjgl-2.9.0.jar - - -@rem Execute eaglercraft -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %EAGLERCRAFT_OPTS% -classpath "%CLASSPATH%" net.lax1dude.eaglercraft.MinecraftMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable EAGLERCRAFT_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%EAGLERCRAFT_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index c79f3b3..d9917e1 100644 Binary files a/build/tmp/compileJava/previous-compilation-data.bin and b/build/tmp/compileJava/previous-compilation-data.bin differ diff --git a/lwjgl-rundir/eaglercraft.jar b/lwjgl-rundir/eaglercraft.jar index a01635a..4f0b7f5 100644 Binary files a/lwjgl-rundir/eaglercraft.jar and b/lwjgl-rundir/eaglercraft.jar differ diff --git a/src/main/java/net/minecraft/src/BiomeDecorator.java b/src/main/java/net/minecraft/src/BiomeDecorator.java index 3c2a50b..0c676ec 100644 --- a/src/main/java/net/minecraft/src/BiomeDecorator.java +++ b/src/main/java/net/minecraft/src/BiomeDecorator.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BiomeDecorator { @@ -8,7 +8,7 @@ public class BiomeDecorator protected World currentWorld; /** The Biome Decorator's random number generator. */ - protected Random randomGenerator; + protected EaglercraftRandom randomGenerator; /** The X-coordinate of the chunk currently being decorated */ protected int chunk_X; @@ -162,7 +162,7 @@ public class BiomeDecorator /** * Decorates the world. Calls code that was formerly (pre-1.8) in ChunkProviderGenerate.populate */ - public void decorate(World par1World, Random par2Random, int par3, int par4) + public void decorate(World par1World, EaglercraftRandom par2Random, int par3, int par4) { if (this.currentWorld != null) { diff --git a/src/main/java/net/minecraft/src/BiomeGenBase.java b/src/main/java/net/minecraft/src/BiomeGenBase.java index 2109dc9..6948963 100644 --- a/src/main/java/net/minecraft/src/BiomeGenBase.java +++ b/src/main/java/net/minecraft/src/BiomeGenBase.java @@ -3,7 +3,7 @@ package net.minecraft.src; import java.awt.Color; import java.util.ArrayList; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class BiomeGenBase { @@ -196,7 +196,7 @@ public abstract class BiomeGenBase /** * Gets a WorldGen appropriate for this biome. */ - public WorldGenerator getRandomWorldGenForTrees(Random par1Random) + public WorldGenerator getRandomWorldGenForTrees(EaglercraftRandom par1Random) { return (WorldGenerator)(par1Random.nextInt(10) == 0 ? this.worldGeneratorBigTree : this.worldGeneratorTrees); } @@ -204,7 +204,7 @@ public abstract class BiomeGenBase /** * Gets a WorldGen appropriate for this biome. */ - public WorldGenerator getRandomWorldGenForGrass(Random par1Random) + public WorldGenerator getRandomWorldGenForGrass(EaglercraftRandom par1Random) { return new WorldGenTallGrass(Block.tallGrass.blockID, 1); } @@ -328,7 +328,7 @@ public abstract class BiomeGenBase return this.temperature; } - public void decorate(World par1World, Random par2Random, int par3, int par4) + public void decorate(World par1World, EaglercraftRandom par2Random, int par3, int par4) { this.theBiomeDecorator.decorate(par1World, par2Random, par3, par4); } diff --git a/src/main/java/net/minecraft/src/BiomeGenDesert.java b/src/main/java/net/minecraft/src/BiomeGenDesert.java index de19309..81e9c99 100644 --- a/src/main/java/net/minecraft/src/BiomeGenDesert.java +++ b/src/main/java/net/minecraft/src/BiomeGenDesert.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BiomeGenDesert extends BiomeGenBase { @@ -16,7 +16,7 @@ public class BiomeGenDesert extends BiomeGenBase this.theBiomeDecorator.cactiPerChunk = 10; } - public void decorate(World par1World, Random par2Random, int par3, int par4) + public void decorate(World par1World, EaglercraftRandom par2Random, int par3, int par4) { super.decorate(par1World, par2Random, par3, par4); diff --git a/src/main/java/net/minecraft/src/BiomeGenForest.java b/src/main/java/net/minecraft/src/BiomeGenForest.java index d111d1a..c7de353 100644 --- a/src/main/java/net/minecraft/src/BiomeGenForest.java +++ b/src/main/java/net/minecraft/src/BiomeGenForest.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BiomeGenForest extends BiomeGenBase { @@ -15,7 +15,7 @@ public class BiomeGenForest extends BiomeGenBase /** * Gets a WorldGen appropriate for this biome. */ - public WorldGenerator getRandomWorldGenForTrees(Random par1Random) + public WorldGenerator getRandomWorldGenForTrees(EaglercraftRandom par1Random) { return (WorldGenerator)(par1Random.nextInt(5) == 0 ? this.worldGeneratorForest : (par1Random.nextInt(10) == 0 ? this.worldGeneratorBigTree : this.worldGeneratorTrees)); } diff --git a/src/main/java/net/minecraft/src/BiomeGenHills.java b/src/main/java/net/minecraft/src/BiomeGenHills.java index 6540ceb..14f1689 100644 --- a/src/main/java/net/minecraft/src/BiomeGenHills.java +++ b/src/main/java/net/minecraft/src/BiomeGenHills.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BiomeGenHills extends BiomeGenBase { @@ -12,7 +12,7 @@ public class BiomeGenHills extends BiomeGenBase this.theWorldGenerator = new WorldGenMinable(Block.silverfish.blockID, 8); } - public void decorate(World par1World, Random par2Random, int par3, int par4) + public void decorate(World par1World, EaglercraftRandom par2Random, int par3, int par4) { super.decorate(par1World, par2Random, par3, par4); int var5 = 3 + par2Random.nextInt(6); diff --git a/src/main/java/net/minecraft/src/BiomeGenJungle.java b/src/main/java/net/minecraft/src/BiomeGenJungle.java index 6b63dcb..6300fe1 100644 --- a/src/main/java/net/minecraft/src/BiomeGenJungle.java +++ b/src/main/java/net/minecraft/src/BiomeGenJungle.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BiomeGenJungle extends BiomeGenBase { @@ -17,7 +17,7 @@ public class BiomeGenJungle extends BiomeGenBase /** * Gets a WorldGen appropriate for this biome. */ - public WorldGenerator getRandomWorldGenForTrees(Random par1Random) + public WorldGenerator getRandomWorldGenForTrees(EaglercraftRandom par1Random) { return (WorldGenerator)(par1Random.nextInt(10) == 0 ? this.worldGeneratorBigTree : (par1Random.nextInt(2) == 0 ? new WorldGenShrub(3, 0) : (par1Random.nextInt(3) == 0 ? new WorldGenHugeTrees(false, 10 + par1Random.nextInt(20), 3, 3) : new WorldGenTrees(false, 4 + par1Random.nextInt(7), 3, 3, true)))); } @@ -25,12 +25,12 @@ public class BiomeGenJungle extends BiomeGenBase /** * Gets a WorldGen appropriate for this biome. */ - public WorldGenerator getRandomWorldGenForGrass(Random par1Random) + public WorldGenerator getRandomWorldGenForGrass(EaglercraftRandom par1Random) { return par1Random.nextInt(4) == 0 ? new WorldGenTallGrass(Block.tallGrass.blockID, 2) : new WorldGenTallGrass(Block.tallGrass.blockID, 1); } - public void decorate(World par1World, Random par2Random, int par3, int par4) + public void decorate(World par1World, EaglercraftRandom par2Random, int par3, int par4) { super.decorate(par1World, par2Random, par3, par4); WorldGenVines var5 = new WorldGenVines(); diff --git a/src/main/java/net/minecraft/src/BiomeGenSwamp.java b/src/main/java/net/minecraft/src/BiomeGenSwamp.java index 31e7846..0796821 100644 --- a/src/main/java/net/minecraft/src/BiomeGenSwamp.java +++ b/src/main/java/net/minecraft/src/BiomeGenSwamp.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BiomeGenSwamp extends BiomeGenBase { @@ -21,7 +21,7 @@ public class BiomeGenSwamp extends BiomeGenBase /** * Gets a WorldGen appropriate for this biome. */ - public WorldGenerator getRandomWorldGenForTrees(Random par1Random) + public WorldGenerator getRandomWorldGenForTrees(EaglercraftRandom par1Random) { return this.worldGeneratorSwamp; } diff --git a/src/main/java/net/minecraft/src/BiomeGenTaiga.java b/src/main/java/net/minecraft/src/BiomeGenTaiga.java index 2ade88d..27c4905 100644 --- a/src/main/java/net/minecraft/src/BiomeGenTaiga.java +++ b/src/main/java/net/minecraft/src/BiomeGenTaiga.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BiomeGenTaiga extends BiomeGenBase { @@ -15,7 +15,7 @@ public class BiomeGenTaiga extends BiomeGenBase /** * Gets a WorldGen appropriate for this biome. */ - public WorldGenerator getRandomWorldGenForTrees(Random par1Random) + public WorldGenerator getRandomWorldGenForTrees(EaglercraftRandom par1Random) { return (WorldGenerator)(par1Random.nextInt(3) == 0 ? new WorldGenTaiga1() : new WorldGenTaiga2(false)); } diff --git a/src/main/java/net/minecraft/src/Block.java b/src/main/java/net/minecraft/src/Block.java index ecd600b..ba096b6 100644 --- a/src/main/java/net/minecraft/src/Block.java +++ b/src/main/java/net/minecraft/src/Block.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class Block { @@ -562,12 +562,12 @@ public class Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) {} + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) {} /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) {} + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) {} /** * Called right before the block is destroyed by a player. Args: world, x, y, z, metaData @@ -603,7 +603,7 @@ public class Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 1; } @@ -611,7 +611,7 @@ public class Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return this.blockID; } @@ -1081,7 +1081,7 @@ public class Block /** * Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive). */ - public int quantityDroppedWithBonus(int par1, Random par2Random) + public int quantityDroppedWithBonus(int par1, EaglercraftRandom par2Random) { return this.quantityDropped(par2Random); } diff --git a/src/main/java/net/minecraft/src/BlockBasePressurePlate.java b/src/main/java/net/minecraft/src/BlockBasePressurePlate.java index d46fac1..4e8fd3a 100644 --- a/src/main/java/net/minecraft/src/BlockBasePressurePlate.java +++ b/src/main/java/net/minecraft/src/BlockBasePressurePlate.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class BlockBasePressurePlate extends Block { @@ -108,7 +108,7 @@ public abstract class BlockBasePressurePlate extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!par1World.isRemote) { @@ -155,11 +155,11 @@ public abstract class BlockBasePressurePlate extends Block if (!var8 && var7) { - par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.1D, (double)par4 + 0.5D, "random.click", 0.3F, 0.5F); + par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.1D, (double)par4 + 0.5D, "EaglercraftRandom.click", 0.3F, 0.5F); } else if (var8 && !var7) { - par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.1D, (double)par4 + 0.5D, "random.click", 0.3F, 0.6F); + par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.1D, (double)par4 + 0.5D, "EaglercraftRandom.click", 0.3F, 0.6F); } if (var8) diff --git a/src/main/java/net/minecraft/src/BlockBed.java b/src/main/java/net/minecraft/src/BlockBed.java index d219448..e4f2da7 100644 --- a/src/main/java/net/minecraft/src/BlockBed.java +++ b/src/main/java/net/minecraft/src/BlockBed.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.Iterator; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockBed extends BlockDirectional { @@ -212,7 +212,7 @@ public class BlockBed extends BlockDirectional /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return isBlockHeadOfBed(par1) ? 0 : Item.bed.itemID; } diff --git a/src/main/java/net/minecraft/src/BlockBookshelf.java b/src/main/java/net/minecraft/src/BlockBookshelf.java index 1c56de3..8fc7f9e 100644 --- a/src/main/java/net/minecraft/src/BlockBookshelf.java +++ b/src/main/java/net/minecraft/src/BlockBookshelf.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockBookshelf extends Block { @@ -21,7 +21,7 @@ public class BlockBookshelf extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 3; } @@ -29,7 +29,7 @@ public class BlockBookshelf extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.book.itemID; } diff --git a/src/main/java/net/minecraft/src/BlockBrewingStand.java b/src/main/java/net/minecraft/src/BlockBrewingStand.java index ea06736..d619a0f 100644 --- a/src/main/java/net/minecraft/src/BlockBrewingStand.java +++ b/src/main/java/net/minecraft/src/BlockBrewingStand.java @@ -1,11 +1,11 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockBrewingStand extends BlockContainer { - private Random rand = new Random(); + private EaglercraftRandom rand = new EaglercraftRandom(); private Icon theIcon; public BlockBrewingStand(int par1) @@ -102,7 +102,7 @@ public class BlockBrewingStand extends BlockContainer /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { double var6 = (double)((float)par2 + 0.4F + par5Random.nextFloat() * 0.2F); double var8 = (double)((float)par3 + 0.7F + par5Random.nextFloat() * 0.3F); @@ -160,7 +160,7 @@ public class BlockBrewingStand extends BlockContainer /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.brewingStand.itemID; } diff --git a/src/main/java/net/minecraft/src/BlockButton.java b/src/main/java/net/minecraft/src/BlockButton.java index 0e166d3..2115fcb 100644 --- a/src/main/java/net/minecraft/src/BlockButton.java +++ b/src/main/java/net/minecraft/src/BlockButton.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class BlockButton extends Block { @@ -226,7 +226,7 @@ public abstract class BlockButton extends Block { par1World.setBlockMetadataWithNotify(par2, par3, par4, var11 + var12, 3); par1World.markBlockRangeForRenderUpdate(par2, par3, par4, par2, par3, par4); - par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.5D, (double)par4 + 0.5D, "random.click", 0.3F, 0.6F); + par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.5D, (double)par4 + 0.5D, "EaglercraftRandom.click", 0.3F, 0.6F); this.func_82536_d(par1World, par2, par3, par4, var11); par1World.scheduleBlockUpdate(par2, par3, par4, this.blockID, this.tickRate(par1World)); return true; @@ -289,7 +289,7 @@ public abstract class BlockButton extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!par1World.isRemote) { @@ -306,7 +306,7 @@ public abstract class BlockButton extends Block par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 & 7, 3); int var7 = var6 & 7; this.func_82536_d(par1World, par2, par3, par4, var7); - par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.5D, (double)par4 + 0.5D, "random.click", 0.3F, 0.5F); + par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.5D, (double)par4 + 0.5D, "EaglercraftRandom.click", 0.3F, 0.5F); par1World.markBlockRangeForRenderUpdate(par2, par3, par4, par2, par3, par4); } } @@ -355,7 +355,7 @@ public abstract class BlockButton extends Block par1World.setBlockMetadataWithNotify(par2, par3, par4, var6 | 8, 3); this.func_82536_d(par1World, par2, par3, par4, var6); par1World.markBlockRangeForRenderUpdate(par2, par3, par4, par2, par3, par4); - par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.5D, (double)par4 + 0.5D, "random.click", 0.3F, 0.6F); + par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.5D, (double)par4 + 0.5D, "EaglercraftRandom.click", 0.3F, 0.6F); } if (!var8 && var7) @@ -363,7 +363,7 @@ public abstract class BlockButton extends Block par1World.setBlockMetadataWithNotify(par2, par3, par4, var6, 3); this.func_82536_d(par1World, par2, par3, par4, var6); par1World.markBlockRangeForRenderUpdate(par2, par3, par4, par2, par3, par4); - par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.5D, (double)par4 + 0.5D, "random.click", 0.3F, 0.5F); + par1World.playSoundEffect((double)par2 + 0.5D, (double)par3 + 0.5D, (double)par4 + 0.5D, "EaglercraftRandom.click", 0.3F, 0.5F); } if (var8) diff --git a/src/main/java/net/minecraft/src/BlockCactus.java b/src/main/java/net/minecraft/src/BlockCactus.java index bbc2a24..9e4eb01 100644 --- a/src/main/java/net/minecraft/src/BlockCactus.java +++ b/src/main/java/net/minecraft/src/BlockCactus.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockCactus extends Block { @@ -17,7 +17,7 @@ public class BlockCactus extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (par1World.isAirBlock(par2, par3 + 1, par4)) { diff --git a/src/main/java/net/minecraft/src/BlockCake.java b/src/main/java/net/minecraft/src/BlockCake.java index d285602..2ede926 100644 --- a/src/main/java/net/minecraft/src/BlockCake.java +++ b/src/main/java/net/minecraft/src/BlockCake.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockCake extends Block { @@ -167,7 +167,7 @@ public class BlockCake extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } @@ -175,7 +175,7 @@ public class BlockCake extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return 0; } diff --git a/src/main/java/net/minecraft/src/BlockCauldron.java b/src/main/java/net/minecraft/src/BlockCauldron.java index 7a84f60..12208c6 100644 --- a/src/main/java/net/minecraft/src/BlockCauldron.java +++ b/src/main/java/net/minecraft/src/BlockCauldron.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockCauldron extends Block { @@ -191,7 +191,7 @@ public class BlockCauldron extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.cauldron.itemID; } diff --git a/src/main/java/net/minecraft/src/BlockChest.java b/src/main/java/net/minecraft/src/BlockChest.java index 5a17025..ad85501 100644 --- a/src/main/java/net/minecraft/src/BlockChest.java +++ b/src/main/java/net/minecraft/src/BlockChest.java @@ -1,11 +1,11 @@ package net.minecraft.src; import java.util.Iterator; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockChest extends BlockContainer { - private final Random random = new Random(); + private final EaglercraftRandom random = new EaglercraftRandom(); /** 1 for trapped chests, 0 for normal chests. */ public final int chestType; diff --git a/src/main/java/net/minecraft/src/BlockClay.java b/src/main/java/net/minecraft/src/BlockClay.java index beda03d..9103fde 100644 --- a/src/main/java/net/minecraft/src/BlockClay.java +++ b/src/main/java/net/minecraft/src/BlockClay.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockClay extends Block { @@ -13,7 +13,7 @@ public class BlockClay extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.clay.itemID; } @@ -21,7 +21,7 @@ public class BlockClay extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 4; } diff --git a/src/main/java/net/minecraft/src/BlockCocoa.java b/src/main/java/net/minecraft/src/BlockCocoa.java index fa78799..16404e0 100644 --- a/src/main/java/net/minecraft/src/BlockCocoa.java +++ b/src/main/java/net/minecraft/src/BlockCocoa.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockCocoa extends BlockDirectional { @@ -33,7 +33,7 @@ public class BlockCocoa extends BlockDirectional /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!this.canBlockStay(par1World, par2, par3, par4)) { diff --git a/src/main/java/net/minecraft/src/BlockCommandBlock.java b/src/main/java/net/minecraft/src/BlockCommandBlock.java index 3152d25..fa028a8 100644 --- a/src/main/java/net/minecraft/src/BlockCommandBlock.java +++ b/src/main/java/net/minecraft/src/BlockCommandBlock.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockCommandBlock extends BlockContainer { @@ -44,7 +44,7 @@ public class BlockCommandBlock extends BlockContainer /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { TileEntity var6 = par1World.getBlockTileEntity(par2, par3, par4); @@ -114,7 +114,7 @@ public class BlockCommandBlock extends BlockContainer /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } diff --git a/src/main/java/net/minecraft/src/BlockComparator.java b/src/main/java/net/minecraft/src/BlockComparator.java index 30c3388..6c5b58b 100644 --- a/src/main/java/net/minecraft/src/BlockComparator.java +++ b/src/main/java/net/minecraft/src/BlockComparator.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockComparator extends BlockRedstoneLogic implements ITileEntityProvider { @@ -13,7 +13,7 @@ public class BlockComparator extends BlockRedstoneLogic implements ITileEntityPr /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.comparator.itemID; } @@ -176,7 +176,7 @@ public class BlockComparator extends BlockRedstoneLogic implements ITileEntityPr } } - private void func_96476_c(World par1World, int par2, int par3, int par4, Random par5Random) + private void func_96476_c(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { int var6 = par1World.getBlockMetadata(par2, par3, par4); int var7 = this.getOutputStrength(par1World, par2, par3, par4, var6); @@ -204,7 +204,7 @@ public class BlockComparator extends BlockRedstoneLogic implements ITileEntityPr /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (this.isRepeaterPowered) { diff --git a/src/main/java/net/minecraft/src/BlockCrops.java b/src/main/java/net/minecraft/src/BlockCrops.java index bbbb7f2..93c142f 100644 --- a/src/main/java/net/minecraft/src/BlockCrops.java +++ b/src/main/java/net/minecraft/src/BlockCrops.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockCrops extends BlockFlower { @@ -30,7 +30,7 @@ public class BlockCrops extends BlockFlower /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { super.updateTick(par1World, par2, par3, par4, par5Random); @@ -184,7 +184,7 @@ public class BlockCrops extends BlockFlower /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return par1 == 7 ? this.getCropItem() : this.getSeedItem(); } @@ -192,7 +192,7 @@ public class BlockCrops extends BlockFlower /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 1; } diff --git a/src/main/java/net/minecraft/src/BlockDaylightDetector.java b/src/main/java/net/minecraft/src/BlockDaylightDetector.java index c4b5b0c..a2f5af8 100644 --- a/src/main/java/net/minecraft/src/BlockDaylightDetector.java +++ b/src/main/java/net/minecraft/src/BlockDaylightDetector.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockDaylightDetector extends BlockContainer { @@ -34,7 +34,7 @@ public class BlockDaylightDetector extends BlockContainer /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) {} + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) {} /** * Lets the block know when one of its neighbor changes. Doesn't know which neighbor changed (coordinates passed are diff --git a/src/main/java/net/minecraft/src/BlockDeadBush.java b/src/main/java/net/minecraft/src/BlockDeadBush.java index 3c409d3..98bbbc2 100644 --- a/src/main/java/net/minecraft/src/BlockDeadBush.java +++ b/src/main/java/net/minecraft/src/BlockDeadBush.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockDeadBush extends BlockFlower { @@ -23,7 +23,7 @@ public class BlockDeadBush extends BlockFlower /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return -1; } diff --git a/src/main/java/net/minecraft/src/BlockDetectorRail.java b/src/main/java/net/minecraft/src/BlockDetectorRail.java index 319ea0a..c44935d 100644 --- a/src/main/java/net/minecraft/src/BlockDetectorRail.java +++ b/src/main/java/net/minecraft/src/BlockDetectorRail.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockDetectorRail extends BlockRailBase { @@ -48,7 +48,7 @@ public class BlockDetectorRail extends BlockRailBase /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!par1World.isRemote) { diff --git a/src/main/java/net/minecraft/src/BlockDispenser.java b/src/main/java/net/minecraft/src/BlockDispenser.java index acf638d..47e5fdf 100644 --- a/src/main/java/net/minecraft/src/BlockDispenser.java +++ b/src/main/java/net/minecraft/src/BlockDispenser.java @@ -1,12 +1,12 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockDispenser extends BlockContainer { /** Registry for all dispense behaviors. */ public static final IRegistry dispenseBehaviorRegistry = new RegistryDefaulted(new BehaviorDefaultDispenseItem()); - protected Random random = new Random(); + protected EaglercraftRandom random = new EaglercraftRandom(); protected Icon furnaceTopIcon; protected Icon furnaceFrontIcon; protected Icon field_96473_e; @@ -174,7 +174,7 @@ public class BlockDispenser extends BlockContainer /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!par1World.isRemote) { diff --git a/src/main/java/net/minecraft/src/BlockDoor.java b/src/main/java/net/minecraft/src/BlockDoor.java index 4289135..89f7b79 100644 --- a/src/main/java/net/minecraft/src/BlockDoor.java +++ b/src/main/java/net/minecraft/src/BlockDoor.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockDoor extends Block { @@ -382,7 +382,7 @@ public class BlockDoor extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return (par1 & 8) != 0 ? 0 : (this.blockMaterial == Material.iron ? Item.doorIron.itemID : Item.doorWood.itemID); } diff --git a/src/main/java/net/minecraft/src/BlockDragonEgg.java b/src/main/java/net/minecraft/src/BlockDragonEgg.java index 51d0115..7f8c2c3 100644 --- a/src/main/java/net/minecraft/src/BlockDragonEgg.java +++ b/src/main/java/net/minecraft/src/BlockDragonEgg.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockDragonEgg extends Block { @@ -30,7 +30,7 @@ public class BlockDragonEgg extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { this.fallIfPossible(par1World, par2, par3, par4); } diff --git a/src/main/java/net/minecraft/src/BlockEnchantmentTable.java b/src/main/java/net/minecraft/src/BlockEnchantmentTable.java index 8617c73..f0e0ddf 100644 --- a/src/main/java/net/minecraft/src/BlockEnchantmentTable.java +++ b/src/main/java/net/minecraft/src/BlockEnchantmentTable.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockEnchantmentTable extends BlockContainer { @@ -26,7 +26,7 @@ public class BlockEnchantmentTable extends BlockContainer /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { super.randomDisplayTick(par1World, par2, par3, par4, par5Random); diff --git a/src/main/java/net/minecraft/src/BlockEndPortal.java b/src/main/java/net/minecraft/src/BlockEndPortal.java index b7b2d9b..5ffcb89 100644 --- a/src/main/java/net/minecraft/src/BlockEndPortal.java +++ b/src/main/java/net/minecraft/src/BlockEndPortal.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockEndPortal extends BlockContainer { @@ -68,7 +68,7 @@ public class BlockEndPortal extends BlockContainer /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } @@ -87,7 +87,7 @@ public class BlockEndPortal extends BlockContainer /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { double var6 = (double)((float)par2 + par5Random.nextFloat()); double var8 = (double)((float)par3 + 0.8F); diff --git a/src/main/java/net/minecraft/src/BlockEndPortalFrame.java b/src/main/java/net/minecraft/src/BlockEndPortalFrame.java index 15f969b..99a716d 100644 --- a/src/main/java/net/minecraft/src/BlockEndPortalFrame.java +++ b/src/main/java/net/minecraft/src/BlockEndPortalFrame.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockEndPortalFrame extends Block { @@ -92,7 +92,7 @@ public class BlockEndPortalFrame extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return 0; } diff --git a/src/main/java/net/minecraft/src/BlockEnderChest.java b/src/main/java/net/minecraft/src/BlockEnderChest.java index 45d183c..e7657e0 100644 --- a/src/main/java/net/minecraft/src/BlockEnderChest.java +++ b/src/main/java/net/minecraft/src/BlockEnderChest.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockEnderChest extends BlockContainer { @@ -39,7 +39,7 @@ public class BlockEnderChest extends BlockContainer /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.obsidian.blockID; } @@ -47,7 +47,7 @@ public class BlockEnderChest extends BlockContainer /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 8; } @@ -133,7 +133,7 @@ public class BlockEnderChest extends BlockContainer /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { for (int var6 = 0; var6 < 3; ++var6) { diff --git a/src/main/java/net/minecraft/src/BlockFarmland.java b/src/main/java/net/minecraft/src/BlockFarmland.java index 2cd54a8..1cfdd56 100644 --- a/src/main/java/net/minecraft/src/BlockFarmland.java +++ b/src/main/java/net/minecraft/src/BlockFarmland.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockFarmland extends Block { @@ -52,7 +52,7 @@ public class BlockFarmland extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!this.isWaterNearby(par1World, par2, par3, par4) && !par1World.canLightningStrikeAt(par2, par3 + 1, par4)) { @@ -152,7 +152,7 @@ public class BlockFarmland extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.dirt.idDropped(0, par2Random, par3); } diff --git a/src/main/java/net/minecraft/src/BlockFire.java b/src/main/java/net/minecraft/src/BlockFire.java index 41ecc39..622f793 100644 --- a/src/main/java/net/minecraft/src/BlockFire.java +++ b/src/main/java/net/minecraft/src/BlockFire.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockFire extends Block { @@ -93,7 +93,7 @@ public class BlockFire extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } @@ -109,7 +109,7 @@ public class BlockFire extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (par1World.getGameRules().getGameRuleBooleanValue("doFireTick")) { @@ -220,7 +220,7 @@ public class BlockFire extends Block return false; } - private void tryToCatchBlockOnFire(World par1World, int par2, int par3, int par4, int par5, Random par6Random, int par7) + private void tryToCatchBlockOnFire(World par1World, int par2, int par3, int par4, int par5, EaglercraftRandom par6Random, int par7) { int var8 = this.abilityToCatchFire[par1World.getBlockId(par2, par3, par4)]; @@ -350,7 +350,7 @@ public class BlockFire extends Block /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (par5Random.nextInt(24) == 0) { diff --git a/src/main/java/net/minecraft/src/BlockFlower.java b/src/main/java/net/minecraft/src/BlockFlower.java index 9647c3a..e95cc6c 100644 --- a/src/main/java/net/minecraft/src/BlockFlower.java +++ b/src/main/java/net/minecraft/src/BlockFlower.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockFlower extends Block { @@ -48,7 +48,7 @@ public class BlockFlower extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { this.checkFlowerChange(par1World, par2, par3, par4); } diff --git a/src/main/java/net/minecraft/src/BlockFlowerPot.java b/src/main/java/net/minecraft/src/BlockFlowerPot.java index 1e05f71..a806296 100644 --- a/src/main/java/net/minecraft/src/BlockFlowerPot.java +++ b/src/main/java/net/minecraft/src/BlockFlowerPot.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockFlowerPot extends Block { @@ -150,7 +150,7 @@ public class BlockFlowerPot extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.flowerPot.itemID; } diff --git a/src/main/java/net/minecraft/src/BlockFlowing.java b/src/main/java/net/minecraft/src/BlockFlowing.java index 712670a..f28aea1 100644 --- a/src/main/java/net/minecraft/src/BlockFlowing.java +++ b/src/main/java/net/minecraft/src/BlockFlowing.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockFlowing extends BlockFluid { @@ -44,7 +44,7 @@ public class BlockFlowing extends BlockFluid /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { int var6 = this.getFlowDecay(par1World, par2, par3, par4); byte var7 = 1; diff --git a/src/main/java/net/minecraft/src/BlockFluid.java b/src/main/java/net/minecraft/src/BlockFluid.java index fadc3b3..6fda989 100644 --- a/src/main/java/net/minecraft/src/BlockFluid.java +++ b/src/main/java/net/minecraft/src/BlockFluid.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class BlockFluid extends Block { @@ -175,7 +175,7 @@ public abstract class BlockFluid extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return 0; } @@ -183,7 +183,7 @@ public abstract class BlockFluid extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } @@ -352,7 +352,7 @@ public abstract class BlockFluid extends Block /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { int var6; @@ -594,7 +594,7 @@ public abstract class BlockFluid extends Block */ protected void triggerLavaMixEffects(World par1World, int par2, int par3, int par4) { - par1World.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), "random.fizz", 0.5F, 2.6F + (par1World.rand.nextFloat() - par1World.rand.nextFloat()) * 0.8F); + par1World.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), "EaglercraftRandom.fizz", 0.5F, 2.6F + (par1World.rand.nextFloat() - par1World.rand.nextFloat()) * 0.8F); for (int var5 = 0; var5 < 8; ++var5) { diff --git a/src/main/java/net/minecraft/src/BlockFurnace.java b/src/main/java/net/minecraft/src/BlockFurnace.java index f3f5744..6165e72 100644 --- a/src/main/java/net/minecraft/src/BlockFurnace.java +++ b/src/main/java/net/minecraft/src/BlockFurnace.java @@ -1,13 +1,13 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockFurnace extends BlockContainer { /** * Is the random generator used by furnace to drop the inventory contents in random directions. */ - private final Random furnaceRand = new Random(); + private final EaglercraftRandom furnaceRand = new EaglercraftRandom(); /** True if this is an active furnace, false if idle */ private final boolean isActive; @@ -29,7 +29,7 @@ public class BlockFurnace extends BlockContainer /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.furnaceIdle.blockID; } @@ -102,7 +102,7 @@ public class BlockFurnace extends BlockContainer /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (this.isActive) { diff --git a/src/main/java/net/minecraft/src/BlockGlass.java b/src/main/java/net/minecraft/src/BlockGlass.java index 8541536..ef064c9 100644 --- a/src/main/java/net/minecraft/src/BlockGlass.java +++ b/src/main/java/net/minecraft/src/BlockGlass.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockGlass extends BlockBreakable { @@ -13,7 +13,7 @@ public class BlockGlass extends BlockBreakable /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } diff --git a/src/main/java/net/minecraft/src/BlockGlowStone.java b/src/main/java/net/minecraft/src/BlockGlowStone.java index 89335a9..4fc9c05 100644 --- a/src/main/java/net/minecraft/src/BlockGlowStone.java +++ b/src/main/java/net/minecraft/src/BlockGlowStone.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockGlowStone extends Block { @@ -13,7 +13,7 @@ public class BlockGlowStone extends Block /** * Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive). */ - public int quantityDroppedWithBonus(int par1, Random par2Random) + public int quantityDroppedWithBonus(int par1, EaglercraftRandom par2Random) { return MathHelper.clamp_int(this.quantityDropped(par2Random) + par2Random.nextInt(par1 + 1), 1, 4); } @@ -21,7 +21,7 @@ public class BlockGlowStone extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 2 + par1Random.nextInt(3); } @@ -29,7 +29,7 @@ public class BlockGlowStone extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.glowstone.itemID; } diff --git a/src/main/java/net/minecraft/src/BlockGrass.java b/src/main/java/net/minecraft/src/BlockGrass.java index 5704f13..86dae61 100644 --- a/src/main/java/net/minecraft/src/BlockGrass.java +++ b/src/main/java/net/minecraft/src/BlockGrass.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockGrass extends Block { @@ -97,7 +97,7 @@ public class BlockGrass extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!par1World.isRemote) { @@ -126,7 +126,7 @@ public class BlockGrass extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.dirt.idDropped(0, par2Random, par3); } diff --git a/src/main/java/net/minecraft/src/BlockGravel.java b/src/main/java/net/minecraft/src/BlockGravel.java index 7a754a8..553c8da 100644 --- a/src/main/java/net/minecraft/src/BlockGravel.java +++ b/src/main/java/net/minecraft/src/BlockGravel.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockGravel extends BlockSand { @@ -12,7 +12,7 @@ public class BlockGravel extends BlockSand /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { if (par3 > 3) { diff --git a/src/main/java/net/minecraft/src/BlockHalfSlab.java b/src/main/java/net/minecraft/src/BlockHalfSlab.java index d5550a3..c519876 100644 --- a/src/main/java/net/minecraft/src/BlockHalfSlab.java +++ b/src/main/java/net/minecraft/src/BlockHalfSlab.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class BlockHalfSlab extends Block { @@ -93,7 +93,7 @@ public abstract class BlockHalfSlab extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return this.isDoubleSlab ? 2 : 1; } diff --git a/src/main/java/net/minecraft/src/BlockHopper.java b/src/main/java/net/minecraft/src/BlockHopper.java index 44a2b6c..213b0e7 100644 --- a/src/main/java/net/minecraft/src/BlockHopper.java +++ b/src/main/java/net/minecraft/src/BlockHopper.java @@ -1,11 +1,11 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockHopper extends BlockContainer { - private final Random field_94457_a = new Random(); + private final EaglercraftRandom field_94457_a = new EaglercraftRandom(); private Icon hopperIcon; private Icon hopperTopIcon; private Icon hopperInsideIcon; diff --git a/src/main/java/net/minecraft/src/BlockIce.java b/src/main/java/net/minecraft/src/BlockIce.java index 4021874..c33660f 100644 --- a/src/main/java/net/minecraft/src/BlockIce.java +++ b/src/main/java/net/minecraft/src/BlockIce.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockIce extends BlockBreakable { @@ -69,7 +69,7 @@ public class BlockIce extends BlockBreakable /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } @@ -77,7 +77,7 @@ public class BlockIce extends BlockBreakable /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (par1World.getSavedLightValue(EnumSkyBlock.Block, par2, par3, par4) > 11 - Block.lightOpacity[this.blockID]) { diff --git a/src/main/java/net/minecraft/src/BlockLadder.java b/src/main/java/net/minecraft/src/BlockLadder.java index 4ac222a..fcdb261 100644 --- a/src/main/java/net/minecraft/src/BlockLadder.java +++ b/src/main/java/net/minecraft/src/BlockLadder.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockLadder extends Block { @@ -169,7 +169,7 @@ public class BlockLadder extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 1; } diff --git a/src/main/java/net/minecraft/src/BlockLeaves.java b/src/main/java/net/minecraft/src/BlockLeaves.java index 2ab9a0c..d80fa0f 100644 --- a/src/main/java/net/minecraft/src/BlockLeaves.java +++ b/src/main/java/net/minecraft/src/BlockLeaves.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockLeaves extends BlockLeavesBase { @@ -106,7 +106,7 @@ public class BlockLeaves extends BlockLeavesBase /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!par1World.isRemote) { @@ -220,7 +220,7 @@ public class BlockLeaves extends BlockLeavesBase /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (par1World.canLightningStrikeAt(par2, par3 + 1, par4) && !par1World.doesBlockHaveSolidTopSurface(par2, par3 - 1, par4) && par5Random.nextInt(15) == 1) { @@ -240,7 +240,7 @@ public class BlockLeaves extends BlockLeavesBase /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return par1Random.nextInt(20) == 0 ? 1 : 0; } @@ -248,7 +248,7 @@ public class BlockLeaves extends BlockLeavesBase /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.sapling.blockID; } diff --git a/src/main/java/net/minecraft/src/BlockLockedChest.java b/src/main/java/net/minecraft/src/BlockLockedChest.java index 0158e5a..9751d3c 100644 --- a/src/main/java/net/minecraft/src/BlockLockedChest.java +++ b/src/main/java/net/minecraft/src/BlockLockedChest.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockLockedChest extends Block { @@ -20,7 +20,7 @@ public class BlockLockedChest extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { par1World.setBlockToAir(par2, par3, par4); } diff --git a/src/main/java/net/minecraft/src/BlockLog.java b/src/main/java/net/minecraft/src/BlockLog.java index b1d5284..326d752 100644 --- a/src/main/java/net/minecraft/src/BlockLog.java +++ b/src/main/java/net/minecraft/src/BlockLog.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockLog extends BlockRotatedPillar { @@ -19,7 +19,7 @@ public class BlockLog extends BlockRotatedPillar /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 1; } @@ -27,7 +27,7 @@ public class BlockLog extends BlockRotatedPillar /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.wood.blockID; } diff --git a/src/main/java/net/minecraft/src/BlockMelon.java b/src/main/java/net/minecraft/src/BlockMelon.java index 5241e51..46b74f2 100644 --- a/src/main/java/net/minecraft/src/BlockMelon.java +++ b/src/main/java/net/minecraft/src/BlockMelon.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockMelon extends Block { @@ -23,7 +23,7 @@ public class BlockMelon extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.melon.itemID; } @@ -31,7 +31,7 @@ public class BlockMelon extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 3 + par1Random.nextInt(5); } @@ -39,7 +39,7 @@ public class BlockMelon extends Block /** * Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive). */ - public int quantityDroppedWithBonus(int par1, Random par2Random) + public int quantityDroppedWithBonus(int par1, EaglercraftRandom par2Random) { int var3 = this.quantityDropped(par2Random) + par2Random.nextInt(1 + par1); diff --git a/src/main/java/net/minecraft/src/BlockMobSpawner.java b/src/main/java/net/minecraft/src/BlockMobSpawner.java index a9da220..5500f51 100644 --- a/src/main/java/net/minecraft/src/BlockMobSpawner.java +++ b/src/main/java/net/minecraft/src/BlockMobSpawner.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockMobSpawner extends BlockContainer { @@ -20,7 +20,7 @@ public class BlockMobSpawner extends BlockContainer /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return 0; } @@ -28,7 +28,7 @@ public class BlockMobSpawner extends BlockContainer /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } diff --git a/src/main/java/net/minecraft/src/BlockMushroom.java b/src/main/java/net/minecraft/src/BlockMushroom.java index 8565ec8..69a3fdd 100644 --- a/src/main/java/net/minecraft/src/BlockMushroom.java +++ b/src/main/java/net/minecraft/src/BlockMushroom.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockMushroom extends BlockFlower { @@ -15,7 +15,7 @@ public class BlockMushroom extends BlockFlower /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (par5Random.nextInt(25) == 0) { @@ -105,7 +105,7 @@ public class BlockMushroom extends BlockFlower /** * Fertilize the mushroom. */ - public boolean fertilizeMushroom(World par1World, int par2, int par3, int par4, Random par5Random) + public boolean fertilizeMushroom(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { int var6 = par1World.getBlockMetadata(par2, par3, par4); par1World.setBlockToAir(par2, par3, par4); diff --git a/src/main/java/net/minecraft/src/BlockMushroomCap.java b/src/main/java/net/minecraft/src/BlockMushroomCap.java index 0a6a27a..92e82bb 100644 --- a/src/main/java/net/minecraft/src/BlockMushroomCap.java +++ b/src/main/java/net/minecraft/src/BlockMushroomCap.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockMushroomCap extends Block { @@ -29,7 +29,7 @@ public class BlockMushroomCap extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { int var2 = par1Random.nextInt(10) - 7; @@ -44,7 +44,7 @@ public class BlockMushroomCap extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.mushroomBrown.blockID + this.mushroomType; } diff --git a/src/main/java/net/minecraft/src/BlockMycelium.java b/src/main/java/net/minecraft/src/BlockMycelium.java index 9af81f4..14f5a80 100644 --- a/src/main/java/net/minecraft/src/BlockMycelium.java +++ b/src/main/java/net/minecraft/src/BlockMycelium.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockMycelium extends Block { @@ -56,7 +56,7 @@ public class BlockMycelium extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!par1World.isRemote) { @@ -85,7 +85,7 @@ public class BlockMycelium extends Block /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { super.randomDisplayTick(par1World, par2, par3, par4, par5Random); @@ -98,7 +98,7 @@ public class BlockMycelium extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.dirt.idDropped(0, par2Random, par3); } diff --git a/src/main/java/net/minecraft/src/BlockNetherStalk.java b/src/main/java/net/minecraft/src/BlockNetherStalk.java index 9ded3a5..38509a6 100644 --- a/src/main/java/net/minecraft/src/BlockNetherStalk.java +++ b/src/main/java/net/minecraft/src/BlockNetherStalk.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockNetherStalk extends BlockFlower { @@ -35,7 +35,7 @@ public class BlockNetherStalk extends BlockFlower /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { int var6 = par1World.getBlockMetadata(par2, par3, par4); @@ -93,7 +93,7 @@ public class BlockNetherStalk extends BlockFlower /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return 0; } @@ -101,7 +101,7 @@ public class BlockNetherStalk extends BlockFlower /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } diff --git a/src/main/java/net/minecraft/src/BlockObsidian.java b/src/main/java/net/minecraft/src/BlockObsidian.java index d98d8e0..8d6223f 100644 --- a/src/main/java/net/minecraft/src/BlockObsidian.java +++ b/src/main/java/net/minecraft/src/BlockObsidian.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockObsidian extends BlockStone { @@ -12,7 +12,7 @@ public class BlockObsidian extends BlockStone /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 1; } @@ -20,7 +20,7 @@ public class BlockObsidian extends BlockStone /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.obsidian.blockID; } diff --git a/src/main/java/net/minecraft/src/BlockOre.java b/src/main/java/net/minecraft/src/BlockOre.java index 38abdf1..5a4b38f 100644 --- a/src/main/java/net/minecraft/src/BlockOre.java +++ b/src/main/java/net/minecraft/src/BlockOre.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockOre extends Block { @@ -13,7 +13,7 @@ public class BlockOre extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return this.blockID == Block.oreCoal.blockID ? Item.coal.itemID : (this.blockID == Block.oreDiamond.blockID ? Item.diamond.itemID : (this.blockID == Block.oreLapis.blockID ? Item.dyePowder.itemID : (this.blockID == Block.oreEmerald.blockID ? Item.emerald.itemID : (this.blockID == Block.oreNetherQuartz.blockID ? Item.netherQuartz.itemID : this.blockID)))); } @@ -21,7 +21,7 @@ public class BlockOre extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return this.blockID == Block.oreLapis.blockID ? 4 + par1Random.nextInt(5) : 1; } @@ -29,7 +29,7 @@ public class BlockOre extends Block /** * Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive). */ - public int quantityDroppedWithBonus(int par1, Random par2Random) + public int quantityDroppedWithBonus(int par1, EaglercraftRandom par2Random) { if (par1 > 0 && this.blockID != this.idDropped(0, par2Random, par1)) { diff --git a/src/main/java/net/minecraft/src/BlockPane.java b/src/main/java/net/minecraft/src/BlockPane.java index cf53abe..85c4467 100644 --- a/src/main/java/net/minecraft/src/BlockPane.java +++ b/src/main/java/net/minecraft/src/BlockPane.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockPane extends Block { @@ -30,7 +30,7 @@ public class BlockPane extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return !this.canDropItself ? 0 : super.idDropped(par1, par2Random, par3); } diff --git a/src/main/java/net/minecraft/src/BlockPistonExtension.java b/src/main/java/net/minecraft/src/BlockPistonExtension.java index cc275fd..c3f7c76 100644 --- a/src/main/java/net/minecraft/src/BlockPistonExtension.java +++ b/src/main/java/net/minecraft/src/BlockPistonExtension.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockPistonExtension extends Block { @@ -129,7 +129,7 @@ public class BlockPistonExtension extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } diff --git a/src/main/java/net/minecraft/src/BlockPistonMoving.java b/src/main/java/net/minecraft/src/BlockPistonMoving.java index b500b0f..c3471dc 100644 --- a/src/main/java/net/minecraft/src/BlockPistonMoving.java +++ b/src/main/java/net/minecraft/src/BlockPistonMoving.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockPistonMoving extends BlockContainer { @@ -102,7 +102,7 @@ public class BlockPistonMoving extends BlockContainer /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return 0; } diff --git a/src/main/java/net/minecraft/src/BlockPortal.java b/src/main/java/net/minecraft/src/BlockPortal.java index 000de52..ed3c1ba 100644 --- a/src/main/java/net/minecraft/src/BlockPortal.java +++ b/src/main/java/net/minecraft/src/BlockPortal.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockPortal extends BlockBreakable { @@ -13,7 +13,7 @@ public class BlockPortal extends BlockBreakable /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { super.updateTick(par1World, par2, par3, par4, par5Random); @@ -240,7 +240,7 @@ public class BlockPortal extends BlockBreakable /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } @@ -267,7 +267,7 @@ public class BlockPortal extends BlockBreakable /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (par5Random.nextInt(100) == 0) { diff --git a/src/main/java/net/minecraft/src/BlockRailBase.java b/src/main/java/net/minecraft/src/BlockRailBase.java index 50c32a3..4f0bd9c 100644 --- a/src/main/java/net/minecraft/src/BlockRailBase.java +++ b/src/main/java/net/minecraft/src/BlockRailBase.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class BlockRailBase extends Block { @@ -104,7 +104,7 @@ public abstract class BlockRailBase extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 1; } diff --git a/src/main/java/net/minecraft/src/BlockRedstoneLight.java b/src/main/java/net/minecraft/src/BlockRedstoneLight.java index 61c2ab6..968c9ec 100644 --- a/src/main/java/net/minecraft/src/BlockRedstoneLight.java +++ b/src/main/java/net/minecraft/src/BlockRedstoneLight.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockRedstoneLight extends Block { @@ -58,7 +58,7 @@ public class BlockRedstoneLight extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!par1World.isRemote && this.powered && !par1World.isBlockIndirectlyGettingPowered(par2, par3, par4)) { @@ -69,7 +69,7 @@ public class BlockRedstoneLight extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.redstoneLampIdle.blockID; } diff --git a/src/main/java/net/minecraft/src/BlockRedstoneLogic.java b/src/main/java/net/minecraft/src/BlockRedstoneLogic.java index 5977e9d..bcd68a7 100644 --- a/src/main/java/net/minecraft/src/BlockRedstoneLogic.java +++ b/src/main/java/net/minecraft/src/BlockRedstoneLogic.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class BlockRedstoneLogic extends BlockDirectional { @@ -41,7 +41,7 @@ public abstract class BlockRedstoneLogic extends BlockDirectional /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { int var6 = par1World.getBlockMetadata(par2, par3, par4); diff --git a/src/main/java/net/minecraft/src/BlockRedstoneOre.java b/src/main/java/net/minecraft/src/BlockRedstoneOre.java index 4249bfe..9669847 100644 --- a/src/main/java/net/minecraft/src/BlockRedstoneOre.java +++ b/src/main/java/net/minecraft/src/BlockRedstoneOre.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockRedstoneOre extends Block { @@ -69,7 +69,7 @@ public class BlockRedstoneOre extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (this.blockID == Block.oreRedstoneGlowing.blockID) { @@ -80,7 +80,7 @@ public class BlockRedstoneOre extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.redstone.itemID; } @@ -88,7 +88,7 @@ public class BlockRedstoneOre extends Block /** * Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive). */ - public int quantityDroppedWithBonus(int par1, Random par2Random) + public int quantityDroppedWithBonus(int par1, EaglercraftRandom par2Random) { return this.quantityDropped(par2Random) + par2Random.nextInt(par1 + 1); } @@ -96,7 +96,7 @@ public class BlockRedstoneOre extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 4 + par1Random.nextInt(2); } @@ -118,7 +118,7 @@ public class BlockRedstoneOre extends Block /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (this.glowing) { @@ -131,7 +131,7 @@ public class BlockRedstoneOre extends Block */ private void sparkle(World par1World, int par2, int par3, int par4) { - Random var5 = par1World.rand; + EaglercraftRandom var5 = par1World.rand; double var6 = 0.0625D; for (int var8 = 0; var8 < 6; ++var8) diff --git a/src/main/java/net/minecraft/src/BlockRedstoneRepeater.java b/src/main/java/net/minecraft/src/BlockRedstoneRepeater.java index 9ef77bd..540f3c1 100644 --- a/src/main/java/net/minecraft/src/BlockRedstoneRepeater.java +++ b/src/main/java/net/minecraft/src/BlockRedstoneRepeater.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockRedstoneRepeater extends BlockRedstoneLogic { @@ -45,7 +45,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneLogic /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.redstoneRepeater.itemID; } @@ -79,7 +79,7 @@ public class BlockRedstoneRepeater extends BlockRedstoneLogic /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (this.isRepeaterPowered) { diff --git a/src/main/java/net/minecraft/src/BlockRedstoneTorch.java b/src/main/java/net/minecraft/src/BlockRedstoneTorch.java index 075ce35..5159404 100644 --- a/src/main/java/net/minecraft/src/BlockRedstoneTorch.java +++ b/src/main/java/net/minecraft/src/BlockRedstoneTorch.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockRedstoneTorch extends BlockTorch { @@ -133,7 +133,7 @@ public class BlockRedstoneTorch extends BlockTorch /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { boolean var6 = this.isIndirectlyPowered(par1World, par2, par3, par4); List var7 = (List)redstoneUpdateInfoCache.get(par1World); @@ -151,7 +151,7 @@ public class BlockRedstoneTorch extends BlockTorch if (this.checkForBurnout(par1World, par2, par3, par4, true)) { - par1World.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), "random.fizz", 0.5F, 2.6F + (par1World.rand.nextFloat() - par1World.rand.nextFloat()) * 0.8F); + par1World.playSoundEffect((double)((float)par2 + 0.5F), (double)((float)par3 + 0.5F), (double)((float)par4 + 0.5F), "EaglercraftRandom.fizz", 0.5F, 2.6F + (par1World.rand.nextFloat() - par1World.rand.nextFloat()) * 0.8F); for (int var8 = 0; var8 < 5; ++var8) { @@ -198,7 +198,7 @@ public class BlockRedstoneTorch extends BlockTorch /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.torchRedstoneActive.blockID; } @@ -214,7 +214,7 @@ public class BlockRedstoneTorch extends BlockTorch /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (this.torchActive) { diff --git a/src/main/java/net/minecraft/src/BlockRedstoneWire.java b/src/main/java/net/minecraft/src/BlockRedstoneWire.java index 1dd2940..7753eac 100644 --- a/src/main/java/net/minecraft/src/BlockRedstoneWire.java +++ b/src/main/java/net/minecraft/src/BlockRedstoneWire.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.ArrayList; import java.util.HashSet; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import java.util.Set; public class BlockRedstoneWire extends Block @@ -360,7 +360,7 @@ public class BlockRedstoneWire extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.redstone.itemID; } @@ -443,7 +443,7 @@ public class BlockRedstoneWire extends Block /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { int var6 = par1World.getBlockMetadata(par2, par3, par4); diff --git a/src/main/java/net/minecraft/src/BlockReed.java b/src/main/java/net/minecraft/src/BlockReed.java index 040d57c..6652f5a 100644 --- a/src/main/java/net/minecraft/src/BlockReed.java +++ b/src/main/java/net/minecraft/src/BlockReed.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockReed extends Block { @@ -15,7 +15,7 @@ public class BlockReed extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (par1World.isAirBlock(par2, par3 + 1, par4)) { @@ -93,7 +93,7 @@ public class BlockReed extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.reed.itemID; } diff --git a/src/main/java/net/minecraft/src/BlockSand.java b/src/main/java/net/minecraft/src/BlockSand.java index 5b9053c..b1099e9 100644 --- a/src/main/java/net/minecraft/src/BlockSand.java +++ b/src/main/java/net/minecraft/src/BlockSand.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockSand extends Block { @@ -38,7 +38,7 @@ public class BlockSand extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!par1World.isRemote) { diff --git a/src/main/java/net/minecraft/src/BlockSapling.java b/src/main/java/net/minecraft/src/BlockSapling.java index e92498a..754b410 100644 --- a/src/main/java/net/minecraft/src/BlockSapling.java +++ b/src/main/java/net/minecraft/src/BlockSapling.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockSapling extends BlockFlower { @@ -19,7 +19,7 @@ public class BlockSapling extends BlockFlower /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!par1World.isRemote) { @@ -41,7 +41,7 @@ public class BlockSapling extends BlockFlower return this.saplingIcon[par2]; } - public void markOrGrowMarked(World par1World, int par2, int par3, int par4, Random par5Random) + public void markOrGrowMarked(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { int var6 = par1World.getBlockMetadata(par2, par3, par4); @@ -58,7 +58,7 @@ public class BlockSapling extends BlockFlower /** * Attempts to grow a sapling into a tree */ - public void growTree(World par1World, int par2, int par3, int par4, Random par5Random) + public void growTree(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { int var6 = par1World.getBlockMetadata(par2, par3, par4) & 3; Object var7 = null; diff --git a/src/main/java/net/minecraft/src/BlockSign.java b/src/main/java/net/minecraft/src/BlockSign.java index 631ed63..f6205e2 100644 --- a/src/main/java/net/minecraft/src/BlockSign.java +++ b/src/main/java/net/minecraft/src/BlockSign.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockSign extends BlockContainer { @@ -130,7 +130,7 @@ public class BlockSign extends BlockContainer /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.sign.itemID; } diff --git a/src/main/java/net/minecraft/src/BlockSilverfish.java b/src/main/java/net/minecraft/src/BlockSilverfish.java index 75a60e0..d25dca0 100644 --- a/src/main/java/net/minecraft/src/BlockSilverfish.java +++ b/src/main/java/net/minecraft/src/BlockSilverfish.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockSilverfish extends Block { @@ -48,7 +48,7 @@ public class BlockSilverfish extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } diff --git a/src/main/java/net/minecraft/src/BlockSkull.java b/src/main/java/net/minecraft/src/BlockSkull.java index e3e36cd..455a255 100644 --- a/src/main/java/net/minecraft/src/BlockSkull.java +++ b/src/main/java/net/minecraft/src/BlockSkull.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockSkull extends BlockContainer { @@ -167,7 +167,7 @@ public class BlockSkull extends BlockContainer /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.skull.itemID; } diff --git a/src/main/java/net/minecraft/src/BlockSnow.java b/src/main/java/net/minecraft/src/BlockSnow.java index 6a08bf7..0cdbef0 100644 --- a/src/main/java/net/minecraft/src/BlockSnow.java +++ b/src/main/java/net/minecraft/src/BlockSnow.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockSnow extends Block { @@ -127,7 +127,7 @@ public class BlockSnow extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.snowball.itemID; } @@ -135,7 +135,7 @@ public class BlockSnow extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } @@ -143,7 +143,7 @@ public class BlockSnow extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (par1World.getSavedLightValue(EnumSkyBlock.Block, par2, par3, par4) > 11) { diff --git a/src/main/java/net/minecraft/src/BlockSnowBlock.java b/src/main/java/net/minecraft/src/BlockSnowBlock.java index b2178d3..34eb18f 100644 --- a/src/main/java/net/minecraft/src/BlockSnowBlock.java +++ b/src/main/java/net/minecraft/src/BlockSnowBlock.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockSnowBlock extends Block { @@ -14,7 +14,7 @@ public class BlockSnowBlock extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.snowball.itemID; } @@ -22,7 +22,7 @@ public class BlockSnowBlock extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 4; } @@ -30,7 +30,7 @@ public class BlockSnowBlock extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (par1World.getSavedLightValue(EnumSkyBlock.Block, par2, par3, par4) > 11) { diff --git a/src/main/java/net/minecraft/src/BlockStairs.java b/src/main/java/net/minecraft/src/BlockStairs.java index 809c51c..7a07d86 100644 --- a/src/main/java/net/minecraft/src/BlockStairs.java +++ b/src/main/java/net/minecraft/src/BlockStairs.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockStairs extends Block { @@ -359,7 +359,7 @@ public class BlockStairs extends Block /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { this.modelBlock.randomDisplayTick(par1World, par2, par3, par4, par5Random); } @@ -499,7 +499,7 @@ public class BlockStairs extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { this.modelBlock.updateTick(par1World, par2, par3, par4, par5Random); } diff --git a/src/main/java/net/minecraft/src/BlockStationary.java b/src/main/java/net/minecraft/src/BlockStationary.java index 68f6f5e..6cb832f 100644 --- a/src/main/java/net/minecraft/src/BlockStationary.java +++ b/src/main/java/net/minecraft/src/BlockStationary.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockStationary extends BlockFluid { @@ -47,7 +47,7 @@ public class BlockStationary extends BlockFluid /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (this.blockMaterial == Material.lava) { diff --git a/src/main/java/net/minecraft/src/BlockStem.java b/src/main/java/net/minecraft/src/BlockStem.java index 3730225..a878bda 100644 --- a/src/main/java/net/minecraft/src/BlockStem.java +++ b/src/main/java/net/minecraft/src/BlockStem.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockStem extends BlockFlower { @@ -30,7 +30,7 @@ public class BlockStem extends BlockFlower /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { super.updateTick(par1World, par2, par3, par4, par5Random); @@ -256,7 +256,7 @@ public class BlockStem extends BlockFlower /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return -1; } @@ -264,7 +264,7 @@ public class BlockStem extends BlockFlower /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 1; } diff --git a/src/main/java/net/minecraft/src/BlockStep.java b/src/main/java/net/minecraft/src/BlockStep.java index 5be5c77..de9e425 100644 --- a/src/main/java/net/minecraft/src/BlockStep.java +++ b/src/main/java/net/minecraft/src/BlockStep.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockStep extends BlockHalfSlab { @@ -43,7 +43,7 @@ public class BlockStep extends BlockHalfSlab /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.stoneSingleSlab.blockID; } diff --git a/src/main/java/net/minecraft/src/BlockStone.java b/src/main/java/net/minecraft/src/BlockStone.java index 91a54a9..a572677 100644 --- a/src/main/java/net/minecraft/src/BlockStone.java +++ b/src/main/java/net/minecraft/src/BlockStone.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockStone extends Block { @@ -13,7 +13,7 @@ public class BlockStone extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.cobblestone.blockID; } diff --git a/src/main/java/net/minecraft/src/BlockTNT.java b/src/main/java/net/minecraft/src/BlockTNT.java index 3303dd2..f3901e8 100644 --- a/src/main/java/net/minecraft/src/BlockTNT.java +++ b/src/main/java/net/minecraft/src/BlockTNT.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockTNT extends Block { @@ -51,7 +51,7 @@ public class BlockTNT extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 1; } diff --git a/src/main/java/net/minecraft/src/BlockTallGrass.java b/src/main/java/net/minecraft/src/BlockTallGrass.java index b393c0f..fd95c59 100644 --- a/src/main/java/net/minecraft/src/BlockTallGrass.java +++ b/src/main/java/net/minecraft/src/BlockTallGrass.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockTallGrass extends BlockFlower { @@ -56,7 +56,7 @@ public class BlockTallGrass extends BlockFlower /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return par2Random.nextInt(8) == 0 ? Item.seeds.itemID : -1; } @@ -64,7 +64,7 @@ public class BlockTallGrass extends BlockFlower /** * Returns the usual quantity dropped by the block plus a bonus of 1 to 'i' (inclusive). */ - public int quantityDroppedWithBonus(int par1, Random par2Random) + public int quantityDroppedWithBonus(int par1, EaglercraftRandom par2Random) { return 1 + par2Random.nextInt(par1 * 2 + 1); } diff --git a/src/main/java/net/minecraft/src/BlockTorch.java b/src/main/java/net/minecraft/src/BlockTorch.java index 1e95db3..7900f5d 100644 --- a/src/main/java/net/minecraft/src/BlockTorch.java +++ b/src/main/java/net/minecraft/src/BlockTorch.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockTorch extends Block { @@ -107,7 +107,7 @@ public class BlockTorch extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { super.updateTick(par1World, par2, par3, par4, par5Random); @@ -266,7 +266,7 @@ public class BlockTorch extends Block /** * A randomly called display update to be able to add particles or other items for display */ - public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void randomDisplayTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { int var6 = par1World.getBlockMetadata(par2, par3, par4); double var7 = (double)((float)par2 + 0.5F); diff --git a/src/main/java/net/minecraft/src/BlockTripWire.java b/src/main/java/net/minecraft/src/BlockTripWire.java index 77f7e99..165a7de 100644 --- a/src/main/java/net/minecraft/src/BlockTripWire.java +++ b/src/main/java/net/minecraft/src/BlockTripWire.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockTripWire extends Block { @@ -66,7 +66,7 @@ public class BlockTripWire extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.silk.itemID; } @@ -208,7 +208,7 @@ public class BlockTripWire extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!par1World.isRemote) { diff --git a/src/main/java/net/minecraft/src/BlockTripWireSource.java b/src/main/java/net/minecraft/src/BlockTripWireSource.java index 1417ee0..5dfe09b 100644 --- a/src/main/java/net/minecraft/src/BlockTripWireSource.java +++ b/src/main/java/net/minecraft/src/BlockTripWireSource.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockTripWireSource extends Block { @@ -264,7 +264,7 @@ public class BlockTripWireSource extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { this.func_72143_a(par1World, par2, par3, par4, this.blockID, par1World.getBlockMetadata(par2, par3, par4), true, -1, 0); } diff --git a/src/main/java/net/minecraft/src/BlockVine.java b/src/main/java/net/minecraft/src/BlockVine.java index 116ad92..737fc51 100644 --- a/src/main/java/net/minecraft/src/BlockVine.java +++ b/src/main/java/net/minecraft/src/BlockVine.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockVine extends Block { @@ -242,7 +242,7 @@ public class BlockVine extends Block /** * Ticks the block if it's been scheduled */ - public void updateTick(World par1World, int par2, int par3, int par4, Random par5Random) + public void updateTick(World par1World, int par2, int par3, int par4, EaglercraftRandom par5Random) { if (!par1World.isRemote && par1World.rand.nextInt(4) == 0) { @@ -411,7 +411,7 @@ public class BlockVine extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return 0; } @@ -419,7 +419,7 @@ public class BlockVine extends Block /** * Returns the quantity of items to drop on block destruction. */ - public int quantityDropped(Random par1Random) + public int quantityDropped(EaglercraftRandom par1Random) { return 0; } diff --git a/src/main/java/net/minecraft/src/BlockWeb.java b/src/main/java/net/minecraft/src/BlockWeb.java index aa10a7d..880892f 100644 --- a/src/main/java/net/minecraft/src/BlockWeb.java +++ b/src/main/java/net/minecraft/src/BlockWeb.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockWeb extends Block { @@ -55,7 +55,7 @@ public class BlockWeb extends Block /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Item.silk.itemID; } diff --git a/src/main/java/net/minecraft/src/BlockWoodSlab.java b/src/main/java/net/minecraft/src/BlockWoodSlab.java index b7ff955..1b34782 100644 --- a/src/main/java/net/minecraft/src/BlockWoodSlab.java +++ b/src/main/java/net/minecraft/src/BlockWoodSlab.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class BlockWoodSlab extends BlockHalfSlab { @@ -25,7 +25,7 @@ public class BlockWoodSlab extends BlockHalfSlab /** * Returns the ID of the items to drop on destruction. */ - public int idDropped(int par1, Random par2Random, int par3) + public int idDropped(int par1, EaglercraftRandom par2Random, int par3) { return Block.woodSingleSlab.blockID; } diff --git a/src/main/java/net/minecraft/src/Chunk.java b/src/main/java/net/minecraft/src/Chunk.java index 1bf9c58..9589d5d 100644 --- a/src/main/java/net/minecraft/src/Chunk.java +++ b/src/main/java/net/minecraft/src/Chunk.java @@ -6,7 +6,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class Chunk { @@ -1108,9 +1108,9 @@ public class Chunk return this.isModified; } - public Random getRandomWithSeed(long par1) + public EaglercraftRandom getRandomWithSeed(long par1) { - return new Random(this.worldObj.getSeed() + (long)(this.xPosition * this.xPosition * 4987142) + (long)(this.xPosition * 5947611) + (long)(this.zPosition * this.zPosition) * 4392871L + (long)(this.zPosition * 389711) ^ par1); + return new EaglercraftRandom(this.worldObj.getSeed() + (long)(this.xPosition * this.xPosition * 4987142) + (long)(this.xPosition * 5947611) + (long)(this.zPosition * this.zPosition) * 4392871L + (long)(this.zPosition * 389711) ^ par1); } public boolean isEmpty() diff --git a/src/main/java/net/minecraft/src/ChunkProviderEnd.java b/src/main/java/net/minecraft/src/ChunkProviderEnd.java index 52fd4f2..da8380e 100644 --- a/src/main/java/net/minecraft/src/ChunkProviderEnd.java +++ b/src/main/java/net/minecraft/src/ChunkProviderEnd.java @@ -1,11 +1,11 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ChunkProviderEnd implements IChunkProvider { - private Random endRNG; + private EaglercraftRandom endRNG; private NoiseGeneratorOctaves noiseGen1; private NoiseGeneratorOctaves noiseGen2; private NoiseGeneratorOctaves noiseGen3; @@ -26,7 +26,7 @@ public class ChunkProviderEnd implements IChunkProvider public ChunkProviderEnd(World par1World, long par2) { this.endWorld = par1World; - this.endRNG = new Random(par2); + this.endRNG = new EaglercraftRandom(par2); this.noiseGen1 = new NoiseGeneratorOctaves(this.endRNG, 16); this.noiseGen2 = new NoiseGeneratorOctaves(this.endRNG, 16); this.noiseGen3 = new NoiseGeneratorOctaves(this.endRNG, 8); diff --git a/src/main/java/net/minecraft/src/ChunkProviderFlat.java b/src/main/java/net/minecraft/src/ChunkProviderFlat.java index 0d7aa98..34cb8bf 100644 --- a/src/main/java/net/minecraft/src/ChunkProviderFlat.java +++ b/src/main/java/net/minecraft/src/ChunkProviderFlat.java @@ -4,12 +4,12 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ChunkProviderFlat implements IChunkProvider { private World worldObj; - private Random random; + private EaglercraftRandom random; private final byte[] cachedBlockIDs = new byte[256]; private final byte[] cachedBlockMetadata = new byte[256]; private final FlatGeneratorInfo flatWorldGenInfo; @@ -22,7 +22,7 @@ public class ChunkProviderFlat implements IChunkProvider public ChunkProviderFlat(World par1World, long par2, boolean par4, String par5Str) { this.worldObj = par1World; - this.random = new Random(par2); + this.random = new EaglercraftRandom(par2); this.flatWorldGenInfo = FlatGeneratorInfo.createFlatGeneratorFromString(par5Str); if (par4) diff --git a/src/main/java/net/minecraft/src/ChunkProviderGenerate.java b/src/main/java/net/minecraft/src/ChunkProviderGenerate.java index f8fa351..daa65f0 100644 --- a/src/main/java/net/minecraft/src/ChunkProviderGenerate.java +++ b/src/main/java/net/minecraft/src/ChunkProviderGenerate.java @@ -1,12 +1,12 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ChunkProviderGenerate implements IChunkProvider { /** RNG. */ - private Random rand; + private EaglercraftRandom rand; /** A NoiseGeneratorOctaves used in generating terrain */ private NoiseGeneratorOctaves noiseGen1; @@ -79,7 +79,7 @@ public class ChunkProviderGenerate implements IChunkProvider { this.worldObj = par1World; this.mapFeaturesEnabled = par4; - this.rand = new Random(par2); + this.rand = new EaglercraftRandom(par2); this.noiseGen1 = new NoiseGeneratorOctaves(this.rand, 16); this.noiseGen2 = new NoiseGeneratorOctaves(this.rand, 16); this.noiseGen3 = new NoiseGeneratorOctaves(this.rand, 8); diff --git a/src/main/java/net/minecraft/src/ChunkProviderHell.java b/src/main/java/net/minecraft/src/ChunkProviderHell.java index da837d6..170ea53 100644 --- a/src/main/java/net/minecraft/src/ChunkProviderHell.java +++ b/src/main/java/net/minecraft/src/ChunkProviderHell.java @@ -1,11 +1,11 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ChunkProviderHell implements IChunkProvider { - private Random hellRNG; + private EaglercraftRandom hellRNG; /** A NoiseGeneratorOctaves used in generating nether terrain */ private NoiseGeneratorOctaves netherNoiseGen1; @@ -47,7 +47,7 @@ public class ChunkProviderHell implements IChunkProvider public ChunkProviderHell(World par1World, long par2) { this.worldObj = par1World; - this.hellRNG = new Random(par2); + this.hellRNG = new EaglercraftRandom(par2); this.netherNoiseGen1 = new NoiseGeneratorOctaves(this.hellRNG, 16); this.netherNoiseGen2 = new NoiseGeneratorOctaves(this.hellRNG, 16); this.netherNoiseGen3 = new NoiseGeneratorOctaves(this.hellRNG, 8); diff --git a/src/main/java/net/minecraft/src/CommandSpreadPlayers.java b/src/main/java/net/minecraft/src/CommandSpreadPlayers.java index 2303a22..17b35c4 100644 --- a/src/main/java/net/minecraft/src/CommandSpreadPlayers.java +++ b/src/main/java/net/minecraft/src/CommandSpreadPlayers.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.minecraft.server.MinecraftServer; public class CommandSpreadPlayers extends CommandBase @@ -93,7 +93,7 @@ public class CommandSpreadPlayers extends CommandBase private void func_110669_a(ICommandSender par1ICommandSender, List par2List, CommandSpreadPlayersPosition par3CommandSpreadPlayersPosition, double par4, double par6, World par8World, boolean par9) { - Random var10 = new Random(); + EaglercraftRandom var10 = new EaglercraftRandom(); double var11 = par3CommandSpreadPlayersPosition.field_111101_a - par6; double var13 = par3CommandSpreadPlayersPosition.field_111100_b - par6; double var15 = par3CommandSpreadPlayersPosition.field_111101_a + par6; @@ -131,7 +131,7 @@ public class CommandSpreadPlayers extends CommandBase return var2.size(); } - private int func_110668_a(CommandSpreadPlayersPosition par1CommandSpreadPlayersPosition, double par2, World par4World, Random par5Random, double par6, double par8, double par10, double par12, CommandSpreadPlayersPosition[] par14ArrayOfCommandSpreadPlayersPosition, boolean par15) + private int func_110668_a(CommandSpreadPlayersPosition par1CommandSpreadPlayersPosition, double par2, World par4World, EaglercraftRandom par5Random, double par6, double par8, double par10, double par12, CommandSpreadPlayersPosition[] par14ArrayOfCommandSpreadPlayersPosition, boolean par15) { boolean var16 = true; double var18 = 3.4028234663852886E38D; @@ -266,7 +266,7 @@ public class CommandSpreadPlayers extends CommandBase return var5; } - private CommandSpreadPlayersPosition[] func_110670_a(Random par1Random, int par2, double par3, double par5, double par7, double par9) + private CommandSpreadPlayersPosition[] func_110670_a(EaglercraftRandom par1Random, int par2, double par3, double par5, double par7, double par9) { CommandSpreadPlayersPosition[] var11 = new CommandSpreadPlayersPosition[par2]; diff --git a/src/main/java/net/minecraft/src/CommandSpreadPlayersPosition.java b/src/main/java/net/minecraft/src/CommandSpreadPlayersPosition.java index 84eb0b8..678a6a4 100644 --- a/src/main/java/net/minecraft/src/CommandSpreadPlayersPosition.java +++ b/src/main/java/net/minecraft/src/CommandSpreadPlayersPosition.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; class CommandSpreadPlayersPosition { @@ -106,7 +106,7 @@ class CommandSpreadPlayersPosition return false; } - public void func_111097_a(Random par1Random, double par2, double par4, double par6, double par8) + public void func_111097_a(EaglercraftRandom par1Random, double par2, double par4, double par6, double par8) { this.field_111101_a = MathHelper.getRandomDoubleInRange(par1Random, par2, par6); this.field_111100_b = MathHelper.getRandomDoubleInRange(par1Random, par4, par8); diff --git a/src/main/java/net/minecraft/src/CommandWeather.java b/src/main/java/net/minecraft/src/CommandWeather.java index 797c736..3ece6ef 100644 --- a/src/main/java/net/minecraft/src/CommandWeather.java +++ b/src/main/java/net/minecraft/src/CommandWeather.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.minecraft.server.MinecraftServer; public class CommandWeather extends CommandBase @@ -28,7 +28,7 @@ public class CommandWeather extends CommandBase { if (par2ArrayOfStr.length >= 1 && par2ArrayOfStr.length <= 2) { - int var3 = (300 + (new Random()).nextInt(600)) * 20; + int var3 = (300 + (new EaglercraftRandom()).nextInt(600)) * 20; if (par2ArrayOfStr.length >= 2) { diff --git a/src/main/java/net/minecraft/src/ComponentMineshaftCorridor.java b/src/main/java/net/minecraft/src/ComponentMineshaftCorridor.java index e5dcfaf..afd22fa 100644 --- a/src/main/java/net/minecraft/src/ComponentMineshaftCorridor.java +++ b/src/main/java/net/minecraft/src/ComponentMineshaftCorridor.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentMineshaftCorridor extends StructureComponent { @@ -32,7 +32,7 @@ public class ComponentMineshaftCorridor extends StructureComponent this.sectionCount = par1NBTTagCompound.getInteger("Num"); } - public ComponentMineshaftCorridor(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentMineshaftCorridor(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -50,7 +50,7 @@ public class ComponentMineshaftCorridor extends StructureComponent } } - public static StructureBoundingBox findValidPlacement(List par0List, Random par1Random, int par2, int par3, int par4, int par5) + public static StructureBoundingBox findValidPlacement(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5) { StructureBoundingBox var6 = new StructureBoundingBox(par2, par3, par4, par2, par3 + 2, par4); int var7; @@ -93,7 +93,7 @@ public class ComponentMineshaftCorridor extends StructureComponent /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { int var4 = this.getComponentType(); int var5 = par3Random.nextInt(4); @@ -206,7 +206,7 @@ public class ComponentMineshaftCorridor extends StructureComponent /** * Used to generate chests with items in it. ex: Temple Chests, Village Blacksmith Chests, Mineshaft Chests. */ - protected boolean generateStructureChestContents(World par1World, StructureBoundingBox par2StructureBoundingBox, Random par3Random, int par4, int par5, int par6, WeightedRandomChestContent[] par7ArrayOfWeightedRandomChestContent, int par8) + protected boolean generateStructureChestContents(World par1World, StructureBoundingBox par2StructureBoundingBox, EaglercraftRandom par3Random, int par4, int par5, int par6, WeightedRandomChestContent[] par7ArrayOfWeightedRandomChestContent, int par8) { int var9 = this.getXWithOffset(par4, par6); int var10 = this.getYWithOffset(par5); @@ -230,7 +230,7 @@ public class ComponentMineshaftCorridor extends StructureComponent * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentMineshaftCross.java b/src/main/java/net/minecraft/src/ComponentMineshaftCross.java index d5487a0..725a1c8 100644 --- a/src/main/java/net/minecraft/src/ComponentMineshaftCross.java +++ b/src/main/java/net/minecraft/src/ComponentMineshaftCross.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentMineshaftCross extends StructureComponent { @@ -22,7 +22,7 @@ public class ComponentMineshaftCross extends StructureComponent this.corridorDirection = par1NBTTagCompound.getInteger("D"); } - public ComponentMineshaftCross(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentMineshaftCross(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.corridorDirection = par4; @@ -30,7 +30,7 @@ public class ComponentMineshaftCross extends StructureComponent this.isMultipleFloors = par3StructureBoundingBox.getYSize() > 3; } - public static StructureBoundingBox findValidPlacement(List par0List, Random par1Random, int par2, int par3, int par4, int par5) + public static StructureBoundingBox findValidPlacement(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5) { StructureBoundingBox var6 = new StructureBoundingBox(par2, par3, par4, par2, par3 + 2, par4); @@ -71,7 +71,7 @@ public class ComponentMineshaftCross extends StructureComponent /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { int var4 = this.getComponentType(); @@ -129,7 +129,7 @@ public class ComponentMineshaftCross extends StructureComponent * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentMineshaftRoom.java b/src/main/java/net/minecraft/src/ComponentMineshaftRoom.java index 10658a3..a3341f9 100644 --- a/src/main/java/net/minecraft/src/ComponentMineshaftRoom.java +++ b/src/main/java/net/minecraft/src/ComponentMineshaftRoom.java @@ -3,7 +3,7 @@ package net.minecraft.src; import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentMineshaftRoom extends StructureComponent { @@ -12,7 +12,7 @@ public class ComponentMineshaftRoom extends StructureComponent public ComponentMineshaftRoom() {} - public ComponentMineshaftRoom(int par1, Random par2Random, int par3, int par4) + public ComponentMineshaftRoom(int par1, EaglercraftRandom par2Random, int par3, int par4) { super(par1); this.boundingBox = new StructureBoundingBox(par3, 50, par4, par3 + 7 + par2Random.nextInt(6), 54 + par2Random.nextInt(6), par4 + 7 + par2Random.nextInt(6)); @@ -21,7 +21,7 @@ public class ComponentMineshaftRoom extends StructureComponent /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { int var4 = this.getComponentType(); int var6 = this.boundingBox.getYSize() - 3 - 1; @@ -112,7 +112,7 @@ public class ComponentMineshaftRoom extends StructureComponent * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentMineshaftStairs.java b/src/main/java/net/minecraft/src/ComponentMineshaftStairs.java index c7b8d0e..7533976 100644 --- a/src/main/java/net/minecraft/src/ComponentMineshaftStairs.java +++ b/src/main/java/net/minecraft/src/ComponentMineshaftStairs.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentMineshaftStairs extends StructureComponent { public ComponentMineshaftStairs() {} - public ComponentMineshaftStairs(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentMineshaftStairs(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -21,7 +21,7 @@ public class ComponentMineshaftStairs extends StructureComponent /** * Trys to find a valid place to put this component. */ - public static StructureBoundingBox findValidPlacement(List par0List, Random par1Random, int par2, int par3, int par4, int par5) + public static StructureBoundingBox findValidPlacement(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5) { StructureBoundingBox var6 = new StructureBoundingBox(par2, par3 - 5, par4, par2, par3 + 2, par4); @@ -53,7 +53,7 @@ public class ComponentMineshaftStairs extends StructureComponent /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { int var4 = this.getComponentType(); @@ -80,7 +80,7 @@ public class ComponentMineshaftStairs extends StructureComponent * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor.java index 73a741b..1f81adb 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeCorridor extends ComponentNetherBridgePiece { @@ -9,7 +9,7 @@ public class ComponentNetherBridgeCorridor extends ComponentNetherBridgePiece public ComponentNetherBridgeCorridor() {} - public ComponentNetherBridgeCorridor(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeCorridor(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -32,7 +32,7 @@ public class ComponentNetherBridgeCorridor extends ComponentNetherBridgePiece /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentX((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 0, 1, true); } @@ -40,7 +40,7 @@ public class ComponentNetherBridgeCorridor extends ComponentNetherBridgePiece /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeCorridor createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeCorridor createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, 0, 0, 5, 7, 5, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeCorridor(par6, par1Random, var7, par5) : null; @@ -50,7 +50,7 @@ public class ComponentNetherBridgeCorridor extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 0, 0, 4, 1, 4, Block.netherBrick.blockID, Block.netherBrick.blockID, false); this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 2, 0, 4, 5, 4, 0, 0, false); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor2.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor2.java index f975214..93a1adb 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor2.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor2.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeCorridor2 extends ComponentNetherBridgePiece { @@ -9,7 +9,7 @@ public class ComponentNetherBridgeCorridor2 extends ComponentNetherBridgePiece public ComponentNetherBridgeCorridor2() {} - public ComponentNetherBridgeCorridor2(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeCorridor2(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -32,7 +32,7 @@ public class ComponentNetherBridgeCorridor2 extends ComponentNetherBridgePiece /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentZ((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 0, 1, true); } @@ -40,7 +40,7 @@ public class ComponentNetherBridgeCorridor2 extends ComponentNetherBridgePiece /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeCorridor2 createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeCorridor2 createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, 0, 0, 5, 7, 5, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeCorridor2(par6, par1Random, var7, par5) : null; @@ -50,7 +50,7 @@ public class ComponentNetherBridgeCorridor2 extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 0, 0, 4, 1, 4, Block.netherBrick.blockID, Block.netherBrick.blockID, false); this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 2, 0, 4, 5, 4, 0, 0, false); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor3.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor3.java index 6c94377..b95a889 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor3.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor3.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeCorridor3 extends ComponentNetherBridgePiece { public ComponentNetherBridgeCorridor3() {} - public ComponentNetherBridgeCorridor3(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeCorridor3(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -17,7 +17,7 @@ public class ComponentNetherBridgeCorridor3 extends ComponentNetherBridgePiece /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 1, 0, true); } @@ -25,7 +25,7 @@ public class ComponentNetherBridgeCorridor3 extends ComponentNetherBridgePiece /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeCorridor3 createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeCorridor3 createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, -7, 0, 5, 14, 10, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeCorridor3(par6, par1Random, var7, par5) : null; @@ -35,7 +35,7 @@ public class ComponentNetherBridgeCorridor3 extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { int var4 = this.getMetadataWithOffset(Block.stairsNetherBrick.blockID, 2); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor4.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor4.java index 0174503..72b70f7 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor4.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor4.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeCorridor4 extends ComponentNetherBridgePiece { public ComponentNetherBridgeCorridor4() {} - public ComponentNetherBridgeCorridor4(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeCorridor4(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -17,7 +17,7 @@ public class ComponentNetherBridgeCorridor4 extends ComponentNetherBridgePiece /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { byte var4 = 1; @@ -33,7 +33,7 @@ public class ComponentNetherBridgeCorridor4 extends ComponentNetherBridgePiece /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeCorridor4 createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeCorridor4 createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -3, 0, 0, 9, 7, 9, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeCorridor4(par6, par1Random, var7, par5) : null; @@ -43,7 +43,7 @@ public class ComponentNetherBridgeCorridor4 extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 0, 0, 8, 1, 8, Block.netherBrick.blockID, Block.netherBrick.blockID, false); this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 2, 0, 8, 5, 8, 0, 0, false); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor5.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor5.java index 0530211..9fa27c6 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor5.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeCorridor5.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeCorridor5 extends ComponentNetherBridgePiece { public ComponentNetherBridgeCorridor5() {} - public ComponentNetherBridgeCorridor5(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeCorridor5(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -17,7 +17,7 @@ public class ComponentNetherBridgeCorridor5 extends ComponentNetherBridgePiece /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 1, 0, true); } @@ -25,7 +25,7 @@ public class ComponentNetherBridgeCorridor5 extends ComponentNetherBridgePiece /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeCorridor5 createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeCorridor5 createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, 0, 0, 5, 7, 5, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeCorridor5(par6, par1Random, var7, par5) : null; @@ -35,7 +35,7 @@ public class ComponentNetherBridgeCorridor5 extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 0, 0, 4, 1, 4, Block.netherBrick.blockID, Block.netherBrick.blockID, false); this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 2, 0, 4, 5, 4, 0, 0, false); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeCrossing.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeCrossing.java index ff7db09..0f97d0c 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeCrossing.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeCrossing.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeCrossing extends ComponentNetherBridgePiece { public ComponentNetherBridgeCrossing() {} - public ComponentNetherBridgeCrossing(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeCrossing(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -17,7 +17,7 @@ public class ComponentNetherBridgeCrossing extends ComponentNetherBridgePiece /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 2, 0, false); this.getNextComponentX((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 0, 2, false); @@ -27,7 +27,7 @@ public class ComponentNetherBridgeCrossing extends ComponentNetherBridgePiece /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeCrossing createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeCrossing createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -2, 0, 0, 7, 9, 7, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeCrossing(par6, par1Random, var7, par5) : null; @@ -37,7 +37,7 @@ public class ComponentNetherBridgeCrossing extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 0, 0, 6, 1, 6, Block.netherBrick.blockID, Block.netherBrick.blockID, false); this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 2, 0, 6, 7, 6, 0, 0, false); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeCrossing2.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeCrossing2.java index a10b104..c9ba74b 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeCrossing2.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeCrossing2.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeCrossing2 extends ComponentNetherBridgePiece { public ComponentNetherBridgeCrossing2() {} - public ComponentNetherBridgeCrossing2(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeCrossing2(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -17,7 +17,7 @@ public class ComponentNetherBridgeCrossing2 extends ComponentNetherBridgePiece /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 1, 0, true); this.getNextComponentX((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 0, 1, true); @@ -27,7 +27,7 @@ public class ComponentNetherBridgeCrossing2 extends ComponentNetherBridgePiece /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeCrossing2 createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeCrossing2 createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, 0, 0, 5, 7, 5, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeCrossing2(par6, par1Random, var7, par5) : null; @@ -37,7 +37,7 @@ public class ComponentNetherBridgeCrossing2 extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 0, 0, 4, 1, 4, Block.netherBrick.blockID, Block.netherBrick.blockID, false); this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 2, 0, 4, 5, 4, 0, 0, false); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeCrossing3.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeCrossing3.java index a78d029..24022f5 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeCrossing3.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeCrossing3.java @@ -1,20 +1,20 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeCrossing3 extends ComponentNetherBridgePiece { public ComponentNetherBridgeCrossing3() {} - public ComponentNetherBridgeCrossing3(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeCrossing3(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; this.boundingBox = par3StructureBoundingBox; } - protected ComponentNetherBridgeCrossing3(Random par1Random, int par2, int par3) + protected ComponentNetherBridgeCrossing3(EaglercraftRandom par1Random, int par2, int par3) { super(0); this.coordBaseMode = par1Random.nextInt(4); @@ -34,7 +34,7 @@ public class ComponentNetherBridgeCrossing3 extends ComponentNetherBridgePiece /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 8, 3, false); this.getNextComponentX((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 3, 8, false); @@ -44,7 +44,7 @@ public class ComponentNetherBridgeCrossing3 extends ComponentNetherBridgePiece /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeCrossing3 createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeCrossing3 createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -8, -3, 0, 19, 10, 19, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeCrossing3(par6, par1Random, var7, par5) : null; @@ -54,7 +54,7 @@ public class ComponentNetherBridgeCrossing3 extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 7, 3, 0, 11, 4, 18, Block.netherBrick.blockID, Block.netherBrick.blockID, false); this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 3, 7, 18, 4, 11, Block.netherBrick.blockID, Block.netherBrick.blockID, false); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeEnd.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeEnd.java index 3ed9794..4e9a083 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeEnd.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeEnd.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeEnd extends ComponentNetherBridgePiece { @@ -9,7 +9,7 @@ public class ComponentNetherBridgeEnd extends ComponentNetherBridgePiece public ComponentNetherBridgeEnd() {} - public ComponentNetherBridgeEnd(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeEnd(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -17,7 +17,7 @@ public class ComponentNetherBridgeEnd extends ComponentNetherBridgePiece this.fillSeed = par2Random.nextInt(); } - public static ComponentNetherBridgeEnd func_74971_a(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeEnd func_74971_a(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, -3, 0, 5, 10, 8, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeEnd(par6, par1Random, var7, par5) : null; @@ -39,9 +39,9 @@ public class ComponentNetherBridgeEnd extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { - Random var4 = new Random((long)this.fillSeed); + EaglercraftRandom var4 = new EaglercraftRandom((long)this.fillSeed); int var5; int var6; int var7; diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeEntrance.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeEntrance.java index b65ecb2..d365062 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeEntrance.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeEntrance.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeEntrance extends ComponentNetherBridgePiece { public ComponentNetherBridgeEntrance() {} - public ComponentNetherBridgeEntrance(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeEntrance(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -17,7 +17,7 @@ public class ComponentNetherBridgeEntrance extends ComponentNetherBridgePiece /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 5, 3, true); } @@ -25,7 +25,7 @@ public class ComponentNetherBridgeEntrance extends ComponentNetherBridgePiece /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeEntrance createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeEntrance createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -5, -3, 0, 13, 14, 13, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeEntrance(par6, par1Random, var7, par5) : null; @@ -35,7 +35,7 @@ public class ComponentNetherBridgeEntrance extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 3, 0, 12, 4, 12, Block.netherBrick.blockID, Block.netherBrick.blockID, false); this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 5, 0, 12, 13, 12, 0, 0, false); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeNetherStalkRoom.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeNetherStalkRoom.java index 7202596..9afe8b3 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeNetherStalkRoom.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeNetherStalkRoom.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeNetherStalkRoom extends ComponentNetherBridgePiece { public ComponentNetherBridgeNetherStalkRoom() {} - public ComponentNetherBridgeNetherStalkRoom(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeNetherStalkRoom(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -17,7 +17,7 @@ public class ComponentNetherBridgeNetherStalkRoom extends ComponentNetherBridgeP /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 5, 3, true); this.getNextComponentNormal((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 5, 11, true); @@ -26,7 +26,7 @@ public class ComponentNetherBridgeNetherStalkRoom extends ComponentNetherBridgeP /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeNetherStalkRoom createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeNetherStalkRoom createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -5, -3, 0, 13, 14, 13, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeNetherStalkRoom(par6, par1Random, var7, par5) : null; @@ -36,7 +36,7 @@ public class ComponentNetherBridgeNetherStalkRoom extends ComponentNetherBridgeP * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 3, 0, 12, 4, 12, Block.netherBrick.blockID, Block.netherBrick.blockID, false); this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 5, 0, 12, 13, 12, 0, 0, false); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgePiece.java b/src/main/java/net/minecraft/src/ComponentNetherBridgePiece.java index c9f9f2c..ae21a7d 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgePiece.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgePiece.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; abstract class ComponentNetherBridgePiece extends StructureComponent { @@ -38,7 +38,7 @@ abstract class ComponentNetherBridgePiece extends StructureComponent return var2 ? var3 : -1; } - private ComponentNetherBridgePiece getNextComponent(ComponentNetherBridgeStartPiece par1ComponentNetherBridgeStartPiece, List par2List, List par3List, Random par4Random, int par5, int par6, int par7, int par8, int par9) + private ComponentNetherBridgePiece getNextComponent(ComponentNetherBridgeStartPiece par1ComponentNetherBridgeStartPiece, List par2List, List par3List, EaglercraftRandom par4Random, int par5, int par6, int par7, int par8, int par9) { int var10 = this.getTotalWeight(par2List); boolean var11 = var10 > 0 && par9 <= 30; @@ -86,7 +86,7 @@ abstract class ComponentNetherBridgePiece extends StructureComponent /** * Finds a random component to tack on to the bridge. Or builds the end. */ - private StructureComponent getNextComponent(ComponentNetherBridgeStartPiece par1ComponentNetherBridgeStartPiece, List par2List, Random par3Random, int par4, int par5, int par6, int par7, int par8, boolean par9) + private StructureComponent getNextComponent(ComponentNetherBridgeStartPiece par1ComponentNetherBridgeStartPiece, List par2List, EaglercraftRandom par3Random, int par4, int par5, int par6, int par7, int par8, boolean par9) { if (Math.abs(par4 - par1ComponentNetherBridgeStartPiece.getBoundingBox().minX) <= 112 && Math.abs(par6 - par1ComponentNetherBridgeStartPiece.getBoundingBox().minZ) <= 112) { @@ -116,7 +116,7 @@ abstract class ComponentNetherBridgePiece extends StructureComponent /** * Gets the next component in any cardinal direction */ - protected StructureComponent getNextComponentNormal(ComponentNetherBridgeStartPiece par1ComponentNetherBridgeStartPiece, List par2List, Random par3Random, int par4, int par5, boolean par6) + protected StructureComponent getNextComponentNormal(ComponentNetherBridgeStartPiece par1ComponentNetherBridgeStartPiece, List par2List, EaglercraftRandom par3Random, int par4, int par5, boolean par6) { switch (this.coordBaseMode) { @@ -140,7 +140,7 @@ abstract class ComponentNetherBridgePiece extends StructureComponent /** * Gets the next component in the +/- X direction */ - protected StructureComponent getNextComponentX(ComponentNetherBridgeStartPiece par1ComponentNetherBridgeStartPiece, List par2List, Random par3Random, int par4, int par5, boolean par6) + protected StructureComponent getNextComponentX(ComponentNetherBridgeStartPiece par1ComponentNetherBridgeStartPiece, List par2List, EaglercraftRandom par3Random, int par4, int par5, boolean par6) { switch (this.coordBaseMode) { @@ -164,7 +164,7 @@ abstract class ComponentNetherBridgePiece extends StructureComponent /** * Gets the next component in the +/- Z direction */ - protected StructureComponent getNextComponentZ(ComponentNetherBridgeStartPiece par1ComponentNetherBridgeStartPiece, List par2List, Random par3Random, int par4, int par5, boolean par6) + protected StructureComponent getNextComponentZ(ComponentNetherBridgeStartPiece par1ComponentNetherBridgeStartPiece, List par2List, EaglercraftRandom par3Random, int par4, int par5, boolean par6) { switch (this.coordBaseMode) { diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeStairs.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeStairs.java index fdf37a4..53bb99f 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeStairs.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeStairs.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeStairs extends ComponentNetherBridgePiece { public ComponentNetherBridgeStairs() {} - public ComponentNetherBridgeStairs(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeStairs(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -17,7 +17,7 @@ public class ComponentNetherBridgeStairs extends ComponentNetherBridgePiece /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentZ((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 6, 2, false); } @@ -25,7 +25,7 @@ public class ComponentNetherBridgeStairs extends ComponentNetherBridgePiece /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeStairs createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeStairs createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -2, 0, 0, 7, 11, 7, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeStairs(par6, par1Random, var7, par5) : null; @@ -35,7 +35,7 @@ public class ComponentNetherBridgeStairs extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 0, 0, 6, 1, 6, Block.netherBrick.blockID, Block.netherBrick.blockID, false); this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 2, 0, 6, 10, 6, 0, 0, false); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeStartPiece.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeStartPiece.java index 138824f..a7140b9 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeStartPiece.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeStartPiece.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.ArrayList; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeStartPiece extends ComponentNetherBridgeCrossing3 { @@ -22,7 +22,7 @@ public class ComponentNetherBridgeStartPiece extends ComponentNetherBridgeCrossi public ComponentNetherBridgeStartPiece() {} - public ComponentNetherBridgeStartPiece(Random par1Random, int par2, int par3) + public ComponentNetherBridgeStartPiece(EaglercraftRandom par1Random, int par2, int par3) { super(par1Random, par2, par3); this.primaryWeights = new ArrayList(); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeStraight.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeStraight.java index c6621a9..538e39d 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeStraight.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeStraight.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeStraight extends ComponentNetherBridgePiece { public ComponentNetherBridgeStraight() {} - public ComponentNetherBridgeStraight(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeStraight(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -17,7 +17,7 @@ public class ComponentNetherBridgeStraight extends ComponentNetherBridgePiece /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentNetherBridgeStartPiece)par1StructureComponent, par2List, par3Random, 1, 3, false); } @@ -25,7 +25,7 @@ public class ComponentNetherBridgeStraight extends ComponentNetherBridgePiece /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeStraight createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeStraight createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, -3, 0, 5, 10, 19, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeStraight(par6, par1Random, var7, par5) : null; @@ -35,7 +35,7 @@ public class ComponentNetherBridgeStraight extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 3, 0, 4, 4, 18, Block.netherBrick.blockID, Block.netherBrick.blockID, false); this.fillWithBlocks(par1World, par3StructureBoundingBox, 1, 5, 0, 3, 7, 18, 0, 0, false); diff --git a/src/main/java/net/minecraft/src/ComponentNetherBridgeThrone.java b/src/main/java/net/minecraft/src/ComponentNetherBridgeThrone.java index 27d6258..7e90ca7 100644 --- a/src/main/java/net/minecraft/src/ComponentNetherBridgeThrone.java +++ b/src/main/java/net/minecraft/src/ComponentNetherBridgeThrone.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentNetherBridgeThrone extends ComponentNetherBridgePiece { @@ -9,7 +9,7 @@ public class ComponentNetherBridgeThrone extends ComponentNetherBridgePiece public ComponentNetherBridgeThrone() {} - public ComponentNetherBridgeThrone(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentNetherBridgeThrone(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -31,7 +31,7 @@ public class ComponentNetherBridgeThrone extends ComponentNetherBridgePiece /** * Creates and returns a new component piece. Or null if it could not find enough room to place it. */ - public static ComponentNetherBridgeThrone createValidComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentNetherBridgeThrone createValidComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -2, 0, 0, 7, 8, 9, par5); return isAboveGround(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentNetherBridgeThrone(par6, par1Random, var7, par5) : null; @@ -41,7 +41,7 @@ public class ComponentNetherBridgeThrone extends ComponentNetherBridgePiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, 2, 0, 6, 7, 7, 0, 0, false); this.fillWithBlocks(par1World, par3StructureBoundingBox, 1, 0, 0, 5, 1, 7, Block.netherBrick.blockID, Block.netherBrick.blockID, false); diff --git a/src/main/java/net/minecraft/src/ComponentScatteredFeature.java b/src/main/java/net/minecraft/src/ComponentScatteredFeature.java index cdc0477..4f33dde 100644 --- a/src/main/java/net/minecraft/src/ComponentScatteredFeature.java +++ b/src/main/java/net/minecraft/src/ComponentScatteredFeature.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; abstract class ComponentScatteredFeature extends StructureComponent { @@ -16,7 +16,7 @@ abstract class ComponentScatteredFeature extends StructureComponent public ComponentScatteredFeature() {} - protected ComponentScatteredFeature(Random par1Random, int par2, int par3, int par4, int par5, int par6, int par7) + protected ComponentScatteredFeature(EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6, int par7) { super(0); this.scatteredFeatureSizeX = par5; diff --git a/src/main/java/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.java b/src/main/java/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.java index c56d494..fa98569 100644 --- a/src/main/java/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.java +++ b/src/main/java/net/minecraft/src/ComponentScatteredFeatureDesertPyramid.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentScatteredFeatureDesertPyramid extends ComponentScatteredFeature { @@ -11,7 +11,7 @@ public class ComponentScatteredFeatureDesertPyramid extends ComponentScatteredFe public ComponentScatteredFeatureDesertPyramid() {} - public ComponentScatteredFeatureDesertPyramid(Random par1Random, int par2, int par3) + public ComponentScatteredFeatureDesertPyramid(EaglercraftRandom par1Random, int par2, int par3) { super(par1Random, par2, 64, par3, 21, 15, 21); } @@ -38,7 +38,7 @@ public class ComponentScatteredFeatureDesertPyramid extends ComponentScatteredFe * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithBlocks(par1World, par3StructureBoundingBox, 0, -4, 0, this.scatteredFeatureSizeX - 1, 0, this.scatteredFeatureSizeZ - 1, Block.sandStone.blockID, Block.sandStone.blockID, false); int var4; diff --git a/src/main/java/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.java b/src/main/java/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.java index 67da175..b7017c0 100644 --- a/src/main/java/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.java +++ b/src/main/java/net/minecraft/src/ComponentScatteredFeatureJunglePyramid.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentScatteredFeatureJunglePyramid extends ComponentScatteredFeature { @@ -22,7 +22,7 @@ public class ComponentScatteredFeatureJunglePyramid extends ComponentScatteredFe public ComponentScatteredFeatureJunglePyramid() {} - public ComponentScatteredFeatureJunglePyramid(Random par1Random, int par2, int par3) + public ComponentScatteredFeatureJunglePyramid(EaglercraftRandom par1Random, int par2, int par3) { super(par1Random, par2, 64, par3, 12, 10, 15); } @@ -49,7 +49,7 @@ public class ComponentScatteredFeatureJunglePyramid extends ComponentScatteredFe * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (!this.func_74935_a(par1World, par3StructureBoundingBox, 0)) { diff --git a/src/main/java/net/minecraft/src/ComponentScatteredFeatureSwampHut.java b/src/main/java/net/minecraft/src/ComponentScatteredFeatureSwampHut.java index 4049f97..f6e81a1 100644 --- a/src/main/java/net/minecraft/src/ComponentScatteredFeatureSwampHut.java +++ b/src/main/java/net/minecraft/src/ComponentScatteredFeatureSwampHut.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentScatteredFeatureSwampHut extends ComponentScatteredFeature { @@ -9,7 +9,7 @@ public class ComponentScatteredFeatureSwampHut extends ComponentScatteredFeature public ComponentScatteredFeatureSwampHut() {} - public ComponentScatteredFeatureSwampHut(Random par1Random, int par2, int par3) + public ComponentScatteredFeatureSwampHut(EaglercraftRandom par1Random, int par2, int par3) { super(par1Random, par2, 64, par3, 7, 5, 9); } @@ -30,7 +30,7 @@ public class ComponentScatteredFeatureSwampHut extends ComponentScatteredFeature * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (!this.func_74935_a(par1World, par3StructureBoundingBox, 0)) { diff --git a/src/main/java/net/minecraft/src/ComponentStronghold.java b/src/main/java/net/minecraft/src/ComponentStronghold.java index 57ff08a..2c60fc3 100644 --- a/src/main/java/net/minecraft/src/ComponentStronghold.java +++ b/src/main/java/net/minecraft/src/ComponentStronghold.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; abstract class ComponentStronghold extends StructureComponent { @@ -31,7 +31,7 @@ abstract class ComponentStronghold extends StructureComponent /** * builds a door of the enumerated types (empty opening is a door) */ - protected void placeDoor(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox, EnumDoor par4EnumDoor, int par5, int par6, int par7) + protected void placeDoor(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, EnumDoor par4EnumDoor, int par5, int par6, int par7) { switch (EnumDoorHelper.doorEnum[par4EnumDoor.ordinal()]) { @@ -79,7 +79,7 @@ abstract class ComponentStronghold extends StructureComponent } } - protected EnumDoor getRandomDoor(Random par1Random) + protected EnumDoor getRandomDoor(EaglercraftRandom par1Random) { int var2 = par1Random.nextInt(5); @@ -104,7 +104,7 @@ abstract class ComponentStronghold extends StructureComponent /** * Gets the next component in any cardinal direction */ - protected StructureComponent getNextComponentNormal(ComponentStrongholdStairs2 par1ComponentStrongholdStairs2, List par2List, Random par3Random, int par4, int par5) + protected StructureComponent getNextComponentNormal(ComponentStrongholdStairs2 par1ComponentStrongholdStairs2, List par2List, EaglercraftRandom par3Random, int par4, int par5) { switch (this.coordBaseMode) { @@ -128,7 +128,7 @@ abstract class ComponentStronghold extends StructureComponent /** * Gets the next component in the +/- X direction */ - protected StructureComponent getNextComponentX(ComponentStrongholdStairs2 par1ComponentStrongholdStairs2, List par2List, Random par3Random, int par4, int par5) + protected StructureComponent getNextComponentX(ComponentStrongholdStairs2 par1ComponentStrongholdStairs2, List par2List, EaglercraftRandom par3Random, int par4, int par5) { switch (this.coordBaseMode) { @@ -152,7 +152,7 @@ abstract class ComponentStronghold extends StructureComponent /** * Gets the next component in the +/- Z direction */ - protected StructureComponent getNextComponentZ(ComponentStrongholdStairs2 par1ComponentStrongholdStairs2, List par2List, Random par3Random, int par4, int par5) + protected StructureComponent getNextComponentZ(ComponentStrongholdStairs2 par1ComponentStrongholdStairs2, List par2List, EaglercraftRandom par3Random, int par4, int par5) { switch (this.coordBaseMode) { diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdChestCorridor.java b/src/main/java/net/minecraft/src/ComponentStrongholdChestCorridor.java index 7d688c6..fc729e6 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdChestCorridor.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdChestCorridor.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdChestCorridor extends ComponentStronghold { @@ -11,7 +11,7 @@ public class ComponentStrongholdChestCorridor extends ComponentStronghold public ComponentStrongholdChestCorridor() {} - public ComponentStrongholdChestCorridor(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentStrongholdChestCorridor(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -34,12 +34,12 @@ public class ComponentStrongholdChestCorridor extends ComponentStronghold /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentStrongholdStairs2)par1StructureComponent, par2List, par3Random, 1, 1); } - public static ComponentStrongholdChestCorridor findValidPlacement(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentStrongholdChestCorridor findValidPlacement(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, -1, 0, 5, 5, 7, par5); return canStrongholdGoDeeper(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentStrongholdChestCorridor(par6, par1Random, var7, par5) : null; @@ -49,7 +49,7 @@ public class ComponentStrongholdChestCorridor extends ComponentStronghold * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdCorridor.java b/src/main/java/net/minecraft/src/ComponentStrongholdCorridor.java index 9cfaf5f..46af6ab 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdCorridor.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdCorridor.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdCorridor extends ComponentStronghold { @@ -9,7 +9,7 @@ public class ComponentStrongholdCorridor extends ComponentStronghold public ComponentStrongholdCorridor() {} - public ComponentStrongholdCorridor(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentStrongholdCorridor(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -29,7 +29,7 @@ public class ComponentStrongholdCorridor extends ComponentStronghold this.field_74993_a = par1NBTTagCompound.getInteger("Steps"); } - public static StructureBoundingBox func_74992_a(List par0List, Random par1Random, int par2, int par3, int par4, int par5) + public static StructureBoundingBox func_74992_a(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5) { boolean var6 = true; StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, -1, 0, 5, 5, 4, par5); @@ -62,7 +62,7 @@ public class ComponentStrongholdCorridor extends ComponentStronghold * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdCrossing.java b/src/main/java/net/minecraft/src/ComponentStrongholdCrossing.java index 9f39c4b..108b47a 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdCrossing.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdCrossing.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdCrossing extends ComponentStronghold { @@ -12,7 +12,7 @@ public class ComponentStrongholdCrossing extends ComponentStronghold public ComponentStrongholdCrossing() {} - public ComponentStrongholdCrossing(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentStrongholdCrossing(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -45,7 +45,7 @@ public class ComponentStrongholdCrossing extends ComponentStronghold /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { int var4 = 3; int var5 = 5; @@ -79,7 +79,7 @@ public class ComponentStrongholdCrossing extends ComponentStronghold } } - public static ComponentStrongholdCrossing findValidPlacement(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentStrongholdCrossing findValidPlacement(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -4, -3, 0, 10, 9, 11, par5); return canStrongholdGoDeeper(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentStrongholdCrossing(par6, par1Random, var7, par5) : null; @@ -89,7 +89,7 @@ public class ComponentStrongholdCrossing extends ComponentStronghold * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdLeftTurn.java b/src/main/java/net/minecraft/src/ComponentStrongholdLeftTurn.java index f94c5ff..96008fb 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdLeftTurn.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdLeftTurn.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdLeftTurn extends ComponentStronghold { public ComponentStrongholdLeftTurn() {} - public ComponentStrongholdLeftTurn(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentStrongholdLeftTurn(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -18,7 +18,7 @@ public class ComponentStrongholdLeftTurn extends ComponentStronghold /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { if (this.coordBaseMode != 2 && this.coordBaseMode != 3) { @@ -30,7 +30,7 @@ public class ComponentStrongholdLeftTurn extends ComponentStronghold } } - public static ComponentStrongholdLeftTurn findValidPlacement(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentStrongholdLeftTurn findValidPlacement(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, -1, 0, 5, 5, 5, par5); return canStrongholdGoDeeper(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentStrongholdLeftTurn(par6, par1Random, var7, par5) : null; @@ -40,7 +40,7 @@ public class ComponentStrongholdLeftTurn extends ComponentStronghold * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdLibrary.java b/src/main/java/net/minecraft/src/ComponentStrongholdLibrary.java index 479ece0..591defd 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdLibrary.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdLibrary.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdLibrary extends ComponentStronghold { @@ -11,7 +11,7 @@ public class ComponentStrongholdLibrary extends ComponentStronghold public ComponentStrongholdLibrary() {} - public ComponentStrongholdLibrary(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentStrongholdLibrary(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -32,7 +32,7 @@ public class ComponentStrongholdLibrary extends ComponentStronghold this.isLargeRoom = par1NBTTagCompound.getBoolean("Tall"); } - public static ComponentStrongholdLibrary findValidPlacement(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentStrongholdLibrary findValidPlacement(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -4, -1, 0, 14, 11, 15, par5); @@ -53,7 +53,7 @@ public class ComponentStrongholdLibrary extends ComponentStronghold * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdPortalRoom.java b/src/main/java/net/minecraft/src/ComponentStrongholdPortalRoom.java index d7612aa..465005f 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdPortalRoom.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdPortalRoom.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdPortalRoom extends ComponentStronghold { @@ -9,7 +9,7 @@ public class ComponentStrongholdPortalRoom extends ComponentStronghold public ComponentStrongholdPortalRoom() {} - public ComponentStrongholdPortalRoom(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentStrongholdPortalRoom(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -31,7 +31,7 @@ public class ComponentStrongholdPortalRoom extends ComponentStronghold /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { if (par1StructureComponent != null) { @@ -39,7 +39,7 @@ public class ComponentStrongholdPortalRoom extends ComponentStronghold } } - public static ComponentStrongholdPortalRoom findValidPlacement(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentStrongholdPortalRoom findValidPlacement(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -4, -1, 0, 11, 8, 16, par5); return canStrongholdGoDeeper(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentStrongholdPortalRoom(par6, par1Random, var7, par5) : null; @@ -49,7 +49,7 @@ public class ComponentStrongholdPortalRoom extends ComponentStronghold * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { this.fillWithRandomizedBlocks(par1World, par3StructureBoundingBox, 0, 0, 0, 10, 7, 15, false, par2Random, StructureStrongholdPieces.getStrongholdStones()); this.placeDoor(par1World, par2Random, par3StructureBoundingBox, EnumDoor.GRATES, 4, 1, 0); diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdPrison.java b/src/main/java/net/minecraft/src/ComponentStrongholdPrison.java index 9071c3b..c3355da 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdPrison.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdPrison.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdPrison extends ComponentStronghold { public ComponentStrongholdPrison() {} - public ComponentStrongholdPrison(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentStrongholdPrison(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -18,12 +18,12 @@ public class ComponentStrongholdPrison extends ComponentStronghold /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentStrongholdStairs2)par1StructureComponent, par2List, par3Random, 1, 1); } - public static ComponentStrongholdPrison findValidPlacement(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentStrongholdPrison findValidPlacement(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, -1, 0, 9, 5, 11, par5); return canStrongholdGoDeeper(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentStrongholdPrison(par6, par1Random, var7, par5) : null; @@ -33,7 +33,7 @@ public class ComponentStrongholdPrison extends ComponentStronghold * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdRightTurn.java b/src/main/java/net/minecraft/src/ComponentStrongholdRightTurn.java index 86690d0..3704ce1 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdRightTurn.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdRightTurn.java @@ -1,11 +1,11 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn { - public ComponentStrongholdRightTurn(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentStrongholdRightTurn(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1, par2Random, par3StructureBoundingBox, par4); } @@ -13,7 +13,7 @@ public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { if (this.coordBaseMode != 2 && this.coordBaseMode != 3) { @@ -29,7 +29,7 @@ public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdRoomCrossing.java b/src/main/java/net/minecraft/src/ComponentStrongholdRoomCrossing.java index 9be3a1c..d9c7d10 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdRoomCrossing.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdRoomCrossing.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdRoomCrossing extends ComponentStronghold { @@ -13,7 +13,7 @@ public class ComponentStrongholdRoomCrossing extends ComponentStronghold public ComponentStrongholdRoomCrossing() {} - public ComponentStrongholdRoomCrossing(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentStrongholdRoomCrossing(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -37,14 +37,14 @@ public class ComponentStrongholdRoomCrossing extends ComponentStronghold /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentStrongholdStairs2)par1StructureComponent, par2List, par3Random, 4, 1); this.getNextComponentX((ComponentStrongholdStairs2)par1StructureComponent, par2List, par3Random, 1, 4); this.getNextComponentZ((ComponentStrongholdStairs2)par1StructureComponent, par2List, par3Random, 1, 4); } - public static ComponentStrongholdRoomCrossing findValidPlacement(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentStrongholdRoomCrossing findValidPlacement(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -4, -1, 0, 11, 7, 11, par5); return canStrongholdGoDeeper(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentStrongholdRoomCrossing(par6, par1Random, var7, par5) : null; @@ -54,7 +54,7 @@ public class ComponentStrongholdRoomCrossing extends ComponentStronghold * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdStairs.java b/src/main/java/net/minecraft/src/ComponentStrongholdStairs.java index 34b7a07..c25e2a2 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdStairs.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdStairs.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdStairs extends ComponentStronghold { @@ -9,7 +9,7 @@ public class ComponentStrongholdStairs extends ComponentStronghold public ComponentStrongholdStairs() {} - public ComponentStrongholdStairs(int par1, Random par2Random, int par3, int par4) + public ComponentStrongholdStairs(int par1, EaglercraftRandom par2Random, int par3, int par4) { super(par1); this.field_75024_a = true; @@ -28,7 +28,7 @@ public class ComponentStrongholdStairs extends ComponentStronghold } } - public ComponentStrongholdStairs(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentStrongholdStairs(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.field_75024_a = false; @@ -52,7 +52,7 @@ public class ComponentStrongholdStairs extends ComponentStronghold /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { if (this.field_75024_a) { @@ -65,7 +65,7 @@ public class ComponentStrongholdStairs extends ComponentStronghold /** * performs some checks, then gives out a fresh Stairs component */ - public static ComponentStrongholdStairs getStrongholdStairsComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentStrongholdStairs getStrongholdStairsComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, -7, 0, 5, 11, 5, par5); return canStrongholdGoDeeper(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentStrongholdStairs(par6, par1Random, var7, par5) : null; @@ -75,7 +75,7 @@ public class ComponentStrongholdStairs extends ComponentStronghold * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdStairs2.java b/src/main/java/net/minecraft/src/ComponentStrongholdStairs2.java index 178c497..40b4e0d 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdStairs2.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdStairs2.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.ArrayList; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdStairs2 extends ComponentStrongholdStairs { @@ -12,7 +12,7 @@ public class ComponentStrongholdStairs2 extends ComponentStrongholdStairs public ComponentStrongholdStairs2() {} - public ComponentStrongholdStairs2(int par1, Random par2Random, int par3, int par4) + public ComponentStrongholdStairs2(int par1, EaglercraftRandom par2Random, int par3, int par4) { super(0, par2Random, par3, par4); } diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdStairsStraight.java b/src/main/java/net/minecraft/src/ComponentStrongholdStairsStraight.java index 8d27134..ba80ca4 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdStairsStraight.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdStairsStraight.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdStairsStraight extends ComponentStronghold { public ComponentStrongholdStairsStraight() {} - public ComponentStrongholdStairsStraight(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentStrongholdStairsStraight(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -18,12 +18,12 @@ public class ComponentStrongholdStairsStraight extends ComponentStronghold /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentStrongholdStairs2)par1StructureComponent, par2List, par3Random, 1, 1); } - public static ComponentStrongholdStairsStraight findValidPlacement(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentStrongholdStairsStraight findValidPlacement(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, -7, 0, 5, 11, 8, par5); return canStrongholdGoDeeper(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentStrongholdStairsStraight(par6, par1Random, var7, par5) : null; @@ -33,7 +33,7 @@ public class ComponentStrongholdStairsStraight extends ComponentStronghold * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentStrongholdStraight.java b/src/main/java/net/minecraft/src/ComponentStrongholdStraight.java index e3fface..b50feee 100644 --- a/src/main/java/net/minecraft/src/ComponentStrongholdStraight.java +++ b/src/main/java/net/minecraft/src/ComponentStrongholdStraight.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentStrongholdStraight extends ComponentStronghold { @@ -10,7 +10,7 @@ public class ComponentStrongholdStraight extends ComponentStronghold public ComponentStrongholdStraight() {} - public ComponentStrongholdStraight(int par1, Random par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) + public ComponentStrongholdStraight(int par1, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox, int par4) { super(par1); this.coordBaseMode = par4; @@ -37,7 +37,7 @@ public class ComponentStrongholdStraight extends ComponentStronghold /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { this.getNextComponentNormal((ComponentStrongholdStairs2)par1StructureComponent, par2List, par3Random, 1, 1); @@ -52,7 +52,7 @@ public class ComponentStrongholdStraight extends ComponentStronghold } } - public static ComponentStrongholdStraight findValidPlacement(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + public static ComponentStrongholdStraight findValidPlacement(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par2, par3, par4, -1, -1, 0, 5, 5, 7, par5); return canStrongholdGoDeeper(var7) && StructureComponent.findIntersecting(par0List, var7) == null ? new ComponentStrongholdStraight(par6, par1Random, var7, par5) : null; @@ -62,7 +62,7 @@ public class ComponentStrongholdStraight extends ComponentStronghold * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.isLiquidInStructureBoundingBox(par1World, par3StructureBoundingBox)) { diff --git a/src/main/java/net/minecraft/src/ComponentVillage.java b/src/main/java/net/minecraft/src/ComponentVillage.java index 6209fad..15cdfb2 100644 --- a/src/main/java/net/minecraft/src/ComponentVillage.java +++ b/src/main/java/net/minecraft/src/ComponentVillage.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; abstract class ComponentVillage extends StructureComponent { @@ -40,7 +40,7 @@ abstract class ComponentVillage extends StructureComponent /** * Gets the next village component, with the bounding box shifted -1 in the X and Z direction. */ - protected StructureComponent getNextComponentNN(ComponentVillageStartPiece par1ComponentVillageStartPiece, List par2List, Random par3Random, int par4, int par5) + protected StructureComponent getNextComponentNN(ComponentVillageStartPiece par1ComponentVillageStartPiece, List par2List, EaglercraftRandom par3Random, int par4, int par5) { switch (this.coordBaseMode) { @@ -64,7 +64,7 @@ abstract class ComponentVillage extends StructureComponent /** * Gets the next village component, with the bounding box shifted +1 in the X and Z direction. */ - protected StructureComponent getNextComponentPP(ComponentVillageStartPiece par1ComponentVillageStartPiece, List par2List, Random par3Random, int par4, int par5) + protected StructureComponent getNextComponentPP(ComponentVillageStartPiece par1ComponentVillageStartPiece, List par2List, EaglercraftRandom par3Random, int par4, int par5) { switch (this.coordBaseMode) { diff --git a/src/main/java/net/minecraft/src/ComponentVillageChurch.java b/src/main/java/net/minecraft/src/ComponentVillageChurch.java index 3279ea2..c27cd13 100644 --- a/src/main/java/net/minecraft/src/ComponentVillageChurch.java +++ b/src/main/java/net/minecraft/src/ComponentVillageChurch.java @@ -1,20 +1,20 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillageChurch extends ComponentVillage { public ComponentVillageChurch() {} - public ComponentVillageChurch(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) + public ComponentVillageChurch(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, EaglercraftRandom par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(par1ComponentVillageStartPiece, par2); this.coordBaseMode = par5; this.boundingBox = par4StructureBoundingBox; } - public static ComponentVillageChurch func_74919_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + public static ComponentVillageChurch func_74919_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { StructureBoundingBox var8 = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 5, 12, 9, par6); return canVillageGoDeeper(var8) && StructureComponent.findIntersecting(par1List, var8) == null ? new ComponentVillageChurch(par0ComponentVillageStartPiece, par7, par2Random, var8, par6) : null; @@ -24,7 +24,7 @@ public class ComponentVillageChurch extends ComponentVillage * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.field_143015_k < 0) { diff --git a/src/main/java/net/minecraft/src/ComponentVillageField.java b/src/main/java/net/minecraft/src/ComponentVillageField.java index b04d0eb..f5ed603 100644 --- a/src/main/java/net/minecraft/src/ComponentVillageField.java +++ b/src/main/java/net/minecraft/src/ComponentVillageField.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillageField extends ComponentVillage { @@ -19,7 +19,7 @@ public class ComponentVillageField extends ComponentVillage public ComponentVillageField() {} - public ComponentVillageField(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) + public ComponentVillageField(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, EaglercraftRandom par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(par1ComponentVillageStartPiece, par2); this.coordBaseMode = par5; @@ -51,7 +51,7 @@ public class ComponentVillageField extends ComponentVillage /** * Returns a crop type to be planted on this field. */ - private int getRandomCrop(Random par1Random) + private int getRandomCrop(EaglercraftRandom par1Random) { switch (par1Random.nextInt(5)) { @@ -66,7 +66,7 @@ public class ComponentVillageField extends ComponentVillage } } - public static ComponentVillageField func_74900_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + public static ComponentVillageField func_74900_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { StructureBoundingBox var8 = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 13, 4, 9, par6); return canVillageGoDeeper(var8) && StructureComponent.findIntersecting(par1List, var8) == null ? new ComponentVillageField(par0ComponentVillageStartPiece, par7, par2Random, var8, par6) : null; @@ -76,7 +76,7 @@ public class ComponentVillageField extends ComponentVillage * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.field_143015_k < 0) { diff --git a/src/main/java/net/minecraft/src/ComponentVillageField2.java b/src/main/java/net/minecraft/src/ComponentVillageField2.java index e4a9747..dda2449 100644 --- a/src/main/java/net/minecraft/src/ComponentVillageField2.java +++ b/src/main/java/net/minecraft/src/ComponentVillageField2.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillageField2 extends ComponentVillage { @@ -13,7 +13,7 @@ public class ComponentVillageField2 extends ComponentVillage public ComponentVillageField2() {} - public ComponentVillageField2(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) + public ComponentVillageField2(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, EaglercraftRandom par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(par1ComponentVillageStartPiece, par2); this.coordBaseMode = par5; @@ -39,7 +39,7 @@ public class ComponentVillageField2 extends ComponentVillage /** * Returns a crop type to be planted on this field. */ - private int pickRandomCrop(Random par1Random) + private int pickRandomCrop(EaglercraftRandom par1Random) { switch (par1Random.nextInt(5)) { @@ -54,7 +54,7 @@ public class ComponentVillageField2 extends ComponentVillage } } - public static ComponentVillageField2 func_74902_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + public static ComponentVillageField2 func_74902_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { StructureBoundingBox var8 = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 7, 4, 9, par6); return canVillageGoDeeper(var8) && StructureComponent.findIntersecting(par1List, var8) == null ? new ComponentVillageField2(par0ComponentVillageStartPiece, par7, par2Random, var8, par6) : null; @@ -64,7 +64,7 @@ public class ComponentVillageField2 extends ComponentVillage * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.field_143015_k < 0) { diff --git a/src/main/java/net/minecraft/src/ComponentVillageHall.java b/src/main/java/net/minecraft/src/ComponentVillageHall.java index 07852d1..58011a9 100644 --- a/src/main/java/net/minecraft/src/ComponentVillageHall.java +++ b/src/main/java/net/minecraft/src/ComponentVillageHall.java @@ -1,20 +1,20 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillageHall extends ComponentVillage { public ComponentVillageHall() {} - public ComponentVillageHall(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) + public ComponentVillageHall(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, EaglercraftRandom par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(par1ComponentVillageStartPiece, par2); this.coordBaseMode = par5; this.boundingBox = par4StructureBoundingBox; } - public static ComponentVillageHall func_74906_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + public static ComponentVillageHall func_74906_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { StructureBoundingBox var8 = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 9, 7, 11, par6); return canVillageGoDeeper(var8) && StructureComponent.findIntersecting(par1List, var8) == null ? new ComponentVillageHall(par0ComponentVillageStartPiece, par7, par2Random, var8, par6) : null; @@ -24,7 +24,7 @@ public class ComponentVillageHall extends ComponentVillage * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.field_143015_k < 0) { diff --git a/src/main/java/net/minecraft/src/ComponentVillageHouse1.java b/src/main/java/net/minecraft/src/ComponentVillageHouse1.java index b07dd38..6d44f49 100644 --- a/src/main/java/net/minecraft/src/ComponentVillageHouse1.java +++ b/src/main/java/net/minecraft/src/ComponentVillageHouse1.java @@ -1,20 +1,20 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillageHouse1 extends ComponentVillage { public ComponentVillageHouse1() {} - public ComponentVillageHouse1(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) + public ComponentVillageHouse1(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, EaglercraftRandom par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(par1ComponentVillageStartPiece, par2); this.coordBaseMode = par5; this.boundingBox = par4StructureBoundingBox; } - public static ComponentVillageHouse1 func_74898_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + public static ComponentVillageHouse1 func_74898_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { StructureBoundingBox var8 = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 9, 9, 6, par6); return canVillageGoDeeper(var8) && StructureComponent.findIntersecting(par1List, var8) == null ? new ComponentVillageHouse1(par0ComponentVillageStartPiece, par7, par2Random, var8, par6) : null; @@ -24,7 +24,7 @@ public class ComponentVillageHouse1 extends ComponentVillage * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.field_143015_k < 0) { diff --git a/src/main/java/net/minecraft/src/ComponentVillageHouse2.java b/src/main/java/net/minecraft/src/ComponentVillageHouse2.java index 74920c3..24c2e6a 100644 --- a/src/main/java/net/minecraft/src/ComponentVillageHouse2.java +++ b/src/main/java/net/minecraft/src/ComponentVillageHouse2.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillageHouse2 extends ComponentVillage { @@ -11,14 +11,14 @@ public class ComponentVillageHouse2 extends ComponentVillage public ComponentVillageHouse2() {} - public ComponentVillageHouse2(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) + public ComponentVillageHouse2(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, EaglercraftRandom par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(par1ComponentVillageStartPiece, par2); this.coordBaseMode = par5; this.boundingBox = par4StructureBoundingBox; } - public static ComponentVillageHouse2 func_74915_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + public static ComponentVillageHouse2 func_74915_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { StructureBoundingBox var8 = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 10, 6, 7, par6); return canVillageGoDeeper(var8) && StructureComponent.findIntersecting(par1List, var8) == null ? new ComponentVillageHouse2(par0ComponentVillageStartPiece, par7, par2Random, var8, par6) : null; @@ -40,7 +40,7 @@ public class ComponentVillageHouse2 extends ComponentVillage * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.field_143015_k < 0) { diff --git a/src/main/java/net/minecraft/src/ComponentVillageHouse3.java b/src/main/java/net/minecraft/src/ComponentVillageHouse3.java index eca2e8a..c9727ab 100644 --- a/src/main/java/net/minecraft/src/ComponentVillageHouse3.java +++ b/src/main/java/net/minecraft/src/ComponentVillageHouse3.java @@ -1,20 +1,20 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillageHouse3 extends ComponentVillage { public ComponentVillageHouse3() {} - public ComponentVillageHouse3(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) + public ComponentVillageHouse3(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, EaglercraftRandom par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(par1ComponentVillageStartPiece, par2); this.coordBaseMode = par5; this.boundingBox = par4StructureBoundingBox; } - public static ComponentVillageHouse3 func_74921_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + public static ComponentVillageHouse3 func_74921_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { StructureBoundingBox var8 = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 9, 7, 12, par6); return canVillageGoDeeper(var8) && StructureComponent.findIntersecting(par1List, var8) == null ? new ComponentVillageHouse3(par0ComponentVillageStartPiece, par7, par2Random, var8, par6) : null; @@ -24,7 +24,7 @@ public class ComponentVillageHouse3 extends ComponentVillage * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.field_143015_k < 0) { diff --git a/src/main/java/net/minecraft/src/ComponentVillageHouse4_Garden.java b/src/main/java/net/minecraft/src/ComponentVillageHouse4_Garden.java index d965629..ed3fc1d 100644 --- a/src/main/java/net/minecraft/src/ComponentVillageHouse4_Garden.java +++ b/src/main/java/net/minecraft/src/ComponentVillageHouse4_Garden.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillageHouse4_Garden extends ComponentVillage { @@ -9,7 +9,7 @@ public class ComponentVillageHouse4_Garden extends ComponentVillage public ComponentVillageHouse4_Garden() {} - public ComponentVillageHouse4_Garden(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) + public ComponentVillageHouse4_Garden(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, EaglercraftRandom par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(par1ComponentVillageStartPiece, par2); this.coordBaseMode = par5; @@ -29,7 +29,7 @@ public class ComponentVillageHouse4_Garden extends ComponentVillage this.isRoofAccessible = par1NBTTagCompound.getBoolean("Terrace"); } - public static ComponentVillageHouse4_Garden func_74912_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + public static ComponentVillageHouse4_Garden func_74912_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { StructureBoundingBox var8 = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 5, 6, 5, par6); return StructureComponent.findIntersecting(par1List, var8) != null ? null : new ComponentVillageHouse4_Garden(par0ComponentVillageStartPiece, par7, par2Random, var8, par6); @@ -39,7 +39,7 @@ public class ComponentVillageHouse4_Garden extends ComponentVillage * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.field_143015_k < 0) { diff --git a/src/main/java/net/minecraft/src/ComponentVillagePathGen.java b/src/main/java/net/minecraft/src/ComponentVillagePathGen.java index 3b8d25a..661b1d1 100644 --- a/src/main/java/net/minecraft/src/ComponentVillagePathGen.java +++ b/src/main/java/net/minecraft/src/ComponentVillagePathGen.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillagePathGen extends ComponentVillageRoadPiece { @@ -9,7 +9,7 @@ public class ComponentVillagePathGen extends ComponentVillageRoadPiece public ComponentVillagePathGen() {} - public ComponentVillagePathGen(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) + public ComponentVillagePathGen(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, EaglercraftRandom par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(par1ComponentVillageStartPiece, par2); this.coordBaseMode = par5; @@ -32,7 +32,7 @@ public class ComponentVillagePathGen extends ComponentVillageRoadPiece /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { boolean var4 = false; int var5; @@ -103,7 +103,7 @@ public class ComponentVillagePathGen extends ComponentVillageRoadPiece } } - public static StructureBoundingBox func_74933_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6) + public static StructureBoundingBox func_74933_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6) { for (int var7 = 7 * MathHelper.getRandomIntegerInRange(par2Random, 3, 5); var7 >= 7; var7 -= 7) { @@ -122,7 +122,7 @@ public class ComponentVillagePathGen extends ComponentVillageRoadPiece * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { int var4 = this.getBiomeSpecificBlock(Block.gravel.blockID, 0); diff --git a/src/main/java/net/minecraft/src/ComponentVillageStartPiece.java b/src/main/java/net/minecraft/src/ComponentVillageStartPiece.java index 137d2ef..c4edd75 100644 --- a/src/main/java/net/minecraft/src/ComponentVillageStartPiece.java +++ b/src/main/java/net/minecraft/src/ComponentVillageStartPiece.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.ArrayList; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillageStartPiece extends ComponentVillageWell { @@ -25,7 +25,7 @@ public class ComponentVillageStartPiece extends ComponentVillageWell public ComponentVillageStartPiece() {} - public ComponentVillageStartPiece(WorldChunkManager par1WorldChunkManager, int par2, Random par3Random, int par4, int par5, List par6List, int par7) + public ComponentVillageStartPiece(WorldChunkManager par1WorldChunkManager, int par2, EaglercraftRandom par3Random, int par4, int par5, List par6List, int par7) { super((ComponentVillageStartPiece)null, 0, par3Random, par4, par5); this.worldChunkMngr = par1WorldChunkManager; diff --git a/src/main/java/net/minecraft/src/ComponentVillageTorch.java b/src/main/java/net/minecraft/src/ComponentVillageTorch.java index f594b18..16d6576 100644 --- a/src/main/java/net/minecraft/src/ComponentVillageTorch.java +++ b/src/main/java/net/minecraft/src/ComponentVillageTorch.java @@ -1,20 +1,20 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillageTorch extends ComponentVillage { public ComponentVillageTorch() {} - public ComponentVillageTorch(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) + public ComponentVillageTorch(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, EaglercraftRandom par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(par1ComponentVillageStartPiece, par2); this.coordBaseMode = par5; this.boundingBox = par4StructureBoundingBox; } - public static StructureBoundingBox func_74904_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6) + public static StructureBoundingBox func_74904_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6) { StructureBoundingBox var7 = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 3, 4, 2, par6); return StructureComponent.findIntersecting(par1List, var7) != null ? null : var7; @@ -24,7 +24,7 @@ public class ComponentVillageTorch extends ComponentVillage * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.field_143015_k < 0) { diff --git a/src/main/java/net/minecraft/src/ComponentVillageWell.java b/src/main/java/net/minecraft/src/ComponentVillageWell.java index 32df257..d3df013 100644 --- a/src/main/java/net/minecraft/src/ComponentVillageWell.java +++ b/src/main/java/net/minecraft/src/ComponentVillageWell.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillageWell extends ComponentVillage { public ComponentVillageWell() {} - public ComponentVillageWell(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, int par4, int par5) + public ComponentVillageWell(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, EaglercraftRandom par3Random, int par4, int par5) { super(par1ComponentVillageStartPiece, par2); this.coordBaseMode = par3Random.nextInt(4); @@ -27,7 +27,7 @@ public class ComponentVillageWell extends ComponentVillage /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) { StructureVillagePieces.getNextStructureComponentVillagePath((ComponentVillageStartPiece)par1StructureComponent, par2List, par3Random, this.boundingBox.minX - 1, this.boundingBox.maxY - 4, this.boundingBox.minZ + 1, 1, this.getComponentType()); StructureVillagePieces.getNextStructureComponentVillagePath((ComponentVillageStartPiece)par1StructureComponent, par2List, par3Random, this.boundingBox.maxX + 1, this.boundingBox.maxY - 4, this.boundingBox.minZ + 1, 3, this.getComponentType()); @@ -39,7 +39,7 @@ public class ComponentVillageWell extends ComponentVillage * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.field_143015_k < 0) { diff --git a/src/main/java/net/minecraft/src/ComponentVillageWoodHut.java b/src/main/java/net/minecraft/src/ComponentVillageWoodHut.java index 8911034..78d79c0 100644 --- a/src/main/java/net/minecraft/src/ComponentVillageWoodHut.java +++ b/src/main/java/net/minecraft/src/ComponentVillageWoodHut.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ComponentVillageWoodHut extends ComponentVillage { @@ -10,7 +10,7 @@ public class ComponentVillageWoodHut extends ComponentVillage public ComponentVillageWoodHut() {} - public ComponentVillageWoodHut(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, Random par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) + public ComponentVillageWoodHut(ComponentVillageStartPiece par1ComponentVillageStartPiece, int par2, EaglercraftRandom par3Random, StructureBoundingBox par4StructureBoundingBox, int par5) { super(par1ComponentVillageStartPiece, par2); this.coordBaseMode = par5; @@ -33,7 +33,7 @@ public class ComponentVillageWoodHut extends ComponentVillage this.isTallHouse = par1NBTTagCompound.getBoolean("C"); } - public static ComponentVillageWoodHut func_74908_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + public static ComponentVillageWoodHut func_74908_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { StructureBoundingBox var8 = StructureBoundingBox.getComponentToAddBoundingBox(par3, par4, par5, 0, 0, 0, 4, 6, 5, par6); return canVillageGoDeeper(var8) && StructureComponent.findIntersecting(par1List, var8) == null ? new ComponentVillageWoodHut(par0ComponentVillageStartPiece, par7, par2Random, var8, par6) : null; @@ -43,7 +43,7 @@ public class ComponentVillageWoodHut extends ComponentVillage * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public boolean addComponentParts(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public boolean addComponentParts(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { if (this.field_143015_k < 0) { diff --git a/src/main/java/net/minecraft/src/ContainerEnchantment.java b/src/main/java/net/minecraft/src/ContainerEnchantment.java index aca3cb6..9eeb10a 100644 --- a/src/main/java/net/minecraft/src/ContainerEnchantment.java +++ b/src/main/java/net/minecraft/src/ContainerEnchantment.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ContainerEnchantment extends Container { @@ -13,7 +13,7 @@ public class ContainerEnchantment extends Container private int posX; private int posY; private int posZ; - private Random rand = new Random(); + private EaglercraftRandom rand = new EaglercraftRandom(); /** used as seed for EnchantmentNameParts (see GuiEnchantment) */ public long nameSeed; diff --git a/src/main/java/net/minecraft/src/DedicatedServer.java b/src/main/java/net/minecraft/src/DedicatedServer.java index cc47200..6bc729d 100644 --- a/src/main/java/net/minecraft/src/DedicatedServer.java +++ b/src/main/java/net/minecraft/src/DedicatedServer.java @@ -6,7 +6,7 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.minecraft.server.MinecraftServer; public class DedicatedServer extends MinecraftServer implements IServer @@ -125,7 +125,7 @@ public class DedicatedServer extends MinecraftServer implements IServer String var6 = this.settings.getProperty("level-seed", ""); String var7 = this.settings.getProperty("level-type", "DEFAULT"); String var8 = this.settings.getProperty("generator-settings", ""); - long var9 = (new Random()).nextLong(); + long var9 = (new EaglercraftRandom()).nextLong(); if (var6.length() > 0) { diff --git a/src/main/java/net/minecraft/src/DispenserBehaviorFireball.java b/src/main/java/net/minecraft/src/DispenserBehaviorFireball.java index 9b577b1..9b02f28 100644 --- a/src/main/java/net/minecraft/src/DispenserBehaviorFireball.java +++ b/src/main/java/net/minecraft/src/DispenserBehaviorFireball.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; final class DispenserBehaviorFireball extends BehaviorDefaultDispenseItem { @@ -15,7 +15,7 @@ final class DispenserBehaviorFireball extends BehaviorDefaultDispenseItem double var7 = var4.getY() + (double)((float)var3.getFrontOffsetX() * 0.3F); double var9 = var4.getZ() + (double)((float)var3.getFrontOffsetZ() * 0.3F); World var11 = par1IBlockSource.getWorld(); - Random var12 = var11.rand; + EaglercraftRandom var12 = var11.rand; double var13 = var12.nextGaussian() * 0.05D + (double)var3.getFrontOffsetX(); double var15 = var12.nextGaussian() * 0.05D + (double)var3.getFrontOffsetY(); double var17 = var12.nextGaussian() * 0.05D + (double)var3.getFrontOffsetZ(); diff --git a/src/main/java/net/minecraft/src/EffectRenderer.java b/src/main/java/net/minecraft/src/EffectRenderer.java index d44e9ac..8fce1e3 100644 --- a/src/main/java/net/minecraft/src/EffectRenderer.java +++ b/src/main/java/net/minecraft/src/EffectRenderer.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.ArrayList; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; @@ -18,7 +18,7 @@ public class EffectRenderer private RenderEngine renderer; /** RNG. */ - private Random rand = new Random(); + private EaglercraftRandom rand = new EaglercraftRandom(); public EffectRenderer(World par1World, RenderEngine par2TextureManager) { diff --git a/src/main/java/net/minecraft/src/EmptyChunk.java b/src/main/java/net/minecraft/src/EmptyChunk.java index 8d8489b..3801671 100644 --- a/src/main/java/net/minecraft/src/EmptyChunk.java +++ b/src/main/java/net/minecraft/src/EmptyChunk.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class EmptyChunk extends Chunk { @@ -175,9 +175,9 @@ public class EmptyChunk extends Chunk return false; } - public Random getRandomWithSeed(long par1) + public EaglercraftRandom getRandomWithSeed(long par1) { - return new Random(this.worldObj.getSeed() + (long)(this.xPosition * this.xPosition * 4987142) + (long)(this.xPosition * 5947611) + (long)(this.zPosition * this.zPosition) * 4392871L + (long)(this.zPosition * 389711) ^ par1); + return new EaglercraftRandom(this.worldObj.getSeed() + (long)(this.xPosition * this.xPosition * 4987142) + (long)(this.xPosition * 5947611) + (long)(this.zPosition * this.zPosition) * 4392871L + (long)(this.zPosition * 389711) ^ par1); } public boolean isEmpty() diff --git a/src/main/java/net/minecraft/src/EnchantmentDurability.java b/src/main/java/net/minecraft/src/EnchantmentDurability.java index 7c494b1..32a4eff 100644 --- a/src/main/java/net/minecraft/src/EnchantmentDurability.java +++ b/src/main/java/net/minecraft/src/EnchantmentDurability.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class EnchantmentDurability extends Enchantment { @@ -44,7 +44,7 @@ public class EnchantmentDurability extends Enchantment * enchantment level (par1). If the ItemStack is Armor then there is a flat 60% chance for damage to be negated no * matter the enchantment level, otherwise there is a 1-(par/1) chance for damage to be negated. */ - public static boolean negateDamage(ItemStack par0ItemStack, int par1, Random par2Random) + public static boolean negateDamage(ItemStack par0ItemStack, int par1, EaglercraftRandom par2Random) { return par0ItemStack.getItem() instanceof ItemArmor && par2Random.nextFloat() < 0.6F ? false : par2Random.nextInt(par1 + 1) > 0; } diff --git a/src/main/java/net/minecraft/src/EnchantmentHelper.java b/src/main/java/net/minecraft/src/EnchantmentHelper.java index cacf914..a3ab562 100644 --- a/src/main/java/net/minecraft/src/EnchantmentHelper.java +++ b/src/main/java/net/minecraft/src/EnchantmentHelper.java @@ -6,12 +6,12 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class EnchantmentHelper { /** Is the random seed of enchantment effects. */ - private static final Random enchantmentRand = new Random(); + private static final EaglercraftRandom enchantmentRand = new EaglercraftRandom(); /** * Used to calculate the extra armor of enchantments on armors equipped on player. @@ -300,7 +300,7 @@ public class EnchantmentHelper * Returns the enchantability of itemstack, it's uses a singular formula for each index (2nd parameter: 0, 1 and 2), * cutting to the max enchantability power of the table (3rd parameter) */ - public static int calcItemStackEnchantability(Random par0Random, int par1, int par2, ItemStack par3ItemStack) + public static int calcItemStackEnchantability(EaglercraftRandom par0Random, int par1, int par2, ItemStack par3ItemStack) { Item var4 = par3ItemStack.getItem(); int var5 = var4.getItemEnchantability(); @@ -324,7 +324,7 @@ public class EnchantmentHelper /** * Adds a random enchantment to the specified item. Args: random, itemStack, enchantabilityLevel */ - public static ItemStack addRandomEnchantment(Random par0Random, ItemStack par1ItemStack, int par2) + public static ItemStack addRandomEnchantment(EaglercraftRandom par0Random, ItemStack par1ItemStack, int par2) { List var3 = buildEnchantmentList(par0Random, par1ItemStack, par2); boolean var4 = par1ItemStack.itemID == Item.book.itemID; @@ -360,7 +360,7 @@ public class EnchantmentHelper * Create a list of random EnchantmentData (enchantments) that can be added together to the ItemStack, the 3rd * parameter is the total enchantability level. */ - public static List buildEnchantmentList(Random par0Random, ItemStack par1ItemStack, int par2) + public static List buildEnchantmentList(EaglercraftRandom par0Random, ItemStack par1ItemStack, int par2) { Item var3 = par1ItemStack.getItem(); int var4 = var3.getItemEnchantability(); diff --git a/src/main/java/net/minecraft/src/EnchantmentNameParts.java b/src/main/java/net/minecraft/src/EnchantmentNameParts.java index aaf0493..541b0f1 100644 --- a/src/main/java/net/minecraft/src/EnchantmentNameParts.java +++ b/src/main/java/net/minecraft/src/EnchantmentNameParts.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class EnchantmentNameParts { @@ -8,7 +8,7 @@ public class EnchantmentNameParts public static final EnchantmentNameParts instance = new EnchantmentNameParts(); /** The RNG used to generate enchant names. */ - private Random rand = new Random(); + private EaglercraftRandom rand = new EaglercraftRandom(); /** List of words used to generate an enchant name. */ private String[] wordList = "the elder scrolls klaatu berata niktu xyzzy bless curse light darkness fire air earth water hot dry cold wet ignite snuff embiggen twist shorten stretch fiddle destroy imbue galvanize enchant free limited range of towards inside sphere cube self other ball mental physical grow shrink demon elemental spirit animal creature beast humanoid undead fresh stale ".split(" "); diff --git a/src/main/java/net/minecraft/src/EnchantmentThorns.java b/src/main/java/net/minecraft/src/EnchantmentThorns.java index e474e1c..1f2a82a 100644 --- a/src/main/java/net/minecraft/src/EnchantmentThorns.java +++ b/src/main/java/net/minecraft/src/EnchantmentThorns.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class EnchantmentThorns extends Enchantment { @@ -39,17 +39,17 @@ public class EnchantmentThorns extends Enchantment return par1ItemStack.getItem() instanceof ItemArmor ? true : super.canApply(par1ItemStack); } - public static boolean func_92094_a(int par0, Random par1Random) + public static boolean func_92094_a(int par0, EaglercraftRandom par1Random) { return par0 <= 0 ? false : par1Random.nextFloat() < 0.15F * (float)par0; } - public static int func_92095_b(int par0, Random par1Random) + public static int func_92095_b(int par0, EaglercraftRandom par1Random) { return par0 > 10 ? par0 - 10 : 1 + par1Random.nextInt(4); } - public static void func_92096_a(Entity par0Entity, EntityLivingBase par1EntityLivingBase, Random par2Random) + public static void func_92096_a(Entity par0Entity, EntityLivingBase par1EntityLivingBase, EaglercraftRandom par2Random) { int var3 = EnchantmentHelper.func_92098_i(par1EntityLivingBase); ItemStack var4 = EnchantmentHelper.func_92099_a(Enchantment.thorns, par1EntityLivingBase); diff --git a/src/main/java/net/minecraft/src/Entity.java b/src/main/java/net/minecraft/src/Entity.java index eeba020..4288f52 100644 --- a/src/main/java/net/minecraft/src/Entity.java +++ b/src/main/java/net/minecraft/src/Entity.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import java.util.UUID; import net.minecraft.server.MinecraftServer; @@ -134,7 +134,7 @@ public abstract class Entity * Reduces the velocity applied by entity collisions by the specified percent. */ public float entityCollisionReduction; - protected Random rand; + protected EaglercraftRandom rand; /** How many ticks has this entity had ran since being alive */ public int ticksExisted; @@ -197,7 +197,7 @@ public abstract class Entity this.width = 0.6F; this.height = 1.8F; this.nextStepDistance = 1; - this.rand = new Random(); + this.rand = new EaglercraftRandom(); this.fireResistance = 1; this.firstUpdate = true; this.dataWatcher = new DataWatcher(); diff --git a/src/main/java/net/minecraft/src/EntityAIFleeSun.java b/src/main/java/net/minecraft/src/EntityAIFleeSun.java index e3b0f1f..742e28b 100644 --- a/src/main/java/net/minecraft/src/EntityAIFleeSun.java +++ b/src/main/java/net/minecraft/src/EntityAIFleeSun.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class EntityAIFleeSun extends EntityAIBase { @@ -72,7 +72,7 @@ public class EntityAIFleeSun extends EntityAIBase private Vec3 findPossibleShelter() { - Random var1 = this.theCreature.getRNG(); + EaglercraftRandom var1 = this.theCreature.getRNG(); for (int var2 = 0; var2 < 10; ++var2) { diff --git a/src/main/java/net/minecraft/src/EntityAIMate.java b/src/main/java/net/minecraft/src/EntityAIMate.java index 7e4e9e9..301f0d6 100644 --- a/src/main/java/net/minecraft/src/EntityAIMate.java +++ b/src/main/java/net/minecraft/src/EntityAIMate.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class EntityAIMate extends EntityAIBase { @@ -116,7 +116,7 @@ public class EntityAIMate extends EntityAIBase var1.setGrowingAge(-24000); var1.setLocationAndAngles(this.theAnimal.posX, this.theAnimal.posY, this.theAnimal.posZ, 0.0F, 0.0F); this.theWorld.spawnEntityInWorld(var1); - Random var2 = this.theAnimal.getRNG(); + EaglercraftRandom var2 = this.theAnimal.getRNG(); for (int var3 = 0; var3 < 7; ++var3) { diff --git a/src/main/java/net/minecraft/src/EntityLivingBase.java b/src/main/java/net/minecraft/src/EntityLivingBase.java index b0b58d0..6b81245 100644 --- a/src/main/java/net/minecraft/src/EntityLivingBase.java +++ b/src/main/java/net/minecraft/src/EntityLivingBase.java @@ -4,7 +4,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import java.util.UUID; public abstract class EntityLivingBase extends Entity @@ -393,7 +393,7 @@ public abstract class EntityLivingBase extends Entity return false; } - public Random getRNG() + public EaglercraftRandom getRNG() { return this.rand; } diff --git a/src/main/java/net/minecraft/src/EntityRenderer.java b/src/main/java/net/minecraft/src/EntityRenderer.java index 0c39ceb..06a811a 100644 --- a/src/main/java/net/minecraft/src/EntityRenderer.java +++ b/src/main/java/net/minecraft/src/EntityRenderer.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.nio.FloatBuffer; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.EaglerAdapter; import net.lax1dude.eaglercraft.EaglerImage; @@ -124,7 +124,7 @@ public class EntityRenderer /** Torch flicker DY */ float torchFlickerDY; - private Random random = new Random(); + private EaglercraftRandom random = new EaglercraftRandom(); /** Rain sound counter */ private int rainSoundCounter; diff --git a/src/main/java/net/minecraft/src/EntitySheep.java b/src/main/java/net/minecraft/src/EntitySheep.java index 808966b..7627d38 100644 --- a/src/main/java/net/minecraft/src/EntitySheep.java +++ b/src/main/java/net/minecraft/src/EntitySheep.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class EntitySheep extends EntityAnimal { @@ -250,7 +250,7 @@ public class EntitySheep extends EntityAnimal /** * This method is called when a sheep spawns in the world to select the color of sheep fleece. */ - public static int getRandomFleeceColor(Random par0Random) + public static int getRandomFleeceColor(EaglercraftRandom par0Random) { int var1 = par0Random.nextInt(100); return var1 < 5 ? 15 : (var1 < 10 ? 7 : (var1 < 15 ? 8 : (var1 < 18 ? 12 : (par0Random.nextInt(500) == 0 ? 6 : 0)))); diff --git a/src/main/java/net/minecraft/src/EntityVillager.java b/src/main/java/net/minecraft/src/EntityVillager.java index 0e07e54..807837f 100644 --- a/src/main/java/net/minecraft/src/EntityVillager.java +++ b/src/main/java/net/minecraft/src/EntityVillager.java @@ -4,7 +4,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class EntityVillager extends EntityAgeable implements IMerchant, INpc { @@ -415,7 +415,7 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc } /** - * based on the villagers profession add items, equipment, and recipies adds par1 random items to the list of things + * based on the villagers profession add items, equipment, and recipies adds par1 EaglercraftRandom items to the list of things * that the villager wants to buy. (at most 1 of each wanted type is added) */ private void addDefaultEquipmentAndRecipies(int par1) @@ -567,9 +567,9 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc public void setRecipes(MerchantRecipeList par1MerchantRecipeList) {} /** - * each recipie takes a random stack from villagerStockList and offers it for 1 emerald + * each recipie takes a EaglercraftRandom stack from villagerStockList and offers it for 1 emerald */ - private static void addMerchantItem(MerchantRecipeList par0MerchantRecipeList, int par1, Random par2Random, float par3) + private static void addMerchantItem(MerchantRecipeList par0MerchantRecipeList, int par1, EaglercraftRandom par2Random, float par3) { if (par2Random.nextFloat() < par3) { @@ -577,7 +577,7 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc } } - private static ItemStack getRandomSizedStack(int par0, Random par1Random) + private static ItemStack getRandomSizedStack(int par0, EaglercraftRandom par1Random) { return new ItemStack(par0, getRandomCountForItem(par0, par1Random), 0); } @@ -585,13 +585,13 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc /** * default to 1, and villagerStockList contains a min/max amount for each index */ - private static int getRandomCountForItem(int par0, Random par1Random) + private static int getRandomCountForItem(int par0, EaglercraftRandom par1Random) { Tuple var2 = (Tuple)villagerStockList.get(Integer.valueOf(par0)); return var2 == null ? 1 : (((Integer)var2.getFirst()).intValue() >= ((Integer)var2.getSecond()).intValue() ? ((Integer)var2.getFirst()).intValue() : ((Integer)var2.getFirst()).intValue() + par1Random.nextInt(((Integer)var2.getSecond()).intValue() - ((Integer)var2.getFirst()).intValue())); } - private static void addBlacksmithItem(MerchantRecipeList par0MerchantRecipeList, int par1, Random par2Random, float par3) + private static void addBlacksmithItem(MerchantRecipeList par0MerchantRecipeList, int par1, EaglercraftRandom par2Random, float par3) { if (par2Random.nextFloat() < par3) { @@ -614,7 +614,7 @@ public class EntityVillager extends EntityAgeable implements IMerchant, INpc } } - private static int getRandomCountForBlacksmithItem(int par0, Random par1Random) + private static int getRandomCountForBlacksmithItem(int par0, EaglercraftRandom par1Random) { Tuple var2 = (Tuple)blacksmithSellingList.get(Integer.valueOf(par0)); return var2 == null ? 1 : (((Integer)var2.getFirst()).intValue() >= ((Integer)var2.getSecond()).intValue() ? ((Integer)var2.getFirst()).intValue() : ((Integer)var2.getFirst()).intValue() + par1Random.nextInt(((Integer)var2.getSecond()).intValue() - ((Integer)var2.getFirst()).intValue())); diff --git a/src/main/java/net/minecraft/src/Explosion.java b/src/main/java/net/minecraft/src/Explosion.java index fe37af8..7576ad6 100644 --- a/src/main/java/net/minecraft/src/Explosion.java +++ b/src/main/java/net/minecraft/src/Explosion.java @@ -6,7 +6,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class Explosion { @@ -16,7 +16,7 @@ public class Explosion /** whether or not this explosion spawns smoke particles */ public boolean isSmoking = true; private int field_77289_h = 16; - private Random explosionRNG = new Random(); + private EaglercraftRandom explosionRNG = new EaglercraftRandom(); private World worldObj; public double explosionX; public double explosionY; diff --git a/src/main/java/net/minecraft/src/GuiAchievements.java b/src/main/java/net/minecraft/src/GuiAchievements.java index 8545281..a599533 100644 --- a/src/main/java/net/minecraft/src/GuiAchievements.java +++ b/src/main/java/net/minecraft/src/GuiAchievements.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import org.lwjgl.input.Mouse; @@ -234,7 +234,7 @@ public class GuiAchievements extends GuiScreen boolean var16 = true; boolean var17 = true; boolean var18 = true; - Random var19 = new Random(); + EaglercraftRandom var19 = new EaglercraftRandom(); int var20; int var22; int var23; diff --git a/src/main/java/net/minecraft/src/GuiCreateWorld.java b/src/main/java/net/minecraft/src/GuiCreateWorld.java index bb05b0b..4cd37ab 100644 --- a/src/main/java/net/minecraft/src/GuiCreateWorld.java +++ b/src/main/java/net/minecraft/src/GuiCreateWorld.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import org.lwjgl.input.Keyboard; public class GuiCreateWorld extends GuiScreen @@ -249,7 +249,7 @@ public class GuiCreateWorld extends GuiScreen } this.createClicked = true; - long var2 = (new Random()).nextLong(); + long var2 = (new EaglercraftRandom()).nextLong(); String var4 = this.textboxSeed.getText(); if (!MathHelper.stringNullOrLengthZero(var4)) diff --git a/src/main/java/net/minecraft/src/GuiEnchantment.java b/src/main/java/net/minecraft/src/GuiEnchantment.java index 6845e5a..43b6161 100644 --- a/src/main/java/net/minecraft/src/GuiEnchantment.java +++ b/src/main/java/net/minecraft/src/GuiEnchantment.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import org.lwjgl.opengl.GL11; @@ -14,7 +14,7 @@ public class GuiEnchantment extends GuiContainer /** The book model used on the GUI. */ private static final ModelBook bookModel = new ModelBook(); - private Random rand = new Random(); + private EaglercraftRandom rand = new EaglercraftRandom(); /** ContainerEnchantment object associated with this gui */ private ContainerEnchantment containerEnchantment; diff --git a/src/main/java/net/minecraft/src/GuiIngame.java b/src/main/java/net/minecraft/src/GuiIngame.java index b91ac02..70f3ea3 100644 --- a/src/main/java/net/minecraft/src/GuiIngame.java +++ b/src/main/java/net/minecraft/src/GuiIngame.java @@ -4,7 +4,7 @@ import java.awt.Color; import java.util.Collection; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; @@ -17,7 +17,7 @@ public class GuiIngame extends Gui private static final TextureLocation widgetsTexPath = new TextureLocation("textures/gui/widgets.png"); private static final TextureLocation pumpkinBlurTexPath = new TextureLocation("textures/misc/pumpkinblur.png"); private static final RenderItem itemRenderer = new RenderItem(); - private final Random rand = new Random(); + private final EaglercraftRandom rand = new EaglercraftRandom(); private final Minecraft mc; /** ChatGUI instance that retains all previous chat data */ diff --git a/src/main/java/net/minecraft/src/GuiWinGame.java b/src/main/java/net/minecraft/src/GuiWinGame.java index 4649f10..bd603ce 100644 --- a/src/main/java/net/minecraft/src/GuiWinGame.java +++ b/src/main/java/net/minecraft/src/GuiWinGame.java @@ -4,7 +4,7 @@ import java.io.BufferedReader; import java.io.InputStreamReader; import java.util.ArrayList; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; @@ -81,7 +81,7 @@ public class GuiWinGame extends GuiScreen String var2 = "" + EnumChatFormatting.WHITE + EnumChatFormatting.OBFUSCATED + EnumChatFormatting.GREEN + EnumChatFormatting.AQUA; short var3 = 274; BufferedReader var4 = new BufferedReader(new InputStreamReader(this.mc.getResourceManager().getResource(new TextureLocation("texts/end.txt")).getInputStream(), Charsets.UTF_8)); - Random var5 = new Random(8124371L); + EaglercraftRandom var5 = new EaglercraftRandom(8124371L); int var6; while ((var1 = var4.readLine()) != null) diff --git a/src/main/java/net/minecraft/src/Item.java b/src/main/java/net/minecraft/src/Item.java index fad79b3..31d2947 100644 --- a/src/main/java/net/minecraft/src/Item.java +++ b/src/main/java/net/minecraft/src/Item.java @@ -3,7 +3,7 @@ package net.minecraft.src; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import java.util.UUID; public class Item @@ -12,7 +12,7 @@ public class Item private CreativeTabs tabToDisplayOn; /** The RNG used by the Item subclasses. */ - protected static Random itemRand = new Random(); + protected static EaglercraftRandom itemRand = new EaglercraftRandom(); /** A 32000 elements Item array. */ public static Item[] itemsList = new Item[32000]; diff --git a/src/main/java/net/minecraft/src/ItemEnchantedBook.java b/src/main/java/net/minecraft/src/ItemEnchantedBook.java index ff88f62..0917b09 100644 --- a/src/main/java/net/minecraft/src/ItemEnchantedBook.java +++ b/src/main/java/net/minecraft/src/ItemEnchantedBook.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class ItemEnchantedBook extends Item { @@ -117,12 +117,12 @@ public class ItemEnchantedBook extends Item } } - public WeightedRandomChestContent func_92114_b(Random par1Random) + public WeightedRandomChestContent func_92114_b(EaglercraftRandom par1Random) { return this.func_92112_a(par1Random, 1, 1, 1); } - public WeightedRandomChestContent func_92112_a(Random par1Random, int par2, int par3, int par4) + public WeightedRandomChestContent func_92112_a(EaglercraftRandom par1Random, int par2, int par3, int par4) { Enchantment var5 = Enchantment.enchantmentsBookList[par1Random.nextInt(Enchantment.enchantmentsBookList.length)]; ItemStack var6 = new ItemStack(this.itemID, 1, 0); diff --git a/src/main/java/net/minecraft/src/ItemStack.java b/src/main/java/net/minecraft/src/ItemStack.java index 7f995e0..53abb63 100644 --- a/src/main/java/net/minecraft/src/ItemStack.java +++ b/src/main/java/net/minecraft/src/ItemStack.java @@ -6,7 +6,7 @@ import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import java.util.Map.Entry; public final class ItemStack @@ -274,7 +274,7 @@ public final class ItemStack * getMaxDamage(). Returns false otherwise or if the ItemStack can't be damaged or if all points of damage are * negated. */ - public boolean attemptDamageItem(int par1, Random par2Random) + public boolean attemptDamageItem(int par1, EaglercraftRandom par2Random) { if (!this.isItemStackDamageable()) { diff --git a/src/main/java/net/minecraft/src/MapGenBase.java b/src/main/java/net/minecraft/src/MapGenBase.java index 5bc543e..303403b 100644 --- a/src/main/java/net/minecraft/src/MapGenBase.java +++ b/src/main/java/net/minecraft/src/MapGenBase.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class MapGenBase { @@ -8,7 +8,7 @@ public class MapGenBase protected int range = 8; /** The RNG used by the MapGen classes. */ - protected Random rand = new Random(); + protected EaglercraftRandom rand = new EaglercraftRandom(); /** This world object. */ protected World worldObj; diff --git a/src/main/java/net/minecraft/src/MapGenCaves.java b/src/main/java/net/minecraft/src/MapGenCaves.java index 4ff0dd4..feb43c1 100644 --- a/src/main/java/net/minecraft/src/MapGenCaves.java +++ b/src/main/java/net/minecraft/src/MapGenCaves.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class MapGenCaves extends MapGenBase { @@ -21,7 +21,7 @@ public class MapGenCaves extends MapGenBase double var21 = (double)(par4 * 16 + 8); float var23 = 0.0F; float var24 = 0.0F; - Random var25 = new Random(par1); + EaglercraftRandom var25 = new EaglercraftRandom(par1); if (par16 <= 0) { diff --git a/src/main/java/net/minecraft/src/MapGenCavesHell.java b/src/main/java/net/minecraft/src/MapGenCavesHell.java index 2ccd278..8118edd 100644 --- a/src/main/java/net/minecraft/src/MapGenCavesHell.java +++ b/src/main/java/net/minecraft/src/MapGenCavesHell.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class MapGenCavesHell extends MapGenBase { @@ -21,7 +21,7 @@ public class MapGenCavesHell extends MapGenBase double var21 = (double)(par4 * 16 + 8); float var23 = 0.0F; float var24 = 0.0F; - Random var25 = new Random(par1); + EaglercraftRandom var25 = new EaglercraftRandom(par1); if (par16 <= 0) { diff --git a/src/main/java/net/minecraft/src/MapGenRavine.java b/src/main/java/net/minecraft/src/MapGenRavine.java index dea5773..c423792 100644 --- a/src/main/java/net/minecraft/src/MapGenRavine.java +++ b/src/main/java/net/minecraft/src/MapGenRavine.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class MapGenRavine extends MapGenBase { @@ -8,7 +8,7 @@ public class MapGenRavine extends MapGenBase protected void generateRavine(long par1, int par3, int par4, byte[] par5ArrayOfByte, double par6, double par8, double par10, float par12, float par13, float par14, int par15, int par16, double par17) { - Random var19 = new Random(par1); + EaglercraftRandom var19 = new EaglercraftRandom(par1); double var20 = (double)(par3 * 16 + 8); double var22 = (double)(par4 * 16 + 8); float var24 = 0.0F; diff --git a/src/main/java/net/minecraft/src/MapGenScatteredFeature.java b/src/main/java/net/minecraft/src/MapGenScatteredFeature.java index 5bd7ff5..5a07079 100644 --- a/src/main/java/net/minecraft/src/MapGenScatteredFeature.java +++ b/src/main/java/net/minecraft/src/MapGenScatteredFeature.java @@ -5,7 +5,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import java.util.Map.Entry; public class MapGenScatteredFeature extends MapGenStructure @@ -67,7 +67,7 @@ public class MapGenScatteredFeature extends MapGenStructure int var5 = par1 / this.maxDistanceBetweenScatteredFeatures; int var6 = par2 / this.maxDistanceBetweenScatteredFeatures; - Random var7 = this.worldObj.setRandomSeed(var5, var6, 14357617); + EaglercraftRandom var7 = this.worldObj.setRandomSeed(var5, var6, 14357617); var5 *= this.maxDistanceBetweenScatteredFeatures; var6 *= this.maxDistanceBetweenScatteredFeatures; var5 += var7.nextInt(this.maxDistanceBetweenScatteredFeatures - this.minDistanceBetweenScatteredFeatures); diff --git a/src/main/java/net/minecraft/src/MapGenStronghold.java b/src/main/java/net/minecraft/src/MapGenStronghold.java index 198d9eb..0565592 100644 --- a/src/main/java/net/minecraft/src/MapGenStronghold.java +++ b/src/main/java/net/minecraft/src/MapGenStronghold.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import java.util.Map.Entry; public class MapGenStronghold extends MapGenStructure @@ -64,7 +64,7 @@ public class MapGenStronghold extends MapGenStructure { if (!this.ranBiomeCheck) { - Random var3 = new Random(); + EaglercraftRandom var3 = new EaglercraftRandom(); var3.setSeed(this.worldObj.getSeed()); double var4 = var3.nextDouble() * Math.PI * 2.0D; int var6 = 1; diff --git a/src/main/java/net/minecraft/src/MapGenStructure.java b/src/main/java/net/minecraft/src/MapGenStructure.java index 06e24c6..a5d0b0b 100644 --- a/src/main/java/net/minecraft/src/MapGenStructure.java +++ b/src/main/java/net/minecraft/src/MapGenStructure.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class MapGenStructure extends MapGenBase { @@ -55,7 +55,7 @@ public abstract class MapGenStructure extends MapGenBase /** * Generates structures in specified chunk next to existing structures. Does *not* generate StructureStarts. */ - public boolean generateStructuresInChunk(World par1World, Random par2Random, int par3, int par4) + public boolean generateStructuresInChunk(World par1World, EaglercraftRandom par2Random, int par3, int par4) { this.func_143027_a(par1World); int var5 = (par3 << 4) + 8; diff --git a/src/main/java/net/minecraft/src/MapGenVillage.java b/src/main/java/net/minecraft/src/MapGenVillage.java index 3a58376..7221874 100644 --- a/src/main/java/net/minecraft/src/MapGenVillage.java +++ b/src/main/java/net/minecraft/src/MapGenVillage.java @@ -4,7 +4,7 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import java.util.Map.Entry; public class MapGenVillage extends MapGenStructure @@ -65,7 +65,7 @@ public class MapGenVillage extends MapGenStructure int var5 = par1 / this.field_82665_g; int var6 = par2 / this.field_82665_g; - Random var7 = this.worldObj.setRandomSeed(var5, var6, 10387312); + EaglercraftRandom var7 = this.worldObj.setRandomSeed(var5, var6, 10387312); var5 *= this.field_82665_g; var6 *= this.field_82665_g; var5 += var7.nextInt(this.field_82665_g - this.field_82666_h); diff --git a/src/main/java/net/minecraft/src/MathHelper.java b/src/main/java/net/minecraft/src/MathHelper.java index 1ff3217..a023061 100644 --- a/src/main/java/net/minecraft/src/MathHelper.java +++ b/src/main/java/net/minecraft/src/MathHelper.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class MathHelper { @@ -147,12 +147,12 @@ public class MathHelper return par0Str == null || par0Str.length() == 0; } - public static int getRandomIntegerInRange(Random par0Random, int par1, int par2) + public static int getRandomIntegerInRange(EaglercraftRandom par0Random, int par1, int par2) { return par1 >= par2 ? par1 : par0Random.nextInt(par2 - par1 + 1) + par1; } - public static double getRandomDoubleInRange(Random par0Random, double par1, double par3) + public static double getRandomDoubleInRange(EaglercraftRandom par0Random, double par1, double par3) { return par1 >= par3 ? par1 : par0Random.nextDouble() * (par3 - par1) + par1; } diff --git a/src/main/java/net/minecraft/src/ModelBase.java b/src/main/java/net/minecraft/src/ModelBase.java index 47ca1e9..b892c35 100644 --- a/src/main/java/net/minecraft/src/ModelBase.java +++ b/src/main/java/net/minecraft/src/ModelBase.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class ModelBase { @@ -40,7 +40,7 @@ public abstract class ModelBase */ public void setLivingAnimations(EntityLivingBase par1EntityLivingBase, float par2, float par3, float par4) {} - public ModelRenderer getRandomModelBox(Random par1Random) + public ModelRenderer getRandomModelBox(EaglercraftRandom par1Random) { return (ModelRenderer)this.boxList.get(par1Random.nextInt(this.boxList.size())); } diff --git a/src/main/java/net/minecraft/src/ModelGhast.java b/src/main/java/net/minecraft/src/ModelGhast.java index d8573fa..8183572 100644 --- a/src/main/java/net/minecraft/src/ModelGhast.java +++ b/src/main/java/net/minecraft/src/ModelGhast.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import org.lwjgl.opengl.GL11; public class ModelGhast extends ModelBase @@ -14,7 +14,7 @@ public class ModelGhast extends ModelBase this.body = new ModelRenderer(this, 0, 0); this.body.addBox(-8.0F, -8.0F, -8.0F, 16, 16, 16); this.body.rotationPointY += (float)(24 + var1); - Random var2 = new Random(1660L); + EaglercraftRandom var2 = new EaglercraftRandom(1660L); for (int var3 = 0; var3 < this.tentacles.length; ++var3) { diff --git a/src/main/java/net/minecraft/src/NetClientHandler.java b/src/main/java/net/minecraft/src/NetClientHandler.java index 0a93661..22f9065 100644 --- a/src/main/java/net/minecraft/src/NetClientHandler.java +++ b/src/main/java/net/minecraft/src/NetClientHandler.java @@ -11,7 +11,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.WebsocketNetworkManager; import net.minecraft.client.ClientBrandRetriever; @@ -49,7 +49,7 @@ public class NetClientHandler extends NetHandler private GuiScreen field_98183_l; /** RNG. */ - Random rand = new Random(); + EaglercraftRandom rand = new EaglercraftRandom(); public NetClientHandler(Minecraft par1Minecraft, String par2Str, int par3) throws IOException { diff --git a/src/main/java/net/minecraft/src/NetLoginHandler.java b/src/main/java/net/minecraft/src/NetLoginHandler.java index fd9d142..7d8fd25 100644 --- a/src/main/java/net/minecraft/src/NetLoginHandler.java +++ b/src/main/java/net/minecraft/src/NetLoginHandler.java @@ -9,14 +9,14 @@ import java.security.PublicKey; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import javax.crypto.SecretKey; import net.minecraft.server.MinecraftServer; public class NetLoginHandler extends NetHandler { /** The Random object used to generate serverId hex strings. */ - private static Random rand = new Random(); + private static EaglercraftRandom rand = new EaglercraftRandom(); /** The 4 byte verify token read from a Packet252SharedKey */ private byte[] verifyToken; diff --git a/src/main/java/net/minecraft/src/NetServerHandler.java b/src/main/java/net/minecraft/src/NetServerHandler.java index c70ae02..948b589 100644 --- a/src/main/java/net/minecraft/src/NetServerHandler.java +++ b/src/main/java/net/minecraft/src/NetServerHandler.java @@ -5,7 +5,7 @@ import java.io.DataInputStream; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.minecraft.server.MinecraftServer; public class NetServerHandler extends NetHandler @@ -32,7 +32,7 @@ public class NetServerHandler extends NetHandler private boolean field_72584_h; private int keepAliveRandomID; private long keepAliveTimeSent; - private static Random randomGenerator = new Random(); + private static EaglercraftRandom randomGenerator = new EaglercraftRandom(); private long ticksOfLastKeepAlive; private int chatSpamThresholdCount; private int creativeItemCreationSpamThresholdTally; diff --git a/src/main/java/net/minecraft/src/NoiseGeneratorOctaves.java b/src/main/java/net/minecraft/src/NoiseGeneratorOctaves.java index 2e58a08..4056289 100644 --- a/src/main/java/net/minecraft/src/NoiseGeneratorOctaves.java +++ b/src/main/java/net/minecraft/src/NoiseGeneratorOctaves.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class NoiseGeneratorOctaves extends NoiseGenerator { @@ -10,7 +10,7 @@ public class NoiseGeneratorOctaves extends NoiseGenerator private NoiseGeneratorPerlin[] generatorCollection; private int octaves; - public NoiseGeneratorOctaves(Random par1Random, int par2) + public NoiseGeneratorOctaves(EaglercraftRandom par1Random, int par2) { this.octaves = par2; this.generatorCollection = new NoiseGeneratorPerlin[par2]; diff --git a/src/main/java/net/minecraft/src/NoiseGeneratorPerlin.java b/src/main/java/net/minecraft/src/NoiseGeneratorPerlin.java index 87ebd7d..a7bda88 100644 --- a/src/main/java/net/minecraft/src/NoiseGeneratorPerlin.java +++ b/src/main/java/net/minecraft/src/NoiseGeneratorPerlin.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class NoiseGeneratorPerlin extends NoiseGenerator { @@ -11,10 +11,10 @@ public class NoiseGeneratorPerlin extends NoiseGenerator public NoiseGeneratorPerlin() { - this(new Random()); + this(new EaglercraftRandom()); } - public NoiseGeneratorPerlin(Random par1Random) + public NoiseGeneratorPerlin(EaglercraftRandom par1Random) { this.permutations = new int[512]; this.xCoord = par1Random.nextDouble() * 256.0D; diff --git a/src/main/java/net/minecraft/src/RConThreadQueryAuth.java b/src/main/java/net/minecraft/src/RConThreadQueryAuth.java index 3db016c..f4d3d72 100644 --- a/src/main/java/net/minecraft/src/RConThreadQueryAuth.java +++ b/src/main/java/net/minecraft/src/RConThreadQueryAuth.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.net.DatagramPacket; import java.util.Date; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; class RConThreadQueryAuth { @@ -35,7 +35,7 @@ class RConThreadQueryAuth this.requestId[2] = var3[5]; this.requestId[3] = var3[6]; this.requestIdAsString = new String(this.requestId); - this.randomChallenge = (new Random()).nextInt(16777216); + this.randomChallenge = (new EaglercraftRandom()).nextInt(16777216); this.challengeValue = String.format("\t%s%d\u0000", new Object[] {this.requestIdAsString, Integer.valueOf(this.randomChallenge)}).getBytes(); } diff --git a/src/main/java/net/minecraft/src/RandomPositionGenerator.java b/src/main/java/net/minecraft/src/RandomPositionGenerator.java index 7c674e3..665419d 100644 --- a/src/main/java/net/minecraft/src/RandomPositionGenerator.java +++ b/src/main/java/net/minecraft/src/RandomPositionGenerator.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class RandomPositionGenerator { @@ -46,7 +46,7 @@ public class RandomPositionGenerator */ private static Vec3 findRandomTargetBlock(EntityCreature par0EntityCreature, int par1, int par2, Vec3 par3Vec3) { - Random var4 = par0EntityCreature.getRNG(); + EaglercraftRandom var4 = par0EntityCreature.getRNG(); boolean var5 = false; int var6 = 0; int var7 = 0; diff --git a/src/main/java/net/minecraft/src/RenderDragon.java b/src/main/java/net/minecraft/src/RenderDragon.java index 1683b6d..6eb698d 100644 --- a/src/main/java/net/minecraft/src/RenderDragon.java +++ b/src/main/java/net/minecraft/src/RenderDragon.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import org.lwjgl.opengl.GL11; @@ -157,7 +157,7 @@ public class RenderDragon extends RenderLiving var5 = (var4 - 0.8F) / 0.2F; } - Random var6 = new Random(432L); + EaglercraftRandom var6 = new EaglercraftRandom(432L); GL11.glDisable(GL11.GL_TEXTURE_2D); GL11.glShadeModel(GL11.GL_SMOOTH); GL11.glEnable(GL11.GL_BLEND); diff --git a/src/main/java/net/minecraft/src/RenderEndPortal.java b/src/main/java/net/minecraft/src/RenderEndPortal.java index 864519b..5263e0e 100644 --- a/src/main/java/net/minecraft/src/RenderEndPortal.java +++ b/src/main/java/net/minecraft/src/RenderEndPortal.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.nio.FloatBuffer; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; @@ -11,7 +11,7 @@ public class RenderEndPortal extends TileEntitySpecialRenderer { private static final TextureLocation enderPortalEndSkyTextures = new TextureLocation("textures/environment/end_sky.png"); private static final TextureLocation endPortalTextures = new TextureLocation("textures/entity/end_portal.png"); - private static final Random field_110644_e = new Random(31100L); + private static final EaglercraftRandom field_110644_e = new EaglercraftRandom(31100L); FloatBuffer field_76908_a = GLAllocation.createDirectFloatBuffer(16); /** diff --git a/src/main/java/net/minecraft/src/RenderEnderman.java b/src/main/java/net/minecraft/src/RenderEnderman.java index 74cae3f..a3ad9f7 100644 --- a/src/main/java/net/minecraft/src/RenderEnderman.java +++ b/src/main/java/net/minecraft/src/RenderEnderman.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; import net.lax1dude.eaglercraft.TextureLocation; @@ -12,7 +12,7 @@ public class RenderEnderman extends RenderLiving /** The model of the enderman */ private ModelEnderman endermanModel; - private Random rnd = new Random(); + private EaglercraftRandom rnd = new EaglercraftRandom(); public RenderEnderman() { diff --git a/src/main/java/net/minecraft/src/RenderGlobal.java b/src/main/java/net/minecraft/src/RenderGlobal.java index 258b488..29aca99 100644 --- a/src/main/java/net/minecraft/src/RenderGlobal.java +++ b/src/main/java/net/minecraft/src/RenderGlobal.java @@ -8,7 +8,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; @@ -225,7 +225,7 @@ public class RenderGlobal implements IWorldAccess private void renderStars() { - Random var1 = new Random(10842L); + EaglercraftRandom var1 = new EaglercraftRandom(10842L); Tessellator var2 = Tessellator.instance; var2.startDrawingQuads(); @@ -2053,7 +2053,7 @@ public class RenderGlobal implements IWorldAccess public void broadcastSound(int par1, int par2, int par3, int par4, int par5) { - Random var6 = this.theWorld.rand; + EaglercraftRandom var6 = this.theWorld.rand; switch (par1) { @@ -2095,7 +2095,7 @@ public class RenderGlobal implements IWorldAccess */ public void playAuxSFX(EntityPlayer par1EntityPlayer, int par2, int par3, int par4, int par5, int par6) { - Random var7 = this.theWorld.rand; + EaglercraftRandom var7 = this.theWorld.rand; double var8; double var10; double var12; diff --git a/src/main/java/net/minecraft/src/RenderItem.java b/src/main/java/net/minecraft/src/RenderItem.java index 47cc10e..59991c7 100644 --- a/src/main/java/net/minecraft/src/RenderItem.java +++ b/src/main/java/net/minecraft/src/RenderItem.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; @@ -13,7 +13,7 @@ public class RenderItem extends Render private RenderBlocks itemRenderBlocks = new RenderBlocks(); /** The RNG used in RenderItem (for bobbing itemstacks on the ground) */ - private Random random = new Random(); + private EaglercraftRandom random = new EaglercraftRandom(); public boolean renderWithColor = true; /** Defines the zLevel of rendering of item on GUI. */ diff --git a/src/main/java/net/minecraft/src/RenderLightningBolt.java b/src/main/java/net/minecraft/src/RenderLightningBolt.java index 6c729fd..b070cc3 100644 --- a/src/main/java/net/minecraft/src/RenderLightningBolt.java +++ b/src/main/java/net/minecraft/src/RenderLightningBolt.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; @@ -22,7 +22,7 @@ public class RenderLightningBolt extends Render double[] var12 = new double[8]; double var13 = 0.0D; double var15 = 0.0D; - Random var17 = new Random(par1EntityLightningBolt.boltVertex); + EaglercraftRandom var17 = new EaglercraftRandom(par1EntityLightningBolt.boltVertex); for (int var18 = 7; var18 >= 0; --var18) { @@ -34,7 +34,7 @@ public class RenderLightningBolt extends Render for (int var45 = 0; var45 < 4; ++var45) { - Random var46 = new Random(par1EntityLightningBolt.boltVertex); + EaglercraftRandom var46 = new EaglercraftRandom(par1EntityLightningBolt.boltVertex); for (int var19 = 0; var19 < 3; ++var19) { diff --git a/src/main/java/net/minecraft/src/RendererLivingEntity.java b/src/main/java/net/minecraft/src/RendererLivingEntity.java index fd24a06..b256496 100644 --- a/src/main/java/net/minecraft/src/RendererLivingEntity.java +++ b/src/main/java/net/minecraft/src/RendererLivingEntity.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import net.lax1dude.eaglercraft.TextureLocation; import net.lax1dude.eaglercraft.adapter.Tessellator; @@ -359,7 +359,7 @@ public abstract class RendererLivingEntity extends Render if (var3 > 0) { EntityArrow var4 = new EntityArrow(par1EntityLivingBase.worldObj, par1EntityLivingBase.posX, par1EntityLivingBase.posY, par1EntityLivingBase.posZ); - Random var5 = new Random((long)par1EntityLivingBase.entityId); + EaglercraftRandom var5 = new EaglercraftRandom((long)par1EntityLivingBase.entityId); RenderHelper.disableStandardItemLighting(); for (int var6 = 0; var6 < var3; ++var6) diff --git a/src/main/java/net/minecraft/src/SoundPool.java b/src/main/java/net/minecraft/src/SoundPool.java index 0c31bab..9f574c4 100644 --- a/src/main/java/net/minecraft/src/SoundPool.java +++ b/src/main/java/net/minecraft/src/SoundPool.java @@ -9,12 +9,12 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Map; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class SoundPool { /** The RNG used by SoundPool. */ - private final Random rand = new Random(); + private final EaglercraftRandom rand = new EaglercraftRandom(); /** * Maps a name (can be sound/newsound/streaming/music/newmusic) to a list of SoundPoolEntry's. diff --git a/src/main/java/net/minecraft/src/SpawnerAnimals.java b/src/main/java/net/minecraft/src/SpawnerAnimals.java index 5fc180c..f6f51c6 100644 --- a/src/main/java/net/minecraft/src/SpawnerAnimals.java +++ b/src/main/java/net/minecraft/src/SpawnerAnimals.java @@ -3,7 +3,7 @@ package net.minecraft.src; import java.util.HashMap; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public final class SpawnerAnimals { @@ -212,7 +212,7 @@ public final class SpawnerAnimals /** * Called during chunk generation to spawn initial creatures. */ - public static void performWorldGenSpawning(World par0World, BiomeGenBase par1BiomeGenBase, int par2, int par3, int par4, int par5, Random par6Random) + public static void performWorldGenSpawning(World par0World, BiomeGenBase par1BiomeGenBase, int par2, int par3, int par4, int par5, EaglercraftRandom par6Random) { List var7 = par1BiomeGenBase.getSpawnableList(EnumCreatureType.creature); diff --git a/src/main/java/net/minecraft/src/SpiderEffectsGroupData.java b/src/main/java/net/minecraft/src/SpiderEffectsGroupData.java index 43a272f..3deaf68 100644 --- a/src/main/java/net/minecraft/src/SpiderEffectsGroupData.java +++ b/src/main/java/net/minecraft/src/SpiderEffectsGroupData.java @@ -1,12 +1,12 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class SpiderEffectsGroupData implements EntityLivingData { public int field_111105_a; - public void func_111104_a(Random par1Random) + public void func_111104_a(EaglercraftRandom par1Random) { int var2 = par1Random.nextInt(5); diff --git a/src/main/java/net/minecraft/src/StringTranslate.java b/src/main/java/net/minecraft/src/StringTranslate.java index 6956ad6..dcbf12f 100644 --- a/src/main/java/net/minecraft/src/StringTranslate.java +++ b/src/main/java/net/minecraft/src/StringTranslate.java @@ -1,103 +1,150 @@ package net.minecraft.src; -import com.google.common.base.Splitter; -import com.google.common.collect.Iterables; -import com.google.common.collect.Maps; import java.io.IOException; -import java.io.InputStream; import java.util.IllegalFormatException; -import java.util.Iterator; -import java.util.Map; -import java.util.regex.Pattern; -import org.apache.commons.io.Charsets; -import org.apache.commons.io.IOUtils; +import java.util.Properties; +import java.util.TreeMap; -public class StringTranslate -{ - private static final Pattern field_111053_a = Pattern.compile("%(\\d+\\$)?[\\d\\.]*[df]"); - private static final Splitter field_135065_b = Splitter.on('=').limit(2); +import net.lax1dude.eaglercraft.EaglerMisc; +import net.minecraft.src.Minecraft; +public class StringTranslate { /** Is the private singleton instance of StringTranslate. */ - private static StringTranslate instance = new StringTranslate(); - private Map languageList = Maps.newHashMap(); + private static StringTranslate instance = new StringTranslate("en_US"); - public StringTranslate() - { - try - { - InputStream var1 = StringTranslate.class.getResourceAsStream("/assets/minecraft/lang/en_US.lang"); - Iterator var2 = IOUtils.readLines(var1, Charsets.UTF_8).iterator(); + /** + * Contains all key/value pairs to be translated - is loaded from + * '/lang/en_US.lang' when the StringTranslate is created. + */ + private Properties translateTable = new Properties(); + private TreeMap languageList; + private TreeMap field_94521_d = new TreeMap(); + private String currentLanguage; + private boolean isUnicode; - while (var2.hasNext()) - { - String var3 = (String)var2.next(); - - if (!var3.isEmpty() && var3.charAt(0) != 35) - { - String[] var4 = (String[])Iterables.toArray(field_135065_b.split(var3), String.class); - - if (var4 != null && var4.length == 2) - { - String var5 = var4[0]; - String var6 = field_111053_a.matcher(var4[1]).replaceAll("%$1s"); - this.languageList.put(var5, var6); - } - } - } - } - catch (IOException var7) - { - ; - } + public StringTranslate(String par1Str) { + this.loadLanguageList(); } /** * Return the StringTranslate singleton instance */ - public static StringTranslate getInstance() - { + public static StringTranslate getInstance() { return instance; } - public static synchronized void func_135063_a(Map par0Map) - { - instance.languageList.clear(); - instance.languageList.putAll(par0Map); + private void loadLanguageList() { + this.languageList = new TreeMap(); + this.languageList.put("en_US", "English (US)"); + } + + public TreeMap getLanguageList() { + return this.languageList; + } + + private void loadLanguage(Properties par1Properties, String par2Str) throws IOException { + String[] var3 = EaglerMisc.bytesToString(Minecraft.getMinecraft().texturePackList.getSelectedTexturePack().getResourceAsBytes("/lang/" + par2Str + ".lang")).replace('\r', '\n') + .replaceAll("\n+", "\n").split("\n"); + + for (String var4 : var3) { + var4 = var4.trim(); + + if (!var4.isEmpty() && !var4.startsWith("#")) { + int var5 = var4.indexOf('='); + + if (var5 != -1) { + par1Properties.setProperty(var4.substring(0, var5), var4.substring(var5 + 1)); + } + } + } + } + + public synchronized void setLanguage(String par1Str, boolean par2) { + if (par2 || !par1Str.equals(this.currentLanguage)) { + Properties var3 = new Properties(); + + try { + this.loadLanguage(var3, "en_US"); + } catch (IOException var9) { + ; + } + + this.isUnicode = false; + /* + if (!"en_US".equals(par1Str)) { + try { + this.loadLanguage(var3, par1Str); + Enumeration var4 = var3.propertyNames(); + + while (var4.hasMoreElements() && !this.isUnicode) { + Object var5 = var4.nextElement(); + Object var6 = var3.get(var5); + + if (var6 != null) { + String var7 = var6.toString(); + + for (int var8 = 0; var8 < var7.length(); ++var8) { + if (var7.charAt(var8) >= 256) { + this.isUnicode = true; + break; + } + } + } + } + } catch (IOException var10) { + var10.printStackTrace(); + return; + } + } + */ + + this.currentLanguage = par1Str; + this.translateTable = var3; + } + } + + public String getCurrentLanguage() { + return this.currentLanguage; + } + + public boolean isUnicode() { + return this.isUnicode; } /** * Translate a key to current language. */ - public synchronized String translateKey(String par1Str) - { - return this.func_135064_c(par1Str); + public synchronized String translateKey(String par1Str) { + return this.translateTable.getProperty(par1Str, par1Str); } /** * Translate a key to current language applying String.format() */ - public synchronized String translateKeyFormat(String par1Str, Object ... par2ArrayOfObj) - { - String var3 = this.func_135064_c(par1Str); + public synchronized String translateKeyFormat(String par1Str, Object... par2ArrayOfObj) { + String var3 = this.translateTable.getProperty(par1Str, par1Str); - try - { + try { return String.format(var3, par2ArrayOfObj); - } - catch (IllegalFormatException var5) - { + } catch (IllegalFormatException var5) { return "Format error: " + var3; } } - private String func_135064_c(String par1Str) - { - String var2 = (String)this.languageList.get(par1Str); - return var2 == null ? par1Str : var2; + public synchronized boolean containsTranslateKey(String par1Str) { + return this.translateTable.containsKey(par1Str); } - public synchronized boolean containsTranslateKey(String par1Str) - { - return this.languageList.containsKey(par1Str); + /** + * Translate a key with a extra '.name' at end added, is used by blocks and + * items. + */ + public synchronized String translateNamedKey(String par1Str) { + return this.translateTable.getProperty(par1Str + ".name", ""); } + + public static boolean isBidirectional(String par0Str) { + return "ar_SA".equals(par0Str) || "he_IL".equals(par0Str); + } + } diff --git a/src/main/java/net/minecraft/src/StructureComponent.java b/src/main/java/net/minecraft/src/StructureComponent.java index a03c764..ca8fda1 100644 --- a/src/main/java/net/minecraft/src/StructureComponent.java +++ b/src/main/java/net/minecraft/src/StructureComponent.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class StructureComponent { @@ -52,13 +52,13 @@ public abstract class StructureComponent /** * Initiates construction of the Structure Component picked, at the current Location of StructGen */ - public void buildComponent(StructureComponent par1StructureComponent, List par2List, Random par3Random) {} + public void buildComponent(StructureComponent par1StructureComponent, List par2List, EaglercraftRandom par3Random) {} /** * second Part of Structure generating, this for example places Spiderwebs, Mob Spawners, it closes Mineshafts at * the end, it adds Fences... */ - public abstract boolean addComponentParts(World var1, Random var2, StructureBoundingBox var3); + public abstract boolean addComponentParts(World var1, EaglercraftRandom var2, StructureBoundingBox var3); public StructureBoundingBox getBoundingBox() { @@ -657,7 +657,7 @@ public abstract class StructureComponent * arguments: World worldObj, StructureBoundingBox structBB, int minX, int minY, int minZ, int maxX, int maxY, int * maxZ, boolean alwaysreplace, Random rand, StructurePieceBlockSelector blockselector */ - protected void fillWithRandomizedBlocks(World par1World, StructureBoundingBox par2StructureBoundingBox, int par3, int par4, int par5, int par6, int par7, int par8, boolean par9, Random par10Random, StructurePieceBlockSelector par11StructurePieceBlockSelector) + protected void fillWithRandomizedBlocks(World par1World, StructureBoundingBox par2StructureBoundingBox, int par3, int par4, int par5, int par6, int par7, int par8, boolean par9, EaglercraftRandom par10Random, StructurePieceBlockSelector par11StructurePieceBlockSelector) { for (int var12 = par4; var12 <= par7; ++var12) { @@ -679,7 +679,7 @@ public abstract class StructureComponent * arguments: World worldObj, StructureBoundingBox structBB, Random rand, float randLimit, int minX, int minY, int * minZ, int maxX, int maxY, int maxZ, int olaceBlockId, int replaceBlockId, boolean alwaysreplace */ - protected void randomlyFillWithBlocks(World par1World, StructureBoundingBox par2StructureBoundingBox, Random par3Random, float par4, int par5, int par6, int par7, int par8, int par9, int par10, int par11, int par12, boolean par13) + protected void randomlyFillWithBlocks(World par1World, StructureBoundingBox par2StructureBoundingBox, EaglercraftRandom par3Random, float par4, int par5, int par6, int par7, int par8, int par9, int par10, int par11, int par12, boolean par13) { for (int var14 = par6; var14 <= par9; ++var14) { @@ -706,7 +706,7 @@ public abstract class StructureComponent /** * Randomly decides if placing or not. Used for Decoration such as Torches and Spiderwebs */ - protected void randomlyPlaceBlock(World par1World, StructureBoundingBox par2StructureBoundingBox, Random par3Random, float par4, int par5, int par6, int par7, int par8, int par9) + protected void randomlyPlaceBlock(World par1World, StructureBoundingBox par2StructureBoundingBox, EaglercraftRandom par3Random, float par4, int par5, int par6, int par7, int par8, int par9) { if (par3Random.nextFloat() < par4) { @@ -793,7 +793,7 @@ public abstract class StructureComponent /** * Used to generate chests with items in it. ex: Temple Chests, Village Blacksmith Chests, Mineshaft Chests. */ - protected boolean generateStructureChestContents(World par1World, StructureBoundingBox par2StructureBoundingBox, Random par3Random, int par4, int par5, int par6, WeightedRandomChestContent[] par7ArrayOfWeightedRandomChestContent, int par8) + protected boolean generateStructureChestContents(World par1World, StructureBoundingBox par2StructureBoundingBox, EaglercraftRandom par3Random, int par4, int par5, int par6, WeightedRandomChestContent[] par7ArrayOfWeightedRandomChestContent, int par8) { int var9 = this.getXWithOffset(par4, par6); int var10 = this.getYWithOffset(par5); @@ -820,7 +820,7 @@ public abstract class StructureComponent /** * Used to generate dispenser contents for structures. ex: Jungle Temples. */ - protected boolean generateStructureDispenserContents(World par1World, StructureBoundingBox par2StructureBoundingBox, Random par3Random, int par4, int par5, int par6, int par7, WeightedRandomChestContent[] par8ArrayOfWeightedRandomChestContent, int par9) + protected boolean generateStructureDispenserContents(World par1World, StructureBoundingBox par2StructureBoundingBox, EaglercraftRandom par3Random, int par4, int par5, int par6, int par7, WeightedRandomChestContent[] par8ArrayOfWeightedRandomChestContent, int par9) { int var10 = this.getXWithOffset(par4, par6); int var11 = this.getYWithOffset(par5); @@ -844,7 +844,7 @@ public abstract class StructureComponent } } - protected void placeDoorAtCurrentPosition(World par1World, StructureBoundingBox par2StructureBoundingBox, Random par3Random, int par4, int par5, int par6, int par7) + protected void placeDoorAtCurrentPosition(World par1World, StructureBoundingBox par2StructureBoundingBox, EaglercraftRandom par3Random, int par4, int par5, int par6, int par7) { int var8 = this.getXWithOffset(par4, par6); int var9 = this.getYWithOffset(par5); diff --git a/src/main/java/net/minecraft/src/StructureMineshaftPieces.java b/src/main/java/net/minecraft/src/StructureMineshaftPieces.java index 242c5a7..201c353 100644 --- a/src/main/java/net/minecraft/src/StructureMineshaftPieces.java +++ b/src/main/java/net/minecraft/src/StructureMineshaftPieces.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class StructureMineshaftPieces { @@ -16,7 +16,7 @@ public class StructureMineshaftPieces MapGenStructureIO.func_143031_a(ComponentMineshaftStairs.class, "MSStairs"); } - private static StructureComponent getRandomComponent(List par0List, Random par1Random, int par2, int par3, int par4, int par5, int par6) + private static StructureComponent getRandomComponent(List par0List, EaglercraftRandom par1Random, int par2, int par3, int par4, int par5, int par6) { int var7 = par1Random.nextInt(100); StructureBoundingBox var8; @@ -52,7 +52,7 @@ public class StructureMineshaftPieces return null; } - private static StructureComponent getNextMineShaftComponent(StructureComponent par0StructureComponent, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + private static StructureComponent getNextMineShaftComponent(StructureComponent par0StructureComponent, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { if (par7 > 8) { @@ -76,7 +76,7 @@ public class StructureMineshaftPieces } } - static StructureComponent getNextComponent(StructureComponent par0StructureComponent, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + static StructureComponent getNextComponent(StructureComponent par0StructureComponent, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { return getNextMineShaftComponent(par0StructureComponent, par1List, par2Random, par3, par4, par5, par6, par7); } diff --git a/src/main/java/net/minecraft/src/StructureMineshaftStart.java b/src/main/java/net/minecraft/src/StructureMineshaftStart.java index a81a260..0bbf06f 100644 --- a/src/main/java/net/minecraft/src/StructureMineshaftStart.java +++ b/src/main/java/net/minecraft/src/StructureMineshaftStart.java @@ -1,12 +1,12 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class StructureMineshaftStart extends StructureStart { public StructureMineshaftStart() {} - public StructureMineshaftStart(World par1World, Random par2Random, int par3, int par4) + public StructureMineshaftStart(World par1World, EaglercraftRandom par2Random, int par3, int par4) { super(par3, par4); ComponentMineshaftRoom var5 = new ComponentMineshaftRoom(0, par2Random, (par3 << 4) + 2, (par4 << 4) + 2); diff --git a/src/main/java/net/minecraft/src/StructureNetherBridgePieces.java b/src/main/java/net/minecraft/src/StructureNetherBridgePieces.java index 4e216e8..037c520 100644 --- a/src/main/java/net/minecraft/src/StructureNetherBridgePieces.java +++ b/src/main/java/net/minecraft/src/StructureNetherBridgePieces.java @@ -1,7 +1,7 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class StructureNetherBridgePieces { @@ -27,7 +27,7 @@ public class StructureNetherBridgePieces MapGenStructureIO.func_143031_a(ComponentNetherBridgeStartPiece.class, "NeStart"); } - private static ComponentNetherBridgePiece createNextComponentRandom(StructureNetherBridgePieceWeight par0StructureNetherBridgePieceWeight, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + private static ComponentNetherBridgePiece createNextComponentRandom(StructureNetherBridgePieceWeight par0StructureNetherBridgePieceWeight, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { Class var8 = par0StructureNetherBridgePieceWeight.weightClass; Object var9 = null; @@ -88,7 +88,7 @@ public class StructureNetherBridgePieces return (ComponentNetherBridgePiece)var9; } - static ComponentNetherBridgePiece createNextComponent(StructureNetherBridgePieceWeight par0StructureNetherBridgePieceWeight, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + static ComponentNetherBridgePiece createNextComponent(StructureNetherBridgePieceWeight par0StructureNetherBridgePieceWeight, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { return createNextComponentRandom(par0StructureNetherBridgePieceWeight, par1List, par2Random, par3, par4, par5, par6, par7); } diff --git a/src/main/java/net/minecraft/src/StructureNetherBridgeStart.java b/src/main/java/net/minecraft/src/StructureNetherBridgeStart.java index 06c8f51..dd25b17 100644 --- a/src/main/java/net/minecraft/src/StructureNetherBridgeStart.java +++ b/src/main/java/net/minecraft/src/StructureNetherBridgeStart.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.ArrayList; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class StructureNetherBridgeStart extends StructureStart { public StructureNetherBridgeStart() {} - public StructureNetherBridgeStart(World par1World, Random par2Random, int par3, int par4) + public StructureNetherBridgeStart(World par1World, EaglercraftRandom par2Random, int par3, int par4) { super(par3, par4); ComponentNetherBridgeStartPiece var5 = new ComponentNetherBridgeStartPiece(par2Random, (par3 << 4) + 2, (par4 << 4) + 2); diff --git a/src/main/java/net/minecraft/src/StructurePieceBlockSelector.java b/src/main/java/net/minecraft/src/StructurePieceBlockSelector.java index 2573b1a..c6f4fdc 100644 --- a/src/main/java/net/minecraft/src/StructurePieceBlockSelector.java +++ b/src/main/java/net/minecraft/src/StructurePieceBlockSelector.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class StructurePieceBlockSelector { @@ -10,7 +10,7 @@ public abstract class StructurePieceBlockSelector /** * picks Block Ids and Metadata (Silverfish) */ - public abstract void selectBlocks(Random var1, int var2, int var3, int var4, boolean var5); + public abstract void selectBlocks(EaglercraftRandom var1, int var2, int var3, int var4, boolean var5); public int getSelectedBlockId() { diff --git a/src/main/java/net/minecraft/src/StructureScatteredFeatureStart.java b/src/main/java/net/minecraft/src/StructureScatteredFeatureStart.java index d8df414..b42b59c 100644 --- a/src/main/java/net/minecraft/src/StructureScatteredFeatureStart.java +++ b/src/main/java/net/minecraft/src/StructureScatteredFeatureStart.java @@ -1,12 +1,12 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class StructureScatteredFeatureStart extends StructureStart { public StructureScatteredFeatureStart() {} - public StructureScatteredFeatureStart(World par1World, Random par2Random, int par3, int par4) + public StructureScatteredFeatureStart(World par1World, EaglercraftRandom par2Random, int par3, int par4) { super(par3, par4); BiomeGenBase var5 = par1World.getBiomeGenForCoords(par3 * 16 + 8, par4 * 16 + 8); diff --git a/src/main/java/net/minecraft/src/StructureScatteredFeatureStones.java b/src/main/java/net/minecraft/src/StructureScatteredFeatureStones.java index c580762..06f2118 100644 --- a/src/main/java/net/minecraft/src/StructureScatteredFeatureStones.java +++ b/src/main/java/net/minecraft/src/StructureScatteredFeatureStones.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; class StructureScatteredFeatureStones extends StructurePieceBlockSelector { @@ -9,7 +9,7 @@ class StructureScatteredFeatureStones extends StructurePieceBlockSelector /** * picks Block Ids and Metadata (Silverfish) */ - public void selectBlocks(Random par1Random, int par2, int par3, int par4, boolean par5) + public void selectBlocks(EaglercraftRandom par1Random, int par2, int par3, int par4, boolean par5) { if (par1Random.nextFloat() < 0.4F) { diff --git a/src/main/java/net/minecraft/src/StructureStart.java b/src/main/java/net/minecraft/src/StructureStart.java index f690c36..a72a404 100644 --- a/src/main/java/net/minecraft/src/StructureStart.java +++ b/src/main/java/net/minecraft/src/StructureStart.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.Iterator; import java.util.LinkedList; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class StructureStart { @@ -33,7 +33,7 @@ public abstract class StructureStart /** * Keeps iterating Structure Pieces and spawning them until the checks tell it to stop */ - public void generateStructure(World par1World, Random par2Random, StructureBoundingBox par3StructureBoundingBox) + public void generateStructure(World par1World, EaglercraftRandom par2Random, StructureBoundingBox par3StructureBoundingBox) { Iterator var4 = this.components.iterator(); @@ -111,7 +111,7 @@ public abstract class StructureStart /** * offsets the structure Bounding Boxes up to a certain height, typically 63 - 10 */ - protected void markAvailableHeight(World par1World, Random par2Random, int par3) + protected void markAvailableHeight(World par1World, EaglercraftRandom par2Random, int par3) { int var4 = 63 - par3; int var5 = this.boundingBox.getYSize() + 1; @@ -132,7 +132,7 @@ public abstract class StructureStart } } - protected void setRandomHeight(World par1World, Random par2Random, int par3, int par4) + protected void setRandomHeight(World par1World, EaglercraftRandom par2Random, int par3, int par4) { int var5 = par4 - par3 + 1 - this.boundingBox.getYSize(); boolean var6 = true; diff --git a/src/main/java/net/minecraft/src/StructureStrongholdPieces.java b/src/main/java/net/minecraft/src/StructureStrongholdPieces.java index 98c1ede..c7fbca9 100644 --- a/src/main/java/net/minecraft/src/StructureStrongholdPieces.java +++ b/src/main/java/net/minecraft/src/StructureStrongholdPieces.java @@ -3,7 +3,7 @@ package net.minecraft.src; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class StructureStrongholdPieces { @@ -71,7 +71,7 @@ public class StructureStrongholdPieces /** * translates the PieceWeight class to the Component class */ - private static ComponentStronghold getStrongholdComponentFromWeightedPiece(Class par0Class, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + private static ComponentStronghold getStrongholdComponentFromWeightedPiece(Class par0Class, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { Object var8 = null; @@ -123,7 +123,7 @@ public class StructureStrongholdPieces return (ComponentStronghold)var8; } - private static ComponentStronghold getNextComponent(ComponentStrongholdStairs2 par0ComponentStrongholdStairs2, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + private static ComponentStronghold getNextComponent(ComponentStrongholdStairs2 par0ComponentStrongholdStairs2, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { if (!canAddStructurePieces()) { @@ -193,7 +193,7 @@ public class StructureStrongholdPieces } } - private static StructureComponent getNextValidComponent(ComponentStrongholdStairs2 par0ComponentStrongholdStairs2, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + private static StructureComponent getNextValidComponent(ComponentStrongholdStairs2 par0ComponentStrongholdStairs2, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { if (par7 > 50) { @@ -217,7 +217,7 @@ public class StructureStrongholdPieces } } - static StructureComponent getNextValidComponentAccess(ComponentStrongholdStairs2 par0ComponentStrongholdStairs2, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + static StructureComponent getNextValidComponentAccess(ComponentStrongholdStairs2 par0ComponentStrongholdStairs2, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { return getNextValidComponent(par0ComponentStrongholdStairs2, par1List, par2Random, par3, par4, par5, par6, par7); } diff --git a/src/main/java/net/minecraft/src/StructureStrongholdStart.java b/src/main/java/net/minecraft/src/StructureStrongholdStart.java index ce734e4..2730dc0 100644 --- a/src/main/java/net/minecraft/src/StructureStrongholdStart.java +++ b/src/main/java/net/minecraft/src/StructureStrongholdStart.java @@ -1,13 +1,13 @@ package net.minecraft.src; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class StructureStrongholdStart extends StructureStart { public StructureStrongholdStart() {} - public StructureStrongholdStart(World par1World, Random par2Random, int par3, int par4) + public StructureStrongholdStart(World par1World, EaglercraftRandom par2Random, int par3, int par4) { super(par3, par4); StructureStrongholdPieces.prepareStructurePieces(); diff --git a/src/main/java/net/minecraft/src/StructureStrongholdStones.java b/src/main/java/net/minecraft/src/StructureStrongholdStones.java index 93244f1..76969a7 100644 --- a/src/main/java/net/minecraft/src/StructureStrongholdStones.java +++ b/src/main/java/net/minecraft/src/StructureStrongholdStones.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; class StructureStrongholdStones extends StructurePieceBlockSelector { @@ -9,7 +9,7 @@ class StructureStrongholdStones extends StructurePieceBlockSelector /** * picks Block Ids and Metadata (Silverfish) */ - public void selectBlocks(Random par1Random, int par2, int par3, int par4, boolean par5) + public void selectBlocks(EaglercraftRandom par1Random, int par2, int par3, int par4, boolean par5) { if (par5) { diff --git a/src/main/java/net/minecraft/src/StructureVillagePieces.java b/src/main/java/net/minecraft/src/StructureVillagePieces.java index f6947bb..391a793 100644 --- a/src/main/java/net/minecraft/src/StructureVillagePieces.java +++ b/src/main/java/net/minecraft/src/StructureVillagePieces.java @@ -3,7 +3,7 @@ package net.minecraft.src; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class StructureVillagePieces { @@ -24,7 +24,7 @@ public class StructureVillagePieces MapGenStructureIO.func_143031_a(ComponentVillageWell.class, "ViW"); } - public static List getStructureVillageWeightedPieceList(Random par0Random, int par1) + public static List getStructureVillageWeightedPieceList(EaglercraftRandom par0Random, int par1) { ArrayList var2 = new ArrayList(); var2.add(new StructureVillagePieceWeight(ComponentVillageHouse4_Garden.class, 4, MathHelper.getRandomIntegerInRange(par0Random, 2 + par1, 4 + par1 * 2))); @@ -68,7 +68,7 @@ public class StructureVillagePieces return var1 ? var2 : -1; } - private static ComponentVillage func_75083_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, StructureVillagePieceWeight par1StructureVillagePieceWeight, List par2List, Random par3Random, int par4, int par5, int par6, int par7, int par8) + private static ComponentVillage func_75083_a(ComponentVillageStartPiece par0ComponentVillageStartPiece, StructureVillagePieceWeight par1StructureVillagePieceWeight, List par2List, EaglercraftRandom par3Random, int par4, int par5, int par6, int par7, int par8) { Class var9 = par1StructureVillagePieceWeight.villagePieceClass; Object var10 = null; @@ -116,7 +116,7 @@ public class StructureVillagePieces /** * attempts to find a next Village Component to be spawned */ - private static ComponentVillage getNextVillageComponent(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + private static ComponentVillage getNextVillageComponent(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { int var8 = func_75079_a(par0ComponentVillageStartPiece.structureVillageWeightedPieceList); @@ -180,7 +180,7 @@ public class StructureVillagePieces /** * attempts to find a next Structure Component to be spawned, private Village function */ - private static StructureComponent getNextVillageStructureComponent(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + private static StructureComponent getNextVillageStructureComponent(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { if (par7 > 50) { @@ -214,7 +214,7 @@ public class StructureVillagePieces } } - private static StructureComponent getNextComponentVillagePath(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + private static StructureComponent getNextComponentVillagePath(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { if (par7 > 3 + par0ComponentVillageStartPiece.terrainType) { @@ -252,12 +252,12 @@ public class StructureVillagePieces /** * attempts to find a next Structure Component to be spawned */ - static StructureComponent getNextStructureComponent(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + static StructureComponent getNextStructureComponent(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { return getNextVillageStructureComponent(par0ComponentVillageStartPiece, par1List, par2Random, par3, par4, par5, par6, par7); } - static StructureComponent getNextStructureComponentVillagePath(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, Random par2Random, int par3, int par4, int par5, int par6, int par7) + static StructureComponent getNextStructureComponentVillagePath(ComponentVillageStartPiece par0ComponentVillageStartPiece, List par1List, EaglercraftRandom par2Random, int par3, int par4, int par5, int par6, int par7) { return getNextComponentVillagePath(par0ComponentVillageStartPiece, par1List, par2Random, par3, par4, par5, par6, par7); } diff --git a/src/main/java/net/minecraft/src/StructureVillageStart.java b/src/main/java/net/minecraft/src/StructureVillageStart.java index 8979159..ec4da61 100644 --- a/src/main/java/net/minecraft/src/StructureVillageStart.java +++ b/src/main/java/net/minecraft/src/StructureVillageStart.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class StructureVillageStart extends StructureStart { @@ -11,7 +11,7 @@ public class StructureVillageStart extends StructureStart public StructureVillageStart() {} - public StructureVillageStart(World par1World, Random par2Random, int par3, int par4, int par5) + public StructureVillageStart(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { super(par3, par4); List var6 = StructureVillagePieces.getStructureVillageWeightedPieceList(par2Random, par5); diff --git a/src/main/java/net/minecraft/src/Teleporter.java b/src/main/java/net/minecraft/src/Teleporter.java index 95391cc..457b08e 100644 --- a/src/main/java/net/minecraft/src/Teleporter.java +++ b/src/main/java/net/minecraft/src/Teleporter.java @@ -3,14 +3,14 @@ package net.minecraft.src; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class Teleporter { private final WorldServer worldServerInstance; /** A private Random() function in Teleporter */ - private final Random random; + private final EaglercraftRandom random; /** Stores successful portal placement locations for rapid lookup. */ private final LongHashMap destinationCoordinateCache = new LongHashMap(); @@ -24,7 +24,7 @@ public class Teleporter public Teleporter(WorldServer par1WorldServer) { this.worldServerInstance = par1WorldServer; - this.random = new Random(par1WorldServer.getSeed()); + this.random = new EaglercraftRandom(par1WorldServer.getSeed()); } /** diff --git a/src/main/java/net/minecraft/src/TileEntityDispenser.java b/src/main/java/net/minecraft/src/TileEntityDispenser.java index 1e92142..0a22444 100644 --- a/src/main/java/net/minecraft/src/TileEntityDispenser.java +++ b/src/main/java/net/minecraft/src/TileEntityDispenser.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class TileEntityDispenser extends TileEntity implements IInventory { @@ -9,7 +9,7 @@ public class TileEntityDispenser extends TileEntity implements IInventory /** * random number generator for instance. Used in random item stack selection. */ - private Random dispenserRandom = new Random(); + private EaglercraftRandom dispenserRandom = new EaglercraftRandom(); protected String customName; /** diff --git a/src/main/java/net/minecraft/src/TileEntityEnchantmentTable.java b/src/main/java/net/minecraft/src/TileEntityEnchantmentTable.java index f83f9ba..344d99b 100644 --- a/src/main/java/net/minecraft/src/TileEntityEnchantmentTable.java +++ b/src/main/java/net/minecraft/src/TileEntityEnchantmentTable.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class TileEntityEnchantmentTable extends TileEntity { @@ -23,7 +23,7 @@ public class TileEntityEnchantmentTable extends TileEntity public float bookRotation2; public float bookRotationPrev; public float bookRotation; - private static Random rand = new Random(); + private static EaglercraftRandom rand = new EaglercraftRandom(); private String field_94136_s; /** diff --git a/src/main/java/net/minecraft/src/WeightedRandom.java b/src/main/java/net/minecraft/src/WeightedRandom.java index 7e4bdc3..a546f69 100644 --- a/src/main/java/net/minecraft/src/WeightedRandom.java +++ b/src/main/java/net/minecraft/src/WeightedRandom.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.Collection; import java.util.Iterator; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WeightedRandom { @@ -25,7 +25,7 @@ public class WeightedRandom /** * Returns a random choice from the input items, with a total weight value. */ - public static WeightedRandomItem getRandomItem(Random par0Random, Collection par1Collection, int par2) + public static WeightedRandomItem getRandomItem(EaglercraftRandom par0Random, Collection par1Collection, int par2) { if (par2 <= 0) { @@ -56,7 +56,7 @@ public class WeightedRandom /** * Returns a random choice from the input items. */ - public static WeightedRandomItem getRandomItem(Random par0Random, Collection par1Collection) + public static WeightedRandomItem getRandomItem(EaglercraftRandom par0Random, Collection par1Collection) { return getRandomItem(par0Random, par1Collection, getTotalWeight(par1Collection)); } @@ -82,7 +82,7 @@ public class WeightedRandom /** * Returns a random choice from the input array of items, with a total weight value. */ - public static WeightedRandomItem getRandomItem(Random par0Random, WeightedRandomItem[] par1ArrayOfWeightedRandomItem, int par2) + public static WeightedRandomItem getRandomItem(EaglercraftRandom par0Random, WeightedRandomItem[] par1ArrayOfWeightedRandomItem, int par2) { if (par2 <= 0) { @@ -112,7 +112,7 @@ public class WeightedRandom /** * Returns a random choice from the input items. */ - public static WeightedRandomItem getRandomItem(Random par0Random, WeightedRandomItem[] par1ArrayOfWeightedRandomItem) + public static WeightedRandomItem getRandomItem(EaglercraftRandom par0Random, WeightedRandomItem[] par1ArrayOfWeightedRandomItem) { return getRandomItem(par0Random, par1ArrayOfWeightedRandomItem, getTotalWeight(par1ArrayOfWeightedRandomItem)); } diff --git a/src/main/java/net/minecraft/src/WeightedRandomChestContent.java b/src/main/java/net/minecraft/src/WeightedRandomChestContent.java index fc9bedc..33be66e 100644 --- a/src/main/java/net/minecraft/src/WeightedRandomChestContent.java +++ b/src/main/java/net/minecraft/src/WeightedRandomChestContent.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WeightedRandomChestContent extends WeightedRandomItem { @@ -32,7 +32,7 @@ public class WeightedRandomChestContent extends WeightedRandomItem /** * Generates the Chest contents. */ - public static void generateChestContents(Random par0Random, WeightedRandomChestContent[] par1ArrayOfWeightedRandomChestContent, IInventory par2IInventory, int par3) + public static void generateChestContents(EaglercraftRandom par0Random, WeightedRandomChestContent[] par1ArrayOfWeightedRandomChestContent, IInventory par2IInventory, int par3) { for (int var4 = 0; var4 < par3; ++var4) { @@ -60,7 +60,7 @@ public class WeightedRandomChestContent extends WeightedRandomItem /** * Generates the Dispenser contents. */ - public static void generateDispenserContents(Random par0Random, WeightedRandomChestContent[] par1ArrayOfWeightedRandomChestContent, TileEntityDispenser par2TileEntityDispenser, int par3) + public static void generateDispenserContents(EaglercraftRandom par0Random, WeightedRandomChestContent[] par1ArrayOfWeightedRandomChestContent, TileEntityDispenser par2TileEntityDispenser, int par3) { for (int var4 = 0; var4 < par3; ++var4) { diff --git a/src/main/java/net/minecraft/src/World.java b/src/main/java/net/minecraft/src/World.java index 280d65a..c362f13 100644 --- a/src/main/java/net/minecraft/src/World.java +++ b/src/main/java/net/minecraft/src/World.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import java.util.Set; import net.minecraft.server.MinecraftServer; @@ -43,7 +43,7 @@ public abstract class World implements IBlockAccess * value of 0x3c6ef35f, producing a highly planar series of values ill-suited for choosing random blocks in a * 16x128x16 field. */ - protected int updateLCG = (new Random()).nextInt(); + protected int updateLCG = (new EaglercraftRandom()).nextInt(); /** * magic number used to generate fast random numbers for 3d distribution within a chunk @@ -64,7 +64,7 @@ public abstract class World implements IBlockAccess public int difficultySetting; /** RNG for World. */ - public Random rand = new Random(); + public EaglercraftRandom rand = new EaglercraftRandom(); /** The WorldProvider instance that World uses. */ public final WorldProvider provider; @@ -4116,7 +4116,7 @@ public abstract class World implements IBlockAccess /** * puts the World Random seed to a specific state dependant on the inputs */ - public Random setRandomSeed(int par1, int par2, int par3) + public EaglercraftRandom setRandomSeed(int par1, int par2, int par3) { long var4 = (long)par1 * 341873128712L + (long)par2 * 132897987541L + this.getWorldInfo().getSeed() + (long)par3; this.rand.setSeed(var4); diff --git a/src/main/java/net/minecraft/src/WorldChunkManager.java b/src/main/java/net/minecraft/src/WorldChunkManager.java index dcee4d5..81d4bf7 100644 --- a/src/main/java/net/minecraft/src/WorldChunkManager.java +++ b/src/main/java/net/minecraft/src/WorldChunkManager.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.ArrayList; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldChunkManager { @@ -219,7 +219,7 @@ public class WorldChunkManager * Finds a valid position within a range, that is in one of the listed biomes. Searches {par1,par2} +-par3 blocks. * Strongly favors positive y positions. */ - public ChunkPosition findBiomePosition(int par1, int par2, int par3, List par4List, Random par5Random) + public ChunkPosition findBiomePosition(int par1, int par2, int par3, List par4List, EaglercraftRandom par5Random) { IntCache.resetIntCache(); int var6 = par1 - par3 >> 2; diff --git a/src/main/java/net/minecraft/src/WorldChunkManagerHell.java b/src/main/java/net/minecraft/src/WorldChunkManagerHell.java index 9e6bd93..7c57e32 100644 --- a/src/main/java/net/minecraft/src/WorldChunkManagerHell.java +++ b/src/main/java/net/minecraft/src/WorldChunkManagerHell.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.Arrays; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldChunkManagerHell extends WorldChunkManager { @@ -98,7 +98,7 @@ public class WorldChunkManagerHell extends WorldChunkManager * Finds a valid position within a range, that is in one of the listed biomes. Searches {par1,par2} +-par3 blocks. * Strongly favors positive y positions. */ - public ChunkPosition findBiomePosition(int par1, int par2, int par3, List par4List, Random par5Random) + public ChunkPosition findBiomePosition(int par1, int par2, int par3, List par4List, EaglercraftRandom par5Random) { return par4List.contains(this.biomeToUse) ? new ChunkPosition(par1 - par3 + par5Random.nextInt(par3 * 2 + 1), 0, par2 - par3 + par5Random.nextInt(par3 * 2 + 1)) : null; } diff --git a/src/main/java/net/minecraft/src/WorldClient.java b/src/main/java/net/minecraft/src/WorldClient.java index bf54269..980c43b 100644 --- a/src/main/java/net/minecraft/src/WorldClient.java +++ b/src/main/java/net/minecraft/src/WorldClient.java @@ -2,7 +2,7 @@ package net.minecraft.src; import java.util.HashSet; import java.util.Iterator; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import java.util.Set; public class WorldClient extends World @@ -314,7 +314,7 @@ public class WorldClient extends World public void doVoidFogParticles(int par1, int par2, int par3) { byte var4 = 16; - Random var5 = new Random(); + EaglercraftRandom var5 = new EaglercraftRandom(); for (int var6 = 0; var6 < 1000; ++var6) { diff --git a/src/main/java/net/minecraft/src/WorldGenBigMushroom.java b/src/main/java/net/minecraft/src/WorldGenBigMushroom.java index 5fc6d02..abf6cbe 100644 --- a/src/main/java/net/minecraft/src/WorldGenBigMushroom.java +++ b/src/main/java/net/minecraft/src/WorldGenBigMushroom.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenBigMushroom extends WorldGenerator { @@ -18,7 +18,7 @@ public class WorldGenBigMushroom extends WorldGenerator super(false); } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { int var6 = par2Random.nextInt(2); diff --git a/src/main/java/net/minecraft/src/WorldGenBigTree.java b/src/main/java/net/minecraft/src/WorldGenBigTree.java index eaadd67..32c578d 100644 --- a/src/main/java/net/minecraft/src/WorldGenBigTree.java +++ b/src/main/java/net/minecraft/src/WorldGenBigTree.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenBigTree extends WorldGenerator { @@ -11,7 +11,7 @@ public class WorldGenBigTree extends WorldGenerator static final byte[] otherCoordPairs = new byte[] {(byte)2, (byte)0, (byte)0, (byte)1, (byte)2, (byte)1}; /** random seed for GenBigTree */ - Random rand = new Random(); + EaglercraftRandom rand = new EaglercraftRandom(); /** Reference to the World object. */ World worldObj; @@ -479,7 +479,7 @@ public class WorldGenBigTree extends WorldGenerator this.leafDensity = par5; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { this.worldObj = par1World; long var6 = par2Random.nextLong(); diff --git a/src/main/java/net/minecraft/src/WorldGenCactus.java b/src/main/java/net/minecraft/src/WorldGenCactus.java index 846bd44..ff4d19e 100644 --- a/src/main/java/net/minecraft/src/WorldGenCactus.java +++ b/src/main/java/net/minecraft/src/WorldGenCactus.java @@ -1,10 +1,10 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenCactus extends WorldGenerator { - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { for (int var6 = 0; var6 < 10; ++var6) { diff --git a/src/main/java/net/minecraft/src/WorldGenClay.java b/src/main/java/net/minecraft/src/WorldGenClay.java index bf7e6fa..9821769 100644 --- a/src/main/java/net/minecraft/src/WorldGenClay.java +++ b/src/main/java/net/minecraft/src/WorldGenClay.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenClay extends WorldGenerator { @@ -16,7 +16,7 @@ public class WorldGenClay extends WorldGenerator this.numberOfBlocks = par1; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { if (par1World.getBlockMaterial(par3, par4, par5) != Material.water) { diff --git a/src/main/java/net/minecraft/src/WorldGenDeadBush.java b/src/main/java/net/minecraft/src/WorldGenDeadBush.java index add53f2..c1b9793 100644 --- a/src/main/java/net/minecraft/src/WorldGenDeadBush.java +++ b/src/main/java/net/minecraft/src/WorldGenDeadBush.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenDeadBush extends WorldGenerator { @@ -12,7 +12,7 @@ public class WorldGenDeadBush extends WorldGenerator this.deadBushID = par1; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { int var11; diff --git a/src/main/java/net/minecraft/src/WorldGenDesertWells.java b/src/main/java/net/minecraft/src/WorldGenDesertWells.java index e0c3c0d..7bddad5 100644 --- a/src/main/java/net/minecraft/src/WorldGenDesertWells.java +++ b/src/main/java/net/minecraft/src/WorldGenDesertWells.java @@ -1,10 +1,10 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenDesertWells extends WorldGenerator { - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { while (par1World.isAirBlock(par3, par4, par5) && par4 > 2) { diff --git a/src/main/java/net/minecraft/src/WorldGenDungeons.java b/src/main/java/net/minecraft/src/WorldGenDungeons.java index a2414c1..f223987 100644 --- a/src/main/java/net/minecraft/src/WorldGenDungeons.java +++ b/src/main/java/net/minecraft/src/WorldGenDungeons.java @@ -1,12 +1,12 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenDungeons extends WorldGenerator { private static final WeightedRandomChestContent[] field_111189_a = new WeightedRandomChestContent[] {new WeightedRandomChestContent(Item.saddle.itemID, 0, 1, 1, 10), new WeightedRandomChestContent(Item.ingotIron.itemID, 0, 1, 4, 10), new WeightedRandomChestContent(Item.bread.itemID, 0, 1, 1, 10), new WeightedRandomChestContent(Item.wheat.itemID, 0, 1, 4, 10), new WeightedRandomChestContent(Item.gunpowder.itemID, 0, 1, 4, 10), new WeightedRandomChestContent(Item.silk.itemID, 0, 1, 4, 10), new WeightedRandomChestContent(Item.bucketEmpty.itemID, 0, 1, 1, 10), new WeightedRandomChestContent(Item.appleGold.itemID, 0, 1, 1, 1), new WeightedRandomChestContent(Item.redstone.itemID, 0, 1, 4, 10), new WeightedRandomChestContent(Item.record13.itemID, 0, 1, 1, 10), new WeightedRandomChestContent(Item.recordCat.itemID, 0, 1, 1, 10), new WeightedRandomChestContent(Item.nameTag.itemID, 0, 1, 1, 10), new WeightedRandomChestContent(Item.horseArmorGold.itemID, 0, 1, 1, 2), new WeightedRandomChestContent(Item.horseArmorIron.itemID, 0, 1, 1, 5), new WeightedRandomChestContent(Item.horseArmorDiamond.itemID, 0, 1, 1, 1)}; - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { byte var6 = 3; int var7 = par2Random.nextInt(2) + 2; @@ -160,7 +160,7 @@ public class WorldGenDungeons extends WorldGenerator /** * Randomly decides which spawner to use in a dungeon */ - private String pickMobSpawner(Random par1Random) + private String pickMobSpawner(EaglercraftRandom par1Random) { int var2 = par1Random.nextInt(4); return var2 == 0 ? "Skeleton" : (var2 == 1 ? "Zombie" : (var2 == 2 ? "Zombie" : (var2 == 3 ? "Spider" : ""))); diff --git a/src/main/java/net/minecraft/src/WorldGenFire.java b/src/main/java/net/minecraft/src/WorldGenFire.java index e113387..f8c111f 100644 --- a/src/main/java/net/minecraft/src/WorldGenFire.java +++ b/src/main/java/net/minecraft/src/WorldGenFire.java @@ -1,10 +1,10 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenFire extends WorldGenerator { - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { for (int var6 = 0; var6 < 64; ++var6) { diff --git a/src/main/java/net/minecraft/src/WorldGenFlowers.java b/src/main/java/net/minecraft/src/WorldGenFlowers.java index d1d9852..bc8b99a 100644 --- a/src/main/java/net/minecraft/src/WorldGenFlowers.java +++ b/src/main/java/net/minecraft/src/WorldGenFlowers.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenFlowers extends WorldGenerator { @@ -12,7 +12,7 @@ public class WorldGenFlowers extends WorldGenerator this.plantBlockId = par1; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { for (int var6 = 0; var6 < 64; ++var6) { diff --git a/src/main/java/net/minecraft/src/WorldGenForest.java b/src/main/java/net/minecraft/src/WorldGenForest.java index bef9cbb..ded0aa4 100644 --- a/src/main/java/net/minecraft/src/WorldGenForest.java +++ b/src/main/java/net/minecraft/src/WorldGenForest.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenForest extends WorldGenerator { @@ -9,7 +9,7 @@ public class WorldGenForest extends WorldGenerator super(par1); } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { int var6 = par2Random.nextInt(3) + 5; boolean var7 = true; diff --git a/src/main/java/net/minecraft/src/WorldGenGlowStone1.java b/src/main/java/net/minecraft/src/WorldGenGlowStone1.java index d18bbb6..a076800 100644 --- a/src/main/java/net/minecraft/src/WorldGenGlowStone1.java +++ b/src/main/java/net/minecraft/src/WorldGenGlowStone1.java @@ -1,10 +1,10 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenGlowStone1 extends WorldGenerator { - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { if (!par1World.isAirBlock(par3, par4, par5)) { diff --git a/src/main/java/net/minecraft/src/WorldGenGlowStone2.java b/src/main/java/net/minecraft/src/WorldGenGlowStone2.java index 9181cb2..ad8e015 100644 --- a/src/main/java/net/minecraft/src/WorldGenGlowStone2.java +++ b/src/main/java/net/minecraft/src/WorldGenGlowStone2.java @@ -1,10 +1,10 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenGlowStone2 extends WorldGenerator { - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { if (!par1World.isAirBlock(par3, par4, par5)) { diff --git a/src/main/java/net/minecraft/src/WorldGenHellLava.java b/src/main/java/net/minecraft/src/WorldGenHellLava.java index ddc7f99..6c153cf 100644 --- a/src/main/java/net/minecraft/src/WorldGenHellLava.java +++ b/src/main/java/net/minecraft/src/WorldGenHellLava.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenHellLava extends WorldGenerator { @@ -14,7 +14,7 @@ public class WorldGenHellLava extends WorldGenerator this.field_94524_b = par2; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { if (par1World.getBlockId(par3, par4 + 1, par5) != Block.netherrack.blockID) { diff --git a/src/main/java/net/minecraft/src/WorldGenHugeTrees.java b/src/main/java/net/minecraft/src/WorldGenHugeTrees.java index 1f06000..8e3ae86 100644 --- a/src/main/java/net/minecraft/src/WorldGenHugeTrees.java +++ b/src/main/java/net/minecraft/src/WorldGenHugeTrees.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenHugeTrees extends WorldGenerator { @@ -21,7 +21,7 @@ public class WorldGenHugeTrees extends WorldGenerator this.leavesMetadata = par4; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { int var6 = par2Random.nextInt(3) + this.baseHeight; boolean var7 = true; @@ -199,7 +199,7 @@ public class WorldGenHugeTrees extends WorldGenerator } } - private void growLeaves(World par1World, int par2, int par3, int par4, int par5, Random par6Random) + private void growLeaves(World par1World, int par2, int par3, int par4, int par5, EaglercraftRandom par6Random) { byte var7 = 2; diff --git a/src/main/java/net/minecraft/src/WorldGenLakes.java b/src/main/java/net/minecraft/src/WorldGenLakes.java index f9018ff..cf6b664 100644 --- a/src/main/java/net/minecraft/src/WorldGenLakes.java +++ b/src/main/java/net/minecraft/src/WorldGenLakes.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenLakes extends WorldGenerator { @@ -11,7 +11,7 @@ public class WorldGenLakes extends WorldGenerator this.blockIndex = par1; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { par3 -= 8; diff --git a/src/main/java/net/minecraft/src/WorldGenLiquids.java b/src/main/java/net/minecraft/src/WorldGenLiquids.java index d269159..7995ff6 100644 --- a/src/main/java/net/minecraft/src/WorldGenLiquids.java +++ b/src/main/java/net/minecraft/src/WorldGenLiquids.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenLiquids extends WorldGenerator { @@ -12,7 +12,7 @@ public class WorldGenLiquids extends WorldGenerator this.liquidBlockId = par1; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { if (par1World.getBlockId(par3, par4 + 1, par5) != Block.stone.blockID) { diff --git a/src/main/java/net/minecraft/src/WorldGenMinable.java b/src/main/java/net/minecraft/src/WorldGenMinable.java index 6a995b2..bfe2914 100644 --- a/src/main/java/net/minecraft/src/WorldGenMinable.java +++ b/src/main/java/net/minecraft/src/WorldGenMinable.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenMinable extends WorldGenerator { @@ -25,7 +25,7 @@ public class WorldGenMinable extends WorldGenerator this.blockToReplace = par3; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { float var6 = par2Random.nextFloat() * (float)Math.PI; double var7 = (double)((float)(par3 + 8) + MathHelper.sin(var6) * (float)this.numberOfBlocks / 8.0F); diff --git a/src/main/java/net/minecraft/src/WorldGenPumpkin.java b/src/main/java/net/minecraft/src/WorldGenPumpkin.java index d478b3f..0f6327f 100644 --- a/src/main/java/net/minecraft/src/WorldGenPumpkin.java +++ b/src/main/java/net/minecraft/src/WorldGenPumpkin.java @@ -1,10 +1,10 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenPumpkin extends WorldGenerator { - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { for (int var6 = 0; var6 < 64; ++var6) { diff --git a/src/main/java/net/minecraft/src/WorldGenReed.java b/src/main/java/net/minecraft/src/WorldGenReed.java index d0fe024..d1f2cc4 100644 --- a/src/main/java/net/minecraft/src/WorldGenReed.java +++ b/src/main/java/net/minecraft/src/WorldGenReed.java @@ -1,10 +1,10 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenReed extends WorldGenerator { - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { for (int var6 = 0; var6 < 20; ++var6) { diff --git a/src/main/java/net/minecraft/src/WorldGenSand.java b/src/main/java/net/minecraft/src/WorldGenSand.java index 0bb9acc..2a9947d 100644 --- a/src/main/java/net/minecraft/src/WorldGenSand.java +++ b/src/main/java/net/minecraft/src/WorldGenSand.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenSand extends WorldGenerator { @@ -16,7 +16,7 @@ public class WorldGenSand extends WorldGenerator this.radius = par1; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { if (par1World.getBlockMaterial(par3, par4, par5) != Material.water) { diff --git a/src/main/java/net/minecraft/src/WorldGenShrub.java b/src/main/java/net/minecraft/src/WorldGenShrub.java index bff8473..7b65b95 100644 --- a/src/main/java/net/minecraft/src/WorldGenShrub.java +++ b/src/main/java/net/minecraft/src/WorldGenShrub.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenShrub extends WorldGenerator { @@ -13,7 +13,7 @@ public class WorldGenShrub extends WorldGenerator this.field_76527_a = par2; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { int var15; diff --git a/src/main/java/net/minecraft/src/WorldGenSpikes.java b/src/main/java/net/minecraft/src/WorldGenSpikes.java index 31b9eaf..818d236 100644 --- a/src/main/java/net/minecraft/src/WorldGenSpikes.java +++ b/src/main/java/net/minecraft/src/WorldGenSpikes.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenSpikes extends WorldGenerator { @@ -14,7 +14,7 @@ public class WorldGenSpikes extends WorldGenerator this.replaceID = par1; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { if (par1World.isAirBlock(par3, par4, par5) && par1World.getBlockId(par3, par4 - 1, par5) == this.replaceID) { diff --git a/src/main/java/net/minecraft/src/WorldGenSwamp.java b/src/main/java/net/minecraft/src/WorldGenSwamp.java index b8e7b25..b821b5f 100644 --- a/src/main/java/net/minecraft/src/WorldGenSwamp.java +++ b/src/main/java/net/minecraft/src/WorldGenSwamp.java @@ -1,10 +1,10 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenSwamp extends WorldGenerator { - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { int var6; diff --git a/src/main/java/net/minecraft/src/WorldGenTaiga1.java b/src/main/java/net/minecraft/src/WorldGenTaiga1.java index 63406ef..318bbf4 100644 --- a/src/main/java/net/minecraft/src/WorldGenTaiga1.java +++ b/src/main/java/net/minecraft/src/WorldGenTaiga1.java @@ -1,10 +1,10 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenTaiga1 extends WorldGenerator { - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { int var6 = par2Random.nextInt(5) + 7; int var7 = var6 - par2Random.nextInt(2) - 3; diff --git a/src/main/java/net/minecraft/src/WorldGenTaiga2.java b/src/main/java/net/minecraft/src/WorldGenTaiga2.java index 527392f..05d728f 100644 --- a/src/main/java/net/minecraft/src/WorldGenTaiga2.java +++ b/src/main/java/net/minecraft/src/WorldGenTaiga2.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenTaiga2 extends WorldGenerator { @@ -9,7 +9,7 @@ public class WorldGenTaiga2 extends WorldGenerator super(par1); } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { int var6 = par2Random.nextInt(4) + 6; int var7 = 1 + par2Random.nextInt(2); diff --git a/src/main/java/net/minecraft/src/WorldGenTallGrass.java b/src/main/java/net/minecraft/src/WorldGenTallGrass.java index 2a10a33..885065b 100644 --- a/src/main/java/net/minecraft/src/WorldGenTallGrass.java +++ b/src/main/java/net/minecraft/src/WorldGenTallGrass.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenTallGrass extends WorldGenerator { @@ -14,7 +14,7 @@ public class WorldGenTallGrass extends WorldGenerator this.tallGrassMetadata = par2; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { int var11; diff --git a/src/main/java/net/minecraft/src/WorldGenTrees.java b/src/main/java/net/minecraft/src/WorldGenTrees.java index 1fdae6e..806b1ee 100644 --- a/src/main/java/net/minecraft/src/WorldGenTrees.java +++ b/src/main/java/net/minecraft/src/WorldGenTrees.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenTrees extends WorldGenerator { @@ -30,7 +30,7 @@ public class WorldGenTrees extends WorldGenerator this.vinesGrow = par5; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { int var6 = par2Random.nextInt(3) + this.minTreeHeight; boolean var7 = true; diff --git a/src/main/java/net/minecraft/src/WorldGenVines.java b/src/main/java/net/minecraft/src/WorldGenVines.java index 48f0773..205afcc 100644 --- a/src/main/java/net/minecraft/src/WorldGenVines.java +++ b/src/main/java/net/minecraft/src/WorldGenVines.java @@ -1,10 +1,10 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenVines extends WorldGenerator { - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { int var6 = par3; diff --git a/src/main/java/net/minecraft/src/WorldGenWaterlily.java b/src/main/java/net/minecraft/src/WorldGenWaterlily.java index 2e6a61a..a4ad53d 100644 --- a/src/main/java/net/minecraft/src/WorldGenWaterlily.java +++ b/src/main/java/net/minecraft/src/WorldGenWaterlily.java @@ -1,10 +1,10 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGenWaterlily extends WorldGenerator { - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { for (int var6 = 0; var6 < 10; ++var6) { diff --git a/src/main/java/net/minecraft/src/WorldGenerator.java b/src/main/java/net/minecraft/src/WorldGenerator.java index 6f9973c..d3e9cba 100644 --- a/src/main/java/net/minecraft/src/WorldGenerator.java +++ b/src/main/java/net/minecraft/src/WorldGenerator.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public abstract class WorldGenerator { @@ -20,7 +20,7 @@ public abstract class WorldGenerator this.doBlockNotify = par1; } - public abstract boolean generate(World var1, Random var2, int var3, int var4, int var5); + public abstract boolean generate(World var1, EaglercraftRandom var2, int var3, int var4, int var5); /** * Rescales the generator settings, only used in WorldGenBigTree diff --git a/src/main/java/net/minecraft/src/WorldGeneratorBonusChest.java b/src/main/java/net/minecraft/src/WorldGeneratorBonusChest.java index d2cd226..0a87f44 100644 --- a/src/main/java/net/minecraft/src/WorldGeneratorBonusChest.java +++ b/src/main/java/net/minecraft/src/WorldGeneratorBonusChest.java @@ -1,6 +1,6 @@ package net.minecraft.src; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; public class WorldGeneratorBonusChest extends WorldGenerator { @@ -20,7 +20,7 @@ public class WorldGeneratorBonusChest extends WorldGenerator this.itemsToGenerateInBonusChest = par2; } - public boolean generate(World par1World, Random par2Random, int par3, int par4, int par5) + public boolean generate(World par1World, EaglercraftRandom par2Random, int par3, int par4, int par5) { int var12; diff --git a/src/main/java/net/minecraft/src/WorldServer.java b/src/main/java/net/minecraft/src/WorldServer.java index 5cdfed1..31ebfdb 100644 --- a/src/main/java/net/minecraft/src/WorldServer.java +++ b/src/main/java/net/minecraft/src/WorldServer.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.List; -import java.util.Random; +import net.lax1dude.eaglercraft.EaglercraftRandom; import java.util.Set; import java.util.TreeSet; import net.minecraft.server.MinecraftServer; @@ -710,7 +710,7 @@ public class WorldServer extends World this.findingSpawnPoint = true; WorldChunkManager var2 = this.provider.worldChunkMgr; List var3 = var2.getBiomesToSpawnIn(); - Random var4 = new Random(this.getSeed()); + EaglercraftRandom var4 = new EaglercraftRandom(this.getSeed()); ChunkPosition var5 = var2.findBiomePosition(0, 0, 256, var3, var4); int var6 = 0; int var7 = this.provider.getAverageGroundLevel();