diff --git a/README.md b/README.md index 8147afb..3f180bb 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ ### Play Minecraft 1.8 in your browser, supports singleplayer and multiplayer -![EaglercraftX 1.8 Screenshot Main Menu](https://media.discordapp.net/attachments/1042594789943689327/1205041865678786581/eagler-1.8-u22-titlescreen-480p.png) +![EaglercraftX 1.8 Screenshot Main Menu](https://deev.is/eagler/cors/eagler-1.8-u22-titlescreen-480p.png) ### This repository contains: diff --git a/buildtools/BuildTools.jar b/buildtools/BuildTools.jar index 6de57ba..3661329 100644 Binary files a/buildtools/BuildTools.jar and b/buildtools/BuildTools.jar differ diff --git a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java index 11bcd0c..2be8b16 100644 --- a/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java +++ b/buildtools/src/main/java/net/lax1dude/eaglercraft/v1_8/buildtools/task/init/DecompileMinecraft.java @@ -182,9 +182,6 @@ public class DecompileMinecraft { ZipEntry z2 = new ZipEntry(nm); jarOut.putNextEntry(z2); IOUtils.write(txt, jarOut, "UTF-8"); - z2 = new ZipEntry("net/lax1dude/eaglercraft/v1_8/sp/server/classes/" + nm); - jarOut.putNextEntry(z2); - ApplyPatchesToZip.writeIntegratedServerClass(nm.substring(0, nm.length() - 5), txt, jarOut); ++xt; if(xt % 75 == 74) { System.out.print("."); diff --git a/client_version b/client_version index 73527d2..0ecd536 100644 --- a/client_version +++ b/client_version @@ -1 +1 @@ -u22 \ No newline at end of file +u23 \ No newline at end of file diff --git a/patches/minecraft/delete.txt b/patches/minecraft/delete.txt index 578972c..fe8e690 100644 --- a/patches/minecraft/delete.txt +++ b/patches/minecraft/delete.txt @@ -1,998 +1,144 @@ -# 997 files to delete: -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntitySuspendFX.java -net/minecraft/world/gen/layer/GenLayerHills.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/MusicTicker.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/WorldRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiScreenWorking.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/stream/ChatController.java +# 143 files to delete: +net/minecraft/client/renderer/VertexBufferUploader.java net/minecraft/realms/DisconnectedRealmsScreen.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/SoundList.java -net/minecraft/world/storage/SaveFormatOld.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerEnderDragonEyes.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/PackMetadataSectionSerializer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/util/JsonBlendingMode.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/status/INetHandlerStatusClient.java -net/minecraft/entity/ai/EntityMoveHelper.java -net/minecraft/village/Village.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/ItemMeshDefinition.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiStreamIndicator.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/EntityRenderer.java -net/minecraft/entity/ai/EntityAITradePlayer.java +net/minecraft/client/stream/Metadata.java net/minecraft/network/NetworkManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/DisconnectedRealmsScreen.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsVertexFormat.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsScrolledSelectionList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/IProgressMeter.java -net/minecraft/world/gen/MapGenCaves.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/FoliageColorReloadListener.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/inventory/GuiContainerCreative.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RendererLivingEntity.java net/minecraft/realms/RealmsServerPing.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiShareToLan.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/ChatLine.java net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java -net/minecraft/entity/ai/EntityAIVillagerMate.java +net/minecraft/server/network/NetHandlerStatusServer.java net/minecraft/client/gui/ServerListEntryLanScan.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/player/inventory/LocalBlockIntercommunication.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/multiplayer/ServerData.java -net/minecraft/entity/ai/EntityAIBase.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/AbstractResourcePack.java -net/minecraft/world/gen/feature/WorldGenDungeons.java net/minecraft/command/server/CommandListBans.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MinecraftError.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/PositionTextureVertex.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerWitherAura.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/model/BlockFaceUV.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/model/BreakingFour.java -net/minecraft/entity/ai/EntityAIMoveThroughVillage.java +net/minecraft/realms/RealmsServerStatusPinger.java net/minecraft/client/renderer/GlStateManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandDebug.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/chunk/VboChunkFactory.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelPig.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiCreateWorld.java -net/minecraft/world/gen/feature/WorldGenTaiga1.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderWolf.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/network/NetHandlerHandshakeTCP.java +net/minecraft/command/server/CommandSaveAll.java net/minecraft/realms/RealmsVertexFormat.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiOptionSlider.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/spectator/ISpectatorMenuObject.java +net/minecraft/network/NettyCompressionDecoder.java net/minecraft/profiler/PlayerUsageSnooper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/spectator/categories/TeleportToTeam.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/network/NetHandlerStatusServer.java -net/minecraft/entity/ai/EntityAIHarvestFarmland.java net/minecraft/command/server/CommandPublishLocalServer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntitySplashFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/inventory/GuiInventory.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/inventory/GuiEditSign.java net/minecraft/command/CommandDebug.java -net/minecraft/world/gen/feature/WorldGenReed.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerSlimeGel.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelSilverfish.java -net/minecraft/command/CommandGive.java -net/minecraft/command/CommandGameRule.java -net/minecraft/world/gen/feature/WorldGenDesertWells.java +net/minecraft/client/renderer/chunk/VboChunkFactory.java net/minecraft/server/management/PreYggdrasilConverter.java net/minecraft/network/PacketThreadUtil.java net/minecraft/realms/RealmsClickableScrolledSelectionList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/TextureCompass.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderMagmaCube.java -net/minecraft/entity/ai/EntityAIWander.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiButtonRealmsProxy.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderXPOrb.java -net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/AbstractTexture.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/ResourcePackListEntryFound.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiScreenDemo.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerArrow.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelArmorStand.java -net/minecraft/command/CommandSpreadPlayers.java -net/minecraft/world/gen/structure/StructureNetherBridgePieces.java -net/minecraft/command/CommandWeather.java -net/minecraft/world/gen/feature/WorldGenTallGrass.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerCustomHead.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityDiggingFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityHeartFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/ItemModelMesher.java -net/minecraft/world/gen/feature/WorldGenSand.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/RenderEnderCrystal.java -net/minecraft/entity/ai/EntityAIOcelotSit.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/ResourcePackFileNotFoundException.java -net/minecraft/world/gen/structure/MapGenStructureData.java -net/minecraft/client/renderer/ThreadDownloadImageData.java -net/minecraft/util/ThreadSafeBoundList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiOptionButton.java -net/minecraft/world/gen/structure/MapGenVillage.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerSaddle.java -net/minecraft/command/CommandBase.java -net/minecraft/world/gen/ChunkProviderEnd.java -net/minecraft/command/server/CommandOp.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/ActiveRenderInfo.java -net/minecraft/world/gen/structure/MapGenMineshaft.java -net/minecraft/world/gen/structure/StructureBoundingBox.java -net/minecraft/world/biome/WorldChunkManagerHell.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTTagLong.java -net/minecraft/command/server/CommandSaveOn.java -net/minecraft/client/gui/stream/GuiIngestServers.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/spectator/categories/SpectatorDetails.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/model/WeightedBakedModel.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/JsonToNBT.java -net/minecraft/entity/ai/EntityAIPanic.java -net/minecraft/world/gen/structure/StructureMineshaftStart.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/stream/GuiIngestServers.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerCreeperCharge.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderEnderman.java -net/minecraft/command/server/CommandBanIp.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/PositionedSound.java -net/minecraft/world/gen/layer/IntCache.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelMinecart.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/network/NetHandlerPlayClient.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/IReloadableResourceManager.java -net/minecraft/world/gen/feature/WorldGenMelon.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/MobAppearance.java -net/minecraft/util/MessageSerializer2.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/model/BuiltInModel.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntityBannerRenderer.java -net/minecraft/network/NettyEncryptingDecoder.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/chunk/ChunkCompileTaskGenerator.java -net/minecraft/command/CommandReplaceItem.java -net/minecraft/entity/ai/EntityAIDoorInteract.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/ThreadedFileIOBase.java -net/minecraft/server/integrated/IntegratedPlayerList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelHorse.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerMooshroomMushroom.java -net/minecraft/command/CommandTime.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/LanguageMetadataSectionSerializer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelBanner.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/MovingSound.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiPlayerTabOverlay.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityCrit2FX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntitySmokeFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelRabbit.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityLavaFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/util/JsonException.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/PreYggdrasilConverter.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/achievement/GuiStats.java -net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/NettyCompressionEncoder.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/BlockFluidRenderer.java -net/minecraft/world/chunk/storage/IChunkLoader.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/ScreenChatOptions.java -net/minecraft/command/CommandXP.java -net/minecraft/client/stream/NullStream.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/Render.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiIngameMenu.java -net/minecraft/entity/ai/EntityAIMoveTowardsTarget.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/shader/ShaderGroup.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/model/ItemModelGenerator.java -net/minecraft/entity/ai/EntityAIFindEntityNearest.java -net/minecraft/world/storage/SaveHandler.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntityPistonRenderer.java -net/minecraft/world/pathfinder/NodeProcessor.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/FontRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiSnooper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/ServerListEntryLanScan.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderSkeleton.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiChat.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/SoundEventAccessorComposite.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/shader/ShaderDefault.java -net/minecraft/entity/EntityTrackerEntry.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTTagInt.java -net/minecraft/entity/ai/EntityAIBeg.java -net/minecraft/server/network/NetHandlerLoginServer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelEnderman.java -net/minecraft/command/CommandPlaySound.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/chunk/VisGraph.java -net/minecraft/world/gen/feature/WorldGenSwamp.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/NettyEncryptingDecoder.java -net/minecraft/world/biome/BiomeCache.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsClickableScrolledSelectionList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsBridge.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/WorldVertexBufferUploader.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/crash/CrashReportCategory.java -net/minecraft/entity/ai/EntityAIFollowGolem.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandDeOp.java -net/minecraft/entity/ai/EntitySenses.java -net/minecraft/entity/ai/EntityAIFollowOwner.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/shader/Framebuffer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerSheepWool.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderPigZombie.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsSliderButton.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelEnderMite.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelZombieVillager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/network/NetworkPlayerInfo.java -net/minecraft/world/gen/ChunkProviderDebug.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/ResourceIndex.java -net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.java -net/minecraft/world/gen/feature/WorldGenDeadBush.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsDefaultVertexFormat.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/SoundCategory.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/achievement/GuiAchievement.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiLanguage.java -net/minecraft/client/gui/GuiScreenDemo.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTTagByteArray.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/shader/ShaderUniform.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/model/ModelBakery.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/OpenGlHelper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderCreeper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/chunk/CompiledChunk.java -net/minecraft/command/server/CommandSetBlock.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/statemap/BlockStateMapper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/ThreadDownloadImageData.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/SoundListSerializer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiVideoSettings.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/BaseMetadataSectionSerializer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/entity/EntityPlayerSP.java -net/minecraft/world/gen/feature/WorldGenFlowers.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/inventory/GuiChest.java -net/minecraft/world/WorldManager.java -net/minecraft/client/gui/GuiScreenRealmsProxy.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/status/client/C01PacketPing.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiNewChat.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderChicken.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/multiplayer/ThreadLanServerPing.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderPotion.java -net/minecraft/entity/ai/EntityAIWatchClosest2.java -net/minecraft/world/pathfinder/SwimNodeProcessor.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntitySkullRenderer.java -net/minecraft/entity/ai/EntityAILeapAtTarget.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/culling/ClippingHelper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiGameOver.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/TexturedQuad.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelSheep1.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/multiplayer/ServerAddress.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/GrassColorReloadListener.java -net/minecraft/entity/ai/EntityAIWatchClosest.java -net/minecraft/util/JsonUtils.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderLeashKnot.java -net/minecraft/client/shader/ShaderGroup.java -net/minecraft/server/management/UserListWhitelist.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/IResourceManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelWither.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiSpectator.java -net/minecraft/client/shader/ShaderLoader.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/GLAllocation.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/storage/RegionFileCache.java -net/minecraft/command/CommandSetSpawnpoint.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntityEndPortalRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/Locale.java -net/minecraft/entity/ai/EntityAIOpenDoor.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/statemap/StateMap.java -net/minecraft/world/gen/feature/WorldGenSavannaTree.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiListButton.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/GlStateManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/ServerListEntryNormal.java -net/minecraft/world/biome/BiomeEndDecorator.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiMemoryErrorScreen.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiResourcePackList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelWolf.java -net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderGiantZombie.java -net/minecraft/realms/RealmsDefaultVertexFormat.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelMagmaCube.java -net/minecraft/world/gen/feature/WorldGenSpikes.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/IThreadedFileIO.java -net/minecraft/world/gen/layer/GenLayerBiome.java -net/minecraft/client/resources/FileResourcePack.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/DestroyBlockProgress.java -net/minecraft/network/ThreadQuickExitException.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityReddustFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelDragon.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/network/NetHandlerLoginClient.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/SoundManager.java -net/minecraft/entity/ai/EntityAISwimming.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiIngame.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/ITickableSound.java -net/minecraft/client/renderer/OpenGlHelper.java -net/minecraft/server/management/PlayerManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/culling/Frustum.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiScreenResourcePacks.java -net/minecraft/command/CommandHandler.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelSkeletonHead.java -net/minecraft/world/demo/DemoWorldManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderFallingBlock.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/multiplayer/WorldClient.java -net/minecraft/entity/ai/EntityAIControlledByPlayer.java -net/minecraft/client/gui/stream/GuiStreamUnavailable.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerEndermanEyes.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/main/Main.java -net/minecraft/command/CommandClone.java -net/minecraft/world/chunk/storage/RegionFile.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/PackMetadataSection.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/model/BlockPartRotation.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/chunk/ListedRenderChunk.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/BlockRendererDispatcher.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/network/OldServerPinger.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityBubbleFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/ResourcePackListEntry.java -net/minecraft/util/EnumTypeAdapterFactory.java -net/minecraft/client/gui/stream/GuiStreamOptions.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiLockIconButton.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerHeldBlock.java -net/minecraft/command/ICommandManager.java -net/minecraft/village/VillageCollection.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderSnowMan.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandPardonPlayer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityLargeExplodeFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityAuraFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiMainMenu.java -net/minecraft/client/network/NetHandlerLoginClient.java -net/minecraft/command/CommandDefaultGameMode.java -net/minecraft/world/gen/layer/GenLayerAddIsland.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/shader/Shader.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/SoundEventAccessor.java -net/minecraft/realms/RealmsScreen.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityPortalFX.java -net/minecraft/world/gen/structure/StructureVillagePieces.java -net/minecraft/world/gen/feature/WorldGenIceSpike.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerArmorBase.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsSimpleScrolledSelectionList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/RenderHelper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/ClientBrandRetriever.java -net/minecraft/client/gui/GuiShareToLan.java -net/minecraft/command/NumberInvalidException.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandPardonIp.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiSlot.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/status/server/S01PacketPong.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandListBans.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityNoteFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityEnchantmentTableParticleFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntitySignRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/FolderResourcePack.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTTagShort.java -net/minecraft/command/CommandSetPlayerTimeout.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiKeyBindingList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/SimpleResource.java -net/minecraft/realms/RealmsLevelSummary.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/inventory/GuiContainer.java -net/minecraft/realms/RealmsServerAddress.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/IPBanEntry.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/IMetadataSerializer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ScreenShotHelper.java -net/minecraft/pathfinding/PathNavigate.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/model/ModelBlockDefinition.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelEnderCrystal.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/UserListBans.java -net/minecraft/client/renderer/vertex/VertexBuffer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MessageDeserializer.java -net/minecraft/world/WorldServer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiErrorScreen.java -net/minecraft/network/rcon/RConConsoleSource.java -net/minecraft/world/chunk/storage/AnvilSaveHandler.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/status/server/S00PacketServerInfo.java -net/minecraft/entity/ai/EntityAIFleeSun.java -net/minecraft/world/gen/feature/WorldGenTrees.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/settings/GameSettings.java -net/minecraft/realms/RealmsVertexFormatElement.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/FontMetadataSection.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/shader/ShaderManager.java -net/minecraft/network/NettyCompressionEncoder.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/DefaultPlayerSkin.java -net/minecraft/world/gen/feature/WorldGenClay.java -net/minecraft/client/renderer/VboRenderList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiHopper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/ServerStatusResponse.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/LayeredColorMaskTexture.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandSaveAll.java -net/minecraft/command/CommandShowSeed.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/stream/BroadcastController.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiScreenBook.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiFlatPresets.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/spectator/SpectatorMenu.java -net/minecraft/command/CommandEntityData.java -net/minecraft/client/stream/TwitchStream.java -net/minecraft/client/shader/ShaderDefault.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntityEnderChestRenderer.java -net/minecraft/command/server/CommandAchievement.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiLabel.java -net/minecraft/world/SpawnerAnimals.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderPlayer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/inventory/GuiDispenser.java -net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiButtonLanguage.java -net/minecraft/world/gen/structure/MapGenStructureIO.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/UserListWhitelistEntry.java -net/minecraft/command/CommandGameMode.java -net/minecraft/server/management/BanEntry.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntityChestRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderBat.java -net/minecraft/client/gui/GuiSlotRealmsProxy.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderWitch.java -net/minecraft/entity/ai/EntityAIPlay.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderVillager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/entity/AbstractClientPlayer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/AnimationMetadataSection.java -net/minecraft/command/server/CommandPardonIp.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/settings/KeyBinding.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/FontMetadataSectionSerializer.java -net/minecraft/server/management/BanList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderMinecart.java -net/minecraft/entity/ai/EntityAINearestAttackableTarget.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/culling/ICamera.java -net/minecraft/server/management/IPBanEntry.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/spectator/BaseSpectatorGroup.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/UserListBansEntry.java -net/minecraft/entity/ai/EntityAITempt.java -net/minecraft/world/gen/layer/GenLayerIsland.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerDeadmau5Head.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityPickupFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/model/BlockPart.java -net/minecraft/command/server/CommandBroadcast.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/crash/CrashReport.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerIronGolemFlower.java -net/minecraft/server/management/UserListOps.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelWitch.java -net/minecraft/world/gen/structure/StructureMineshaftPieces.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/chunk/SetVisibility.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/SimpleReloadableResourceManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/JsonUtils.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTTagDouble.java -net/minecraft/entity/ai/EntityAISit.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiListExtended.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTTagEnd.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/IResourcePack.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/LanguageMetadataSection.java -net/minecraft/realms/Realms.java -net/minecraft/world/chunk/storage/AnvilSaveConverter.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderWither.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/DynamicTexture.java -net/minecraft/client/gui/GuiButtonRealmsProxy.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderMinecartMobSpawner.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelSlime.java -net/minecraft/client/network/OldServerPinger.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/spectator/ISpectatorMenuView.java -net/minecraft/world/gen/ChunkProviderHell.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiResourcePackSelected.java -net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java -net/minecraft/command/CommandResultStats.java -net/minecraft/entity/ai/EntityAIRestrictOpenDoor.java -net/minecraft/entity/ai/EntityLookHelper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTTagList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiTextField.java -net/minecraft/client/gui/stream/GuiTwitchUserMode.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerSpiderEyes.java -net/minecraft/realms/RealmsScrolledSelectionList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelBoat.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityFlameFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/TextureManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerCape.java -net/minecraft/command/server/CommandStop.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/Language.java -net/minecraft/world/gen/layer/GenLayerSmooth.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntityEnchantmentTableRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/stream/MetadataCombat.java -net/minecraft/entity/ai/EntityAIHurtByTarget.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/ITickable.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/I18n.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/multiplayer/ServerList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/multiplayer/PlayerControllerMP.java -net/minecraft/world/gen/feature/WorldGeneratorBonusChest.java -net/minecraft/world/Teleporter.java -net/minecraft/world/gen/layer/GenLayerRiver.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/NetworkManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTSizeTracker.java -net/minecraft/server/management/UserList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/ThreadQuickExitException.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderSheep.java -net/minecraft/world/gen/structure/StructureOceanMonumentPieces.java -net/minecraft/command/CommandTitle.java -net/minecraft/world/gen/MapGenCavesHell.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/TextureAtlasSprite.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelSign.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsLevelSummary.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerHeldItemWitch.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/PingResponseHandler.java -net/minecraft/command/SyntaxErrorException.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderSlime.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiDownloadTerrain.java -net/minecraft/entity/EntityTracker.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/UserListOpsEntry.java -net/minecraft/client/stream/MetadataCombat.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/InventoryEffectRenderer.java -net/minecraft/util/MessageDeserializer.java -net/minecraft/pathfinding/PathNavigateGround.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/integrated/IntegratedServer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelChicken.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandSaveOff.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerVillagerArmor.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiRenameWorld.java -net/minecraft/realms/RealmsBufferBuilder.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerWolfCollar.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderFish.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/culling/ClippingHelperImpl.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/PositionedSoundRecord.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/ViewFrustum.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiScreenCustomizePresets.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelChest.java -net/minecraft/world/gen/MapGenBase.java -net/minecraft/client/renderer/VertexBufferUploader.java -net/minecraft/command/CommandWorldBorder.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/NettyEncryptingEncoder.java -net/minecraft/command/IAdminCommand.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntitySpellParticleFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/CompressedStreamTools.java -net/minecraft/world/gen/layer/GenLayerVoronoiZoom.java -net/minecraft/entity/ai/EntityAITargetNonTamed.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/achievement/GuiAchievements.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiScreenServerList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/Stitcher.java -net/minecraft/entity/ai/EntityAIOcelotAttack.java -net/minecraft/client/stream/Metadata.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/SaveHandlerMP.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/IResource.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelSquid.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumTypeAdapterFactory.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsServerPing.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/stream/GuiTwitchUserMode.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MouseFilter.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiControls.java -net/minecraft/village/VillageSiege.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiCustomizeSkin.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/TextureOffset.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/TextureMap.java -net/minecraft/command/CommandTrigger.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderPainting.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/NettyCompressionDecoder.java -net/minecraft/world/gen/feature/WorldGenIcePath.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/model/FaceBakery.java -net/minecraft/world/storage/DerivedWorldInfo.java -net/minecraft/server/network/NetHandlerStatusServer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/EnumFaceDirection.java -net/minecraft/realms/RealmsServerStatusPinger.java -net/minecraft/command/CommandExecuteAt.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTTagCompound.java -net/minecraft/network/NetHandlerPlayServer.java -net/minecraft/world/gen/feature/WorldGenWaterlily.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/BlockModelRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelSheep2.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/model/BlockPartFace.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/LayeredTexture.java -net/minecraft/entity/ai/EntityAICreeperSwell.java -net/minecraft/command/server/CommandSaveAll.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelGuardian.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/Tessellator.java -net/minecraft/network/NettyCompressionDecoder.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/vertex/VertexFormat.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelQuadruped.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/IMetadataSectionSerializer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/rcon/RConConsoleSource.java -net/minecraft/client/renderer/chunk/VboChunkFactory.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiRepair.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/status/INetHandlerStatusServer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/storage/AnvilSaveConverter.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/RegionRenderCache.java -net/minecraft/world/gen/feature/WorldGenGlowStone1.java -net/minecraft/pathfinding/PathFinder.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiSelectWorld.java net/minecraft/client/shader/ShaderManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiUtilRenderComponents.java net/minecraft/server/management/UserListBans.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsServerStatusPinger.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/BanList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiResourcePackAvailable.java net/minecraft/server/integrated/IntegratedServerCommandManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderCow.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/integrated/IntegratedServerCommandManager.java +net/minecraft/network/status/client/C01PacketPing.java net/minecraft/realms/RealmsMth.java -net/minecraft/world/gen/structure/MapGenStronghold.java net/minecraft/realms/RealmsConnect.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelBat.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/stream/IStream.java net/minecraft/client/stream/BroadcastController.java net/minecraft/client/stream/IngestServerTester.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntitySnowShovelFX.java net/minecraft/command/server/CommandDeOp.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandPublishLocalServer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/Timer.java -net/minecraft/command/ServerCommandManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/profiler/IPlayerUsage.java +net/minecraft/client/renderer/ThreadDownloadImageData.java +net/minecraft/util/ThreadSafeBoundList.java net/minecraft/client/shader/ShaderLinkHelper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityBreakingFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/VertexBufferUploader.java net/minecraft/client/gui/ServerListEntryLanDetected.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/UserListWhitelist.java -net/minecraft/world/biome/WorldChunkManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/stream/GuiStreamUnavailable.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/spectator/PlayerMenuObject.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/Realms.java -net/minecraft/entity/ai/EntityAIAttackOnCollide.java -net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderDragon.java +net/minecraft/command/server/CommandOp.java net/minecraft/world/chunk/storage/RegionFileCache.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/RenderWitherSkull.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/UserListEntry.java -net/minecraft/world/gen/feature/WorldGenVines.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsButton.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/RegionRenderCacheBuilder.java +net/minecraft/network/status/client/C00PacketServerQuery.java +net/minecraft/command/server/CommandSaveOn.java +net/minecraft/client/gui/stream/GuiIngestServers.java net/minecraft/client/network/NetHandlerHandshakeMemory.java -net/minecraft/server/MinecraftServer.java -net/minecraft/stats/StatisticsFile.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/BlockModelShapes.java -net/minecraft/world/gen/feature/WorldGenHellLava.java -net/minecraft/world/gen/layer/GenLayerFuzzyZoom.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/model/BakedQuad.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiSlider.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EffectRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/Barrier.java -net/minecraft/command/server/CommandEmote.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderArrow.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsVertexFormatElement.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/IParticleFactory.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java -net/minecraft/world/gen/feature/WorldGenCactus.java -net/minecraft/command/WrongUsageException.java -net/minecraft/entity/ai/EntityAITarget.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/model/IBakedModel.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelBook.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/ITickableTextureObject.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderEndermite.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/vertex/VertexBuffer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsMth.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiYesNoCallback.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/network/LanServerDetector.java +net/minecraft/command/server/CommandBanIp.java +net/minecraft/util/MessageSerializer2.java +net/minecraft/network/NettyEncryptingDecoder.java +net/minecraft/server/integrated/IntegratedPlayerList.java net/minecraft/client/renderer/WorldVertexBufferUploader.java -net/minecraft/world/gen/ChunkProviderServer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/ResourcePackListEntryDefault.java -net/minecraft/entity/ai/EntityJumpHelper.java net/minecraft/network/PingResponseHandler.java -net/minecraft/entity/ai/EntityAIMate.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityParticleEmitter.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/storage/AnvilSaveHandler.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/player/inventory/ContainerLocalMenu.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/SoundHandler.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/TextureClock.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandBanIp.java -net/minecraft/world/gen/ChunkProviderFlat.java -net/minecraft/world/gen/layer/GenLayerDeepOcean.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityFootStepFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/stream/NullStream.java -net/minecraft/entity/ai/EntityAIOwnerHurtTarget.java -net/minecraft/world/gen/feature/WorldGenMegaJungle.java -net/minecraft/command/server/CommandTeleport.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsConnect.java +net/minecraft/client/stream/NullStream.java net/minecraft/network/NetworkSystem.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/GuardianSound.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/inventory/GuiCrafting.java -net/minecraft/pathfinding/PathPoint.java -net/minecraft/command/CommandNotFoundException.java net/minecraft/client/shader/Shader.java -net/minecraft/world/gen/feature/WorldGenLiquids.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelArmorStandArmor.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderHorse.java -net/minecraft/command/server/CommandMessage.java -net/minecraft/command/CommandParticle.java -net/minecraft/world/gen/layer/GenLayerZoom.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderOcelot.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/TextureMetadataSection.java +net/minecraft/network/status/INetHandlerStatusClient.java net/minecraft/client/resources/SkinManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/ArmorStandRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiSimpleScrolledSelectionListProxy.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/ISound.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiScreenOptionsSounds.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerBipedArmor.java -net/minecraft/command/CommandCompare.java -net/minecraft/world/pathfinder/WalkNodeProcessor.java -net/minecraft/entity/ai/EntityAIVillagerInteract.java -net/minecraft/command/CommandStats.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsBufferBuilder.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/statemap/StateMapperBase.java -net/minecraft/command/CommandKill.java -net/minecraft/world/gen/layer/GenLayerRiverInit.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderBoat.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiEnchantment.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityCloudFX.java net/minecraft/util/MessageDeserializer2.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ThreadSafeBoundList.java -net/minecraft/world/gen/feature/WorldGenPumpkin.java -net/minecraft/command/CommandEnchant.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/model/ItemTransformVec3f.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/AnvilConverterException.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/ChunkRenderContainer.java -net/minecraft/pathfinding/Path.java -net/minecraft/world/gen/feature/WorldGenShrub.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandBanPlayer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerSnowmanHead.java +net/minecraft/network/status/server/S01PacketPong.java +net/minecraft/network/status/server/S00PacketServerInfo.java net/minecraft/util/HttpUtil.java -net/minecraft/command/CommandClearInventory.java -net/minecraft/entity/ai/EntityAIRestrictSun.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityBlockDustFX.java net/minecraft/realms/RealmsButton.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/profiler/PlayerUsageSnooper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderGhast.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MessageDeserializer2.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntityMobSpawnerRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/RenderGlobal.java -net/minecraft/village/VillageDoorInfo.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelZombie.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelBase.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderLiving.java +net/minecraft/network/status/INetHandlerStatusServer.java +net/minecraft/client/gui/GuiScreenDemo.java net/minecraft/client/renderer/vertex/VertexFormatElement.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/model/SimpleBakedModel.java -net/minecraft/entity/ai/EntityAITasks.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelVillager.java -net/minecraft/entity/ai/EntityAILookAtVillager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderMooshroom.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandWhitelist.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderGuardian.java -net/minecraft/command/CommandToggleDownfall.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelGhast.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandStop.java +net/minecraft/client/gui/GuiScreenRealmsProxy.java net/minecraft/client/renderer/texture/TextureAtlasSprite.java -net/minecraft/entity/ai/EntityAIMoveIndoors.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelHumanoidHead.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelSpider.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/SoundRegistry.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntityRendererDispatcher.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/ScaledResolution.java -net/minecraft/entity/ai/EntityAIDefendVillage.java -net/minecraft/server/management/ItemInWorldManager.java -net/minecraft/entity/ai/EntityAIMoveToBlock.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderIronGolem.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiCreateFlatWorld.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiOverlayDebug.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/chunk/ChunkRenderWorker.java +net/minecraft/util/JsonUtils.java +net/minecraft/client/shader/ShaderGroup.java +net/minecraft/server/management/UserListWhitelist.java +net/minecraft/client/shader/ShaderLoader.java net/minecraft/realms/RealmsEditBox.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTTagIntArray.java -net/minecraft/entity/player/EntityPlayerMP.java net/minecraft/server/management/UserListEntry.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/model/ItemCameraTransforms.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderTNTPrimed.java net/minecraft/network/NettyEncryptionTranslator.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/integrated/IntegratedPlayerList.java -net/minecraft/command/CommandDifficulty.java -net/minecraft/world/gen/feature/WorldGenHugeTrees.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/IMetadataSection.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/Tezzelator.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsAnvilLevelStorageSource.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiOptionsRowList.java net/minecraft/client/audio/SoundManager.java -net/minecraft/world/gen/structure/StructureComponent.java -net/minecraft/command/CommandFill.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/IImageBuffer.java -net/minecraft/command/ICommand.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/RenderItemFrame.java net/minecraft/command/server/CommandPardonPlayer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/main/GameConfiguration.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/UserList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelSnowMan.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiSleepMP.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/entity/EntityOtherPlayerMP.java -net/minecraft/command/CommandServerKick.java -net/minecraft/pathfinding/PathNavigateClimber.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/inventory/GuiScreenHorseInventory.java +net/minecraft/realms/RealmsDefaultVertexFormat.java net/minecraft/realms/RealmsBridge.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/TextureUtil.java -net/minecraft/world/gen/MapGenRavine.java +net/minecraft/client/resources/FileResourcePack.java +net/minecraft/network/ThreadQuickExitException.java net/minecraft/server/management/UserListOpsEntry.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/model/ModelRotation.java net/minecraft/util/MessageSerializer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiScreenAddServer.java -net/minecraft/world/gen/structure/StructureOceanMonument.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/chunk/RenderChunk.java +net/minecraft/client/renderer/OpenGlHelper.java net/minecraft/server/management/PlayerProfileCache.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiWinGame.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsScreen.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelCreeper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/inventory/GuiFurnace.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/inventory/GuiBrewingStand.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/SoundPoolEntry.java -net/minecraft/world/chunk/storage/AnvilChunkLoader.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/inventory/CreativeCrafting.java +net/minecraft/client/gui/stream/GuiStreamUnavailable.java net/minecraft/client/multiplayer/ThreadLanServerPing.java -net/minecraft/command/server/CommandListPlayers.java -net/minecraft/command/server/CommandSummon.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTUtil.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelPlayer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/stream/MetadataPlayerDeath.java -net/minecraft/entity/ai/EntityAILookIdle.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MessageSerializer.java -net/minecraft/command/server/CommandMessageRaw.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/spectator/ISpectatorMenuRecipient.java net/minecraft/network/NettyEncryptingEncoder.java net/minecraft/client/AnvilConverterException.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsEditBox.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderCaveSpider.java -net/minecraft/scoreboard/ServerScoreboard.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityFirework.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTException.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/MovingSoundMinecart.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiConfirmOpenLink.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/stream/IngestServerTester.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiCommandBlock.java -net/minecraft/world/gen/layer/GenLayerBiomeEdge.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/FileResourcePack.java -net/minecraft/world/gen/structure/MapGenNetherBridge.java -net/minecraft/world/gen/layer/GenLayerEdge.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTTagString.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/NetworkSystem.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/AnimationMetadataSectionSerializer.java -net/minecraft/server/management/ServerConfigurationManager.java +net/minecraft/util/EnumTypeAdapterFactory.java +net/minecraft/client/gui/stream/GuiStreamOptions.java +net/minecraft/client/network/NetHandlerLoginClient.java +net/minecraft/realms/RealmsScreen.java net/minecraft/client/stream/ChatController.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/shader/ShaderLinkHelper.java -net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderRabbit.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntityBeaconRenderer.java -net/minecraft/world/gen/feature/WorldGenLakes.java net/minecraft/command/server/CommandWhitelist.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntitySpecialRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiMerchant.java -net/minecraft/world/gen/ChunkProviderGenerate.java -net/minecraft/world/gen/feature/WorldGenDoublePlant.java +net/minecraft/client/gui/GuiShareToLan.java net/minecraft/profiler/IPlayerUsage.java -net/minecraft/world/gen/layer/GenLayer.java -net/minecraft/world/gen/layer/GenLayerRiverMix.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MessageSerializer2.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/Session.java -net/minecraft/world/gen/GeneratorBushFeature.java net/minecraft/realms/Tezzelator.java -net/minecraft/world/gen/layer/GenLayerRareBiome.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderEntityItem.java -net/minecraft/world/gen/feature/WorldGenForest.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelCow.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsServerAddress.java net/minecraft/command/server/CommandSaveOff.java -net/minecraft/pathfinding/PathEntity.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/ISoundEventAccessor.java -net/minecraft/world/gen/feature/WorldGenBigTree.java -net/minecraft/world/gen/feature/WorldGenerator.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelLargeChest.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/Gui.java +net/minecraft/realms/RealmsLevelSummary.java +net/minecraft/realms/RealmsServerAddress.java net/minecraft/realms/RealmsAnvilLevelStorageSource.java net/minecraft/realms/RealmsSliderButton.java -net/minecraft/entity/ai/EntityAIBreakDoor.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/Matrix4f.java net/minecraft/world/storage/ThreadedFileIOBase.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/BanEntry.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/NettyEncryptionTranslator.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/spectator/categories/TeleportToPlayer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityHugeExplodeFX.java -net/minecraft/world/gen/feature/WorldGenFire.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/stream/MetadataAchievement.java -net/minecraft/world/gen/feature/WorldGenAbstractTree.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderPig.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/RenderList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiSlotRealmsProxy.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MouseHelper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerHeldItem.java -net/minecraft/world/gen/feature/WorldGenGlowStone2.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/FallbackResourceManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/inventory/GuiBeacon.java -net/minecraft/command/server/CommandTestFor.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/IIconCreator.java +net/minecraft/client/renderer/vertex/VertexBuffer.java +net/minecraft/network/rcon/RConConsoleSource.java +net/minecraft/world/chunk/storage/AnvilSaveHandler.java +net/minecraft/realms/RealmsVertexFormatElement.java +net/minecraft/network/NettyCompressionEncoder.java net/minecraft/client/shader/Framebuffer.java net/minecraft/client/gui/GuiSnooper.java -net/minecraft/world/gen/feature/WorldGenTaiga2.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/SkinManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiScreenRealmsProxy.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/MapItemRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelLeashKnot.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/LoadingScreenRenderer.java -net/minecraft/world/gen/layer/GenLayerShore.java -net/minecraft/entity/ai/RandomPositionGenerator.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/network/NetHandlerHandshakeMemory.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityRainFX.java +net/minecraft/client/renderer/VboRenderList.java net/minecraft/server/network/NetHandlerHandshakeTCP.java -net/minecraft/world/gen/structure/MapGenStructure.java -net/minecraft/world/gen/layer/GenLayerAddSnow.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/VboRenderList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiCustomizeWorldScreen.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/shader/ShaderLoader.java net/minecraft/server/integrated/IntegratedServer.java net/minecraft/client/renderer/WorldRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/LanguageManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderFireball.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiPageButtonList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelIronGolem.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/ServerSelectionList.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/ResourcePackRepository.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderSilverfish.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/IResourceManagerReloadListener.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/AnimationFrame.java -net/minecraft/world/gen/feature/WorldGenBigMushroom.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/realms/RealmsSharedConstants.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/SimpleTexture.java -net/minecraft/command/server/CommandScoreboard.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelOcelot.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiOptions.java +net/minecraft/client/stream/TwitchStream.java +net/minecraft/client/shader/ShaderDefault.java +net/minecraft/server/management/BanEntry.java +net/minecraft/client/gui/GuiSlotRealmsProxy.java +net/minecraft/command/server/CommandPardonIp.java net/minecraft/client/stream/MetadataAchievement.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/status/client/C00PacketServerQuery.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/ItemRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/chunk/IRenderChunkFactory.java +net/minecraft/server/management/BanList.java +net/minecraft/server/management/IPBanEntry.java net/minecraft/client/gui/GuiStreamIndicator.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderZombie.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/model/ModelBlock.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/stream/GuiStreamOptions.java net/minecraft/util/CryptManager.java net/minecraft/server/management/UserListWhitelistEntry.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderTntMinecart.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityExplodeFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiMultiplayer.java -net/minecraft/world/gen/structure/StructureStrongholdPieces.java -net/minecraft/command/CommandHelp.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/LoggingPrintStream.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/stream/TwitchStream.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/chunk/ListChunkFactory.java -net/minecraft/command/server/CommandTestForBlock.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/statemap/IStateMapper.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandSaveOn.java -net/minecraft/world/WorldServerMulti.java -net/minecraft/world/gen/feature/WorldGenCanopyTree.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/ImageBufferDownload.java +net/minecraft/server/management/UserListOps.java net/minecraft/client/gui/GuiSimpleScrolledSelectionListProxy.java -net/minecraft/world/chunk/storage/ChunkLoader.java net/minecraft/client/stream/MetadataPlayerDeath.java -net/minecraft/entity/ai/EntityAIAvoidEntity.java -net/minecraft/world/gen/feature/WorldGenBlockBlob.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/data/TextureMetadataSectionSerializer.java net/minecraft/world/storage/IThreadedFileIO.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityCritFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiYesNo.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/HttpUtil.java net/minecraft/command/server/CommandBanPlayer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/Minecraft.java net/minecraft/client/shader/ShaderUniform.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/texture/ITextureObject.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MovementInputFromOptions.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderSquid.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/PlayerProfileCache.java -net/minecraft/pathfinding/PathNavigateSwimmer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/stream/Metadata.java -net/minecraft/world/gen/feature/WorldGenMinable.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/DefaultResourcePack.java +net/minecraft/realms/Realms.java +net/minecraft/world/chunk/storage/AnvilSaveConverter.java +net/minecraft/client/gui/GuiButtonRealmsProxy.java +net/minecraft/client/network/OldServerPinger.java +net/minecraft/client/gui/GuiClickableScrolledSelectionListProxy.java net/minecraft/server/management/UserListBansEntry.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/layers/LayerEnderDragonDeath.java net/minecraft/client/renderer/vertex/VertexFormat.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderLightningBolt.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderSnowball.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderEntity.java -net/minecraft/entity/ai/EntityAIFollowParent.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTTagByte.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/ServerListEntryLanDetected.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/ChestRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityFishWakeFX.java +net/minecraft/client/gui/stream/GuiTwitchUserMode.java +net/minecraft/realms/RealmsScrolledSelectionList.java +net/minecraft/command/server/CommandStop.java net/minecraft/realms/RealmsSharedConstants.java -net/minecraft/entity/ai/EntityAIArrowAttack.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTTagFloat.java -net/minecraft/command/server/CommandSetDefaultSpawnpoint.java -net/minecraft/world/gen/structure/MapGenScatteredFeature.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/block/statemap/DefaultStateMapper.java -net/minecraft/world/gen/structure/StructureStart.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/UserListOps.java -net/minecraft/command/CommandEffect.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiButton.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/multiplayer/ChunkProviderClient.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderBlaze.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/PacketThreadUtil.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/StitcherException.java +net/minecraft/server/management/UserList.java net/minecraft/realms/RealmsSimpleScrolledSelectionList.java -net/minecraft/entity/ai/EntityAIEatGrass.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/particle/EntityDropParticleFX.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelBiped.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/audio/MovingSoundMinecartRiding.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelBlaze.java net/minecraft/client/resources/FolderResourcePack.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelBox.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderBiped.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderItem.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/model/ModelManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandOp.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/nbt/NBTBase.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/vertex/DefaultVertexFormats.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiScreen.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/model/ModelSkeleton.java +net/minecraft/client/stream/MetadataCombat.java net/minecraft/client/network/LanServerDetector.java -net/minecraft/command/CommandBlockData.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/entity/RenderSpider.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/vertex/VertexFormatElement.java -net/minecraft/world/gen/feature/WorldGenMegaPineTree.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/gui/GuiDisconnected.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/renderer/tileentity/TileEntityItemStackRenderer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/resources/model/ModelResourceLocation.java -net/minecraft/world/biome/BiomeDecorator.java -net/minecraft/entity/ai/EntityAILookAtTradePlayer.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/CryptManager.java -net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/client/multiplayer/GuiConnecting.java +net/minecraft/util/MessageDeserializer.java +net/minecraft/realms/RealmsBufferBuilder.java diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/Block.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/Block.edit.java deleted file mode 100644 index eca6489..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/Block.edit.java +++ /dev/null @@ -1,99 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 492 : 493 @ 492 : 493 - -~ public void randomTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void updateTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { - -> CHANGE 2 : 3 @ 2 : 3 - -~ public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) { - -> CHANGE 18 : 19 @ 18 : 19 - -~ public int quantityDropped(EaglercraftRandom random) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 15 : 16 @ 15 : 16 - -~ { - -> DELETE 10 @ 10 : 11 - -> CHANGE 4 : 5 @ 4 : 5 - -~ if (worldIn.getGameRules().getBoolean("doTileDrops")) { - -> CHANGE 12 : 13 @ 12 : 13 - -~ { - -> DELETE 7 @ 7 : 8 - -> CHANGE 251 : 252 @ 251 : 252 - -~ public int quantityDroppedWithBonus(int fortune, EaglercraftRandom random) { - -> INSERT 136 : 137 @ 136 - -+ bootstrapStates(); - -> INSERT 468 : 508 @ 468 - -+ public static void bootstrapStates() { -+ BlockBed.bootstrapStates(); -+ BlockDirt.bootstrapStates(); -+ BlockDoor.bootstrapStates(); -+ BlockDoublePlant.bootstrapStates(); -+ BlockFlowerPot.bootstrapStates(); -+ BlockHugeMushroom.bootstrapStates(); -+ BlockLever.bootstrapStates(); -+ BlockLog.bootstrapStates(); -+ BlockNewLeaf.bootstrapStates(); -+ BlockNewLog.bootstrapStates(); -+ BlockOldLeaf.bootstrapStates(); -+ BlockOldLog.bootstrapStates(); -+ BlockPistonExtension.bootstrapStates(); -+ BlockPistonMoving.bootstrapStates(); -+ BlockPlanks.bootstrapStates(); -+ BlockPrismarine.bootstrapStates(); -+ BlockQuartz.bootstrapStates(); -+ BlockRail.bootstrapStates(); -+ BlockRailDetector.bootstrapStates(); -+ BlockRailPowered.bootstrapStates(); -+ BlockRedSandstone.bootstrapStates(); -+ BlockRedstoneComparator.bootstrapStates(); -+ BlockRedstoneWire.bootstrapStates(); -+ BlockSand.bootstrapStates(); -+ BlockSandStone.bootstrapStates(); -+ BlockSapling.bootstrapStates(); -+ BlockSilverfish.bootstrapStates(); -+ BlockSlab.bootstrapStates(); -+ BlockStairs.bootstrapStates(); -+ BlockStone.bootstrapStates(); -+ BlockStoneBrick.bootstrapStates(); -+ BlockStoneSlab.bootstrapStates(); -+ BlockStoneSlabNew.bootstrapStates(); -+ BlockTallGrass.bootstrapStates(); -+ BlockTrapDoor.bootstrapStates(); -+ BlockWall.bootstrapStates(); -+ BlockWoodSlab.bootstrapStates(); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockAnvil.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockAnvil.edit.java deleted file mode 100644 index e28eb17..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockAnvil.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 64 : 65 @ 64 : 65 - -~ { - -> DELETE 2 @ 2 : 3 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBanner.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBanner.edit.java deleted file mode 100644 index 7a9d06f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBanner.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 12 : 13 @ 12 : 13 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 60 : 61 @ 60 : 61 - -~ public Item getItemDropped(IBlockState state, EaglercraftRandom rand, int fortune) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBasePressurePlate.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBasePressurePlate.edit.java deleted file mode 100644 index d9dfcec..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBasePressurePlate.edit.java +++ /dev/null @@ -1,29 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 87 : 88 @ 87 : 88 - -~ public void randomTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom random) { - -> CHANGE 2 : 4 @ 2 : 4 - -~ public void updateTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) { -~ { - -> DELETE 4 @ 4 : 5 - -> CHANGE 4 : 5 @ 4 : 5 - -~ { - -> DELETE 4 @ 4 : 5 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBeacon.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBeacon.edit.java deleted file mode 100644 index 31ed942..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBeacon.edit.java +++ /dev/null @@ -1,52 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 18 @ 18 : 19 - -> CHANGE 24 : 25 @ 24 : 27 - -~ { - -> DELETE 5 @ 5 : 7 - -> INSERT 1 : 2 @ 1 - -+ return true; - -> CHANGE 40 : 41 @ 40 : 43 - -~ Chunk chunk = worldIn.getChunkFromBlockCoords(glassPos); - -> CHANGE 1 : 6 @ 1 : 6 - -~ for (int i = glassPos.getY() - 1; i >= 0; --i) { -~ final BlockPos blockpos = new BlockPos(glassPos.getX(), i, glassPos.getZ()); -~ if (!chunk.canSeeSky(blockpos)) { -~ break; -~ } - -> CHANGE 1 : 10 @ 1 : 13 - -~ IBlockState iblockstate = worldIn.getBlockState(blockpos); -~ if (iblockstate.getBlock() == Blocks.beacon) { -~ ((WorldServer) worldIn).addScheduledTask(new Runnable() { -~ public void run() { -~ TileEntity tileentity = worldIn.getTileEntity(blockpos); -~ if (tileentity instanceof TileEntityBeacon) { -~ ((TileEntityBeacon) tileentity).updateBeacon(); -~ worldIn.addBlockEvent(blockpos, Blocks.beacon, 1, 0); -~ } - -> CHANGE 1 : 2 @ 1 : 3 - -~ }); - -> CHANGE 1 : 2 @ 1 : 2 - -~ } - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBed.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBed.edit.java deleted file mode 100644 index 4a4e3c7..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBed.edit.java +++ /dev/null @@ -1,110 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> INSERT 12 : 13 @ 12 - -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.server.MinecraftServer; - -> CHANGE 17 : 18 @ 17 : 19 - -~ public static PropertyEnum PART; - -> INSERT 2 : 6 @ 2 - -+ public static void bootstrapStates() { -+ PART = PropertyEnum.create("part", BlockBed.EnumPartType.class); -+ } -+ - -> CHANGE 9 : 10 @ 9 : 12 - -~ { - -> INSERT 7 : 8 @ 7 - -+ } - -> CHANGE 1 : 9 @ 1 : 12 - -~ if (world.provider.canRespawnHere() && world.getBiomeGenForCoords(blockpos) != BiomeGenBase.hell) { -~ if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() -~ .getBoolean("bedSpawnPoint") && Math.abs(entityplayer.posX - (double) blockpos.getX()) <= 3.0D -~ && Math.abs(entityplayer.posY - (double) blockpos.getY()) <= 2.0D -~ && Math.abs(entityplayer.posZ - (double) blockpos.getZ()) <= 3.0D) { -~ BlockPos blockpos1 = BlockBed.getSafeExitLocation(world, blockpos, 0); -~ if (blockpos1 == null) { -~ blockpos1 = blockpos.up(); - -> CHANGE 1 : 4 @ 1 : 6 - -~ entityplayer.setSpawnPoint(blockpos1.add(0.5F, 0.1F, 0.5F), false); -~ entityplayer.addChatComponentMessage(new ChatComponentTranslation("tile.bed.setspawn")); -~ if (entityplayer.isSneaking()) { - -> CHANGE 1 : 3 @ 1 : 9 - -~ } -~ } - -> INSERT 1 : 6 @ 1 - -+ if (((Boolean) iblockstate.getValue(OCCUPIED)).booleanValue()) { -+ EntityPlayer entityplayer1 = this.getPlayerInBed(world, blockpos); -+ if (entityplayer1 != null) { -+ entityplayer -+ .addChatComponentMessage(new ChatComponentTranslation("tile.bed.occupied", new Object[0])); - -> INSERT 2 : 12 @ 2 - -+ -+ iblockstate = iblockstate.withProperty(OCCUPIED, Boolean.valueOf(false)); -+ world.setBlockState(blockpos, iblockstate, 4); -+ } -+ -+ EntityPlayer.EnumStatus entityplayer$enumstatus = entityplayer.trySleep(blockpos); -+ if (entityplayer$enumstatus == EntityPlayer.EnumStatus.OK) { -+ iblockstate = iblockstate.withProperty(OCCUPIED, Boolean.valueOf(true)); -+ world.setBlockState(blockpos, iblockstate, 4); -+ return true; - -> CHANGE 1 : 7 @ 1 : 5 - -~ if (entityplayer$enumstatus == EntityPlayer.EnumStatus.NOT_POSSIBLE_NOW) { -~ entityplayer -~ .addChatComponentMessage(new ChatComponentTranslation("tile.bed.noSleep", new Object[0])); -~ } else if (entityplayer$enumstatus == EntityPlayer.EnumStatus.NOT_SAFE) { -~ entityplayer -~ .addChatComponentMessage(new ChatComponentTranslation("tile.bed.notSafe", new Object[0])); - -> DELETE 2 @ 2 : 4 - -> INSERT 2 : 12 @ 2 - -+ } else { -+ world.setBlockToAir(blockpos); -+ BlockPos blockpos1 = blockpos.offset(((EnumFacing) iblockstate.getValue(FACING)).getOpposite()); -+ if (world.getBlockState(blockpos1).getBlock() == this) { -+ world.setBlockToAir(blockpos1); -+ } -+ -+ world.newExplosion((Entity) null, (double) blockpos.getX() + 0.5D, (double) blockpos.getY() + 0.5D, -+ (double) blockpos.getZ() + 0.5D, 5.0F, true, true); -+ return true; - -> CHANGE 33 : 34 @ 33 : 34 - -~ { - -> CHANGE 6 : 7 @ 6 : 7 - -~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBookshelf.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBookshelf.edit.java deleted file mode 100644 index a6e3dc4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBookshelf.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 20 : 21 @ 20 : 21 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBrewingStand.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBrewingStand.edit.java deleted file mode 100644 index dbfb5fb..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBrewingStand.edit.java +++ /dev/null @@ -1,30 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 77 : 78 @ 77 : 80 - -~ { - -> DELETE 5 @ 5 : 7 - -> INSERT 1 : 2 @ 1 - -+ return true; - -> CHANGE 13 : 14 @ 13 : 14 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { - -> CHANGE 15 : 16 @ 15 : 16 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBush.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBush.edit.java deleted file mode 100644 index f8b6dc3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockBush.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 49 : 50 @ 49 : 50 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockButton.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockButton.edit.java deleted file mode 100644 index f87c591..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockButton.edit.java +++ /dev/null @@ -1,27 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 172 : 173 @ 172 : 173 - -~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { - -> CHANGE 2 : 4 @ 2 : 4 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { -~ { - -> DELETE 10 @ 10 : 11 - -> CHANGE 12 : 13 @ 12 : 13 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCactus.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCactus.edit.java deleted file mode 100644 index d953008..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCactus.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 33 : 34 @ 33 : 34 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCake.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCake.edit.java deleted file mode 100644 index 8abffdc..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCake.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 107 : 108 @ 107 : 108 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCarpet.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCarpet.edit.java deleted file mode 100644 index 631ea06..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCarpet.edit.java +++ /dev/null @@ -1,34 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 11 : 13 @ 11 - -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.player.EntityPlayer; -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.projectile.EntityArrow; - -> INSERT 3 : 4 @ 3 - -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.server.MinecraftServer; - -> INSERT 99 : 113 @ 99 - -+ -+ public boolean onBlockActivated(World world, BlockPos blockpos, IBlockState var3, EntityPlayer entityplayer, -+ EnumFacing var5, float var6, float var7, float var8) { -+ if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance().getBoolean("clickToSit") -+ && entityplayer.getHeldItem() == null) { -+ EntityArrow arrow = new EntityArrow(world, blockpos.getX() + 0.5D, blockpos.getY() - 0.4375D, -+ blockpos.getZ() + 0.5D); -+ arrow.isChair = true; -+ world.spawnEntityInWorld(arrow); -+ entityplayer.mountEntity(arrow); -+ return true; -+ } -+ return super.onBlockActivated(world, blockpos, var3, entityplayer, var5, var6, var7, var8); -+ } - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCauldron.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCauldron.edit.java deleted file mode 100644 index bc87bf1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCauldron.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 70 : 71 @ 70 : 71 - -~ if (entity.isBurning() && i > 0 && entity.getEntityBoundingBox().minY <= (double) f) { - -> CHANGE 8 : 9 @ 8 : 11 - -~ { - -> CHANGE 102 : 103 @ 102 : 103 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockChest.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockChest.edit.java deleted file mode 100644 index 85989c2..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockChest.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 141 : 142 @ 141 : 144 - -~ { - -> CHANGE 186 : 187 @ 186 : 189 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockClay.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockClay.edit.java deleted file mode 100644 index e6e5874..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockClay.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 20 : 21 @ 20 : 21 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCocoa.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCocoa.edit.java deleted file mode 100644 index b40946f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCocoa.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 39 : 40 @ 39 : 40 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { - -> CHANGE 117 : 118 @ 117 : 118 - -~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCommandBlock.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCommandBlock.edit.java deleted file mode 100644 index 6126348..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCommandBlock.edit.java +++ /dev/null @@ -1,32 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 38 : 39 @ 38 : 39 - -~ { - -> DELETE 9 @ 9 : 10 - -> CHANGE 2 : 3 @ 2 : 3 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { - -> CHANGE 40 : 41 @ 40 : 41 - -~ { - -> DELETE 2 @ 2 : 3 - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCrops.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCrops.edit.java deleted file mode 100644 index eeea02c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockCrops.edit.java +++ /dev/null @@ -1,34 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 42 : 43 @ 42 : 43 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> CHANGE 83 : 84 @ 83 : 84 - -~ { - -> DELETE 10 @ 10 : 11 - -> CHANGE 3 : 4 @ 3 : 4 - -~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { - -> CHANGE 11 : 12 @ 11 : 12 - -~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDaylightDetector.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDaylightDetector.edit.java deleted file mode 100644 index 9adeacc..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDaylightDetector.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 73 : 74 @ 73 : 76 - -~ { - -> CHANGE 18 : 19 @ 18 : 19 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDeadBush.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDeadBush.edit.java deleted file mode 100644 index 3204e12..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDeadBush.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 42 : 43 @ 42 : 43 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 5 : 6 @ 5 : 6 - -~ if (entityplayer.getCurrentEquippedItem() != null - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDirt.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDirt.edit.java deleted file mode 100644 index d0cac5b..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDirt.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 28 : 29 @ 28 : 30 - -~ public static PropertyEnum VARIANT; - -> INSERT 9 : 13 @ 9 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockDirt.DirtType.class); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDispenser.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDispenser.edit.java deleted file mode 100644 index e4cad9f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDispenser.edit.java +++ /dev/null @@ -1,31 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 43 : 44 @ 43 : 44 - -~ protected EaglercraftRandom rand = new EaglercraftRandom(); - -> CHANGE 18 : 19 @ 18 : 19 - -~ { - -> CHANGE 24 : 25 @ 24 : 27 - -~ { - -> CHANGE 49 : 51 @ 49 : 51 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { -~ { - -> DELETE 2 @ 2 : 3 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDoor.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDoor.edit.java deleted file mode 100644 index 5f01222..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDoor.edit.java +++ /dev/null @@ -1,36 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 33 : 34 @ 33 : 35 - -~ public static PropertyEnum HINGE; - -> CHANGE 1 : 2 @ 1 : 3 - -~ public static PropertyEnum HALF; - -> INSERT 8 : 13 @ 8 - -+ public static void bootstrapStates() { -+ HINGE = PropertyEnum.create("hinge", BlockDoor.EnumHingePosition.class); -+ HALF = PropertyEnum.create("half", BlockDoor.EnumDoorHalf.class); -+ } -+ - -> CHANGE 136 : 137 @ 136 : 137 - -~ { - -> CHANGE 18 : 19 @ 18 : 19 - -~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDoublePlant.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDoublePlant.edit.java deleted file mode 100644 index fb85344..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDoublePlant.edit.java +++ /dev/null @@ -1,47 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 34 : 36 @ 34 : 38 - -~ public static PropertyEnum VARIANT; -~ public static PropertyEnum HALF; - -> INSERT 13 : 18 @ 13 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockDoublePlant.EnumPlantType.class); -+ HALF = PropertyEnum.create("half", BlockDoublePlant.EnumBlockHalf.class); -+ } -+ - -> CHANGE 60 : 61 @ 60 : 61 - -~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom random, int var3) { - -> CHANGE 41 : 42 @ 41 : 42 - -~ if (entityplayer.getCurrentEquippedItem() == null - -> CHANGE 17 : 18 @ 17 : 18 - -~ } else { - -> DELETE 7 @ 7 : 9 - -> CHANGE 45 : 46 @ 45 : 46 - -~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState var4) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDragonEgg.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDragonEgg.edit.java deleted file mode 100644 index 51890d1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDragonEgg.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 35 : 36 @ 35 : 36 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { - -> CHANGE 44 : 46 @ 44 : 64 - -~ worldIn.setBlockState(blockpos, iblockstate, 2); -~ worldIn.setBlockToAir(pos); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDynamicLiquid.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDynamicLiquid.edit.java deleted file mode 100644 index c1389d4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockDynamicLiquid.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 31 : 32 @ 31 : 32 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> CHANGE 85 : 86 @ 85 : 86 - -~ for (EnumFacing enumfacing1 : (Set) set) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockEnchantmentTable.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockEnchantmentTable.edit.java deleted file mode 100644 index 03fd3a1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockEnchantmentTable.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 35 : 36 @ 35 : 36 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> CHANGE 43 : 44 @ 43 : 46 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockEndPortal.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockEndPortal.edit.java deleted file mode 100644 index 34bc7dd..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockEndPortal.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 53 : 54 @ 53 : 54 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> CHANGE 4 : 5 @ 4 : 5 - -~ if (entity.ridingEntity == null && entity.riddenByEntity == null) { - -> CHANGE 5 : 6 @ 5 : 6 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockEndPortalFrame.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockEndPortalFrame.edit.java deleted file mode 100644 index 08bfda9..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockEndPortalFrame.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 53 : 54 @ 53 : 54 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockEnderChest.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockEnderChest.edit.java deleted file mode 100644 index c08cbd1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockEnderChest.edit.java +++ /dev/null @@ -1,26 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 50 : 51 @ 50 : 51 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> DELETE 25 @ 25 : 27 - -> CHANGE 15 : 16 @ 15 : 16 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFalling.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFalling.edit.java deleted file mode 100644 index 5940216..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFalling.edit.java +++ /dev/null @@ -1,26 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 36 : 38 @ 36 : 38 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { -~ { - -> DELETE 2 @ 2 : 3 - -> CHANGE 6 : 10 @ 6 : 12 - -~ EntityFallingBlock entityfallingblock = new EntityFallingBlock(worldIn, (double) pos.getX() + 0.5D, -~ (double) pos.getY(), (double) pos.getZ() + 0.5D, worldIn.getBlockState(pos)); -~ this.onStartFalling(entityfallingblock); -~ worldIn.spawnEntityInWorld(entityfallingblock); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFarmland.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFarmland.edit.java deleted file mode 100644 index 07c7e52..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFarmland.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 51 : 52 @ 51 : 52 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { - -> CHANGE 15 : 16 @ 15 : 16 - -~ if (world.rand.nextFloat() < f - 0.5F) { - -> CHANGE 50 : 51 @ 50 : 51 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFence.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFence.edit.java deleted file mode 100644 index 08c410d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFence.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 153 : 154 @ 153 : 154 - -~ return ItemLead.attachToFence(entityplayer, world, blockpos); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFenceGate.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFenceGate.edit.java deleted file mode 100644 index 97157d0..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFenceGate.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 125 : 126 @ 125 : 126 - -~ { - -> DELETE 16 @ 16 : 17 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFire.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFire.edit.java deleted file mode 100644 index 06d4617..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFire.edit.java +++ /dev/null @@ -1,28 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 127 : 128 @ 127 : 128 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> CHANGE 7 : 8 @ 7 : 8 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> CHANGE 106 : 107 @ 106 : 107 - -~ private void catchOnFire(World worldIn, BlockPos pos, int chance, EaglercraftRandom random, int age) { - -> CHANGE 77 : 78 @ 77 : 78 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFlowerPot.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFlowerPot.edit.java deleted file mode 100644 index 00fbc27..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFlowerPot.edit.java +++ /dev/null @@ -1,27 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 37 : 38 @ 37 : 39 - -~ public static PropertyEnum CONTENTS; - -> INSERT 8 : 12 @ 8 - -+ public static void bootstrapStates() { -+ CONTENTS = PropertyEnum.create("contents", BlockFlowerPot.EnumFlowerType.class); -+ } -+ - -> CHANGE 124 : 125 @ 124 : 125 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFurnace.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFurnace.edit.java deleted file mode 100644 index e9575ce..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFurnace.edit.java +++ /dev/null @@ -1,28 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 40 : 41 @ 40 : 41 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 8 : 9 @ 8 : 9 - -~ { - -> CHANGE 19 : 20 @ 19 : 20 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> CHANGE 30 : 31 @ 30 : 33 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockGlass.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockGlass.edit.java deleted file mode 100644 index eb2c654..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockGlass.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 18 : 19 @ 18 : 19 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockGlowstone.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockGlowstone.edit.java deleted file mode 100644 index 3e3f4a8..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockGlowstone.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 22 : 23 @ 22 : 23 - -~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDropped(EaglercraftRandom random) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockGrass.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockGrass.edit.java deleted file mode 100644 index 6e7754a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockGrass.edit.java +++ /dev/null @@ -1,31 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 54 : 56 @ 54 : 56 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { -~ { - -> DELETE 17 @ 17 : 18 - -> CHANGE 4 : 5 @ 4 : 5 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) { - -> CHANGE 8 : 9 @ 8 : 9 - -~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void grow(World world, EaglercraftRandom random, BlockPos blockpos, IBlockState var4) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockGravel.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockGravel.edit.java deleted file mode 100644 index a1341c9..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockGravel.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 14 : 15 @ 14 : 15 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockHopper.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockHopper.edit.java deleted file mode 100644 index 401b2ff..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockHopper.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 105 : 106 @ 105 : 108 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockHugeMushroom.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockHugeMushroom.edit.java deleted file mode 100644 index 2f44b67..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockHugeMushroom.edit.java +++ /dev/null @@ -1,28 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 22 : 23 @ 22 : 24 - -~ public static PropertyEnum VARIANT; - -> CHANGE 9 : 14 @ 9 : 10 - -~ public static void bootstrapStates() { -~ VARIANT = PropertyEnum.create("variant", BlockHugeMushroom.EnumType.class); -~ } -~ -~ public int quantityDropped(EaglercraftRandom random) { - -> CHANGE 16 : 17 @ 16 : 17 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockIce.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockIce.edit.java deleted file mode 100644 index 39c6aef..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockIce.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 60 : 61 @ 60 : 61 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockJukebox.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockJukebox.edit.java deleted file mode 100644 index 45d0209..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockJukebox.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 15 : 16 @ 15 : 16 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 34 : 35 @ 34 : 35 - -~ { - -> CHANGE 10 : 11 @ 10 : 11 - -~ { - -> CHANGE 28 : 29 @ 28 : 31 - -~ super.dropBlockAsItemWithChance(world, blockpos, iblockstate, f, 0); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockLeaves.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockLeaves.edit.java deleted file mode 100644 index 01dfb1c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockLeaves.edit.java +++ /dev/null @@ -1,37 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 77 : 79 @ 77 : 79 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { -~ { - -> DELETE 78 @ 78 : 79 - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { - -> CHANGE 15 : 16 @ 15 : 16 - -~ public int quantityDropped(EaglercraftRandom random) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 4 : 5 @ 4 : 5 - -~ { - -> DELETE 23 @ 23 : 24 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockLever.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockLever.edit.java deleted file mode 100644 index 39d49e3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockLever.edit.java +++ /dev/null @@ -1,23 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 28 : 29 @ 28 : 30 - -~ public static PropertyEnum FACING; - -> INSERT 9 : 13 @ 9 - -+ public static void bootstrapStates() { -+ FACING = PropertyEnum.create("facing", BlockLever.EnumOrientation.class); -+ } -+ - -> CHANGE 121 : 122 @ 121 : 124 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockLiquid.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockLiquid.edit.java deleted file mode 100644 index d598d64..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockLiquid.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 114 : 115 @ 114 : 115 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> CHANGE 64 : 65 @ 64 : 65 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockLog.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockLog.edit.java deleted file mode 100644 index ea30f50..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockLog.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 22 : 23 @ 22 : 24 - -~ public static PropertyEnum LOG_AXIS; - -> INSERT 8 : 12 @ 8 - -+ public static void bootstrapStates() { -+ LOG_AXIS = PropertyEnum.create("axis", BlockLog.EnumAxis.class); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockMelon.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockMelon.edit.java deleted file mode 100644 index b07ac34..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockMelon.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 21 : 22 @ 21 : 22 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDropped(EaglercraftRandom random) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockMobSpawner.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockMobSpawner.edit.java deleted file mode 100644 index 267d077..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockMobSpawner.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 26 : 27 @ 26 : 27 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockMushroom.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockMushroom.edit.java deleted file mode 100644 index 4a9850c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockMushroom.edit.java +++ /dev/null @@ -1,28 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 24 : 25 @ 24 : 25 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { - -> CHANGE 52 : 53 @ 52 : 53 - -~ public boolean generateBigMushroom(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) { - -> CHANGE 20 : 21 @ 20 : 21 - -~ public boolean canUseBonemeal(World var1, EaglercraftRandom random, BlockPos var3, IBlockState var4) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void grow(World world, EaglercraftRandom random, BlockPos blockpos, IBlockState iblockstate) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockMycelium.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockMycelium.edit.java deleted file mode 100644 index 7a4534b..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockMycelium.edit.java +++ /dev/null @@ -1,27 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 38 : 40 @ 38 : 40 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { -~ { - -> DELETE 18 @ 18 : 19 - -> CHANGE 4 : 5 @ 4 : 5 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> CHANGE 9 : 10 @ 9 : 10 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockNetherWart.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockNetherWart.edit.java deleted file mode 100644 index aeda1bc..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockNetherWart.edit.java +++ /dev/null @@ -1,30 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 43 : 44 @ 43 : 44 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> CHANGE 10 : 11 @ 10 : 11 - -~ { - -> DELETE 11 @ 11 : 12 - -> CHANGE 3 : 4 @ 3 : 4 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockNewLeaf.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockNewLeaf.edit.java deleted file mode 100644 index 266d2a1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockNewLeaf.edit.java +++ /dev/null @@ -1,29 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 29 : 30 @ 29 : 35 - -~ public static PropertyEnum VARIANT; - -> INSERT 6 : 14 @ 6 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() { -+ public boolean apply(BlockPlanks.EnumType blockplanks$enumtype) { -+ return blockplanks$enumtype.getMetadata() >= 4; -+ } -+ }); -+ } -+ - -> DELETE 4 @ 4 : 5 - -> CHANGE 51 : 52 @ 51 : 52 - -~ if (entityplayer.getCurrentEquippedItem() != null - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockNewLog.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockNewLog.edit.java deleted file mode 100644 index 6cebc9a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockNewLog.edit.java +++ /dev/null @@ -1,23 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 23 : 24 @ 23 : 29 - -~ public static PropertyEnum VARIANT; - -> INSERT 6 : 14 @ 6 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() { -+ public boolean apply(BlockPlanks.EnumType blockplanks$enumtype) { -+ return blockplanks$enumtype.getMetadata() >= 4; -+ } -+ }); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockNote.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockNote.edit.java deleted file mode 100644 index 9c5d98b..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockNote.edit.java +++ /dev/null @@ -1,18 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 52 : 53 @ 52 : 55 - -~ { - -> CHANGE 13 : 14 @ 13 : 14 - -~ { - -> DELETE 5 @ 5 : 6 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockObsidian.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockObsidian.edit.java deleted file mode 100644 index 601aebe..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockObsidian.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 21 : 22 @ 21 : 22 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockOldLeaf.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockOldLeaf.edit.java deleted file mode 100644 index a96d8ba..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockOldLeaf.edit.java +++ /dev/null @@ -1,27 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 31 : 32 @ 31 : 37 - -~ public static PropertyEnum VARIANT; - -> INSERT 6 : 14 @ 6 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() { -+ public boolean apply(BlockPlanks.EnumType blockplanks$enumtype) { -+ return blockplanks$enumtype.getMetadata() < 4; -+ } -+ }); -+ } -+ - -> CHANGE 85 : 86 @ 85 : 86 - -~ if (entityplayer.getCurrentEquippedItem() != null - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockOldLog.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockOldLog.edit.java deleted file mode 100644 index c09ef4e..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockOldLog.edit.java +++ /dev/null @@ -1,23 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 23 : 24 @ 23 : 29 - -~ public static PropertyEnum VARIANT; - -> INSERT 6 : 14 @ 6 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class, new Predicate() { -+ public boolean apply(BlockPlanks.EnumType blockplanks$enumtype) { -+ return blockplanks$enumtype.getMetadata() < 4; -+ } -+ }); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockOre.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockOre.edit.java deleted file mode 100644 index 62ad57a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockOre.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 30 : 31 @ 30 : 31 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 7 : 8 @ 7 : 8 - -~ public int quantityDropped(EaglercraftRandom random) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPackedIce.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPackedIce.edit.java deleted file mode 100644 index eb2c654..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPackedIce.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 18 : 19 @ 18 : 19 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPane.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPane.edit.java deleted file mode 100644 index 41526a1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPane.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 55 : 56 @ 55 : 56 - -~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom random, int i) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPistonBase.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPistonBase.edit.java deleted file mode 100644 index 696efbd..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPistonBase.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 58 : 59 @ 58 : 62 - -~ this.checkForMove(world, blockpos, iblockstate); - -> CHANGE 3 : 4 @ 3 : 7 - -~ this.checkForMove(world, blockpos, iblockstate); - -> CHANGE 3 : 4 @ 3 : 4 - -~ if (world.getTileEntity(blockpos) == null) { - -> CHANGE 50 : 51 @ 50 : 51 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPistonExtension.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPistonExtension.edit.java deleted file mode 100644 index 780419a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPistonExtension.edit.java +++ /dev/null @@ -1,28 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 29 : 30 @ 29 : 31 - -~ public static PropertyEnum TYPE; - -> INSERT 11 : 16 @ 11 - -+ public static void bootstrapStates() { -+ TYPE = PropertyEnum.create("type", -+ BlockPistonExtension.EnumPistonType.class); -+ } -+ - -> CHANGE 44 : 45 @ 44 : 45 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPistonMoving.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPistonMoving.edit.java deleted file mode 100644 index 68418af..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPistonMoving.edit.java +++ /dev/null @@ -1,39 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 32 : 33 @ 32 : 33 - -~ public static PropertyEnum TYPE; - -> INSERT 8 : 12 @ 8 - -+ public static void bootstrapStates() { -+ TYPE = BlockPistonExtension.TYPE; -+ } -+ - -> CHANGE 47 : 48 @ 47 : 48 - -~ if (world.getTileEntity(blockpos) == null) { - -> CHANGE 7 : 8 @ 7 : 8 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 4 : 5 @ 4 : 5 - -~ { - -> CHANGE 13 : 14 @ 13 : 17 - -~ world.getTileEntity(blockpos); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPlanks.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPlanks.edit.java deleted file mode 100644 index 9697bd2..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPlanks.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 23 : 24 @ 23 : 25 - -~ public static PropertyEnum VARIANT; - -> INSERT 7 : 11 @ 7 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPortal.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPortal.edit.java deleted file mode 100644 index abfbf4c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPortal.edit.java +++ /dev/null @@ -1,29 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 4 @ 2 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache; - -> CHANGE 38 : 39 @ 38 : 39 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> CHANGE 119 : 120 @ 119 : 120 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> CHANGE 14 : 15 @ 14 : 15 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { - -> CHANGE 46 : 47 @ 46 : 47 - -~ EaglerLoadingCache loadingcache = BlockPattern.func_181627_a(parWorld, true); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPotato.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPotato.edit.java deleted file mode 100644 index 638cfdb..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPotato.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 28 : 29 @ 28 : 29 - -~ { - -> DELETE 3 @ 3 : 4 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPressurePlate.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPressurePlate.edit.java deleted file mode 100644 index bf14b29..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPressurePlate.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 55 : 56 @ 55 : 56 - -~ for (Entity entity : (List) list) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPrismarine.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPrismarine.edit.java deleted file mode 100644 index 2f999f8..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockPrismarine.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 24 : 25 @ 24 : 26 - -~ public static PropertyEnum VARIANT; - -> INSERT 10 : 14 @ 10 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockPrismarine.EnumType.class); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockQuartz.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockQuartz.edit.java deleted file mode 100644 index a6c085f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockQuartz.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 27 : 28 @ 27 : 29 - -~ public static PropertyEnum VARIANT; - -> INSERT 7 : 11 @ 7 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockQuartz.EnumType.class); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRail.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRail.edit.java deleted file mode 100644 index 9bf07ee..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRail.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 19 : 20 @ 19 : 21 - -~ public static PropertyEnum SHAPE; - -> INSERT 7 : 11 @ 7 - -+ public static void bootstrapStates() { -+ SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRailBase.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRailBase.edit.java deleted file mode 100644 index bd907f3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRailBase.edit.java +++ /dev/null @@ -1,29 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 3 : 4 @ 3 - -+ - -> CHANGE 79 : 80 @ 79 : 80 - -~ { - -> DELETE 5 @ 5 : 6 - -> CHANGE 3 : 4 @ 3 : 4 - -~ { - -> DELETE 27 @ 27 : 28 - -> CHANGE 8 : 10 @ 8 : 11 - -~ return (new BlockRailBase.Rail(worldIn, parBlockPos, parIBlockState)) -~ .func_180364_a(worldIn.isBlockPowered(parBlockPos), parFlag).getBlockState(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRailDetector.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRailDetector.edit.java deleted file mode 100644 index eff618d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRailDetector.edit.java +++ /dev/null @@ -1,44 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 26 : 27 @ 26 : 35 - -~ public static PropertyEnum SHAPE; - -> INSERT 9 : 21 @ 9 - -+ public static void bootstrapStates() { -+ SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class, -+ new Predicate() { -+ public boolean apply(BlockRailBase.EnumRailDirection blockrailbase$enumraildirection) { -+ return blockrailbase$enumraildirection != BlockRailBase.EnumRailDirection.NORTH_EAST -+ && blockrailbase$enumraildirection != BlockRailBase.EnumRailDirection.NORTH_WEST -+ && blockrailbase$enumraildirection != BlockRailBase.EnumRailDirection.SOUTH_EAST -+ && blockrailbase$enumraildirection != BlockRailBase.EnumRailDirection.SOUTH_WEST; -+ } -+ }); -+ } -+ - -> CHANGE 9 : 10 @ 9 : 10 - -~ { - -> CHANGE 6 : 7 @ 6 : 7 - -~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { - -> CHANGE 2 : 4 @ 2 : 4 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { -~ if (((Boolean) iblockstate.getValue(POWERED)).booleanValue()) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRailPowered.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRailPowered.edit.java deleted file mode 100644 index 8203e30..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRailPowered.edit.java +++ /dev/null @@ -1,27 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 21 : 22 @ 21 : 30 - -~ public static PropertyEnum SHAPE; - -> INSERT 9 : 21 @ 9 - -+ public static void bootstrapStates() { -+ SHAPE = PropertyEnum.create("shape", BlockRailBase.EnumRailDirection.class, -+ new Predicate() { -+ public boolean apply(BlockRailBase.EnumRailDirection blockrailbase$enumraildirection) { -+ return blockrailbase$enumraildirection != BlockRailBase.EnumRailDirection.NORTH_EAST -+ && blockrailbase$enumraildirection != BlockRailBase.EnumRailDirection.NORTH_WEST -+ && blockrailbase$enumraildirection != BlockRailBase.EnumRailDirection.SOUTH_EAST -+ && blockrailbase$enumraildirection != BlockRailBase.EnumRailDirection.SOUTH_WEST; -+ } -+ }); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedSandstone.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedSandstone.edit.java deleted file mode 100644 index 2f81be3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedSandstone.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 23 : 24 @ 23 : 25 - -~ public static PropertyEnum TYPE; - -> INSERT 7 : 11 @ 7 - -+ public static void bootstrapStates() { -+ TYPE = PropertyEnum.create("type", BlockRedSandstone.EnumType.class); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneComparator.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneComparator.edit.java deleted file mode 100644 index a23e559..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneComparator.edit.java +++ /dev/null @@ -1,31 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 35 : 36 @ 35 : 37 - -~ public static PropertyEnum MODE; - -> INSERT 9 : 13 @ 9 - -+ public static void bootstrapStates() { -+ MODE = PropertyEnum.create("mode", BlockRedstoneComparator.Mode.class); -+ } -+ - -> CHANGE 4 : 5 @ 4 : 5 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 148 : 149 @ 148 : 149 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneDiode.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneDiode.edit.java deleted file mode 100644 index 32f5098..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneDiode.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 43 : 44 @ 43 : 44 - -~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { - -> CHANGE 2 : 3 @ 2 : 3 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneLight.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneLight.edit.java deleted file mode 100644 index 38bbd92..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneLight.edit.java +++ /dev/null @@ -1,35 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 29 : 30 @ 29 : 30 - -~ { - -> DELETE 5 @ 5 : 6 - -> CHANGE 4 : 5 @ 4 : 5 - -~ { - -> DELETE 5 @ 5 : 6 - -> CHANGE 3 : 5 @ 3 : 5 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { -~ { - -> DELETE 3 @ 3 : 4 - -> CHANGE 3 : 4 @ 3 : 4 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneOre.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneOre.edit.java deleted file mode 100644 index 7d39974..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneOre.edit.java +++ /dev/null @@ -1,36 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 61 : 62 @ 61 : 62 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { - -> CHANGE 6 : 7 @ 6 : 7 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDropped(EaglercraftRandom random) { - -> CHANGE 12 : 13 @ 12 : 13 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { - -> CHANGE 7 : 8 @ 7 : 8 - -~ EaglercraftRandom random = worldIn.rand; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneRepeater.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneRepeater.edit.java deleted file mode 100644 index 648b2d8..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneRepeater.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 73 : 74 @ 73 : 74 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 15 : 16 @ 15 : 16 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneTorch.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneTorch.edit.java deleted file mode 100644 index 52d10e1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneTorch.edit.java +++ /dev/null @@ -1,28 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 85 : 86 @ 85 : 86 - -~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { - -> CHANGE 2 : 3 @ 2 : 3 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> CHANGE 48 : 49 @ 48 : 49 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 7 : 8 @ 7 : 8 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneWire.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneWire.edit.java deleted file mode 100644 index 6e9ff2d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockRedstoneWire.edit.java +++ /dev/null @@ -1,65 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 31 : 35 @ 31 : 39 - -~ public static PropertyEnum NORTH; -~ public static PropertyEnum EAST; -~ public static PropertyEnum SOUTH; -~ public static PropertyEnum WEST; - -> INSERT 14 : 25 @ 14 - -+ public static void bootstrapStates() { -+ NORTH = PropertyEnum.create("north", -+ BlockRedstoneWire.EnumAttachPosition.class); -+ EAST = PropertyEnum.create("east", -+ BlockRedstoneWire.EnumAttachPosition.class); -+ SOUTH = PropertyEnum.create("south", -+ BlockRedstoneWire.EnumAttachPosition.class); -+ WEST = PropertyEnum.create("west", -+ BlockRedstoneWire.EnumAttachPosition.class); -+ } -+ - -> CHANGE 52 : 53 @ 52 : 53 - -~ for (BlockPos blockpos : (ArrayList) arraylist) { - -> CHANGE 78 : 79 @ 78 : 79 - -~ { - -> DELETE 18 @ 18 : 19 - -> CHANGE 5 : 6 @ 5 : 6 - -~ { - -> DELETE 18 @ 18 : 19 - -> CHANGE 13 : 18 @ 13 : 21 - -~ if (this.canPlaceBlockAt(world, blockpos)) { -~ this.updateSurroundingRedstone(world, blockpos, iblockstate); -~ } else { -~ this.dropBlockAsItem(world, blockpos, iblockstate, 0); -~ world.setBlockToAir(blockpos); - -> CHANGE 3 : 4 @ 3 : 4 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 99 : 100 @ 99 : 100 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockReed.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockReed.edit.java deleted file mode 100644 index 8234243..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockReed.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 34 : 35 @ 34 : 35 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { - -> CHANGE 62 : 63 @ 62 : 63 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSand.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSand.edit.java deleted file mode 100644 index f89f2f5..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSand.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 22 : 23 @ 22 : 24 - -~ public static PropertyEnum VARIANT; - -> INSERT 5 : 9 @ 5 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockSand.EnumType.class); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSandStone.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSandStone.edit.java deleted file mode 100644 index 78590dd..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSandStone.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 23 : 24 @ 23 : 25 - -~ public static PropertyEnum TYPE; - -> INSERT 7 : 11 @ 7 - -+ public static void bootstrapStates() { -+ TYPE = PropertyEnum.create("type", BlockSandStone.EnumType.class); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSapling.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSapling.edit.java deleted file mode 100644 index 65bfb1a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSapling.edit.java +++ /dev/null @@ -1,46 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 36 : 37 @ 36 : 38 - -~ public static PropertyEnum TYPE; - -> INSERT 10 : 14 @ 10 - -+ public static void bootstrapStates() { -+ TYPE = PropertyEnum.create("type", BlockPlanks.EnumType.class); -+ } -+ - -> CHANGE 5 : 7 @ 5 : 7 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -~ { - -> DELETE 4 @ 4 : 5 - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void grow(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) { - -> CHANGE 8 : 9 @ 8 : 9 - -~ public void generateTree(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) { - -> CHANGE 119 : 120 @ 119 : 120 - -~ public boolean canUseBonemeal(World world, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void grow(World world, EaglercraftRandom random, BlockPos blockpos, IBlockState iblockstate) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSeaLantern.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSeaLantern.edit.java deleted file mode 100644 index 00ee57f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSeaLantern.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 22 : 23 @ 22 : 23 - -~ public int quantityDropped(EaglercraftRandom random) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSign.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSign.edit.java deleted file mode 100644 index c6526af..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSign.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 58 : 59 @ 58 : 59 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 9 : 10 @ 9 : 12 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSilverfish.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSilverfish.edit.java deleted file mode 100644 index 3b8b194..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSilverfish.edit.java +++ /dev/null @@ -1,28 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 25 : 26 @ 25 : 27 - -~ public static PropertyEnum VARIANT; - -> CHANGE 8 : 13 @ 8 : 9 - -~ public static void bootstrapStates() { -~ VARIANT = PropertyEnum.create("variant", BlockSilverfish.EnumType.class); -~ } -~ -~ public int quantityDropped(EaglercraftRandom var1) { - -> CHANGE 27 : 28 @ 27 : 28 - -~ if (world.getGameRules().getBoolean("doTileDrops")) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSkull.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSkull.edit.java deleted file mode 100644 index 2bcb429..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSkull.edit.java +++ /dev/null @@ -1,33 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 18 : 20 @ 18 : 20 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTUtil; - -> CHANGE 110 : 111 @ 110 : 111 - -~ { - -> CHANGE 20 : 21 @ 20 : 21 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 5 : 6 @ 5 : 6 - -~ && this.getWitherBasePattern().match(worldIn, pos) != null; - -> CHANGE 3 : 4 @ 3 : 5 - -~ if (te.getSkullType() == 1 && pos.getY() >= 2 && worldIn.getDifficulty() != EnumDifficulty.PEACEFUL) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSlab.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSlab.edit.java deleted file mode 100644 index 7839370..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSlab.edit.java +++ /dev/null @@ -1,52 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> INSERT 7 : 9 @ 7 - -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.player.EntityPlayer; -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.projectile.EntityArrow; - -> INSERT 2 : 3 @ 2 - -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.server.MinecraftServer; - -> CHANGE 15 : 16 @ 15 : 17 - -~ public static PropertyEnum HALF; - -> INSERT 12 : 16 @ 12 - -+ public static void bootstrapStates() { -+ HALF = PropertyEnum.create("half", BlockSlab.EnumBlockHalf.class); -+ } -+ - -> CHANGE 48 : 49 @ 48 : 49 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> INSERT 65 : 78 @ 65 - -+ -+ public boolean onBlockActivated(World world, BlockPos blockpos, IBlockState var3, EntityPlayer entityplayer, -+ EnumFacing var5, float var6, float var7, float var8) { -+ if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance().getBoolean("clickToSit") -+ && entityplayer.getHeldItem() == null) { -+ EntityArrow arrow = new EntityArrow(world, blockpos.getX() + 0.5D, blockpos.getY(), blockpos.getZ() + 0.5D); -+ arrow.isChair = true; -+ world.spawnEntityInWorld(arrow); -+ entityplayer.mountEntity(arrow); -+ return true; -+ } -+ return super.onBlockActivated(world, blockpos, var3, entityplayer, var5, var6, var7, var8); -+ } - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSnow.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSnow.edit.java deleted file mode 100644 index 3be5b57..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSnow.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 104 : 105 @ 104 : 105 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSnowBlock.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSnowBlock.edit.java deleted file mode 100644 index 98e5cf0..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSnowBlock.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 24 : 25 @ 24 : 25 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSponge.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSponge.edit.java deleted file mode 100644 index 8a63627..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockSponge.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 86 : 87 @ 86 : 87 - -~ for (BlockPos blockpos2 : (ArrayList) arraylist) { - -> CHANGE 23 : 24 @ 23 : 24 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStainedGlass.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStainedGlass.edit.java deleted file mode 100644 index ed4835c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStainedGlass.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 52 : 53 @ 52 : 53 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> CHANGE 16 : 17 @ 16 : 20 - -~ BlockBeacon.updateColorAsync(world, blockpos); - -> CHANGE 3 : 4 @ 3 : 7 - -~ BlockBeacon.updateColorAsync(world, blockpos); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStainedGlassPane.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStainedGlassPane.edit.java deleted file mode 100644 index 34f3e3a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStainedGlassPane.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 70 : 71 @ 70 : 74 - -~ BlockBeacon.updateColorAsync(world, blockpos); - -> CHANGE 3 : 4 @ 3 : 7 - -~ BlockBeacon.updateColorAsync(world, blockpos); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStairs.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStairs.edit.java deleted file mode 100644 index 4558c8d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStairs.edit.java +++ /dev/null @@ -1,52 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> INSERT 11 : 12 @ 11 - -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.projectile.EntityArrow; - -> INSERT 1 : 2 @ 1 - -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.server.MinecraftServer; - -> CHANGE 20 : 22 @ 20 : 24 - -~ public static PropertyEnum HALF; -~ public static PropertyEnum SHAPE; - -> INSERT 20 : 25 @ 20 - -+ public static void bootstrapStates() { -+ HALF = PropertyEnum.create("half", BlockStairs.EnumHalf.class); -+ SHAPE = PropertyEnum.create("shape", BlockStairs.EnumShape.class); -+ } -+ - -> CHANGE 344 : 345 @ 344 : 345 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> CHANGE 60 : 61 @ 60 : 61 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> INSERT 5 : 13 @ 5 - -+ if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance().getBoolean("clickToSit") -+ && entityplayer.getHeldItem() == null) { -+ EntityArrow arrow = new EntityArrow(world, blockpos.getX() + 0.5D, blockpos.getY(), blockpos.getZ() + 0.5D); -+ arrow.isChair = true; -+ world.spawnEntityInWorld(arrow); -+ entityplayer.mountEntity(arrow); -+ return true; -+ } - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStaticLiquid.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStaticLiquid.edit.java deleted file mode 100644 index 8ffa0f4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStaticLiquid.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 40 : 41 @ 40 : 41 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStem.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStem.edit.java deleted file mode 100644 index bae3137..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStem.edit.java +++ /dev/null @@ -1,32 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 64 : 65 @ 64 : 65 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { - -> CHANGE 62 : 63 @ 62 : 63 - -~ { - -> CHANGE 19 : 20 @ 19 : 20 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 12 : 13 @ 12 : 13 - -~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStone.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStone.edit.java deleted file mode 100644 index d6b0185..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStone.edit.java +++ /dev/null @@ -1,27 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 22 : 23 @ 22 : 24 - -~ public static PropertyEnum VARIANT; - -> INSERT 7 : 11 @ 7 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockStone.EnumType.class); -+ } -+ - -> CHANGE 9 : 10 @ 9 : 10 - -~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStoneBrick.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStoneBrick.edit.java deleted file mode 100644 index c02db7c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStoneBrick.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 22 : 23 @ 22 : 24 - -~ public static PropertyEnum VARIANT; - -> INSERT 11 : 15 @ 11 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockStoneBrick.EnumType.class); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStoneSlab.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStoneSlab.edit.java deleted file mode 100644 index b5fd736..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStoneSlab.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 25 : 26 @ 25 : 27 - -~ public static PropertyEnum VARIANT; - -> CHANGE 14 : 19 @ 14 : 15 - -~ public static void bootstrapStates() { -~ VARIANT = PropertyEnum.create("variant", BlockStoneSlab.EnumType.class); -~ } -~ -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStoneSlabNew.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStoneSlabNew.edit.java deleted file mode 100644 index 0af1904..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockStoneSlabNew.edit.java +++ /dev/null @@ -1,27 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 27 : 28 @ 27 : 29 - -~ public static PropertyEnum VARIANT; - -> INSERT 14 : 18 @ 14 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockStoneSlabNew.EnumType.class); -+ } -+ - -> CHANGE 4 : 5 @ 4 : 5 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTNT.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTNT.edit.java deleted file mode 100644 index 15e4830..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTNT.edit.java +++ /dev/null @@ -1,22 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 55 : 56 @ 55 : 56 - -~ { - -> CHANGE 13 : 14 @ 13 : 14 - -~ { - -> DELETE 6 @ 6 : 7 - -> CHANGE 24 : 25 @ 24 : 25 - -~ if (entity instanceof EntityArrow) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTallGrass.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTallGrass.edit.java deleted file mode 100644 index 5c70723..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTallGrass.edit.java +++ /dev/null @@ -1,43 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 31 : 32 @ 31 : 33 - -~ public static PropertyEnum TYPE; - -> INSERT 8 : 12 @ 8 - -+ public static void bootstrapStates() { -+ TYPE = PropertyEnum.create("type", BlockTallGrass.EnumType.class); -+ } -+ - -> CHANGE 26 : 27 @ 26 : 27 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int var3) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { - -> CHANGE 5 : 6 @ 5 : 6 - -~ if (entityplayer.getCurrentEquippedItem() != null - -> CHANGE 26 : 27 @ 26 : 27 - -~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void grow(World world, EaglercraftRandom var2, BlockPos blockpos, IBlockState iblockstate) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTorch.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTorch.edit.java deleted file mode 100644 index 57bd85f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTorch.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 158 : 159 @ 158 : 159 - -~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTrapDoor.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTrapDoor.edit.java deleted file mode 100644 index f25c354..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTrapDoor.edit.java +++ /dev/null @@ -1,25 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 36 : 37 @ 36 : 38 - -~ public static PropertyEnum HALF; - -> INSERT 11 : 15 @ 11 - -+ public static void bootstrapStates() { -+ HALF = PropertyEnum.create("half", BlockTrapDoor.DoorHalf.class); -+ } -+ - -> CHANGE 78 : 79 @ 78 : 79 - -~ { - -> DELETE 13 @ 13 : 14 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTripWire.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTripWire.edit.java deleted file mode 100644 index 2fbd165..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTripWire.edit.java +++ /dev/null @@ -1,39 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 75 : 76 @ 75 : 76 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 43 : 46 @ 43 : 49 - -~ if (entityplayer.getCurrentEquippedItem() != null -~ && entityplayer.getCurrentEquippedItem().getItem() == Items.shears) { -~ world.setBlockState(blockpos, iblockstate.withProperty(DISARMED, Boolean.valueOf(true)), 4); - -> CHANGE 24 : 25 @ 24 : 25 - -~ { - -> CHANGE 6 : 7 @ 6 : 7 - -~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { - -> CHANGE 2 : 4 @ 2 : 4 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { -~ { - -> CHANGE 15 : 16 @ 15 : 16 - -~ for (Entity entity : (List) list) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTripWireHook.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTripWireHook.edit.java deleted file mode 100644 index 50ba15f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockTripWireHook.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 176 : 177 @ 176 : 177 - -~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { - -> CHANGE 2 : 3 @ 2 : 3 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockVine.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockVine.edit.java deleted file mode 100644 index 123c058..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockVine.edit.java +++ /dev/null @@ -1,35 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 190 : 191 @ 190 : 191 - -~ if (!this.recheckGrownSides(world, blockpos, iblockstate)) { - -> CHANGE 6 : 8 @ 6 : 8 - -~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -~ { - -> DELETE 118 @ 118 : 119 - -> CHANGE 15 : 16 @ 15 : 16 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public int quantityDropped(EaglercraftRandom var1) { - -> CHANGE 5 : 6 @ 5 : 6 - -~ if (entityplayer.getCurrentEquippedItem() != null - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockWall.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockWall.edit.java deleted file mode 100644 index d624756..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockWall.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 36 : 37 @ 36 : 38 - -~ public static PropertyEnum VARIANT; - -> INSERT 13 : 17 @ 13 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockWall.EnumType.class); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockWeb.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockWeb.edit.java deleted file mode 100644 index 9628378..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockWeb.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 41 : 42 @ 41 : 42 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockWoodSlab.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockWoodSlab.edit.java deleted file mode 100644 index 55bc42b..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockWoodSlab.edit.java +++ /dev/null @@ -1,27 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 23 : 24 @ 23 : 25 - -~ public static PropertyEnum VARIANT; - -> INSERT 12 : 16 @ 12 - -+ public static void bootstrapStates() { -+ VARIANT = PropertyEnum.create("variant", BlockPlanks.EnumType.class); -+ } -+ - -> CHANGE 4 : 5 @ 4 : 5 - -~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockWorkbench.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockWorkbench.edit.java deleted file mode 100644 index d882672..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockWorkbench.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 34 : 35 @ 34 : 37 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/IGrowable.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/IGrowable.edit.java deleted file mode 100644 index 77cb025..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/IGrowable.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 7 : 8 @ 7 : 8 - -~ boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4); - -> CHANGE 1 : 2 @ 1 : 2 - -~ void grow(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/properties/PropertyEnum.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/properties/PropertyEnum.edit.java deleted file mode 100644 index 0accdf5..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/properties/PropertyEnum.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 28 : 29 @ 28 : 29 - -~ for (T oenum : allowedValues) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/state/BlockState.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/state/BlockState.edit.java deleted file mode 100644 index f65c107..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/state/BlockState.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 65 : 66 @ 65 : 66 - -~ for (BlockState.StateImplementation blockstate$stateimplementation1 : (ArrayList) arraylist) { - -> CHANGE 97 : 98 @ 97 : 98 - -~ for (Comparable comparable : (Collection) iproperty.getAllowedValues()) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/state/BlockStateBase.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/state/BlockStateBase.edit.java deleted file mode 100644 index e0a4a44..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/state/BlockStateBase.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 5 : 6 @ 5 - -+ - -> CHANGE 28 : 29 @ 28 : 30 - -~ return this.withProperty(property, cyclePropertyValue(property.getAllowedValues(), this.getValue(property))); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/state/pattern/BlockPattern.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/state/pattern/BlockPattern.edit.java deleted file mode 100644 index 6cb16ad..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/state/pattern/BlockPattern.edit.java +++ /dev/null @@ -1,55 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 7 @ 4 : 6 - -~ -~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerCacheProvider; -~ import net.lax1dude.eaglercraft.v1_8.cache.EaglerLoadingCache; - -> CHANGE 45 : 46 @ 45 : 46 - -~ EaglerLoadingCache lcache) { - -> CHANGE 3 : 4 @ 3 : 5 - -~ if (!this.blockMatches[k][j][i].apply(lcache.get(translateOffset(pos, finger, thumb, i, j, k)))) { - -> CHANGE 11 : 12 @ 11 : 12 - -~ EaglerLoadingCache loadingcache = func_181627_a(worldIn, false); - -> CHANGE 19 : 21 @ 19 : 21 - -~ public static EaglerLoadingCache func_181627_a(World parWorld, boolean parFlag) { -~ return new EaglerLoadingCache(new BlockPattern.CacheLoader(parWorld, parFlag)); - -> CHANGE 16 : 17 @ 16 : 17 - -~ static class CacheLoader implements EaglerCacheProvider { - -> CHANGE 8 : 9 @ 8 : 9 - -~ public BlockWorldState create(BlockPos parBlockPos) { - -> INSERT 2 : 3 @ 2 - -+ - -> CHANGE 6 : 7 @ 6 : 7 - -~ private final EaglerLoadingCache lcache; - -> CHANGE 5 : 6 @ 5 : 6 - -~ EaglerLoadingCache parLoadingCache, int parInt1, int parInt2, int parInt3) { - -> CHANGE 30 : 31 @ 30 : 31 - -~ return (BlockWorldState) this.lcache.get(BlockPattern.translateOffset(this.pos, this.getFinger(), - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java deleted file mode 100644 index 56a0456..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 7 @ 7 : 8 - -> DELETE 5 @ 5 : 7 - -> CHANGE 21 : 22 @ 21 : 22 - -~ if (!(aisle == null || aisle.length <= 0) && !StringUtils.isEmpty(aisle[0])) { - -> CHANGE 18 : 19 @ 18 : 19 - -~ this.symbolMap.put(Character.valueOf(c0), null); - -> CHANGE 27 : 28 @ 27 : 29 - -~ Predicate[][][] apredicate = new Predicate[this.depth.size()][this.aisleHeight][this.rowWidth]; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandBlockData.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandBlockData.edit.java deleted file mode 100644 index 8fa78e9..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandBlockData.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 8 : 11 @ 8 : 11 - -~ import net.minecraft.nbt.JsonToNBT; -~ import net.minecraft.nbt.NBTException; -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandClearInventory.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandClearInventory.edit.java deleted file mode 100644 index 5f9ecdc..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandClearInventory.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 12 @ 9 : 12 - -~ import net.minecraft.nbt.JsonToNBT; -~ import net.minecraft.nbt.NBTException; -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandCompare.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandCompare.edit.java deleted file mode 100644 index e10870d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandCompare.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 10 : 11 @ 10 : 11 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandEnchant.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandEnchant.edit.java deleted file mode 100644 index 5176ca3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandEnchant.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 12 : 13 @ 12 : 13 - -~ import net.minecraft.nbt.NBTTagList; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandEntityData.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandEntityData.edit.java deleted file mode 100644 index 8fa78e9..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandEntityData.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 8 : 11 @ 8 : 11 - -~ import net.minecraft.nbt.JsonToNBT; -~ import net.minecraft.nbt.NBTException; -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandGive.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandGive.edit.java deleted file mode 100644 index e781c1a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandGive.edit.java +++ /dev/null @@ -1,13 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 12 : 14 @ 12 : 14 - -~ import net.minecraft.nbt.JsonToNBT; -~ import net.minecraft.nbt.NBTException; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandReplaceItem.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandReplaceItem.edit.java deleted file mode 100644 index 680b778..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandReplaceItem.edit.java +++ /dev/null @@ -1,13 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 18 : 20 @ 18 : 20 - -~ import net.minecraft.nbt.JsonToNBT; -~ import net.minecraft.nbt.NBTException; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandResultStats.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandResultStats.edit.java deleted file mode 100644 index 422c315..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandResultStats.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/PlayerSelector.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/PlayerSelector.edit.java deleted file mode 100644 index 1d7e372..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/PlayerSelector.edit.java +++ /dev/null @@ -1,60 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 71 : 72 @ 71 : 72 - -~ for (Entity entity : (ArrayList) list) { - -> CHANGE 20 : 21 @ 20 : 21 - -~ for (World world : (ArrayList) list) { - -> CHANGE 49 : 50 @ 49 : 50 - -~ String s = func_179651_b(parMap, "type"); - -> INSERT 16 : 17 @ 16 - -+ final String ss = s; - -> CHANGE 2 : 3 @ 2 : 3 - -~ return EntityList.isStringEntityName(entity, ss) != flag; - -> CHANGE 49 : 50 @ 49 : 50 - -~ String s = func_179651_b(parMap, "team"); - -> INSERT 6 : 7 @ 6 - -+ final String ss = s; - -> CHANGE 8 : 9 @ 8 : 9 - -~ return s1.equals(ss) != flag; - -> CHANGE 16 : 17 @ 16 : 17 - -~ for (Entry entry : (Set) map.entrySet()) { - -> CHANGE 39 : 40 @ 39 : 40 - -~ String s = func_179651_b(parMap, "name"); - -> INSERT 6 : 7 @ 6 - -+ final String ss = s; - -> CHANGE 2 : 3 @ 2 : 3 - -~ return entity.getName().equals(ss) != flag; - -> CHANGE 135 : 136 @ 135 : 136 - -~ parList = (List) Lists.newArrayList(entity); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandBlockLogic.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandBlockLogic.edit.java deleted file mode 100644 index ed15907..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandBlockLogic.edit.java +++ /dev/null @@ -1,43 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 5 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EagRuntime; -~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; -~ - -> CHANGE 6 : 8 @ 6 : 8 - -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; - -> CHANGE 1 : 2 @ 1 : 2 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 14 : 15 @ 14 : 15 - -~ private static final SimpleDateFormat timestampFormat = EagRuntime.fixDateFormat(new SimpleDateFormat("HH:mm:ss")); - -> DELETE 59 @ 59 : 63 - -> CHANGE 1 : 2 @ 1 : 2 - -~ if (minecraftserver != null && minecraftserver.isCommandBlockEnabled()) { - -> CHANGE 39 : 40 @ 39 : 40 - -~ if (this.trackOutput && this.getEntityWorld() != null) { - -> CHANGE 9 : 10 @ 9 : 10 - -~ return minecraftserver == null - -> DELETE 29 @ 29 : 33 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandSetBlock.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandSetBlock.edit.java deleted file mode 100644 index 3c6f47f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandSetBlock.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 12 : 15 @ 12 : 15 - -~ import net.minecraft.nbt.JsonToNBT; -~ import net.minecraft.nbt.NBTException; -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandSummon.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandSummon.edit.java deleted file mode 100644 index 3c6f47f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandSummon.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 12 : 15 @ 12 : 15 - -~ import net.minecraft.nbt.JsonToNBT; -~ import net.minecraft.nbt.NBTException; -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandTestFor.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandTestFor.edit.java deleted file mode 100644 index e540233..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandTestFor.edit.java +++ /dev/null @@ -1,15 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 8 : 12 @ 8 : 12 - -~ import net.minecraft.nbt.JsonToNBT; -~ import net.minecraft.nbt.NBTException; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTUtil; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandTestForBlock.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandTestForBlock.edit.java deleted file mode 100644 index 418742b..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandTestForBlock.edit.java +++ /dev/null @@ -1,15 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 11 : 15 @ 11 : 15 - -~ import net.minecraft.nbt.JsonToNBT; -~ import net.minecraft.nbt.NBTException; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTUtil; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/EnchantmentDurability.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/EnchantmentDurability.edit.java deleted file mode 100644 index e7695b7..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/EnchantmentDurability.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 35 : 36 @ 35 : 36 - -~ public static boolean negateDamage(ItemStack parItemStack, int parInt1, EaglercraftRandom parRandom) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/EnchantmentHelper.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/EnchantmentHelper.edit.java deleted file mode 100644 index 255a800..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/EnchantmentHelper.edit.java +++ /dev/null @@ -1,43 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 10 : 11 @ 10 : 11 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 9 : 11 @ 9 : 11 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 11 : 12 @ 11 : 12 - -~ private static final EaglercraftRandom enchantmentRand = new EaglercraftRandom(); - -> CHANGE 211 : 213 @ 211 : 212 - -~ public static int calcItemStackEnchantability(EaglercraftRandom parRandom, int parInt1, int parInt2, -~ ItemStack parItemStack) { - -> CHANGE 14 : 15 @ 14 : 15 - -~ public static ItemStack addRandomEnchantment(EaglercraftRandom parRandom, ItemStack parItemStack, int parInt1) { - -> CHANGE 7 : 8 @ 7 : 8 - -~ for (EnchantmentData enchantmentdata : (List) list) { - -> CHANGE 11 : 13 @ 11 : 12 - -~ public static List buildEnchantmentList(EaglercraftRandom randomIn, ItemStack itemStackIn, -~ int parInt1) { - -> CHANGE 30 : 31 @ 30 : 31 - -~ for (EnchantmentData enchantmentdata1 : (ArrayList) arraylist) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/EnchantmentThorns.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/EnchantmentThorns.edit.java deleted file mode 100644 index 11c9792..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/EnchantmentThorns.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 40 : 41 @ 40 : 41 - -~ EaglercraftRandom random = entitylivingbase.getRNG(); - -> CHANGE 17 : 18 @ 17 : 18 - -~ public static boolean func_92094_a(int parInt1, EaglercraftRandom parRandom) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public static int func_92095_b(int parInt1, EaglercraftRandom parRandom) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/EnumEnchantmentType.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/EnumEnchantmentType.edit.java deleted file mode 100644 index 1fd9443..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/EnumEnchantmentType.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 9 : 11 @ 9 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 3 : 7 @ 3 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/enchantment/EnumEnchantmentType"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/DataWatcher.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/DataWatcher.edit.java deleted file mode 100644 index d227e44..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/DataWatcher.edit.java +++ /dev/null @@ -1,82 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 8 : 10 @ 8 : 13 - -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; - -> CHANGE 20 : 21 @ 20 : 21 - -~ // private ReadWriteLock lock = new ReentrantReadWriteLock(); - -> CHANGE 16 : 17 @ 16 : 17 - -~ // this.lock.writeLock().lock(); - -> CHANGE 1 : 2 @ 1 : 2 - -~ // this.lock.writeLock().unlock(); - -> CHANGE 7 : 8 @ 7 : 8 - -~ // this.lock.writeLock().lock(); - -> CHANGE 1 : 2 @ 1 : 2 - -~ // this.lock.writeLock().unlock(); - -> CHANGE 28 : 29 @ 28 : 29 - -~ // this.lock.readLock().lock(); - -> CHANGE 11 : 12 @ 11 : 12 - -~ // this.lock.readLock().unlock(); - -> CHANGE 41 : 42 @ 41 : 42 - -~ // this.lock.readLock().lock(); - -> CHANGE 12 : 13 @ 12 : 13 - -~ // this.lock.readLock().unlock(); - -> CHANGE 7 : 8 @ 7 : 8 - -~ // this.lock.readLock().lock(); - -> CHANGE 5 : 6 @ 5 : 6 - -~ // this.lock.readLock().unlock(); - -> CHANGE 5 : 6 @ 5 : 6 - -~ // this.lock.readLock().lock(); - -> CHANGE 9 : 10 @ 9 : 10 - -~ // this.lock.readLock().unlock(); - -> CHANGE 25 : 26 @ 25 : 26 - -~ buffer.writeItemStackToBuffer_server(itemstack); - -> CHANGE 45 : 47 @ 45 : 46 - -~ datawatcher$watchableobject = new DataWatcher.WatchableObject(i, j, -~ buffer.readItemStackFromBuffer_server()); - -> CHANGE 21 : 22 @ 21 : 22 - -~ // this.lock.writeLock().lock(); - -> CHANGE 10 : 11 @ 10 : 11 - -~ // this.lock.writeLock().unlock(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/Entity.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/Entity.edit.java deleted file mode 100644 index 36aa8fd..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/Entity.edit.java +++ /dev/null @@ -1,145 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 7 @ 3 : 5 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ import net.lax1dude.eaglercraft.v1_8.HString; -~ - -> INSERT 1 : 3 @ 1 - -+ -+ import net.lax1dude.eaglercraft.v1_8.sp.server.CrashReportHelper; - -> CHANGE 10 : 12 @ 10 : 12 - -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; - -> CHANGE 13 : 17 @ 13 : 17 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagDouble; -~ import net.minecraft.nbt.NBTTagFloat; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 69 : 70 @ 69 : 70 - -~ protected EaglercraftRandom rand; - -> CHANGE 27 : 28 @ 27 : 28 - -~ protected EaglercraftUUID entityUniqueID; - -> CHANGE 21 : 22 @ 21 : 22 - -~ this.rand = new EaglercraftRandom(); - -> CHANGE 63 : 64 @ 63 : 64 - -~ if (this.width > f2 && !this.firstUpdate) { - -> CHANGE 47 : 48 @ 47 : 48 - -~ if (this.worldObj instanceof WorldServer) { - -> CHANGE 39 : 40 @ 39 : 42 - -~ if (this.fire > 0) { - -> CHANGE 23 : 24 @ 23 : 26 - -~ this.setFlag(0, this.fire > 0); - -> CHANGE 117 : 118 @ 117 : 118 - -~ for (AxisAlignedBB axisalignedbb1 : (List) list1) { - -> CHANGE 6 : 7 @ 6 : 7 - -~ for (AxisAlignedBB axisalignedbb2 : (List) list1) { - -> CHANGE 5 : 6 @ 5 : 6 - -~ for (AxisAlignedBB axisalignedbb13 : (List) list1) { - -> CHANGE 17 : 18 @ 17 : 18 - -~ for (AxisAlignedBB axisalignedbb6 : (List) list) { - -> CHANGE 6 : 7 @ 6 : 7 - -~ for (AxisAlignedBB axisalignedbb7 : (List) list) { - -> CHANGE 6 : 7 @ 6 : 7 - -~ for (AxisAlignedBB axisalignedbb8 : (List) list) { - -> CHANGE 7 : 8 @ 7 : 8 - -~ for (AxisAlignedBB axisalignedbb9 : (List) list) { - -> CHANGE 6 : 7 @ 6 : 7 - -~ for (AxisAlignedBB axisalignedbb10 : (List) list) { - -> CHANGE 6 : 7 @ 6 : 7 - -~ for (AxisAlignedBB axisalignedbb11 : (List) list) { - -> CHANGE 18 : 19 @ 18 : 19 - -~ for (AxisAlignedBB axisalignedbb12 : (List) list) { - -> CHANGE 142 : 143 @ 142 : 143 - -~ CrashReportHelper.addIntegratedServerBlockInfo(crashreportcategory, blockpos2, iblockstate); - -> CHANGE 508 : 510 @ 508 : 509 - -~ this.entityUniqueID = new EaglercraftUUID(tagCompund.getLong("UUIDMost"), -~ tagCompund.getLong("UUIDLeast")); - -> CHANGE 1 : 2 @ 1 : 2 - -~ this.entityUniqueID = EaglercraftUUID.fromString(tagCompund.getString("UUID")); - -> CHANGE 226 : 227 @ 226 : 227 - -~ for (AxisAlignedBB axisalignedbb : (List) list) { - -> CHANGE 23 : 24 @ 23 : 24 - -~ if (!parBlockPos.equals(this.field_181016_an)) { - -> CHANGE 48 : 49 @ 48 : 50 - -~ return !this.isImmuneToFire && this.fire > 0; - -> CHANGE 182 : 183 @ 182 : 183 - -~ return HString.format("%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", - -> CHANGE 25 : 26 @ 25 : 26 - -~ if (!this.isDead) { - -> CHANGE 72 : 73 @ 72 : 73 - -~ category.addCrashSection("Entity\'s Exact location", HString.format("%.2f, %.2f, %.2f", - -> CHANGE 4 : 5 @ 4 : 5 - -~ category.addCrashSection("Entity\'s Momentum", HString.format("%.2f, %.2f, %.2f", new Object[] { - -> CHANGE 17 : 18 @ 17 : 18 - -~ public EaglercraftUUID getUniqueID() { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityAgeable.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityAgeable.edit.java deleted file mode 100644 index 8b74208..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityAgeable.edit.java +++ /dev/null @@ -1,32 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 7 : 8 @ 7 : 8 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 27 : 28 @ 27 : 28 - -~ { - -> INSERT 20 : 21 @ 20 - -+ return true; - -> DELETE 1 @ 1 : 3 - -> CHANGE 11 : 12 @ 11 : 12 - -~ return this.growingAge; - -> CHANGE 52 : 53 @ 52 : 67 - -~ { - -> DELETE 12 @ 12 : 13 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityCreature.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityCreature.edit.java deleted file mode 100644 index 6bcf8a2..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityCreature.edit.java +++ /dev/null @@ -1,17 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 18 : 20 @ 18 : 19 - -~ public static final EaglercraftUUID FLEEING_SPEED_MODIFIER_UUID = EaglercraftUUID -~ .fromString("E199AD21-BA8A-4C53-8D13-6182D5C69D3A"); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityHanging.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityHanging.edit.java deleted file mode 100644 index 7ce116c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityHanging.edit.java +++ /dev/null @@ -1,32 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.minecraft.nbt.NBTTagCompound; - -> INSERT 5 : 6 @ 5 - -+ - -> CHANGE 76 : 77 @ 76 : 77 - -~ if (this.tickCounter1++ == 100) { - -> CHANGE 57 : 58 @ 57 : 58 - -~ if (!this.isDead) { - -> CHANGE 10 : 11 @ 10 : 11 - -~ if (!this.isDead && d0 * d0 + d1 * d1 + d2 * d2 > 0.0D) { - -> CHANGE 7 : 8 @ 7 : 8 - -~ if (!this.isDead && d0 * d0 + d1 * d1 + d2 * d2 > 0.0D) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityLeashKnot.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityLeashKnot.edit.java deleted file mode 100644 index e625802..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityLeashKnot.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 10 @ 9 : 10 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 67 : 68 @ 67 : 68 - -~ if (itemstack != null && itemstack.getItem() == Items.lead) { - -> CHANGE 11 : 12 @ 11 : 12 - -~ if (!flag) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityList.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityList.edit.java deleted file mode 100644 index 7d8958c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityList.edit.java +++ /dev/null @@ -1,196 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 74 : 75 @ 74 : 75 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 3 : 5 @ 3 : 5 - -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> INSERT 11 : 13 @ 11 - -+ private static final Map> stringToConstructorMapping = Maps -+ .newHashMap(); - -> INSERT 2 : 3 @ 2 - -+ private static final Map> idToConstructorMapping = Maps.newHashMap(); - -> INSERT 1 : 3 @ 1 - -+ private static final Map, EntityConstructor> classToConstructorMapping = Maps -+ .newHashMap(); - -> CHANGE 3 : 5 @ 3 : 4 - -~ private static void addMapping(Class entityClass, -~ EntityConstructor entityConstructor, String entityName, int id) { - -> INSERT 10 : 11 @ 10 - -+ stringToConstructorMapping.put(entityName, entityConstructor); - -> INSERT 2 : 3 @ 2 - -+ idToConstructorMapping.put(Integer.valueOf(id), entityConstructor); - -> INSERT 1 : 2 @ 1 - -+ classToConstructorMapping.put(entityClass, entityConstructor); - -> CHANGE 4 : 6 @ 4 : 5 - -~ private static void addMapping(Class entityClass, -~ EntityConstructor entityConstructor, String entityName, int entityID, int baseColor, - -> CHANGE 1 : 2 @ 1 : 2 - -~ addMapping(entityClass, entityConstructor, entityName, entityID); - -> CHANGE 7 : 10 @ 7 : 11 - -~ EntityConstructor constructor = stringToConstructorMapping.get(entityName); -~ if (constructor != null) { -~ entity = constructor.createEntity(worldIn); - -> CHANGE 2 : 3 @ 2 : 3 - -~ logger.error("Could not create entity", exception); - -> INSERT 5 : 28 @ 5 - -+ public static Entity createEntityByClass(Class entityClass, World worldIn) { -+ Entity entity = null; -+ -+ try { -+ EntityConstructor constructor = classToConstructorMapping.get(entityClass); -+ if (constructor != null) { -+ entity = constructor.createEntity(worldIn); -+ } -+ } catch (Exception exception) { -+ logger.error("Could not create entity", exception); -+ } -+ -+ return entity; -+ } -+ -+ public static Entity createEntityByClassUnsafe(Class entityClass, World worldIn) { -+ EntityConstructor constructor = classToConstructorMapping.get(entityClass); -+ if (constructor != null) { -+ return constructor.createEntity(worldIn); -+ } -+ return null; -+ } -+ - -> CHANGE 8 : 11 @ 8 : 12 - -~ EntityConstructor constructor = stringToConstructorMapping.get(nbt.getString("id")); -~ if (constructor != null) { -~ entity = constructor.createEntity(worldIn); - -> CHANGE 2 : 3 @ 2 : 3 - -~ logger.error("Could not create entity", exception); - -> CHANGE 15 : 18 @ 15 : 19 - -~ EntityConstructor constructor = getConstructorFromID(entityID); -~ if (constructor != null) { -~ entity = constructor.createEntity(worldIn); - -> CHANGE 2 : 3 @ 2 : 3 - -~ logger.error("Could not create entity", exception); - -> INSERT 18 : 22 @ 18 - -+ public static EntityConstructor getConstructorFromID(int entityID) { -+ return idToConstructorMapping.get(Integer.valueOf(entityID)); -+ } -+ - -> CHANGE 20 : 21 @ 20 : 21 - -~ for (String s : (Set) set) { - -> CHANGE 26 : 95 @ 26 : 88 - -~ addMapping(EntityItem.class, (w) -> new EntityItem(w), "Item", 1); -~ addMapping(EntityXPOrb.class, (w) -> new EntityXPOrb(w), "XPOrb", 2); -~ addMapping(EntityEgg.class, (w) -> new EntityEgg(w), "ThrownEgg", 7); -~ addMapping(EntityLeashKnot.class, (w) -> new EntityLeashKnot(w), "LeashKnot", 8); -~ addMapping(EntityPainting.class, (w) -> new EntityPainting(w), "Painting", 9); -~ addMapping(EntityArrow.class, (w) -> new EntityArrow(w), "Arrow", 10); -~ addMapping(EntitySnowball.class, (w) -> new EntitySnowball(w), "Snowball", 11); -~ addMapping(EntityLargeFireball.class, (w) -> new EntityLargeFireball(w), "Fireball", 12); -~ addMapping(EntitySmallFireball.class, (w) -> new EntitySmallFireball(w), "SmallFireball", 13); -~ addMapping(EntityEnderPearl.class, (w) -> new EntityEnderPearl(w), "ThrownEnderpearl", 14); -~ addMapping(EntityEnderEye.class, (w) -> new EntityEnderEye(w), "EyeOfEnderSignal", 15); -~ addMapping(EntityPotion.class, (w) -> new EntityPotion(w), "ThrownPotion", 16); -~ addMapping(EntityExpBottle.class, (w) -> new EntityExpBottle(w), "ThrownExpBottle", 17); -~ addMapping(EntityItemFrame.class, (w) -> new EntityItem(w), "ItemFrame", 18); -~ addMapping(EntityWitherSkull.class, (w) -> new EntityWitherSkull(w), "WitherSkull", 19); -~ addMapping(EntityTNTPrimed.class, (w) -> new EntityTNTPrimed(w), "PrimedTnt", 20); -~ addMapping(EntityFallingBlock.class, (w) -> new EntityFallingBlock(w), "FallingSand", 21); -~ addMapping(EntityFireworkRocket.class, (w) -> new EntityFireworkRocket(w), "FireworksRocketEntity", 22); -~ addMapping(EntityArmorStand.class, (w) -> new EntityArmorStand(w), "ArmorStand", 30); -~ addMapping(EntityBoat.class, (w) -> new EntityBoat(w), "Boat", 41); -~ addMapping(EntityMinecartEmpty.class, (w) -> new EntityMinecartEmpty(w), -~ EntityMinecart.EnumMinecartType.RIDEABLE.getName(), 42); -~ addMapping(EntityMinecartChest.class, (w) -> new EntityMinecartChest(w), -~ EntityMinecart.EnumMinecartType.CHEST.getName(), 43); -~ addMapping(EntityMinecartFurnace.class, (w) -> new EntityMinecartFurnace(w), -~ EntityMinecart.EnumMinecartType.FURNACE.getName(), 44); -~ addMapping(EntityMinecartTNT.class, (w) -> new EntityMinecartTNT(w), -~ EntityMinecart.EnumMinecartType.TNT.getName(), 45); -~ addMapping(EntityMinecartHopper.class, (w) -> new EntityMinecartHopper(w), -~ EntityMinecart.EnumMinecartType.HOPPER.getName(), 46); -~ addMapping(EntityMinecartMobSpawner.class, (w) -> new EntityMinecartMobSpawner(w), -~ EntityMinecart.EnumMinecartType.SPAWNER.getName(), 47); -~ addMapping(EntityMinecartCommandBlock.class, (w) -> new EntityMinecartCommandBlock(w), -~ EntityMinecart.EnumMinecartType.COMMAND_BLOCK.getName(), 40); -~ addMapping(EntityLiving.class, null, "Mob", 48); -~ addMapping(EntityMob.class, null, "Monster", 49); -~ addMapping(EntityCreeper.class, (w) -> new EntityCreeper(w), "Creeper", 50, 894731, 0); -~ addMapping(EntitySkeleton.class, (w) -> new EntitySkeleton(w), "Skeleton", 51, 12698049, 4802889); -~ addMapping(EntitySpider.class, (w) -> new EntitySpider(w), "Spider", 52, 3419431, 11013646); -~ addMapping(EntityGiantZombie.class, (w) -> new EntityGiantZombie(w), "Giant", 53); -~ addMapping(EntityZombie.class, (w) -> new EntityZombie(w), "Zombie", 54, '\uafaf', 7969893); -~ addMapping(EntitySlime.class, (w) -> new EntitySlime(w), "Slime", 55, 5349438, 8306542); -~ addMapping(EntityGhast.class, (w) -> new EntityGhast(w), "Ghast", 56, 16382457, 12369084); -~ addMapping(EntityPigZombie.class, (w) -> new EntityPigZombie(w), "PigZombie", 57, 15373203, 5009705); -~ addMapping(EntityEnderman.class, (w) -> new EntityEnderman(w), "Enderman", 58, 1447446, 0); -~ addMapping(EntityCaveSpider.class, (w) -> new EntityCaveSpider(w), "CaveSpider", 59, 803406, 11013646); -~ addMapping(EntitySilverfish.class, (w) -> new EntitySilverfish(w), "Silverfish", 60, 7237230, 3158064); -~ addMapping(EntityBlaze.class, (w) -> new EntityBlaze(w), "Blaze", 61, 16167425, 16775294); -~ addMapping(EntityMagmaCube.class, (w) -> new EntityMagmaCube(w), "LavaSlime", 62, 3407872, 16579584); -~ addMapping(EntityDragon.class, (w) -> new EntityDragon(w), "EnderDragon", 63); -~ addMapping(EntityWither.class, (w) -> new EntityWither(w), "WitherBoss", 64); -~ addMapping(EntityBat.class, (w) -> new EntityBat(w), "Bat", 65, 4996656, 986895); -~ addMapping(EntityWitch.class, (w) -> new EntityWitch(w), "Witch", 66, 3407872, 5349438); -~ addMapping(EntityEndermite.class, (w) -> new EntityEndermite(w), "Endermite", 67, 1447446, 7237230); -~ addMapping(EntityGuardian.class, (w) -> new EntityGuardian(w), "Guardian", 68, 5931634, 15826224); -~ addMapping(EntityPig.class, (w) -> new EntityPig(w), "Pig", 90, 15771042, 14377823); -~ addMapping(EntitySheep.class, (w) -> new EntitySheep(w), "Sheep", 91, 15198183, 16758197); -~ addMapping(EntityCow.class, (w) -> new EntityCow(w), "Cow", 92, 4470310, 10592673); -~ addMapping(EntityChicken.class, (w) -> new EntityChicken(w), "Chicken", 93, 10592673, 16711680); -~ addMapping(EntitySquid.class, (w) -> new EntitySquid(w), "Squid", 94, 2243405, 7375001); -~ addMapping(EntityWolf.class, (w) -> new EntityWolf(w), "Wolf", 95, 14144467, 13545366); -~ addMapping(EntityMooshroom.class, (w) -> new EntityMooshroom(w), "MushroomCow", 96, 10489616, 12040119); -~ addMapping(EntitySnowman.class, (w) -> new EntitySnowman(w), "SnowMan", 97); -~ addMapping(EntityOcelot.class, (w) -> new EntityOcelot(w), "Ozelot", 98, 15720061, 5653556); -~ addMapping(EntityIronGolem.class, (w) -> new EntityIronGolem(w), "VillagerGolem", 99); -~ addMapping(EntityHorse.class, (w) -> new EntityHorse(w), "EntityHorse", 100, 12623485, 15656192); -~ addMapping(EntityRabbit.class, (w) -> new EntityRabbit(w), "Rabbit", 101, 10051392, 7555121); -~ addMapping(EntityVillager.class, (w) -> new EntityVillager(w), "Villager", 120, 5651507, 12422002); -~ addMapping(EntityEnderCrystal.class, (w) -> new EntityEnderCrystal(w), "EnderCrystal", 200); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityLiving.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityLiving.edit.java deleted file mode 100644 index 6be924b..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityLiving.edit.java +++ /dev/null @@ -1,47 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 27 : 30 @ 27 : 30 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagFloat; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 147 : 148 @ 147 : 164 - -~ this.worldObj.setEntityState(this, (byte) 20); - -> CHANGE 13 : 14 @ 13 : 17 - -~ this.updateLeashedState(); - -> CHANGE 118 : 119 @ 118 : 120 - -~ if (this.canPickUpLoot() && !this.dead && this.worldObj.getGameRules().getBoolean("mobGriefing")) { - -> CHANGE 462 : 463 @ 462 : 463 - -~ if (dropLead) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ if (sendPacket && this.worldObj instanceof WorldServer) { - -> CHANGE 22 : 23 @ 22 : 23 - -~ if (sendAttachNotification && this.worldObj instanceof WorldServer) { - -> CHANGE 9 : 11 @ 9 : 10 - -~ EaglercraftUUID uuid = new EaglercraftUUID(this.leashNBTTag.getLong("UUIDMost"), -~ this.leashNBTTag.getLong("UUIDLeast")); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityLivingBase.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityLivingBase.edit.java deleted file mode 100644 index 50e8cd6..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityLivingBase.edit.java +++ /dev/null @@ -1,108 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 5 : 6 @ 5 - -+ - -> CHANGE 4 : 6 @ 4 : 6 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 23 : 28 @ 23 : 28 - -~ import net.minecraft.nbt.NBTBase; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagFloat; -~ import net.minecraft.nbt.NBTTagList; -~ import net.minecraft.nbt.NBTTagShort; - -> CHANGE 26 : 28 @ 26 : 27 - -~ private static final EaglercraftUUID sprintingSpeedBoostModifierUUID = EaglercraftUUID -~ .fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D"); - -> CHANGE 93 : 94 @ 93 : 94 - -~ if (this.fallDistance > 3.0F && flag) { - -> CHANGE 41 : 42 @ 41 : 42 - -~ if (this.isImmuneToFire()) { - -> CHANGE 24 : 25 @ 24 : 25 - -~ if (this.isRiding() && this.ridingEntity instanceof EntityLivingBase) { - -> CHANGE 58 : 59 @ 58 : 59 - -~ if ((this.recentlyHit > 0 || this.isPlayer()) && this.canDropLoot() - -> CHANGE 44 : 45 @ 44 : 45 - -~ public EaglercraftRandom getRNG() { - -> CHANGE 74 : 75 @ 74 : 75 - -~ if (nbttagcompound.hasKey("Attributes", 9) && this.worldObj != null) { - -> CHANGE 40 : 41 @ 40 : 41 - -~ { - -> CHANGE 9 : 10 @ 9 : 10 - -~ { - -> CHANGE 58 : 59 @ 58 : 59 - -~ { - -> CHANGE 67 : 68 @ 67 : 68 - -~ { - -> CHANGE 8 : 9 @ 8 : 9 - -~ if (flag) { - -> CHANGE 10 : 11 @ 10 : 11 - -~ { - -> DELETE 25 @ 25 : 27 - -> CHANGE 122 : 123 @ 122 : 123 - -~ { - -> CHANGE 422 : 423 @ 422 : 436 - -~ this.motionY -= 0.08D; - -> CHANGE 78 : 79 @ 78 : 79 - -~ { - -> CHANGE 193 : 194 @ 193 : 196 - -~ this.collideWithNearbyEntities(); - -> CHANGE 30 : 31 @ 30 : 34 - -~ this.dismountEntity(this.ridingEntity); - -> CHANGE 31 : 32 @ 31 : 32 - -~ if (!entity.isDead) { - -> CHANGE 48 : 49 @ 48 : 49 - -~ return true; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityMinecartCommandBlock.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityMinecartCommandBlock.edit.java deleted file mode 100644 index c59ad39..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityMinecartCommandBlock.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityTracker.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityTracker.edit.java deleted file mode 100644 index 616ef2a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityTracker.edit.java +++ /dev/null @@ -1,18 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 7 : 9 @ 7 : 9 - -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; - -> CHANGE 33 : 35 @ 33 : 35 - -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EnumCreatureAttribute.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EnumCreatureAttribute.edit.java deleted file mode 100644 index 2bfe9a2..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EnumCreatureAttribute.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 2 : 4 @ 2 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 2 : 7 @ 2 - -+ -+ static { -+ __checkIntegratedContextValid("net/minecraft/entity/EnumCreatureAttribute"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EnumCreatureType.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EnumCreatureType.edit.java deleted file mode 100644 index f7c6206..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EnumCreatureType.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 9 : 11 @ 9 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 5 : 9 @ 5 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/entity/EnumCreatureType"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/SharedMonsterAttributes.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/SharedMonsterAttributes.edit.java deleted file mode 100644 index 6d2aa0d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/SharedMonsterAttributes.edit.java +++ /dev/null @@ -1,28 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 5 : 9 @ 5 : 9 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> CHANGE 40 : 41 @ 40 : 41 - -~ for (AttributeModifier attributemodifier : (Collection) collection) { - -> CHANGE 57 : 59 @ 57 : 58 - -~ EaglercraftUUID uuid = new EaglercraftUUID(parNBTTagCompound.getLong("UUIDMost"), -~ parNBTTagCompound.getLong("UUIDLeast")); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityMinecartMobSpawner.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityMinecartMobSpawner.edit.java deleted file mode 100644 index c7a53cd..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityMinecartMobSpawner.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 5 : 6 @ 5 : 6 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java deleted file mode 100644 index 4c8929d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/attributes/AttributeModifier.edit.java +++ /dev/null @@ -1,25 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 4 @ 2 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.ThreadLocalRandom; -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 14 : 15 @ 14 : 15 - -~ private final EaglercraftUUID id; - -> CHANGE 6 : 7 @ 6 : 7 - -~ public AttributeModifier(EaglercraftUUID idIn, String nameIn, double amountIn, int operationIn) { - -> CHANGE 9 : 10 @ 9 : 10 - -~ public EaglercraftUUID getID() { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java deleted file mode 100644 index f34df92..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/attributes/IAttributeInstance.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 16 : 17 @ 16 : 17 - -~ AttributeModifier getModifier(EaglercraftUUID var1); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java deleted file mode 100644 index d28f2a8..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/attributes/ModifiableAttributeInstance.edit.java +++ /dev/null @@ -1,30 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 10 @ 9 : 10 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 17 : 18 @ 17 : 18 - -~ private final Map mapByUUID = Maps.newHashMap(); - -> CHANGE 44 : 45 @ 44 : 45 - -~ public AttributeModifier getModifier(EaglercraftUUID uuid) { - -> CHANGE 14 : 15 @ 14 : 15 - -~ this.mapByName.put(attributemodifier.getName(), (Set) object); - -> CHANGE 35 : 36 @ 35 : 36 - -~ for (AttributeModifier attributemodifier : (Collection) Lists.newArrayList(collection)) { - -> DELETE 2 @ 2 : 3 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/boss/EntityDragon.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/boss/EntityDragon.edit.java deleted file mode 100644 index 680205d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/boss/EntityDragon.edit.java +++ /dev/null @@ -1,42 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 108 @ 108 : 117 - -> CHANGE 36 : 37 @ 36 : 52 - -~ { - -> CHANGE 107 : 108 @ 107 : 108 - -~ if (this.hurtTime == 0) { - -> CHANGE 46 : 47 @ 46 : 47 - -~ { - -> DELETE 3 @ 3 : 4 - -> CHANGE 7 : 8 @ 7 : 8 - -~ { - -> DELETE 3 @ 3 : 4 - -> CHANGE 13 : 14 @ 13 : 14 - -~ for (EntityEnderCrystal entityendercrystal1 : (List) list) { - -> CHANGE 165 : 166 @ 165 : 166 - -~ { - -> CHANGE 18 : 19 @ 18 : 19 - -~ if (this.deathTicks == 200) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/boss/EntityDragonPart.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/boss/EntityDragonPart.edit.java deleted file mode 100644 index 4df05a4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/boss/EntityDragonPart.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/boss/EntityWither.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/boss/EntityWither.edit.java deleted file mode 100644 index 11091b4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/boss/EntityWither.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 28 : 29 @ 28 : 29 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 82 : 83 @ 82 : 83 - -~ if (this.getWatchedTargetId(0) > 0) { - -> CHANGE 332 : 333 @ 332 : 333 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/effect/EntityLightningBolt.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/effect/EntityLightningBolt.edit.java deleted file mode 100644 index 2bafc22..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/effect/EntityLightningBolt.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 7 : 8 @ 7 : 8 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 24 : 25 @ 24 : 25 - -~ if (worldIn.getGameRules().getBoolean("doFireTick") - -> CHANGE 37 : 38 @ 37 : 39 - -~ if (this.worldObj.getGameRules().getBoolean("doFireTick") && this.worldObj.isAreaLoaded(blockpos, 10) - -> CHANGE 8 : 9 @ 8 : 11 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityArmorStand.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityArmorStand.edit.java deleted file mode 100644 index 107147d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityArmorStand.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 16 : 18 @ 16 : 18 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 262 : 263 @ 262 : 263 - -~ } else if (!entityplayer.isSpectator()) { - -> CHANGE 95 : 96 @ 95 : 98 - -~ if (DamageSource.outOfWorld.equals(damagesource)) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityBoat.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityBoat.edit.java deleted file mode 100644 index 72e28cc..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityBoat.edit.java +++ /dev/null @@ -1,53 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 11 : 12 @ 11 : 12 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 76 : 77 @ 76 : 77 - -~ } else if (!this.isDead) { - -> CHANGE 138 : 139 @ 138 : 167 - -~ { - -> CHANGE 66 : 67 @ 66 : 67 - -~ if (!this.isDead) { - -> CHANGE 36 : 43 @ 36 : 45 - -~ List list = this.worldObj.getEntitiesWithinAABBExcludingEntity(this, -~ this.getEntityBoundingBox().expand(0.20000000298023224D, 0.0D, 0.20000000298023224D)); -~ if (list != null && !list.isEmpty()) { -~ for (int j2 = 0; j2 < list.size(); ++j2) { -~ Entity entity = (Entity) list.get(j2); -~ if (entity != this.riddenByEntity && entity.canBePushed() && entity instanceof EntityBoat) { -~ entity.applyEntityCollision(this); - -> DELETE 2 @ 2 : 7 - -> INSERT 2 : 6 @ 2 - -+ -+ if (this.riddenByEntity != null && this.riddenByEntity.isDead) { -+ this.riddenByEntity = null; -+ } - -> CHANGE 22 : 23 @ 22 : 23 - -~ { - -> DELETE 2 @ 2 : 3 - -> CHANGE 8 : 9 @ 8 : 9 - -~ if (!this.isDead) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityEnderCrystal.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityEnderCrystal.edit.java deleted file mode 100644 index c531abb..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityEnderCrystal.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 68 : 69 @ 68 : 69 - -~ if (!this.isDead) { - -> CHANGE 3 : 4 @ 3 : 6 - -~ this.worldObj.createExplosion((Entity) null, this.posX, this.posY, this.posZ, 6.0F, true); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityEnderEye.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityEnderEye.edit.java deleted file mode 100644 index c2f6203..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityEnderEye.edit.java +++ /dev/null @@ -1,26 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 111 : 112 @ 111 : 112 - -~ { - -> CHANGE 34 : 35 @ 34 : 35 - -~ { - -> CHANGE 2 : 3 @ 2 : 3 - -~ if (this.despawnTimer > 80) { - -> DELETE 9 @ 9 : 10 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityEnderPearl.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityEnderPearl.edit.java deleted file mode 100644 index 5215a65..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityEnderPearl.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 52 : 53 @ 52 : 53 - -~ { - -> DELETE 27 @ 27 : 28 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityExpBottle.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityExpBottle.edit.java deleted file mode 100644 index 135969c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityExpBottle.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 42 : 43 @ 42 : 43 - -~ { - -> DELETE 11 @ 11 : 12 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityFallingBlock.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityFallingBlock.edit.java deleted file mode 100644 index f367767..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityFallingBlock.edit.java +++ /dev/null @@ -1,36 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 10 : 11 @ 10 : 11 - -~ import net.minecraft.crash.CrashReportCategory; - -> CHANGE 3 : 5 @ 3 : 5 - -~ import net.minecraft.nbt.NBTBase; -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 66 : 67 @ 66 : 67 - -~ } else { - -> CHANGE 10 : 11 @ 10 : 11 - -~ { - -> CHANGE 38 : 40 @ 38 : 40 - -~ } else if (this.fallTime > 100 && (blockpos1.getY() < 1 || blockpos1.getY() > 256) -~ || this.fallTime > 600) { - -> DELETE 7 @ 7 : 8 - -> CHANGE 13 : 14 @ 13 : 14 - -~ for (Entity entity : (ArrayList) arraylist) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityFireworkRocket.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityFireworkRocket.edit.java deleted file mode 100644 index 43136db..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityFireworkRocket.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> DELETE 101 @ 101 : 112 - -> DELETE 2 @ 2 : 17 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityItem.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityItem.edit.java deleted file mode 100644 index b5fd419..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityItem.edit.java +++ /dev/null @@ -1,35 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 10 @ 9 : 10 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 6 : 8 @ 6 : 8 - -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> CHANGE 76 : 77 @ 76 : 79 - -~ this.searchForOtherItemsNearby(); - -> CHANGE 21 : 22 @ 21 : 22 - -~ if (this.age >= 6000) { - -> CHANGE 138 : 139 @ 138 : 139 - -~ { - -> DELETE 42 @ 42 : 43 - -> CHANGE 14 : 15 @ 14 : 18 - -~ this.searchForOtherItemsNearby(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityItemFrame.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityItemFrame.edit.java deleted file mode 100644 index 6969897..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityItemFrame.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 10 @ 9 : 10 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 38 : 39 @ 38 : 39 - -~ { - -> CHANGE 132 : 133 @ 132 : 133 - -~ if (itemstack != null) { - -> CHANGE 6 : 7 @ 6 : 7 - -~ } else { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecart.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecart.edit.java deleted file mode 100644 index 0f72172..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecart.edit.java +++ /dev/null @@ -1,32 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 3 : 4 @ 3 - -+ - -> CHANGE 19 : 20 @ 19 : 20 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 105 : 106 @ 105 : 106 - -~ if (!this.isDead) { - -> CHANGE 68 : 69 @ 68 : 69 - -~ if (this.worldObj instanceof WorldServer) { - -> CHANGE 37 : 38 @ 37 : 55 - -~ { - -> CHANGE 409 : 410 @ 409 : 410 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartContainer.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartContainer.edit.java deleted file mode 100644 index ca19456..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartContainer.edit.java +++ /dev/null @@ -1,17 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 7 : 9 @ 7 : 9 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 143 : 144 @ 143 : 144 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartEmpty.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartEmpty.edit.java deleted file mode 100644 index 8333459..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartEmpty.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 30 : 31 @ 30 : 31 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartFurnace.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartFurnace.edit.java deleted file mode 100644 index ad939fc..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartFurnace.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 10 @ 9 : 10 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartHopper.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartHopper.edit.java deleted file mode 100644 index ee7124f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartHopper.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 13 : 14 @ 13 : 14 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 44 : 45 @ 44 : 45 - -~ { - -> CHANGE 40 : 41 @ 40 : 41 - -~ if (this.isEntityAlive() && this.getBlocked()) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartTNT.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartTNT.edit.java deleted file mode 100644 index ff9cad5..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityMinecartTNT.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 10 @ 9 : 10 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 78 : 79 @ 78 : 79 - -~ { - -> CHANGE 39 : 40 @ 39 : 40 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityPainting.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityPainting.edit.java deleted file mode 100644 index ad939fc..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityPainting.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 10 @ 9 : 10 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityTNTPrimed.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityTNTPrimed.edit.java deleted file mode 100644 index 3f40201..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityTNTPrimed.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 63 : 64 @ 63 : 64 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityXPOrb.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityXPOrb.edit.java deleted file mode 100644 index 2e8baf1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/item/EntityXPOrb.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 5 : 6 @ 5 : 6 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 162 : 163 @ 162 : 163 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityBlaze.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityBlaze.edit.java deleted file mode 100644 index 2ba5feb..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityBlaze.edit.java +++ /dev/null @@ -1,10 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 83 @ 83 : 98 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityCreeper.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityCreeper.edit.java deleted file mode 100644 index 860ffc8..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityCreeper.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 21 : 22 @ 21 : 22 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 169 : 172 @ 169 : 174 - -~ this.ignite(); -~ itemstack.damageItem(1, entityplayer); -~ return true; - -> CHANGE 6 : 7 @ 6 : 7 - -~ { - -> DELETE 6 @ 6 : 7 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityEnderman.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityEnderman.edit.java deleted file mode 100644 index e4c5a51..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityEnderman.edit.java +++ /dev/null @@ -1,43 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 1 : 2 @ 1 : 2 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 24 : 25 @ 24 : 25 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 17 : 19 @ 17 : 18 - -~ private static final EaglercraftUUID attackingSpeedBoostModifierUUID = EaglercraftUUID -~ .fromString("020E0DFB-87AE-4653-9556-831010E291A0"); - -> DELETE 83 @ 83 : 94 - -> CHANGE 143 : 144 @ 143 : 146 - -~ this.setScreaming(true); - -> CHANGE 40 : 41 @ 40 : 41 - -~ public static void doBootstrap() { - -> CHANGE 115 : 116 @ 115 : 116 - -~ EaglercraftRandom random = this.enderman.getRNG(); - -> CHANGE 36 : 37 @ 36 : 37 - -~ EaglercraftRandom random = this.enderman.getRNG(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityEndermite.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityEndermite.edit.java deleted file mode 100644 index 80449ab..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityEndermite.edit.java +++ /dev/null @@ -1,18 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 15 : 16 @ 15 : 16 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 90 : 91 @ 90 : 100 - -~ { - -> DELETE 8 @ 8 : 9 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityGhast.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityGhast.edit.java deleted file mode 100644 index 1e7f994..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityGhast.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 11 : 12 @ 11 : 12 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 45 : 46 @ 45 : 46 - -~ if (this.worldObj.getDifficulty() == EnumDifficulty.PEACEFUL) { - -> CHANGE 203 : 204 @ 203 : 204 - -~ EaglercraftRandom random = this.parentEntity.getRNG(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityGuardian.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityGuardian.edit.java deleted file mode 100644 index 67316d7..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityGuardian.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 24 : 25 @ 24 : 25 - -~ import net.minecraft.nbt.NBTTagCompound; - -> DELETE 139 @ 139 : 151 - -> DELETE 52 @ 52 : 124 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityIronGolem.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityIronGolem.edit.java deleted file mode 100644 index 79d0df4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityIronGolem.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 30 : 31 @ 30 : 31 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityMob.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityMob.edit.java deleted file mode 100644 index b9486f3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityMob.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 40 : 41 @ 40 : 41 - -~ if (this.worldObj.getDifficulty() == EnumDifficulty.PEACEFUL) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityPigZombie.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityPigZombie.edit.java deleted file mode 100644 index 316d995..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityPigZombie.edit.java +++ /dev/null @@ -1,28 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 13 : 14 @ 13 : 14 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 13 : 14 @ 13 : 14 - -~ private static final EaglercraftUUID ATTACK_SPEED_BOOST_MODIFIER_UUID = EaglercraftUUID - -> CHANGE 5 : 6 @ 5 : 6 - -~ private EaglercraftUUID angerTargetUUID; - -> CHANGE 83 : 84 @ 83 : 84 - -~ this.angerTargetUUID = EaglercraftUUID.fromString(s); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySilverfish.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySilverfish.edit.java deleted file mode 100644 index b13667a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySilverfish.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 137 : 138 @ 137 : 138 - -~ EaglercraftRandom random = this.field_179485_a.getRNG(); - -> CHANGE 62 : 63 @ 62 : 63 - -~ EaglercraftRandom random = this.silverfish.getRNG(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySkeleton.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySkeleton.edit.java deleted file mode 100644 index 80589a1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySkeleton.edit.java +++ /dev/null @@ -1,26 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 34 : 35 @ 34 : 35 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 33 : 34 @ 33 : 34 - -~ if (worldIn != null) { - -> CHANGE 48 : 49 @ 48 : 49 - -~ if (this.worldObj.isDaytime()) { - -> DELETE 23 @ 23 : 27 - -> CHANGE 165 : 166 @ 165 : 166 - -~ if (i == 0) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySlime.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySlime.edit.java deleted file mode 100644 index 087093b..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySlime.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 16 : 17 @ 16 : 17 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 82 : 83 @ 82 : 84 - -~ if (this.worldObj.getDifficulty() == EnumDifficulty.PEACEFUL && this.getSlimeSize() > 0) { - -> CHANGE 64 : 65 @ 64 : 65 - -~ if (i > 1 && this.getHealth() <= 0.0F) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySnowman.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySnowman.edit.java deleted file mode 100644 index 8ac5df7..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySnowman.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 53 : 54 @ 53 : 54 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySpider.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySpider.edit.java deleted file mode 100644 index 2233e8b..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntitySpider.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 67 : 68 @ 67 : 68 - -~ { - -> CHANGE 136 : 137 @ 136 : 137 - -~ public void func_111104_a(EaglercraftRandom rand) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityWitch.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityWitch.edit.java deleted file mode 100644 index 5354fc7..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityWitch.edit.java +++ /dev/null @@ -1,25 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 34 : 36 @ 34 : 35 - -~ private static final EaglercraftUUID MODIFIER_UUID = EaglercraftUUID -~ .fromString("5CD17E52-A79A-43D3-A529-90FDE04B181E"); - -> CHANGE 50 : 51 @ 50 : 51 - -~ { - -> CHANGE 8 : 9 @ 8 : 9 - -~ for (PotionEffect potioneffect : (List) list) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityZombie.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityZombie.edit.java deleted file mode 100644 index 6551715..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/monster/EntityZombie.edit.java +++ /dev/null @@ -1,37 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 32 : 33 @ 32 : 33 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 21 : 23 @ 21 : 22 - -~ private static final EaglercraftUUID babySpeedBoostUUID = EaglercraftUUID -~ .fromString("B9766B59-9566-4402-BC1F-2EE2A276D836"); - -> CHANGE 86 : 87 @ 86 : 87 - -~ if (this.worldObj != null) { - -> CHANGE 19 : 20 @ 19 : 20 - -~ if (this.worldObj.isDaytime() && !this.isChild()) { - -> CHANGE 84 : 85 @ 84 : 85 - -~ if (this.isConverting()) { - -> CHANGE 231 : 232 @ 231 : 234 - -~ this.startConversion(this.rand.nextInt(2401) + 3600); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityAnimal.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityAnimal.edit.java deleted file mode 100644 index ad939fc..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityAnimal.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 10 @ 9 : 10 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityBat.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityBat.edit.java deleted file mode 100644 index 86b8076..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityBat.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 8 : 9 @ 8 : 9 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 154 : 155 @ 154 : 155 - -~ if (this.getIsBatHanging()) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityChicken.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityChicken.edit.java deleted file mode 100644 index 57f0b5d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityChicken.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 19 : 20 @ 19 : 20 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 60 : 61 @ 60 : 61 - -~ if (!this.isChild() && !this.isChickenJockey() && --this.timeUntilNextEgg <= 0) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityHorse.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityHorse.edit.java deleted file mode 100644 index fa172ab..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityHorse.edit.java +++ /dev/null @@ -1,78 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 30 : 32 @ 30 : 32 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> DELETE 2 @ 2 : 3 - -> CHANGE 287 : 288 @ 287 : 288 - -~ if (this.isChested()) { - -> CHANGE 64 : 65 @ 64 : 65 - -~ { - -> DELETE 5 @ 5 : 6 - -> CHANGE 214 : 215 @ 214 : 216 - -~ if ((this.riddenByEntity == null || this.riddenByEntity == playerEntity) && this.isTame()) { - -> CHANGE 149 : 150 @ 149 : 153 - -~ player.mountEntity(this); - -> CHANGE 35 : 36 @ 35 : 39 - -~ this.dropChestItems(); - -> CHANGE 8 : 9 @ 8 : 9 - -~ { - -> DELETE 24 @ 24 : 25 - -> DELETE 4 @ 4 : 9 - -> CHANGE 5 : 6 @ 5 : 6 - -~ if (this.jumpRearingCounter > 0 && ++this.jumpRearingCounter > 20) { - -> CHANGE 60 : 62 @ 60 : 65 - -~ this.openMouthCounter = 1; -~ this.setHorseWatchableBoolean(128, true); - -> CHANGE 24 : 26 @ 24 : 29 - -~ this.jumpRearingCounter = 1; -~ this.setRearing(true); - -> CHANGE 17 : 18 @ 17 : 18 - -~ if (animalChestIn != null) { - -> CHANGE 56 : 59 @ 56 : 61 - -~ this.setAIMoveSpeed( -~ (float) this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).getAttributeValue()); -~ super.moveEntityWithHeading(f, f1); - -> CHANGE 33 : 34 @ 33 : 34 - -~ nbttagcompound.setString("Owner", this.getOwnerId()); - -> CHANGE 37 : 39 @ 37 : 42 - -~ if (nbttagcompound.hasKey("Owner", 8)) { -~ s = nbttagcompound.getString("Owner"); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityMooshroom.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityMooshroom.edit.java deleted file mode 100644 index 4e58857..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityMooshroom.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 46 : 47 @ 46 : 47 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityOcelot.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityOcelot.edit.java deleted file mode 100644 index f492879..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityOcelot.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 28 : 29 @ 28 : 29 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 124 : 125 @ 124 : 125 - -~ if (this.isOwner(entityplayer) && !this.isBreedingItem(itemstack)) { - -> CHANGE 12 : 13 @ 12 : 13 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityPig.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityPig.edit.java deleted file mode 100644 index 069ffbf..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityPig.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 21 : 22 @ 21 : 22 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 76 : 77 @ 76 : 78 - -~ } else if (!this.getSaddled() || this.riddenByEntity != null && this.riddenByEntity != entityplayer) { - -> CHANGE 42 : 43 @ 42 : 43 - -~ if (!this.isDead) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityRabbit.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityRabbit.edit.java deleted file mode 100644 index 122e786..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityRabbit.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 30 : 31 @ 30 : 31 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 182 : 183 @ 182 : 183 - -~ if (this.field_175540_bm == 0) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntitySheep.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntitySheep.edit.java deleted file mode 100644 index b6f2186..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntitySheep.edit.java +++ /dev/null @@ -1,26 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 24 : 25 @ 24 : 25 - -~ import net.minecraft.nbt.NBTTagCompound; - -> DELETE 49 @ 49 : 57 - -> CHANGE 61 : 62 @ 61 : 62 - -~ { - -> CHANGE 71 : 72 @ 71 : 72 - -~ public static EnumDyeColor getRandomSheepColor(EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntitySquid.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntitySquid.edit.java deleted file mode 100644 index 024b8fa..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntitySquid.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 99 : 100 @ 99 : 102 - -~ { - -> CHANGE 25 : 26 @ 25 : 26 - -~ { - -> CHANGE 14 : 15 @ 14 : 15 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityTameable.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityTameable.edit.java deleted file mode 100644 index 5cc2cd4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityTameable.edit.java +++ /dev/null @@ -1,40 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 5 : 6 @ 5 : 6 - -~ import net.minecraft.nbt.NBTTagCompound; - -> DELETE 1 @ 1 : 2 - -> CHANGE 28 : 29 @ 28 : 29 - -~ nbttagcompound.setString("Owner", ""); - -> CHANGE 1 : 2 @ 1 : 2 - -~ nbttagcompound.setString("Owner", this.getOwnerId()); - -> CHANGE 8 : 10 @ 8 : 13 - -~ if (nbttagcompound.hasKey("Owner", 8)) { -~ s = nbttagcompound.getString("Owner"); - -> CHANGE 83 : 84 @ 83 : 84 - -~ EaglercraftUUID uuid = EaglercraftUUID.fromString(this.getOwnerId()); - -> CHANGE 45 : 47 @ 45 : 47 - -~ if (this.worldObj.getGameRules().getBoolean("showDeathMessages") && this.hasCustomName() -~ && this.getOwner() instanceof EntityPlayerMP) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityVillager.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityVillager.edit.java deleted file mode 100644 index 171ae62..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityVillager.edit.java +++ /dev/null @@ -1,57 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 40 : 42 @ 40 : 42 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 295 : 296 @ 295 : 296 - -~ if (this.buyingList == null || this.buyingList.size() > 0) { - -> CHANGE 216 : 217 @ 216 : 217 - -~ if (this.livingSoundTime > -this.getTalkInterval() + 20) { - -> CHANGE 167 : 168 @ 167 : 168 - -~ if (!this.isDead) { - -> CHANGE 107 : 108 @ 107 : 108 - -~ public void modifyMerchantRecipeList(MerchantRecipeList recipeList, EaglercraftRandom random) { - -> CHANGE 10 : 11 @ 10 : 11 - -~ void modifyMerchantRecipeList(MerchantRecipeList var1, EaglercraftRandom var2); - -> CHANGE 16 : 17 @ 16 : 17 - -~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) { - -> CHANGE 18 : 19 @ 18 : 19 - -~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) { - -> CHANGE 23 : 24 @ 23 : 24 - -~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) { - -> CHANGE 26 : 27 @ 26 : 27 - -~ public void modifyMerchantRecipeList(MerchantRecipeList merchantrecipelist, EaglercraftRandom random) { - -> CHANGE 24 : 25 @ 24 : 25 - -~ public int getPrice(EaglercraftRandom rand) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityWolf.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityWolf.edit.java deleted file mode 100644 index d5a6cc6..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/passive/EntityWolf.edit.java +++ /dev/null @@ -1,28 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 37 : 38 @ 37 : 38 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 128 : 129 @ 128 : 129 - -~ if (this.isWet && !this.isShaking && !this.hasPath() && this.onGround) { - -> CHANGE 6 : 7 @ 6 : 7 - -~ if (this.getAttackTarget() == null && this.isAngry()) { - -> CHANGE 152 : 153 @ 152 : 153 - -~ if (this.isOwner(entityplayer) && !this.isBreedingItem(itemstack)) { - -> CHANGE 14 : 15 @ 14 : 15 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/EntityPlayer.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/EntityPlayer.edit.java deleted file mode 100644 index 50b069a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/EntityPlayer.edit.java +++ /dev/null @@ -1,105 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 6 @ 4 : 5 - -~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -~ - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 42 : 44 @ 42 : 44 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 79 : 80 @ 79 : 80 - -~ this.inventoryContainer = new ContainerPlayer(this.inventory, true, this); - -> CHANGE 49 : 50 @ 49 : 53 - -~ this.setEating(false); - -> CHANGE 19 : 20 @ 19 : 20 - -~ if (--this.itemInUseCount == 0) { - -> CHANGE 17 : 18 @ 17 : 18 - -~ { - -> CHANGE 14 : 15 @ 14 : 15 - -~ if (this.openContainer != null && !this.openContainer.canInteractWith(this)) { - -> CHANGE 46 : 47 @ 46 : 47 - -~ { - -> CHANGE 107 : 108 @ 107 : 108 - -~ if (this.isSneaking()) { - -> CHANGE 54 : 55 @ 54 : 57 - -~ iattributeinstance.setBaseValue((double) this.capabilities.getWalkSpeed()); - -> CHANGE 108 : 109 @ 108 : 109 - -~ for (ScoreObjective scoreobjective : (Collection) collection) { - -> CHANGE 211 : 212 @ 211 : 212 - -~ if (this.isPlayerSleeping()) { - -> INSERT 125 : 135 @ 125 - -+ } else if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() -+ .getBoolean("clickToRide") && itemstack == null && parEntity instanceof EntityPlayer) { -+ EntityPlayer otherPlayer = (EntityPlayer) parEntity; -+ while (otherPlayer.riddenByEntity instanceof EntityPlayer) { -+ otherPlayer = (EntityPlayer) otherPlayer.riddenByEntity; -+ } -+ if (otherPlayer.riddenByEntity == null && otherPlayer != this) { -+ mountEntity(otherPlayer); -+ return true; -+ } - -> CHANGE 170 : 171 @ 170 : 171 - -~ { - -> CHANGE 65 : 66 @ 65 : 68 - -~ this.worldObj.updateAllPlayersSleepingFlag(); - -> CHANGE 39 : 40 @ 39 : 40 - -~ if (flag1) { - -> CHANGE 295 : 296 @ 295 : 299 - -~ this.foodStats.addExhaustion(parFloat1); - -> CHANGE 19 : 20 @ 19 : 23 - -~ this.setEating(true); - -> CHANGE 156 : 158 @ 156 : 158 - -~ public static EaglercraftUUID getUUID(GameProfile profile) { -~ EaglercraftUUID uuid = profile.getId(); - -> CHANGE 7 : 9 @ 7 : 9 - -~ public static EaglercraftUUID getOfflineUUID(String username) { -~ return EaglercraftUUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes(Charsets.UTF_8)); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/EnumPlayerModelParts.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/EnumPlayerModelParts.edit.java deleted file mode 100644 index dfc3e1f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/EnumPlayerModelParts.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 5 : 7 @ 5 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 4 : 8 @ 4 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/entity/player/EnumPlayerModelParts"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/InventoryPlayer.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/InventoryPlayer.edit.java deleted file mode 100644 index 38b617d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/InventoryPlayer.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 6 @ 4 : 6 - -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; - -> CHANGE 5 : 8 @ 5 : 8 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; -~ import net.minecraft.nbt.NBTUtil; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/PlayerCapabilities.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/PlayerCapabilities.edit.java deleted file mode 100644 index 72a6117..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/PlayerCapabilities.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityArrow.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityArrow.edit.java deleted file mode 100644 index c697794..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityArrow.edit.java +++ /dev/null @@ -1,35 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 15 : 16 @ 15 : 16 - -~ import net.minecraft.nbt.NBTTagCompound; - -> INSERT 147 : 149 @ 147 - -+ public boolean isChair = false; -+ - -> INSERT 2 : 9 @ 2 - -+ if (isChair) { -+ if (!(riddenByEntity instanceof EntityPlayer)) { -+ isChair = false; -+ setDead(); -+ } -+ return; -+ } - -> CHANGE 109 : 110 @ 109 : 112 - -~ entitylivingbase.setArrowCountInEntity(entitylivingbase.getArrowCountInEntity() + 1); - -> CHANGE 167 : 168 @ 167 : 168 - -~ if (this.inGround && this.arrowShake <= 0) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityEgg.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityEgg.edit.java deleted file mode 100644 index 2d4af91..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityEgg.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 38 : 39 @ 38 : 39 - -~ if (this.rand.nextInt(8) == 0) { - -> CHANGE 21 : 22 @ 21 : 25 - -~ this.setDead(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityFireball.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityFireball.edit.java deleted file mode 100644 index 4232357..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityFireball.edit.java +++ /dev/null @@ -1,17 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 6 : 8 @ 6 : 8 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 76 : 77 @ 76 : 77 - -~ if ((this.shootingEntity == null || !this.shootingEntity.isDead) - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityFishHook.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityFishHook.edit.java deleted file mode 100644 index 1c86a1a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityFishHook.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 16 : 17 @ 16 : 17 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 185 : 186 @ 185 : 186 - -~ { - -> CHANGE 140 : 141 @ 140 : 141 - -~ if (d10 > 0.0D) { - -> CHANGE 140 : 141 @ 140 : 143 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityLargeFireball.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityLargeFireball.edit.java deleted file mode 100644 index 2b0443e..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityLargeFireball.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 5 : 6 @ 5 : 6 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 28 : 29 @ 28 : 29 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityPotion.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityPotion.edit.java deleted file mode 100644 index bbecb25..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityPotion.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 7 : 8 @ 7 : 8 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 68 : 69 @ 68 : 69 - -~ { - -> CHANGE 5 : 6 @ 5 : 6 - -~ for (EntityLivingBase entitylivingbase : (List) list1) { - -> CHANGE 7 : 8 @ 7 : 8 - -~ for (PotionEffect potioneffect : (List) list) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntitySmallFireball.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntitySmallFireball.edit.java deleted file mode 100644 index c25fa9a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntitySmallFireball.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 36 : 37 @ 36 : 37 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntitySnowball.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntitySnowball.edit.java deleted file mode 100644 index 0b1916d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntitySnowball.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 46 : 47 @ 46 : 50 - -~ this.setDead(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityThrowable.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityThrowable.edit.java deleted file mode 100644 index 2c71d9a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityThrowable.edit.java +++ /dev/null @@ -1,25 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 158 : 159 @ 158 : 159 - -~ { - -> CHANGE 131 : 133 @ 131 : 132 - -~ Entity entity = ((WorldServer) this.worldObj) -~ .getEntityFromUuid(EaglercraftUUID.fromString(this.throwerName)); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityWitherSkull.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityWitherSkull.edit.java deleted file mode 100644 index 4555ac6..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/projectile/EntityWitherSkull.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 58 : 59 @ 58 : 59 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/init/Blocks.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/init/Blocks.edit.java deleted file mode 100644 index 2b48944..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/init/Blocks.edit.java +++ /dev/null @@ -1,213 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 45 : 243 @ 45 : 243 - -~ public static Block air; -~ public static Block stone; -~ public static BlockGrass grass; -~ public static Block dirt; -~ public static Block cobblestone; -~ public static Block planks; -~ public static Block sapling; -~ public static Block bedrock; -~ public static BlockDynamicLiquid flowing_water; -~ public static BlockStaticLiquid water; -~ public static BlockDynamicLiquid flowing_lava; -~ public static BlockStaticLiquid lava; -~ public static BlockSand sand; -~ public static Block gravel; -~ public static Block gold_ore; -~ public static Block iron_ore; -~ public static Block coal_ore; -~ public static Block log; -~ public static Block log2; -~ public static BlockLeaves leaves; -~ public static BlockLeaves leaves2; -~ public static Block sponge; -~ public static Block glass; -~ public static Block lapis_ore; -~ public static Block lapis_block; -~ public static Block dispenser; -~ public static Block sandstone; -~ public static Block noteblock; -~ public static Block bed; -~ public static Block golden_rail; -~ public static Block detector_rail; -~ public static BlockPistonBase sticky_piston; -~ public static Block web; -~ public static BlockTallGrass tallgrass; -~ public static BlockDeadBush deadbush; -~ public static BlockPistonBase piston; -~ public static BlockPistonExtension piston_head; -~ public static Block wool; -~ public static BlockPistonMoving piston_extension; -~ public static BlockFlower yellow_flower; -~ public static BlockFlower red_flower; -~ public static BlockBush brown_mushroom; -~ public static BlockBush red_mushroom; -~ public static Block gold_block; -~ public static Block iron_block; -~ public static BlockSlab double_stone_slab; -~ public static BlockSlab stone_slab; -~ public static Block brick_block; -~ public static Block tnt; -~ public static Block bookshelf; -~ public static Block mossy_cobblestone; -~ public static Block obsidian; -~ public static Block torch; -~ public static BlockFire fire; -~ public static Block mob_spawner; -~ public static Block oak_stairs; -~ public static BlockChest chest; -~ public static BlockRedstoneWire redstone_wire; -~ public static Block diamond_ore; -~ public static Block diamond_block; -~ public static Block crafting_table; -~ public static Block wheat; -~ public static Block farmland; -~ public static Block furnace; -~ public static Block lit_furnace; -~ public static Block standing_sign; -~ public static Block oak_door; -~ public static Block spruce_door; -~ public static Block birch_door; -~ public static Block jungle_door; -~ public static Block acacia_door; -~ public static Block dark_oak_door; -~ public static Block ladder; -~ public static Block rail; -~ public static Block stone_stairs; -~ public static Block wall_sign; -~ public static Block lever; -~ public static Block stone_pressure_plate; -~ public static Block iron_door; -~ public static Block wooden_pressure_plate; -~ public static Block redstone_ore; -~ public static Block lit_redstone_ore; -~ public static Block unlit_redstone_torch; -~ public static Block redstone_torch; -~ public static Block stone_button; -~ public static Block snow_layer; -~ public static Block ice; -~ public static Block snow; -~ public static BlockCactus cactus; -~ public static Block clay; -~ public static BlockReed reeds; -~ public static Block jukebox; -~ public static Block oak_fence; -~ public static Block spruce_fence; -~ public static Block birch_fence; -~ public static Block jungle_fence; -~ public static Block dark_oak_fence; -~ public static Block acacia_fence; -~ public static Block pumpkin; -~ public static Block netherrack; -~ public static Block soul_sand; -~ public static Block glowstone; -~ public static BlockPortal portal; -~ public static Block lit_pumpkin; -~ public static Block cake; -~ public static BlockRedstoneRepeater unpowered_repeater; -~ public static BlockRedstoneRepeater powered_repeater; -~ public static Block trapdoor; -~ public static Block monster_egg; -~ public static Block stonebrick; -~ public static Block brown_mushroom_block; -~ public static Block red_mushroom_block; -~ public static Block iron_bars; -~ public static Block glass_pane; -~ public static Block melon_block; -~ public static Block pumpkin_stem; -~ public static Block melon_stem; -~ public static Block vine; -~ public static Block oak_fence_gate; -~ public static Block spruce_fence_gate; -~ public static Block birch_fence_gate; -~ public static Block jungle_fence_gate; -~ public static Block dark_oak_fence_gate; -~ public static Block acacia_fence_gate; -~ public static Block brick_stairs; -~ public static Block stone_brick_stairs; -~ public static BlockMycelium mycelium; -~ public static Block waterlily; -~ public static Block nether_brick; -~ public static Block nether_brick_fence; -~ public static Block nether_brick_stairs; -~ public static Block nether_wart; -~ public static Block enchanting_table; -~ public static Block brewing_stand; -~ public static BlockCauldron cauldron; -~ public static Block end_portal; -~ public static Block end_portal_frame; -~ public static Block end_stone; -~ public static Block dragon_egg; -~ public static Block redstone_lamp; -~ public static Block lit_redstone_lamp; -~ public static BlockSlab double_wooden_slab; -~ public static BlockSlab wooden_slab; -~ public static Block cocoa; -~ public static Block sandstone_stairs; -~ public static Block emerald_ore; -~ public static Block ender_chest; -~ public static BlockTripWireHook tripwire_hook; -~ public static Block tripwire; -~ public static Block emerald_block; -~ public static Block spruce_stairs; -~ public static Block birch_stairs; -~ public static Block jungle_stairs; -~ public static Block command_block; -~ public static BlockBeacon beacon; -~ public static Block cobblestone_wall; -~ public static Block flower_pot; -~ public static Block carrots; -~ public static Block potatoes; -~ public static Block wooden_button; -~ public static BlockSkull skull; -~ public static Block anvil; -~ public static Block trapped_chest; -~ public static Block light_weighted_pressure_plate; -~ public static Block heavy_weighted_pressure_plate; -~ public static BlockRedstoneComparator unpowered_comparator; -~ public static BlockRedstoneComparator powered_comparator; -~ public static BlockDaylightDetector daylight_detector; -~ public static BlockDaylightDetector daylight_detector_inverted; -~ public static Block redstone_block; -~ public static Block quartz_ore; -~ public static BlockHopper hopper; -~ public static Block quartz_block; -~ public static Block quartz_stairs; -~ public static Block activator_rail; -~ public static Block dropper; -~ public static Block stained_hardened_clay; -~ public static Block barrier; -~ public static Block iron_trapdoor; -~ public static Block hay_block; -~ public static Block carpet; -~ public static Block hardened_clay; -~ public static Block coal_block; -~ public static Block packed_ice; -~ public static Block acacia_stairs; -~ public static Block dark_oak_stairs; -~ public static Block slime_block; -~ public static BlockDoublePlant double_plant; -~ public static BlockStainedGlass stained_glass; -~ public static BlockStainedGlassPane stained_glass_pane; -~ public static Block prismarine; -~ public static Block sea_lantern; -~ public static Block standing_banner; -~ public static Block wall_banner; -~ public static Block red_sandstone; -~ public static Block red_sandstone_stairs; -~ public static BlockSlab double_stone_slab2; -~ public static BlockSlab stone_slab2; - -> CHANGE 5 : 6 @ 5 : 6 - -~ static void doBootstrap() { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/init/Bootstrap.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/init/Bootstrap.edit.java deleted file mode 100644 index 7abfc73..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/init/Bootstrap.edit.java +++ /dev/null @@ -1,88 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; - -> CHANGE 1 : 3 @ 1 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> INSERT 22 : 23 @ 22 - -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.monster.EntityEnderman; - -> INSERT 9 : 10 @ 9 - -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.item.ItemAxe; - -> INSERT 3 : 4 @ 3 - -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.item.ItemPickaxe; - -> INSERT 1 : 2 @ 1 - -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.item.ItemSpade; - -> CHANGE 1 : 4 @ 1 : 3 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTUtil; -~ import net.minecraft.util.LoggingPrintStream; - -> DELETE 6 @ 6 : 7 - -> CHANGE 2 : 5 @ 2 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.biome.BiomeGenBase; -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> CHANGE 109 : 110 @ 109 : 110 - -~ EaglercraftRandom random = world.rand; - -> CHANGE 139 : 140 @ 139 : 142 - -~ world.playAuxSFX(2005, blockpos, 0); - -> CHANGE 42 : 43 @ 42 : 43 - -~ { - -> CHANGE 14 : 15 @ 14 : 15 - -~ gameprofile = new GameProfile((EaglercraftUUID) null, s); - -> CHANGE 42 : 43 @ 42 : 46 - -~ world.setBlockState(blockpos, blockpumpkin.getDefaultState(), 3); - -> INSERT 27 : 29 @ 27 - -+ Blocks.doBootstrap(); -+ BiomeGenBase.doBootstrap(); - -> INSERT 1 : 5 @ 1 - -+ EntityEnderman.doBootstrap(); -+ ItemAxe.doBootstrap(); -+ ItemPickaxe.doBootstrap(); -+ ItemSpade.doBootstrap(); - -> INSERT 1 : 2 @ 1 - -+ Items.doBootstrap(); - -> CHANGE 6 : 8 @ 6 : 8 - -~ System.setErr(new LoggingPrintStream("STDERR", true, System.err)); -~ System.setOut(new LoggingPrintStream("STDOUT", false, SYSOUT)); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/init/Items.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/init/Items.edit.java deleted file mode 100644 index 4321ea3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/init/Items.edit.java +++ /dev/null @@ -1,202 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 23 : 210 @ 23 : 210 - -~ public static Item iron_shovel; -~ public static Item iron_pickaxe; -~ public static Item iron_axe; -~ public static Item flint_and_steel; -~ public static Item apple; -~ public static ItemBow bow; -~ public static Item arrow; -~ public static Item coal; -~ public static Item diamond; -~ public static Item iron_ingot; -~ public static Item gold_ingot; -~ public static Item iron_sword; -~ public static Item wooden_sword; -~ public static Item wooden_shovel; -~ public static Item wooden_pickaxe; -~ public static Item wooden_axe; -~ public static Item stone_sword; -~ public static Item stone_shovel; -~ public static Item stone_pickaxe; -~ public static Item stone_axe; -~ public static Item diamond_sword; -~ public static Item diamond_shovel; -~ public static Item diamond_pickaxe; -~ public static Item diamond_axe; -~ public static Item stick; -~ public static Item bowl; -~ public static Item mushroom_stew; -~ public static Item golden_sword; -~ public static Item golden_shovel; -~ public static Item golden_pickaxe; -~ public static Item golden_axe; -~ public static Item string; -~ public static Item feather; -~ public static Item gunpowder; -~ public static Item wooden_hoe; -~ public static Item stone_hoe; -~ public static Item iron_hoe; -~ public static Item diamond_hoe; -~ public static Item golden_hoe; -~ public static Item wheat_seeds; -~ public static Item wheat; -~ public static Item bread; -~ public static ItemArmor leather_helmet; -~ public static ItemArmor leather_chestplate; -~ public static ItemArmor leather_leggings; -~ public static ItemArmor leather_boots; -~ public static ItemArmor chainmail_helmet; -~ public static ItemArmor chainmail_chestplate; -~ public static ItemArmor chainmail_leggings; -~ public static ItemArmor chainmail_boots; -~ public static ItemArmor iron_helmet; -~ public static ItemArmor iron_chestplate; -~ public static ItemArmor iron_leggings; -~ public static ItemArmor iron_boots; -~ public static ItemArmor diamond_helmet; -~ public static ItemArmor diamond_chestplate; -~ public static ItemArmor diamond_leggings; -~ public static ItemArmor diamond_boots; -~ public static ItemArmor golden_helmet; -~ public static ItemArmor golden_chestplate; -~ public static ItemArmor golden_leggings; -~ public static ItemArmor golden_boots; -~ public static Item flint; -~ public static Item porkchop; -~ public static Item cooked_porkchop; -~ public static Item painting; -~ public static Item golden_apple; -~ public static Item sign; -~ public static Item oak_door; -~ public static Item spruce_door; -~ public static Item birch_door; -~ public static Item jungle_door; -~ public static Item acacia_door; -~ public static Item dark_oak_door; -~ public static Item bucket; -~ public static Item water_bucket; -~ public static Item lava_bucket; -~ public static Item minecart; -~ public static Item saddle; -~ public static Item iron_door; -~ public static Item redstone; -~ public static Item snowball; -~ public static Item boat; -~ public static Item leather; -~ public static Item milk_bucket; -~ public static Item brick; -~ public static Item clay_ball; -~ public static Item reeds; -~ public static Item paper; -~ public static Item book; -~ public static Item slime_ball; -~ public static Item chest_minecart; -~ public static Item furnace_minecart; -~ public static Item egg; -~ public static Item compass; -~ public static ItemFishingRod fishing_rod; -~ public static Item clock; -~ public static Item glowstone_dust; -~ public static Item fish; -~ public static Item cooked_fish; -~ public static Item dye; -~ public static Item bone; -~ public static Item sugar; -~ public static Item cake; -~ public static Item bed; -~ public static Item repeater; -~ public static Item cookie; -~ public static ItemMap filled_map; -~ public static ItemShears shears; -~ public static Item melon; -~ public static Item pumpkin_seeds; -~ public static Item melon_seeds; -~ public static Item beef; -~ public static Item cooked_beef; -~ public static Item chicken; -~ public static Item cooked_chicken; -~ public static Item mutton; -~ public static Item cooked_mutton; -~ public static Item rabbit; -~ public static Item cooked_rabbit; -~ public static Item rabbit_stew; -~ public static Item rabbit_foot; -~ public static Item rabbit_hide; -~ public static Item rotten_flesh; -~ public static Item ender_pearl; -~ public static Item blaze_rod; -~ public static Item ghast_tear; -~ public static Item gold_nugget; -~ public static Item nether_wart; -~ public static ItemPotion potionitem; -~ public static Item glass_bottle; -~ public static Item spider_eye; -~ public static Item fermented_spider_eye; -~ public static Item blaze_powder; -~ public static Item magma_cream; -~ public static Item brewing_stand; -~ public static Item cauldron; -~ public static Item ender_eye; -~ public static Item speckled_melon; -~ public static Item spawn_egg; -~ public static Item experience_bottle; -~ public static Item fire_charge; -~ public static Item writable_book; -~ public static Item written_book; -~ public static Item emerald; -~ public static Item item_frame; -~ public static Item flower_pot; -~ public static Item carrot; -~ public static Item potato; -~ public static Item baked_potato; -~ public static Item poisonous_potato; -~ public static ItemEmptyMap map; -~ public static Item golden_carrot; -~ public static Item skull; -~ public static Item carrot_on_a_stick; -~ public static Item nether_star; -~ public static Item pumpkin_pie; -~ public static Item fireworks; -~ public static Item firework_charge; -~ public static ItemEnchantedBook enchanted_book; -~ public static Item comparator; -~ public static Item netherbrick; -~ public static Item quartz; -~ public static Item tnt_minecart; -~ public static Item hopper_minecart; -~ public static ItemArmorStand armor_stand; -~ public static Item iron_horse_armor; -~ public static Item golden_horse_armor; -~ public static Item diamond_horse_armor; -~ public static Item lead; -~ public static Item name_tag; -~ public static Item command_block_minecart; -~ public static Item record_13; -~ public static Item record_cat; -~ public static Item record_blocks; -~ public static Item record_chirp; -~ public static Item record_far; -~ public static Item record_mall; -~ public static Item record_mellohi; -~ public static Item record_stal; -~ public static Item record_strad; -~ public static Item record_ward; -~ public static Item record_11; -~ public static Item record_wait; -~ public static Item prismarine_shard; -~ public static Item prismarine_crystals; -~ public static Item banner; - -> CHANGE 5 : 6 @ 5 : 6 - -~ static void doBootstrap() { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/Container.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/Container.edit.java deleted file mode 100644 index 5c5613a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/Container.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 4 : 5 @ 4 - -+ - -> CHANGE 34 : 35 @ 34 : 35 - -~ this.inventoryItemStacks.add((ItemStack) null); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerBeacon.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerBeacon.edit.java deleted file mode 100644 index 1403a8e..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerBeacon.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 54 : 55 @ 54 : 55 - -~ if (entityplayer != null) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerEnchantment.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerEnchantment.edit.java deleted file mode 100644 index 82207e0..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerEnchantment.edit.java +++ /dev/null @@ -1,36 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 28 : 29 @ 28 : 29 - -~ private EaglercraftRandom rand; - -> CHANGE 19 : 20 @ 19 : 20 - -~ this.rand = new EaglercraftRandom(); - -> CHANGE 77 : 78 @ 77 : 78 - -~ { - -> DELETE 1 @ 1 : 2 - -> CHANGE 83 : 84 @ 83 : 84 - -~ { - -> CHANGE 54 : 55 @ 54 : 55 - -~ { - -> DELETE 6 @ 6 : 7 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerMerchant.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerMerchant.edit.java deleted file mode 100644 index 6e0d137..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerMerchant.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 119 : 120 @ 119 : 120 - -~ { - -> DELETE 9 @ 9 : 10 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerPlayer.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerPlayer.edit.java deleted file mode 100644 index 654c1a9..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerPlayer.edit.java +++ /dev/null @@ -1,29 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 42 : 44 @ 42 : 43 - -~ for (int k = 0; k < 4; ++k) { -~ final int kk = k; - -> CHANGE 1 : 2 @ 1 : 2 - -~ new Slot(playerInventory, playerInventory.getSizeInventory() - 1 - kk, 8, 8 + kk * 18) { - -> CHANGE 7 : 8 @ 7 : 8 - -~ ? ((ItemArmor) itemstack.getItem()).armorType == kk - -> CHANGE 1 : 2 @ 1 : 2 - -~ && itemstack.getItem() != Items.skull ? false : kk == 0)); - -> CHANGE 3 : 4 @ 3 : 4 - -~ return ItemArmor.EMPTY_SLOT_NAMES[kk]; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerRepair.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerRepair.edit.java deleted file mode 100644 index eded72b..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerRepair.edit.java +++ /dev/null @@ -1,28 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 22 : 24 @ 22 : 24 - -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> CHANGE 68 : 70 @ 68 : 70 - -~ if (!entityplayer.capabilities.isCreativeMode && iblockstate.getBlock() == Blocks.anvil -~ && entityplayer.getRNG().nextFloat() < 0.12F) { - -> CHANGE 10 : 11 @ 10 : 11 - -~ } else { - -> CHANGE 223 : 224 @ 223 : 224 - -~ { - -> DELETE 6 @ 6 : 7 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerWorkbench.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerWorkbench.edit.java deleted file mode 100644 index bb18023..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/ContainerWorkbench.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 61 : 62 @ 61 : 62 - -~ { - -> DELETE 6 @ 6 : 7 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/InventoryEnderChest.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/InventoryEnderChest.edit.java deleted file mode 100644 index 1effa98..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/InventoryEnderChest.edit.java +++ /dev/null @@ -1,13 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 5 : 7 @ 5 : 7 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/InventoryHelper.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/InventoryHelper.edit.java deleted file mode 100644 index aeb50a5..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/InventoryHelper.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 11 : 12 @ 11 : 12 - -~ private static final EaglercraftRandom RANDOM = new EaglercraftRandom(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/SlotFurnaceOutput.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/SlotFurnaceOutput.edit.java deleted file mode 100644 index 9eb07ac..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/inventory/SlotFurnaceOutput.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 52 : 53 @ 52 : 53 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/EnumAction.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/EnumAction.edit.java deleted file mode 100644 index 5a524fe..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/EnumAction.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 2 : 4 @ 2 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 2 : 7 @ 2 - -+ -+ static { -+ __checkIntegratedContextValid("net/minecraft/item/EnumAction"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/EnumDyeColor.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/EnumDyeColor.edit.java deleted file mode 100644 index 312fde8..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/EnumDyeColor.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 6 : 8 @ 6 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 18 : 22 @ 18 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/item/EnumDyeColor"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/EnumRarity.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/EnumRarity.edit.java deleted file mode 100644 index 70f7346..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/EnumRarity.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 4 : 6 @ 4 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 4 : 8 @ 4 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/item/EnumRarity"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/Item.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/Item.edit.java deleted file mode 100644 index 5b9bbc9..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/Item.edit.java +++ /dev/null @@ -1,26 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 8 : 10 @ 8 : 10 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 91 : 92 @ 91 : 92 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 22 : 24 @ 22 : 23 - -~ protected static final EaglercraftUUID itemModifierUUID = EaglercraftUUID -~ .fromString("CB3F55D3-645C-4F38-A497-9C13A33DB5CF"); - -> CHANGE 1 : 2 @ 1 : 2 - -~ protected static EaglercraftRandom itemRand = new EaglercraftRandom(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemAppleGold.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemAppleGold.edit.java deleted file mode 100644 index 59ae3f8..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemAppleGold.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 35 : 36 @ 35 : 38 - -~ entityplayer.addPotionEffect(new PotionEffect(Potion.absorption.id, 2400, 0)); - -> CHANGE 2 : 3 @ 2 : 3 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemArmor.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemArmor.edit.java deleted file mode 100644 index 4afaf3b..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemArmor.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 15 : 16 @ 15 : 16 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemArmorStand.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemArmorStand.edit.java deleted file mode 100644 index 78c3bce..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemArmorStand.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 45 : 46 @ 45 : 46 - -~ { - -> CHANGE 28 : 29 @ 28 : 29 - -~ private void applyRandomRotations(EntityArmorStand armorStand, EaglercraftRandom rand) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemAxe.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemAxe.edit.java deleted file mode 100644 index 7f33060..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemAxe.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 19 : 20 @ 19 : 22 - -~ private static Set EFFECTIVE_ON = null; - -> INSERT 1 : 6 @ 1 - -+ public static void doBootstrap() { -+ EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.planks, Blocks.bookshelf, Blocks.log, Blocks.log2, -+ Blocks.chest, Blocks.pumpkin, Blocks.lit_pumpkin, Blocks.melon_block, Blocks.ladder }); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBanner.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBanner.edit.java deleted file mode 100644 index fb0d136..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBanner.edit.java +++ /dev/null @@ -1,15 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 12 : 14 @ 12 : 14 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> DELETE 36 @ 36 : 38 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBed.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBed.edit.java deleted file mode 100644 index 0ade803..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBed.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 29 : 30 @ 29 : 32 - -~ if (enumfacing != EnumFacing.UP) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBlock.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBlock.edit.java deleted file mode 100644 index e7d4148..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBlock.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 11 : 12 @ 11 : 12 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 69 : 70 @ 69 : 70 - -~ if (tileentity.func_183000_F() - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBoat.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBoat.edit.java deleted file mode 100644 index 89cc51a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBoat.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 90 : 91 @ 90 : 93 - -~ world.spawnEntityInWorld(entityboat); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBow.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBow.edit.java deleted file mode 100644 index a612b93..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBow.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 74 : 75 @ 74 : 77 - -~ worldIn.spawnEntityInWorld(entityarrow); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBucket.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBucket.edit.java deleted file mode 100644 index a1920d7..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBucket.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 124 : 125 @ 124 : 125 - -~ if (flag && !material.isLiquid()) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBucketMilk.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBucketMilk.edit.java deleted file mode 100644 index 91fad29..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemBucketMilk.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 29 : 30 @ 29 : 32 - -~ playerIn.clearActivePotions(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemDye.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemDye.edit.java deleted file mode 100644 index b698a16..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemDye.edit.java +++ /dev/null @@ -1,17 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 51 : 52 @ 51 : 55 - -~ world.playAuxSFX(2005, blockpos, 0); - -> CHANGE 36 : 38 @ 36 : 38 - -~ if (igrowable.canGrow(worldIn, target, iblockstate, false)) { -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEditableBook.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEditableBook.edit.java deleted file mode 100644 index 0426f15..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEditableBook.edit.java +++ /dev/null @@ -1,18 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 12 @ 9 : 12 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; -~ import net.minecraft.nbt.NBTTagString; - -> CHANGE 65 : 66 @ 65 : 68 - -~ this.resolveContents(itemstack, entityplayer); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEgg.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEgg.edit.java deleted file mode 100644 index 2a484e3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEgg.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 29 : 30 @ 29 : 32 - -~ world.spawnEntityInWorld(new EntityEgg(world, entityplayer)); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEnchantedBook.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEnchantedBook.edit.java deleted file mode 100644 index 9eb47a7..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEnchantedBook.edit.java +++ /dev/null @@ -1,25 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 8 : 10 @ 8 : 10 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 87 : 88 @ 87 : 88 - -~ public WeightedRandomChestContent getRandom(EaglercraftRandom rand) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public WeightedRandomChestContent getRandom(EaglercraftRandom rand, int minChance, int maxChance, int weight) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEnderEye.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEnderEye.edit.java deleted file mode 100644 index 7e57ac5..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEnderEye.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 35 : 36 @ 35 : 38 - -~ { - -> CHANGE 92 : 93 @ 92 : 93 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEnderPearl.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEnderPearl.edit.java deleted file mode 100644 index 7a24ea7..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemEnderPearl.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 29 : 30 @ 29 : 32 - -~ world.spawnEntityInWorld(new EntityEnderPearl(world, entityplayer)); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemExpBottle.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemExpBottle.edit.java deleted file mode 100644 index 26f513f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemExpBottle.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 32 : 33 @ 32 : 35 - -~ world.spawnEntityInWorld(new EntityExpBottle(world, entityplayer)); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFireball.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFireball.edit.java deleted file mode 100644 index 9496132..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFireball.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 26 : 27 @ 26 : 29 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFirework.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFirework.edit.java deleted file mode 100644 index 662e4e3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFirework.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 10 : 12 @ 10 : 12 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 15 : 16 @ 15 : 16 - -~ { - -> DELETE 9 @ 9 : 11 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFireworkCharge.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFireworkCharge.edit.java deleted file mode 100644 index 480ecf4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFireworkCharge.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 8 : 11 @ 8 : 11 - -~ import net.minecraft.nbt.NBTBase; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagIntArray; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFishingRod.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFishingRod.edit.java deleted file mode 100644 index 21eb559..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFishingRod.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 39 : 40 @ 39 : 42 - -~ world.spawnEntityInWorld(new EntityFishHook(world, entityplayer)); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFood.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFood.edit.java deleted file mode 100644 index 0a4c564..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemFood.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 51 : 52 @ 51 : 52 - -~ if (this.potionId > 0 && world.rand.nextFloat() < this.potionEffectProbability) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemHangingEntity.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemHangingEntity.edit.java deleted file mode 100644 index ecda4d6..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemHangingEntity.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 41 : 42 @ 41 : 45 - -~ world.spawnEntityInWorld(entityhanging); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemHoe.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemHoe.edit.java deleted file mode 100644 index 88d0b7c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemHoe.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 66 : 67 @ 66 : 69 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemLead.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemLead.edit.java deleted file mode 100644 index 60f930a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemLead.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 31 : 32 @ 31 : 34 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemMap.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemMap.edit.java deleted file mode 100644 index ec233ff..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemMap.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 50 : 51 @ 50 : 51 - -~ if (mapdata == null) { - -> CHANGE 149 : 150 @ 149 : 150 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemMinecart.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemMinecart.edit.java deleted file mode 100644 index c8697a3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemMinecart.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 96 : 97 @ 96 : 97 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemMonsterPlacer.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemMonsterPlacer.edit.java deleted file mode 100644 index 9e81f02..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemMonsterPlacer.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 60 : 61 @ 60 : 63 - -~ if (!entityplayer.canPlayerEdit(blockpos.offset(enumfacing), enumfacing, itemstack)) { - -> CHANGE 41 : 42 @ 41 : 44 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemPickaxe.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemPickaxe.edit.java deleted file mode 100644 index 157c9de..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemPickaxe.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 19 : 20 @ 19 : 25 - -~ private static Set EFFECTIVE_ON = null; - -> INSERT 1 : 6 @ 1 - -+ public static void doBootstrap() { -+ EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.planks, Blocks.bookshelf, Blocks.log, Blocks.log2, -+ Blocks.chest, Blocks.pumpkin, Blocks.lit_pumpkin, Blocks.melon_block, Blocks.ladder }); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemPotion.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemPotion.edit.java deleted file mode 100644 index afed9c2..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemPotion.edit.java +++ /dev/null @@ -1,46 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 10 : 12 @ 10 - -+ import java.util.Set; -+ - -> CHANGE 9 : 11 @ 9 : 11 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 66 : 67 @ 66 : 67 - -~ { - -> CHANGE 2 : 3 @ 2 : 3 - -~ for (PotionEffect potioneffect : (List) list) { - -> CHANGE 32 : 33 @ 32 : 35 - -~ world.spawnEntityInWorld(new EntityPotion(world, entityplayer, itemstack)); - -> CHANGE 24 : 25 @ 24 : 25 - -~ for (PotionEffect potioneffect : (List) list) { - -> CHANGE 37 : 38 @ 37 : 38 - -~ for (PotionEffect potioneffect : (List) list1) { - -> CHANGE 4 : 5 @ 4 : 5 - -~ for (Entry entry : (Set>) map.entrySet()) { - -> CHANGE 33 : 34 @ 33 : 34 - -~ for (Entry entry1 : (Set>) hashmultimap.entries()) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemRecord.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemRecord.edit.java deleted file mode 100644 index 33f5cdb..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemRecord.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 42 : 43 @ 42 : 45 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSign.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSign.edit.java deleted file mode 100644 index b044210..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSign.edit.java +++ /dev/null @@ -1,10 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 42 @ 42 : 44 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSkull.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSkull.edit.java deleted file mode 100644 index 2ca1c12..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSkull.edit.java +++ /dev/null @@ -1,34 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; - -> CHANGE 1 : 2 @ 1 : 2 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 8 : 10 @ 8 : 10 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTUtil; - -> CHANGE 45 : 46 @ 45 : 46 - -~ { - -> CHANGE 19 : 21 @ 19 : 20 - -~ gameprofile = new GameProfile((EaglercraftUUID) null, -~ nbttagcompound.getString("SkullOwner")); - -> CHANGE 62 : 63 @ 62 : 63 - -~ GameProfile gameprofile = new GameProfile((EaglercraftUUID) null, nbt.getString("SkullOwner")); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSlab.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSlab.edit.java deleted file mode 100644 index e39bcde..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSlab.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 104 : 105 @ 104 : 105 - -~ .withProperty((IProperty) this.singleSlab.getVariantProperty(), comparable); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSnowball.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSnowball.edit.java deleted file mode 100644 index df6cdb1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSnowball.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 29 : 30 @ 29 : 32 - -~ world.spawnEntityInWorld(new EntitySnowball(world, entityplayer)); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSpade.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSpade.edit.java deleted file mode 100644 index 3515169..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemSpade.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 17 : 18 @ 17 : 20 - -~ private static Set EFFECTIVE_ON = null; - -> INSERT 1 : 6 @ 1 - -+ public static void doBootstrap() { -+ EFFECTIVE_ON = Sets.newHashSet(new Block[] { Blocks.clay, Blocks.dirt, Blocks.farmland, Blocks.grass, -+ Blocks.gravel, Blocks.mycelium, Blocks.sand, Blocks.snow, Blocks.snow_layer, Blocks.soul_sand }); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemStack.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemStack.edit.java deleted file mode 100644 index c151491..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemStack.edit.java +++ /dev/null @@ -1,44 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 5 : 6 @ 5 - -+ - -> INSERT 2 : 3 @ 2 - -+ import java.util.Collection; - -> CHANGE 1 : 4 @ 1 : 2 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ import net.lax1dude.eaglercraft.v1_8.HString; -~ - -> CHANGE 18 : 21 @ 18 : 21 - -~ import net.minecraft.nbt.NBTBase; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 189 : 190 @ 189 : 190 - -~ public boolean attemptDamageItem(int amount, EaglercraftRandom rand) { - -> CHANGE 249 : 250 @ 249 : 250 - -~ s = s + HString.format("#%04d/%d%s", - -> CHANGE 2 : 3 @ 2 : 3 - -~ s = s + HString.format("#%04d%s", new Object[] { Integer.valueOf(i), s1 }); - -> CHANGE 56 : 57 @ 56 : 57 - -~ for (Entry entry : (Collection) multimap.entries()) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemWritableBook.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemWritableBook.edit.java deleted file mode 100644 index 1effa98..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/ItemWritableBook.edit.java +++ /dev/null @@ -1,13 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 5 : 7 @ 5 : 7 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/RecipeBookCloning.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/RecipeBookCloning.edit.java deleted file mode 100644 index 7da43e6..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/RecipeBookCloning.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 7 : 8 @ 7 : 8 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/RecipeFireworks.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/RecipeFireworks.edit.java deleted file mode 100644 index 4834f34..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/RecipeFireworks.edit.java +++ /dev/null @@ -1,13 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 11 @ 9 : 11 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/RecipesBanners.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/RecipesBanners.edit.java deleted file mode 100644 index 4834f34..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/RecipesBanners.edit.java +++ /dev/null @@ -1,13 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 11 @ 9 : 11 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/RecipesMapExtending.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/RecipesMapExtending.edit.java deleted file mode 100644 index 422c315..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/RecipesMapExtending.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/ShapedRecipes.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/ShapedRecipes.edit.java deleted file mode 100644 index c7a53cd..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/ShapedRecipes.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 5 : 6 @ 5 : 6 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/ShapelessRecipes.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/ShapelessRecipes.edit.java deleted file mode 100644 index 979ad3a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/item/crafting/ShapelessRecipes.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 52 : 53 @ 52 : 53 - -~ for (ItemStack itemstack1 : (ArrayList) arraylist) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/EnumConnectionState.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/EnumConnectionState.edit.java deleted file mode 100644 index 0073c56..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/EnumConnectionState.edit.java +++ /dev/null @@ -1,40 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 5 : 7 @ 5 - -+ -+ import java.util.Collection; - -> CHANGE 104 : 105 @ 104 : 109 - -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; - -> INSERT 1 : 3 @ 1 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> DELETE 110 @ 110 : 118 - -> INSERT 11 : 15 @ 11 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/network/EnumConnectionState"); -+ } -+ - -> CHANGE 17 : 18 @ 17 : 18 - -~ this.directionMaps.put(direction, (BiMap>) object); - -> CHANGE 45 : 47 @ 45 : 46 - -~ for (Class oclass : (Collection) ((BiMap) enumconnectionstate.directionMaps -~ .get(enumpacketdirection)).values()) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/EnumPacketDirection.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/EnumPacketDirection.edit.java deleted file mode 100644 index 9a83838..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/EnumPacketDirection.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 2 : 4 @ 2 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 2 : 7 @ 2 - -+ -+ static { -+ __checkIntegratedContextValid("net/minecraft/network/EnumPacketDirection"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/PacketBuffer.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/PacketBuffer.edit.java deleted file mode 100644 index 58c5f27..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/PacketBuffer.edit.java +++ /dev/null @@ -1,60 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 4 @ 2 : 11 - -~ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -~ - -> CHANGE 1 : 3 @ 1 : 9 - -~ -~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; - -> CHANGE 2 : 3 @ 2 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 3 : 4 @ 3 : 4 - -~ public class PacketBuffer extends net.minecraft.network.PacketBuffer { - -> DELETE 1 @ 1 : 3 - -> DELETE 4 @ 4 : 6 - -> CHANGE 1 : 2 @ 1 : 2 - -~ super(wrapped); - -> CHANGE 2 : 3 @ 2 : 24 - -~ public BlockPos readBlockPos_server() { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void writeBlockPos_server(BlockPos pos) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public IChatComponent readChatComponent_server() throws IOException { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void writeChatComponent_server(IChatComponent component) throws IOException { - -> CHANGE 3 : 4 @ 3 : 101 - -~ public void writeItemStackToBuffer_server(ItemStack stack) { - -> CHANGE 16 : 17 @ 16 : 17 - -~ public ItemStack readItemStackFromBuffer_server() throws IOException { - -> DELETE 12 @ 12 : 620 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/client/C00PacketLoginStart.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/client/C00PacketLoginStart.edit.java deleted file mode 100644 index ccc227d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/client/C00PacketLoginStart.edit.java +++ /dev/null @@ -1,44 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; - -> CHANGE 1 : 2 @ 1 : 2 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> INSERT 13 : 14 @ 13 - -+ private byte[] skin; - -> CHANGE 4 : 5 @ 4 : 5 - -~ public C00PacketLoginStart(GameProfile profileIn, byte[] skin) { - -> INSERT 1 : 2 @ 1 - -+ this.skin = skin; - -> CHANGE 3 : 5 @ 3 : 4 - -~ this.profile = new GameProfile((EaglercraftUUID) null, parPacketBuffer.readStringFromBuffer(16)); -~ this.skin = parPacketBuffer.readByteArray(); - -> INSERT 4 : 5 @ 4 - -+ parPacketBuffer.writeByteArray(this.skin); - -> INSERT 9 : 13 @ 9 - -+ -+ public byte[] getSkin() { -+ return this.skin; -+ } - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java deleted file mode 100644 index 7412bb6..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/client/C01PacketEncryptionResponse.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 3 @ 3 : 6 - -> DELETE 3 @ 3 : 4 - -> DELETE 12 @ 12 : 20 - -> DELETE 13 @ 13 : 21 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/server/S00PacketDisconnect.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/server/S00PacketDisconnect.edit.java deleted file mode 100644 index a3adc2c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/server/S00PacketDisconnect.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 26 : 27 @ 26 : 27 - -~ this.reason = parPacketBuffer.readChatComponent_server(); - -> CHANGE 3 : 4 @ 3 : 4 - -~ parPacketBuffer.writeChatComponent_server(this.reason); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java deleted file mode 100644 index 9986898..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/server/S01PacketEncryptionRequest.edit.java +++ /dev/null @@ -1,26 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 3 @ 3 : 4 - -> DELETE 3 @ 3 : 4 - -> DELETE 10 @ 10 : 11 - -> DELETE 5 @ 5 : 11 - -> CHANGE 2 : 3 @ 2 : 3 - -~ parPacketBuffer.readByteArray(); - -> CHANGE 5 : 6 @ 5 : 6 - -~ parPacketBuffer.writeByteArray(new byte[0]); - -> DELETE 11 @ 11 : 15 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java deleted file mode 100644 index 475065a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/login/server/S02PacketLoginSuccess.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; - -> CHANGE 1 : 2 @ 1 : 2 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 24 : 25 @ 24 : 25 - -~ EaglercraftUUID uuid = EaglercraftUUID.fromString(s); - -> CHANGE 4 : 5 @ 4 : 5 - -~ EaglercraftUUID uuid = this.profile.getId(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C07PacketPlayerDigging.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C07PacketPlayerDigging.edit.java deleted file mode 100644 index 1962138..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C07PacketPlayerDigging.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 33 : 34 @ 33 : 34 - -~ this.position = parPacketBuffer.readBlockPos_server(); - -> CHANGE 5 : 6 @ 5 : 6 - -~ parPacketBuffer.writeBlockPos_server(this.position); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.edit.java deleted file mode 100644 index 1b7e3cc..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C08PacketPlayerBlockPlacement.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 43 : 44 @ 43 : 44 - -~ this.position = parPacketBuffer.readBlockPos_server(); - -> CHANGE 1 : 2 @ 1 : 2 - -~ this.stack = parPacketBuffer.readItemStackFromBuffer_server(); - -> CHANGE 6 : 7 @ 6 : 7 - -~ parPacketBuffer.writeBlockPos_server(this.position); - -> CHANGE 1 : 2 @ 1 : 2 - -~ parPacketBuffer.writeItemStackToBuffer_server(this.stack); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C0EPacketClickWindow.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C0EPacketClickWindow.edit.java deleted file mode 100644 index 3e59890..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C0EPacketClickWindow.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 46 : 47 @ 46 : 47 - -~ this.clickedItem = parPacketBuffer.readItemStackFromBuffer_server(); - -> CHANGE 8 : 9 @ 8 : 9 - -~ parPacketBuffer.writeItemStackToBuffer_server(this.clickedItem); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C10PacketCreativeInventoryAction.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C10PacketCreativeInventoryAction.edit.java deleted file mode 100644 index 0381e9a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C10PacketCreativeInventoryAction.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 33 : 34 @ 33 : 34 - -~ this.stack = parPacketBuffer.readItemStackFromBuffer_server(); - -> CHANGE 4 : 5 @ 4 : 5 - -~ parPacketBuffer.writeItemStackToBuffer_server(this.stack); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C12PacketUpdateSign.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C12PacketUpdateSign.edit.java deleted file mode 100644 index b4e7d22..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C12PacketUpdateSign.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 29 : 30 @ 29 : 30 - -~ this.pos = parPacketBuffer.readBlockPos_server(); - -> CHANGE 11 : 12 @ 11 : 12 - -~ parPacketBuffer.writeBlockPos_server(this.pos); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C14PacketTabComplete.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C14PacketTabComplete.edit.java deleted file mode 100644 index d93a3f1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C14PacketTabComplete.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 36 : 37 @ 36 : 37 - -~ this.targetBlock = parPacketBuffer.readBlockPos_server(); - -> CHANGE 9 : 10 @ 9 : 10 - -~ parPacketBuffer.writeBlockPos_server(this.targetBlock); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C15PacketClientSettings.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C15PacketClientSettings.edit.java deleted file mode 100644 index 9070283..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C15PacketClientSettings.edit.java +++ /dev/null @@ -1,15 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 69 : 73 @ 69 - -+ -+ public int getViewDistance() { -+ return this.view; -+ } - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java deleted file mode 100644 index 145ac04..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C17PacketCustomPayload.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C18PacketSpectate.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C18PacketSpectate.edit.java deleted file mode 100644 index 5fe06bf..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/client/C18PacketSpectate.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 14 : 15 @ 14 : 15 - -~ private EaglercraftUUID id; - -> CHANGE 4 : 5 @ 4 : 5 - -~ public C18PacketSpectate(EaglercraftUUID id) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S02PacketChat.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S02PacketChat.edit.java deleted file mode 100644 index c379704..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S02PacketChat.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 32 : 33 @ 32 : 33 - -~ this.chatComponent = parPacketBuffer.readChatComponent_server(); - -> CHANGE 4 : 5 @ 4 : 5 - -~ parPacketBuffer.writeChatComponent_server(this.chatComponent); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S04PacketEntityEquipment.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S04PacketEntityEquipment.edit.java deleted file mode 100644 index 7c2bf10..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S04PacketEntityEquipment.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 32 : 33 @ 32 : 33 - -~ this.itemStack = parPacketBuffer.readItemStackFromBuffer_server(); - -> CHANGE 5 : 6 @ 5 : 6 - -~ parPacketBuffer.writeItemStackToBuffer_server(this.itemStack); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S05PacketSpawnPosition.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S05PacketSpawnPosition.edit.java deleted file mode 100644 index de59b03..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S05PacketSpawnPosition.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 26 : 27 @ 26 : 27 - -~ this.spawnBlockPos = parPacketBuffer.readBlockPos_server(); - -> CHANGE 3 : 4 @ 3 : 4 - -~ parPacketBuffer.writeBlockPos_server(this.spawnBlockPos); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S0APacketUseBed.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S0APacketUseBed.edit.java deleted file mode 100644 index 91fd07a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S0APacketUseBed.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 31 : 32 @ 31 : 32 - -~ this.bedPos = parPacketBuffer.readBlockPos_server(); - -> CHANGE 4 : 5 @ 4 : 5 - -~ parPacketBuffer.writeBlockPos_server(this.bedPos); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java deleted file mode 100644 index ce50124..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S0CPacketSpawnPlayer.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 18 : 19 @ 18 : 19 - -~ private EaglercraftUUID playerId; - -> CHANGE 65 : 66 @ 65 : 66 - -~ public EaglercraftUUID getPlayer() { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S10PacketSpawnPainting.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S10PacketSpawnPainting.edit.java deleted file mode 100644 index 45ea927..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S10PacketSpawnPainting.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 36 : 37 @ 36 : 37 - -~ this.position = parPacketBuffer.readBlockPos_server(); - -> CHANGE 6 : 7 @ 6 : 7 - -~ parPacketBuffer.writeBlockPos_server(this.position); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java deleted file mode 100644 index d805701..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S20PacketEntityProperties.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 7 : 8 @ 7 : 8 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 42 : 43 @ 42 : 43 - -~ EaglercraftUUID uuid = parPacketBuffer.readUuid(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S21PacketChunkData.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S21PacketChunkData.edit.java deleted file mode 100644 index fad4ddb..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S21PacketChunkData.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 86 : 87 @ 86 : 87 - -~ for (ExtendedBlockStorage extendedblockstorage1 : (ArrayList) arraylist) { - -> CHANGE 8 : 9 @ 8 : 9 - -~ for (ExtendedBlockStorage extendedblockstorage2 : (ArrayList) arraylist) { - -> CHANGE 5 : 6 @ 5 : 6 - -~ for (ExtendedBlockStorage extendedblockstorage3 : (ArrayList) arraylist) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S23PacketBlockChange.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S23PacketBlockChange.edit.java deleted file mode 100644 index fee9d6a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S23PacketBlockChange.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 31 : 32 @ 31 : 32 - -~ this.blockPosition = parPacketBuffer.readBlockPos_server(); - -> CHANGE 4 : 5 @ 4 : 5 - -~ parPacketBuffer.writeBlockPos_server(this.blockPosition); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S24PacketBlockAction.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S24PacketBlockAction.edit.java deleted file mode 100644 index 3dc71b3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S24PacketBlockAction.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 33 : 34 @ 33 : 34 - -~ this.blockPosition = parPacketBuffer.readBlockPos_server(); - -> CHANGE 6 : 7 @ 6 : 7 - -~ parPacketBuffer.writeBlockPos_server(this.blockPosition); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S25PacketBlockBreakAnim.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S25PacketBlockBreakAnim.edit.java deleted file mode 100644 index e126b8a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S25PacketBlockBreakAnim.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 31 : 32 @ 31 : 32 - -~ this.position = parPacketBuffer.readBlockPos_server(); - -> CHANGE 5 : 6 @ 5 : 6 - -~ parPacketBuffer.writeBlockPos_server(this.position); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S28PacketEffect.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S28PacketEffect.edit.java deleted file mode 100644 index 71b61ca..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S28PacketEffect.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 33 : 34 @ 33 : 34 - -~ this.soundPos = parPacketBuffer.readBlockPos_server(); - -> CHANGE 6 : 7 @ 6 : 7 - -~ parPacketBuffer.writeBlockPos_server(this.soundPos); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S2DPacketOpenWindow.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S2DPacketOpenWindow.edit.java deleted file mode 100644 index 6110fc6..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S2DPacketOpenWindow.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 49 : 50 @ 49 : 50 - -~ this.windowTitle = parPacketBuffer.readChatComponent_server(); - -> CHANGE 10 : 11 @ 10 : 11 - -~ parPacketBuffer.writeChatComponent_server(this.windowTitle); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S2FPacketSetSlot.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S2FPacketSetSlot.edit.java deleted file mode 100644 index f683c59..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S2FPacketSetSlot.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 36 : 37 @ 36 : 37 - -~ this.item = parPacketBuffer.readItemStackFromBuffer_server(); - -> CHANGE 5 : 6 @ 5 : 6 - -~ parPacketBuffer.writeItemStackToBuffer_server(this.item); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S30PacketWindowItems.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S30PacketWindowItems.edit.java deleted file mode 100644 index a753493..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S30PacketWindowItems.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 40 : 41 @ 40 : 41 - -~ this.itemStacks[i] = parPacketBuffer.readItemStackFromBuffer_server(); - -> CHANGE 9 : 10 @ 9 : 10 - -~ parPacketBuffer.writeItemStackToBuffer_server(itemstack); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S33PacketUpdateSign.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S33PacketUpdateSign.edit.java deleted file mode 100644 index 3365348..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S33PacketUpdateSign.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 32 : 33 @ 32 : 33 - -~ this.blockPos = parPacketBuffer.readBlockPos_server(); - -> CHANGE 3 : 4 @ 3 : 4 - -~ this.lines[i] = parPacketBuffer.readChatComponent_server(); - -> CHANGE 5 : 6 @ 5 : 6 - -~ parPacketBuffer.writeBlockPos_server(this.blockPos); - -> CHANGE 2 : 3 @ 2 : 3 - -~ parPacketBuffer.writeChatComponent_server(this.lines[i]); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S35PacketUpdateTileEntity.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S35PacketUpdateTileEntity.edit.java deleted file mode 100644 index f7aac39..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S35PacketUpdateTileEntity.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 27 : 28 @ 27 : 28 - -~ this.blockPos = parPacketBuffer.readBlockPos_server(); - -> CHANGE 5 : 6 @ 5 : 6 - -~ parPacketBuffer.writeBlockPos_server(this.blockPos); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S36PacketSignEditorOpen.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S36PacketSignEditorOpen.edit.java deleted file mode 100644 index 1fa0134..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S36PacketSignEditorOpen.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 30 : 31 @ 30 : 31 - -~ this.signPosition = parPacketBuffer.readBlockPos_server(); - -> CHANGE 3 : 4 @ 3 : 4 - -~ parPacketBuffer.writeBlockPos_server(this.signPosition); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java deleted file mode 100644 index 0a26202..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java +++ /dev/null @@ -1,29 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 6 @ 4 : 6 - -~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.Property; - -> CHANGE 75 : 76 @ 75 : 76 - -~ ichatcomponent = parPacketBuffer.readChatComponent_server(); - -> CHANGE 13 : 14 @ 13 : 14 - -~ ichatcomponent = parPacketBuffer.readChatComponent_server(); - -> CHANGE 41 : 42 @ 41 : 42 - -~ parPacketBuffer.writeChatComponent_server(s38packetplayerlistitem$addplayerdata.getDisplayName()); - -> CHANGE 16 : 17 @ 16 : 17 - -~ parPacketBuffer.writeChatComponent_server(s38packetplayerlistitem$addplayerdata.getDisplayName()); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java deleted file mode 100644 index 145ac04..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S3FPacketCustomPayload.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S40PacketDisconnect.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S40PacketDisconnect.edit.java deleted file mode 100644 index a3adc2c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S40PacketDisconnect.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 26 : 27 @ 26 : 27 - -~ this.reason = parPacketBuffer.readChatComponent_server(); - -> CHANGE 3 : 4 @ 3 : 4 - -~ parPacketBuffer.writeChatComponent_server(this.reason); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S45PacketTitle.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S45PacketTitle.edit.java deleted file mode 100644 index 54a4018..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S45PacketTitle.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 45 : 46 @ 45 : 46 - -~ this.message = parPacketBuffer.readChatComponent_server(); - -> CHANGE 13 : 14 @ 13 : 14 - -~ parPacketBuffer.writeChatComponent_server(this.message); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.edit.java deleted file mode 100644 index a421a6d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S47PacketPlayerListHeaderFooter.edit.java +++ /dev/null @@ -1,18 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 27 : 29 @ 27 : 29 - -~ this.header = parPacketBuffer.readChatComponent_server(); -~ this.footer = parPacketBuffer.readChatComponent_server(); - -> CHANGE 3 : 5 @ 3 : 5 - -~ parPacketBuffer.writeChatComponent_server(this.header); -~ parPacketBuffer.writeChatComponent_server(this.footer); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.edit.java deleted file mode 100644 index 4df05a4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/play/server/S49PacketUpdateEntityNBT.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/potion/Potion.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/potion/Potion.edit.java deleted file mode 100644 index ebbc3d8..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/potion/Potion.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 5 : 6 @ 5 : 6 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 144 : 145 @ 144 : 147 - -~ ((EntityPlayer) entityLivingBaseIn).getFoodStats().addStats(parInt1 + 1, 1.0F); - -> CHANGE 101 : 103 @ 101 : 103 - -~ AttributeModifier attributemodifier = new AttributeModifier(EaglercraftUUID.fromString(parString1), -~ this.getName(), parDouble1, parInt1); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/potion/PotionEffect.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/potion/PotionEffect.edit.java deleted file mode 100644 index b19e13c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/potion/PotionEffect.edit.java +++ /dev/null @@ -1,17 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 1 : 3 @ 1 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/scoreboard/Scoreboard.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/scoreboard/Scoreboard.edit.java deleted file mode 100644 index bcccf80..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/scoreboard/Scoreboard.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 49 : 50 @ 49 : 50 - -~ this.scoreObjectiveCriterias.put(criteria, (List) object); - -> CHANGE 32 : 33 @ 32 : 33 - -~ this.entitiesScoreObjectives.put(name, (Map) object); - -> CHANGE 61 : 62 @ 61 : 62 - -~ for (Map map : (Collection) collection) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/scoreboard/ScoreboardSaveData.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/scoreboard/ScoreboardSaveData.edit.java deleted file mode 100644 index d41e527..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/scoreboard/ScoreboardSaveData.edit.java +++ /dev/null @@ -1,19 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 5 @ 2 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; -~ import net.minecraft.nbt.NBTTagString; - -> CHANGE 8 : 10 @ 8 : 10 - -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/LowerStringMap.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/LowerStringMap.edit.java deleted file mode 100644 index d6600b2..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/LowerStringMap.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 48 : 49 @ 48 : 49 - -~ this.put((String) entry.getKey(), (V) entry.getValue()); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/stats/StatFileWriter.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/stats/StatFileWriter.edit.java deleted file mode 100644 index 34d1f24..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/stats/StatFileWriter.edit.java +++ /dev/null @@ -1,17 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 3 : 5 @ 3 - -+ -+ import java.util.HashMap; - -> CHANGE 15 : 16 @ 15 : 16 - -~ protected final Map statsData = new HashMap(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/stats/StatList.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/stats/StatList.edit.java deleted file mode 100644 index 1116d39..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/stats/StatList.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 174 : 175 @ 174 : 175 - -~ for (Item item : (HashSet) hashset) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java deleted file mode 100644 index 3a777b3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java +++ /dev/null @@ -1,26 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 3 : 4 @ 3 - -+ - -> CHANGE 7 : 10 @ 7 : 10 - -~ import net.minecraft.nbt.NBTBase; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 55 : 56 @ 55 : 70 - -~ { - -> CHANGE 213 : 214 @ 213 : 219 - -~ return false; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntity.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntity.edit.java deleted file mode 100644 index c984997..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntity.edit.java +++ /dev/null @@ -1,50 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 3 : 4 @ 3 - -+ - -> INSERT 2 : 4 @ 2 - -+ -+ import net.lax1dude.eaglercraft.v1_8.sp.server.CrashReportHelper; - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.minecraft.crash.CrashReportCategory; - -> CHANGE 1 : 2 @ 1 : 2 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 23 : 26 @ 23 : 25 - -~ import net.lax1dude.eaglercraft.v1_8.HString; -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> CHANGE 65 : 67 @ 65 : 66 - -~ logger.error("Caught exception calling tile entity constructor!"); -~ logger.error(exception); - -> CHANGE 88 : 90 @ 88 : 89 - -~ CrashReportHelper.addIntegratedServerBlockInfo(reportCategory, this.pos, this.getBlockType(), -~ this.getBlockMetadata()); - -> CHANGE 6 : 7 @ 6 : 7 - -~ return HString.format("ID #%d (%s // %s)", - -> CHANGE 14 : 16 @ 14 : 16 - -~ String s = HString.format("%4s", new Object[] { Integer.toBinaryString(i) }).replace(" ", "0"); -~ return HString.format("%1$d / 0x%1$X / 0b%2$s", new Object[] { Integer.valueOf(i), s }); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityBanner.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityBanner.edit.java deleted file mode 100644 index 4834f34..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityBanner.edit.java +++ /dev/null @@ -1,13 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 11 @ 9 : 11 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityBeacon.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityBeacon.edit.java deleted file mode 100644 index 351467e..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityBeacon.edit.java +++ /dev/null @@ -1,28 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 19 : 20 @ 19 : 20 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 43 : 44 @ 43 : 44 - -~ if (this.isComplete && this.levels > 0 && this.primaryEffect > 0) { - -> CHANGE 14 : 15 @ 14 : 15 - -~ for (EntityPlayer entityplayer : (List) list) { - -> CHANGE 4 : 5 @ 4 : 5 - -~ for (EntityPlayer entityplayer1 : (List) list) { - -> CHANGE 87 : 88 @ 87 : 88 - -~ if (this.levels == 4 && i < this.levels) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityBrewingStand.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityBrewingStand.edit.java deleted file mode 100644 index 05d74c4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityBrewingStand.edit.java +++ /dev/null @@ -1,17 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 15 : 17 @ 15 : 17 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 55 : 56 @ 55 : 56 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityChest.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityChest.edit.java deleted file mode 100644 index 080ad82..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityChest.edit.java +++ /dev/null @@ -1,17 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 11 : 13 @ 11 : 13 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 217 : 218 @ 217 : 218 - -~ if (this.numPlayersUsing != 0 && (this.ticksSinceSync + i + j + k) % 200 == 0) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityCommandBlock.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityCommandBlock.edit.java deleted file mode 100644 index f9b10e6..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityCommandBlock.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityComparator.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityComparator.edit.java deleted file mode 100644 index 72a6117..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityComparator.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java deleted file mode 100644 index 10c4727..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 15 : 16 @ 15 : 16 - -~ if (this.worldObj != null && this.worldObj.getTotalWorldTime() % 20L == 0L) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityDispenser.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityDispenser.edit.java deleted file mode 100644 index 3f45092..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityDispenser.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 6 : 8 @ 6 : 8 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 10 : 11 @ 10 : 11 - -~ private static final EaglercraftRandom RNG = new EaglercraftRandom(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityEnchantmentTable.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityEnchantmentTable.edit.java deleted file mode 100644 index fa4691b..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityEnchantmentTable.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 26 : 27 @ 26 : 27 - -~ private static EaglercraftRandom rand = new EaglercraftRandom(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityFlowerPot.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityFlowerPot.edit.java deleted file mode 100644 index ad25b18..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityFlowerPot.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityFurnace.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityFurnace.edit.java deleted file mode 100644 index a72e5c8..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityFurnace.edit.java +++ /dev/null @@ -1,17 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 21 : 23 @ 21 : 23 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 153 : 154 @ 153 : 154 - -~ { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityHopper.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityHopper.edit.java deleted file mode 100644 index 6f319de..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityHopper.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 15 : 17 @ 15 : 17 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 147 : 148 @ 147 : 148 - -~ if (this.worldObj != null) { - -> CHANGE 10 : 11 @ 10 : 11 - -~ if (this.worldObj != null) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityLockable.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityLockable.edit.java deleted file mode 100644 index 72a6117..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityLockable.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityMobSpawner.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityMobSpawner.edit.java deleted file mode 100644 index ad25b18..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityMobSpawner.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityNote.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityNote.edit.java deleted file mode 100644 index 4df05a4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityNote.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityPiston.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityPiston.edit.java deleted file mode 100644 index c69458a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntityPiston.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 8 : 9 @ 8 : 9 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntitySign.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntitySign.edit.java deleted file mode 100644 index 87344a1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntitySign.edit.java +++ /dev/null @@ -1,40 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 2 @ 2 : 3 - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.minecraft.nbt.NBTTagCompound; - -> INSERT 14 : 16 @ 14 - -+ import org.json.JSONException; -+ - -> CHANGE 80 : 81 @ 80 : 81 - -~ } catch (JSONException var8) { - -> INSERT 80 : 82 @ 80 - -+ boolean didSomething = false; -+ - -> INSERT 5 : 6 @ 5 - -+ didSomething = true; - -> INSERT 6 : 11 @ 6 - -+ if (!didSomething && MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() -+ .getBoolean("doSignEditing")) { -+ playerIn.openEditSign(this); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntitySkull.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntitySkull.edit.java deleted file mode 100644 index 6b8d029..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/tileentity/TileEntitySkull.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 8 @ 3 : 8 - -~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.Property; -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTUtil; - -> CHANGE 40 : 41 @ 40 : 41 - -~ this.playerProfile = new GameProfile((EaglercraftUUID) null, s); - -> CHANGE 34 : 35 @ 34 : 58 - -~ return input; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/Cartesian.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/Cartesian.edit.java deleted file mode 100644 index 9812c87..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/Cartesian.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 53 : 54 @ 53 : 54 - -~ return (List) Arrays.asList(aobject); - -> CHANGE 14 : 15 @ 14 : 15 - -~ ? Collections.singletonList((T[]) Cartesian.createArray(this.clazz, 0)).iterator() - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatComponentScore.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatComponentScore.edit.java deleted file mode 100644 index 73f8d7a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatComponentScore.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 12 : 14 @ 12 - -+ import net.lax1dude.eaglercraft.v1_8.HString; -+ - -> CHANGE 29 : 30 @ 29 : 30 - -~ if (minecraftserver != null && StringUtils.isNullOrEmpty(this.value)) { - -> CHANGE 4 : 5 @ 4 : 5 - -~ this.setValue(HString.format("%d", new Object[] { Integer.valueOf(score.getScorePoints()) })); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatComponentTranslation.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatComponentTranslation.edit.java deleted file mode 100644 index 57ca5d2..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatComponentTranslation.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 10 : 12 @ 10 - -+ -+ import net.lax1dude.eaglercraft.v1_8.HString; - -> CHANGE 72 : 73 @ 72 : 73 - -~ HString.format(format.substring(j, k), new Object[0])); - -> CHANGE 25 : 26 @ 25 : 26 - -~ HString.format(format.substring(j), new Object[0])); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatComponentTranslationFormatException.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatComponentTranslationFormatException.edit.java deleted file mode 100644 index d65f591..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatComponentTranslationFormatException.edit.java +++ /dev/null @@ -1,25 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 6 : 8 @ 6 - -+ import net.lax1dude.eaglercraft.v1_8.HString; -+ - -> CHANGE 7 : 8 @ 7 : 8 - -~ super(HString.format("Error parsing: %s: %s", new Object[] { component, message })); - -> CHANGE 3 : 4 @ 3 : 4 - -~ super(HString.format("Invalid index %d requested for %s", new Object[] { Integer.valueOf(index), component })); - -> CHANGE 3 : 4 @ 3 : 4 - -~ super(HString.format("Error while parsing: %s", new Object[] { component }), cause); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatStyle.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatStyle.edit.java deleted file mode 100644 index 0791fab..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatStyle.edit.java +++ /dev/null @@ -1,159 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 7 @ 2 : 11 - -~ import org.json.JSONException; -~ import org.json.JSONObject; -~ -~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeCodec; -~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; - -> CHANGE 341 : 350 @ 341 : 353 - -~ public static class Serializer implements JSONTypeCodec { -~ public ChatStyle deserialize(JSONObject jsonobject) throws JSONException { -~ ChatStyle chatstyle = new ChatStyle(); -~ if (jsonobject == null) { -~ return null; -~ } else { -~ if (jsonobject.has("bold")) { -~ chatstyle.bold = jsonobject.getBoolean("bold"); -~ } - -> CHANGE 1 : 4 @ 1 : 4 - -~ if (jsonobject.has("italic")) { -~ chatstyle.italic = jsonobject.getBoolean("italic"); -~ } - -> CHANGE 1 : 4 @ 1 : 4 - -~ if (jsonobject.has("underlined")) { -~ chatstyle.underlined = jsonobject.getBoolean("underlined"); -~ } - -> CHANGE 1 : 4 @ 1 : 4 - -~ if (jsonobject.has("strikethrough")) { -~ chatstyle.strikethrough = jsonobject.getBoolean("strikethrough"); -~ } - -> CHANGE 1 : 4 @ 1 : 4 - -~ if (jsonobject.has("obfuscated")) { -~ chatstyle.obfuscated = jsonobject.getBoolean("obfuscated"); -~ } - -> CHANGE 1 : 4 @ 1 : 5 - -~ if (jsonobject.has("color")) { -~ chatstyle.color = EnumChatFormatting.getValueByName(jsonobject.getString("color")); -~ } - -> CHANGE 1 : 4 @ 1 : 4 - -~ if (jsonobject.has("insertion")) { -~ chatstyle.insertion = jsonobject.getString("insertion"); -~ } - -> CHANGE 1 : 11 @ 1 : 12 - -~ if (jsonobject.has("clickEvent")) { -~ JSONObject jsonobject1 = jsonobject.getJSONObject("clickEvent"); -~ if (jsonobject1 != null) { -~ String jsonprimitive = jsonobject1.optString("action"); -~ ClickEvent.Action clickevent$action = jsonprimitive == null ? null -~ : ClickEvent.Action.getValueByCanonicalName(jsonprimitive); -~ String jsonprimitive1 = jsonobject1.optString("value"); -~ if (clickevent$action != null && jsonprimitive1 != null -~ && clickevent$action.shouldAllowInChat()) { -~ chatstyle.chatClickEvent = new ClickEvent(clickevent$action, jsonprimitive1); - -> INSERT 2 : 3 @ 2 - -+ } - -> CHANGE 1 : 12 @ 1 : 13 - -~ if (jsonobject.has("hoverEvent")) { -~ JSONObject jsonobject2 = jsonobject.getJSONObject("hoverEvent"); -~ if (jsonobject2 != null) { -~ String jsonprimitive2 = jsonobject2.getString("action"); -~ HoverEvent.Action hoverevent$action = jsonprimitive2 == null ? null -~ : HoverEvent.Action.getValueByCanonicalName(jsonprimitive2); -~ IChatComponent ichatcomponent = JSONTypeProvider.deserializeNoCast(jsonobject2.get("value"), -~ IChatComponent.class); -~ if (hoverevent$action != null && ichatcomponent != null -~ && hoverevent$action.shouldAllowInChat()) { -~ chatstyle.chatHoverEvent = new HoverEvent(hoverevent$action, ichatcomponent); - -> DELETE 2 @ 2 : 4 - -> CHANGE 1 : 3 @ 1 : 3 - -~ -~ return chatstyle; - -> CHANGE 3 : 4 @ 3 : 5 - -~ public JSONObject serialize(ChatStyle chatstyle) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ JSONObject jsonobject = new JSONObject(); - -> CHANGE 1 : 2 @ 1 : 2 - -~ jsonobject.put("bold", chatstyle.bold); - -> CHANGE 3 : 4 @ 3 : 4 - -~ jsonobject.put("italic", chatstyle.italic); - -> CHANGE 3 : 4 @ 3 : 4 - -~ jsonobject.put("underlined", chatstyle.underlined); - -> CHANGE 3 : 4 @ 3 : 4 - -~ jsonobject.put("strikethrough", chatstyle.strikethrough); - -> CHANGE 3 : 4 @ 3 : 4 - -~ jsonobject.put("obfuscated", chatstyle.obfuscated); - -> CHANGE 3 : 4 @ 3 : 4 - -~ jsonobject.put("color", chatstyle.color.getFriendlyName()); - -> CHANGE 3 : 4 @ 3 : 4 - -~ jsonobject.put("insertion", chatstyle.insertion); - -> CHANGE 3 : 7 @ 3 : 7 - -~ JSONObject jsonobject1 = new JSONObject(); -~ jsonobject1.put("action", chatstyle.chatClickEvent.getAction().getCanonicalName()); -~ jsonobject1.put("value", chatstyle.chatClickEvent.getValue()); -~ jsonobject.put("clickEvent", jsonobject1); - -> CHANGE 3 : 14 @ 3 : 7 - -~ JSONObject jsonobject2 = new JSONObject(); -~ jsonobject2.put("action", chatstyle.chatHoverEvent.getAction().getCanonicalName()); -~ Object obj = JSONTypeProvider.serialize(chatstyle.chatHoverEvent.getValue()); -~ if (obj instanceof String) { -~ jsonobject2.put("value", (String) obj); -~ } else if (obj instanceof JSONObject) { -~ jsonobject2.put("value", (JSONObject) obj); -~ } else { -~ throw new ClassCastException(); -~ } -~ jsonobject.put("hoverEvent", jsonobject2); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ClassInheritanceMultiMap.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ClassInheritanceMultiMap.edit.java deleted file mode 100644 index a00a08a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ClassInheritanceMultiMap.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 40 : 41 @ 40 : 41 - -~ for (T object : this.field_181745_e) { - -> CHANGE 33 : 34 @ 33 : 34 - -~ this.map.put(parClass1, Lists.newArrayList(parObject)); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnchantmentNameParts.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnchantmentNameParts.edit.java deleted file mode 100644 index 4741347..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnchantmentNameParts.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 10 : 11 @ 10 : 11 - -~ private EaglercraftRandom rand = new EaglercraftRandom(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumChatFormatting.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumChatFormatting.edit.java deleted file mode 100644 index 1a94b04..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumChatFormatting.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 4 : 7 @ 4 - -+ -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 14 : 18 @ 14 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/util/EnumChatFormatting"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumFacing.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumFacing.edit.java deleted file mode 100644 index dd8cc98..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumFacing.edit.java +++ /dev/null @@ -1,36 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 5 : 6 @ 5 - -+ - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> INSERT 4 : 6 @ 4 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 8 : 12 @ 8 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/util/EnumFacing"); -+ } -+ - -> CHANGE 162 : 163 @ 162 : 163 - -~ public static EnumFacing random(EaglercraftRandom rand) { - -> CHANGE 140 : 141 @ 140 : 141 - -~ public EnumFacing random(EaglercraftRandom rand) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumParticleTypes.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumParticleTypes.edit.java deleted file mode 100644 index 744340e..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumParticleTypes.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 4 : 5 @ 4 - -+ - -> INSERT 3 : 5 @ 3 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 17 : 21 @ 17 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/util/EnumParticleTypes"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumWorldBlockLayer.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumWorldBlockLayer.edit.java deleted file mode 100644 index 60dc3ed..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/EnumWorldBlockLayer.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 2 : 4 @ 2 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 3 : 7 @ 3 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/util/EnumWorldBlockLayer"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/FoodStats.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/FoodStats.edit.java deleted file mode 100644 index c7a53cd..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/FoodStats.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 5 : 6 @ 5 : 6 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/IChatComponent.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/IChatComponent.edit.java deleted file mode 100644 index e79851f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/IChatComponent.edit.java +++ /dev/null @@ -1,226 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 2 @ 2 : 13 - -> DELETE 3 @ 3 : 10 - -> INSERT 1 : 8 @ 1 - -+ import org.json.JSONArray; -+ import org.json.JSONException; -+ import org.json.JSONObject; -+ -+ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeCodec; -+ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; -+ - -> CHANGE 19 : 20 @ 19 : 20 - -~ public static class Serializer implements JSONTypeCodec { - -> CHANGE 1 : 7 @ 1 : 16 - -~ public IChatComponent deserialize(Object parJsonElement) throws JSONException { -~ if (parJsonElement instanceof String) { -~ return new ChatComponentText((String) parJsonElement); -~ } else if (!(parJsonElement instanceof JSONObject)) { -~ if (parJsonElement instanceof JSONArray) { -~ JSONArray jsonarray1 = (JSONArray) parJsonElement; - -> CHANGE 2 : 4 @ 2 : 5 - -~ for (Object jsonelement : jsonarray1) { -~ IChatComponent ichatcomponent1 = this.deserialize(jsonelement); - -> CHANGE 9 : 11 @ 9 : 11 - -~ throw new JSONException("Don\'t know how to turn " + parJsonElement.getClass().getSimpleName() -~ + " into a Component"); - -> CHANGE 2 : 3 @ 2 : 3 - -~ JSONObject jsonobject = (JSONObject) parJsonElement; - -> CHANGE 2 : 3 @ 2 : 3 - -~ object = new ChatComponentText(jsonobject.getString("text")); - -> CHANGE 1 : 2 @ 1 : 2 - -~ String s = jsonobject.getString("translate"); - -> CHANGE 1 : 3 @ 1 : 3 - -~ JSONArray jsonarray = jsonobject.getJSONArray("with"); -~ Object[] aobject = new Object[jsonarray.length()]; - -> CHANGE 2 : 3 @ 2 : 3 - -~ aobject[i] = this.deserialize(jsonarray.get(i)); - -> CHANGE 14 : 15 @ 14 : 15 - -~ JSONObject jsonobject1 = jsonobject.getJSONObject("score"); - -> CHANGE 1 : 2 @ 1 : 2 - -~ throw new JSONException("A score component needs a least a name and an objective"); - -> CHANGE 2 : 3 @ 2 : 4 - -~ object = new ChatComponentScore(jsonobject1.getString("name"), jsonobject1.getString("objective")); - -> CHANGE 1 : 2 @ 1 : 2 - -~ ((ChatComponentScore) object).setValue(jsonobject1.getString("value")); - -> CHANGE 3 : 4 @ 3 : 4 - -~ throw new JSONException( - -> CHANGE 3 : 4 @ 3 : 4 - -~ object = new ChatComponentSelector(jsonobject.getString("selector")); - -> CHANGE 3 : 6 @ 3 : 6 - -~ JSONArray jsonarray2 = jsonobject.getJSONArray("extra"); -~ if (jsonarray2.length() <= 0) { -~ throw new JSONException("Unexpected empty array of components"); - -> CHANGE 2 : 4 @ 2 : 5 - -~ for (int j = 0; j < jsonarray2.length(); ++j) { -~ ((IChatComponent) object).appendSibling(this.deserialize(jsonarray2.get(j))); - -> CHANGE 3 : 4 @ 3 : 5 - -~ ((IChatComponent) object).setChatStyle(JSONTypeProvider.deserialize(parJsonElement, ChatStyle.class)); - -> CHANGE 4 : 8 @ 4 : 12 - -~ private void serializeChatStyle(ChatStyle style, JSONObject object) { -~ JSONObject jsonelement = JSONTypeProvider.serialize(style); -~ for (String entry : jsonelement.keySet()) { -~ object.put(entry, jsonelement.get(entry)); - -> DELETE 1 @ 1 : 2 - -> CHANGE 2 : 3 @ 2 : 4 - -~ public Object serialize(IChatComponent ichatcomponent) { - -> CHANGE 2 : 3 @ 2 : 3 - -~ return ((ChatComponentText) ichatcomponent).getChatComponentText_TextValue(); - -> CHANGE 1 : 2 @ 1 : 2 - -~ JSONObject jsonobject = new JSONObject(); - -> CHANGE 1 : 2 @ 1 : 2 - -~ this.serializeChatStyle(ichatcomponent.getChatStyle(), jsonobject); - -> CHANGE 3 : 4 @ 3 : 4 - -~ JSONArray jsonarray = new JSONArray(); - -> CHANGE 2 : 3 @ 2 : 4 - -~ jsonarray.put(this.serialize(ichatcomponent1)); - -> CHANGE 2 : 3 @ 2 : 3 - -~ jsonobject.put("extra", jsonarray); - -> CHANGE 3 : 4 @ 3 : 5 - -~ jsonobject.put("text", ((ChatComponentText) ichatcomponent).getChatComponentText_TextValue()); - -> CHANGE 2 : 3 @ 2 : 3 - -~ jsonobject.put("translate", chatcomponenttranslation.getKey()); - -> CHANGE 2 : 3 @ 2 : 3 - -~ JSONArray jsonarray1 = new JSONArray(); - -> CHANGE 3 : 4 @ 3 : 5 - -~ jsonarray1.put(this.serialize((IChatComponent) object)); - -> CHANGE 1 : 2 @ 1 : 2 - -~ jsonarray1.put(String.valueOf(object)); - -> CHANGE 3 : 4 @ 3 : 4 - -~ jsonobject.put("with", jsonarray1); - -> CHANGE 3 : 8 @ 3 : 8 - -~ JSONObject jsonobject1 = new JSONObject(); -~ jsonobject1.put("name", chatcomponentscore.getName()); -~ jsonobject1.put("objective", chatcomponentscore.getObjective()); -~ jsonobject1.put("value", chatcomponentscore.getUnformattedTextForChat()); -~ jsonobject.put("score", jsonobject1); - -> CHANGE 7 : 8 @ 7 : 8 - -~ jsonobject.put("selector", chatcomponentselector.getSelector()); - -> INSERT 6 : 9 @ 6 - -+ /** -+ * So sorry for this implementation -+ */ - -> CHANGE 1 : 8 @ 1 : 2 - -~ if ((component instanceof ChatComponentText) && component.getChatStyle().isEmpty() -~ && component.getSiblings().isEmpty()) { -~ String escaped = new JSONObject().put("E", component.getUnformattedTextForChat()).toString(); -~ return escaped.substring(5, escaped.length() - 1); -~ } else { -~ return JSONTypeProvider.serialize(component).toString(); -~ } - -> CHANGE 3 : 7 @ 3 : 4 - -~ if (json.equals("null")) { -~ return new ChatComponentText(""); -~ } -~ return (IChatComponent) JSONTypeProvider.deserialize(json, IChatComponent.class); - -> INSERT 1 : 2 @ 1 - -+ } - -> CHANGE 1 : 14 @ 1 : 7 - -~ public static IChatComponent join(List components) { -~ ChatComponentText chatcomponenttext = new ChatComponentText(""); -~ -~ for (int i = 0; i < components.size(); ++i) { -~ if (i > 0) { -~ if (i == components.size() - 1) { -~ chatcomponenttext.appendText(" and "); -~ } else if (i > 0) { -~ chatcomponenttext.appendText(", "); -~ } -~ } -~ -~ chatcomponenttext.appendSibling((IChatComponent) components.get(i)); - -> INSERT 1 : 3 @ 1 - -+ -+ return chatcomponenttext; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/IJsonSerializable.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/IJsonSerializable.edit.java deleted file mode 100644 index 4616e96..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/IJsonSerializable.edit.java +++ /dev/null @@ -1,18 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 2 @ 2 : 4 - -> CHANGE 1 : 2 @ 1 : 2 - -~ void fromJson(Object var1); - -> CHANGE 1 : 2 @ 1 : 2 - -~ Object getSerializableElement(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/IThreadListener.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/IThreadListener.edit.java deleted file mode 100644 index db5b5c4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/IThreadListener.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 2 @ 2 : 4 - -> CHANGE 1 : 2 @ 1 : 2 - -~ void addScheduledTask(Runnable var1); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/IntHashMap.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/IntHashMap.edit.java deleted file mode 100644 index ab4e8c1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/IntHashMap.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 30 : 31 @ 30 : 31 - -~ return (V) inthashmap$entry.valueEntry; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/JsonSerializableSet.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/JsonSerializableSet.edit.java deleted file mode 100644 index bd6bd27..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/JsonSerializableSet.edit.java +++ /dev/null @@ -1,34 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 4 @ 4 : 7 - -> INSERT 1 : 4 @ 1 - -+ -+ import org.json.JSONArray; -+ - -> CHANGE 12 : 18 @ 12 : 16 - -~ public void fromJson(Object jsonelement) { -~ if (jsonelement instanceof JSONArray) { -~ for (Object jsonelement1 : (JSONArray) jsonelement) { -~ if (jsonelement1 instanceof String) { -~ this.add((String) jsonelement1); -~ } - -> CHANGE 5 : 7 @ 5 : 7 - -~ public Object getSerializableElement() { -~ JSONArray jsonarray = new JSONArray(); - -> CHANGE 2 : 3 @ 2 : 3 - -~ jsonarray.put(s); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/LazyLoadBase.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/LazyLoadBase.edit.java deleted file mode 100644 index 8ce7085..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/LazyLoadBase.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 2 @ 2 : 4 - -> DELETE 1 @ 1 : 6 - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/LongHashMap.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/LongHashMap.edit.java deleted file mode 100644 index 0daf046..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/LongHashMap.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 44 : 45 @ 44 : 45 - -~ return (V) longhashmap$entry.value; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MapPopulator.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MapPopulator.edit.java deleted file mode 100644 index 1a6bdc3..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MapPopulator.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 23 : 24 @ 23 : 24 - -~ map.put((K) object, (V) iterator.next()); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MathHelper.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MathHelper.edit.java deleted file mode 100644 index 54dd6fe..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/MathHelper.edit.java +++ /dev/null @@ -1,33 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 4 @ 2 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; - -> CHANGE 107 : 108 @ 107 : 108 - -~ public static int getRandomIntegerInRange(EaglercraftRandom parRandom, int parInt1, int parInt2) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public static float randomFloatClamp(EaglercraftRandom parRandom, float parFloat1, float parFloat2) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public static double getRandomDoubleInRange(EaglercraftRandom parRandom, double parDouble1, double parDouble2) { - -> CHANGE 147 : 148 @ 147 : 148 - -~ public static EaglercraftUUID getRandomUuid(EaglercraftRandom rand) { - -> CHANGE 2 : 3 @ 2 : 3 - -~ return new EaglercraftUUID(i, j); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ObjectIntIdentityMap.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ObjectIntIdentityMap.edit.java deleted file mode 100644 index f62ac11..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ObjectIntIdentityMap.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 25 : 26 @ 25 : 26 - -~ this.objectList.add((T) null); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/RegistrySimple.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/RegistrySimple.edit.java deleted file mode 100644 index 39b2be8..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/RegistrySimple.edit.java +++ /dev/null @@ -1,13 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 11 @ 9 : 11 - -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ReportedException.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ReportedException.edit.java deleted file mode 100644 index fa4a9eb..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ReportedException.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.minecraft.crash.CrashReport; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/Rotations.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/Rotations.edit.java deleted file mode 100644 index 10b4a8a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/Rotations.edit.java +++ /dev/null @@ -1,13 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 4 @ 2 : 4 - -~ import net.minecraft.nbt.NBTTagFloat; -~ import net.minecraft.nbt.NBTTagList; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/StatCollector.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/StatCollector.edit.java deleted file mode 100644 index 1770955..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/StatCollector.edit.java +++ /dev/null @@ -1,14 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 13 @ 13 : 14 - -> CHANGE 10 : 11 @ 10 : 11 - -~ return localizedName.translateKey(key); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/StringTranslate.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/StringTranslate.edit.java deleted file mode 100644 index aa3c77a..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/StringTranslate.edit.java +++ /dev/null @@ -1,71 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 5 : 9 @ 5 - -+ -+ import net.lax1dude.eaglercraft.v1_8.HString; -+ import net.lax1dude.eaglercraft.v1_8.IOUtils; -+ - -> INSERT 2 : 3 @ 2 - -+ import java.nio.charset.StandardCharsets; - -> INSERT 1 : 2 @ 1 - -+ import java.util.List; - -> DELETE 2 @ 2 : 4 - -> CHANGE 15 : 17 @ 15 : 18 - -~ private StringTranslate() { -~ } - -> CHANGE 1 : 13 @ 1 : 9 - -~ public static void init(List strs) { -~ instance.languageList.clear(); -~ for (String s : strs) { -~ if (!s.isEmpty() && s.charAt(0) != 35) { -~ String[] astring = (String[]) Iterables.toArray(equalSignSplitter.split(s), String.class); -~ if (astring != null && astring.length == 2) { -~ String s1 = astring[0]; -~ String s2 = numericVariablePattern.matcher(astring[1]).replaceAll("%s"); // TODO: originally "%$1s" -~ // but must be "%s" to -~ // work with TeaVM -~ // (why?) -~ instance.languageList.put(s1, s2); - -> DELETE 2 @ 2 : 6 - -> INSERT 2 : 3 @ 2 - -+ instance.lastUpdateTimeInMilliseconds = System.currentTimeMillis(); - -> CHANGE 6 : 7 @ 6 : 7 - -~ public static void replaceWith(Map parMap) { - -> CHANGE 5 : 6 @ 5 : 6 - -~ public String translateKey(String key) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public String translateKeyFormat(String key, Object... format) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ return HString.format(s, format); - -> CHANGE 10 : 11 @ 10 : 11 - -~ public boolean isKeyTranslated(String key) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/Util.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/Util.edit.java deleted file mode 100644 index 6faaa0c..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/Util.edit.java +++ /dev/null @@ -1,18 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 5 - -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> INSERT 3 : 6 @ 3 - -+ import net.lax1dude.eaglercraft.v1_8.futures.ExecutionException; -+ import net.lax1dude.eaglercraft.v1_8.futures.FutureTask; -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/WeightedRandom.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/WeightedRandom.edit.java deleted file mode 100644 index 232449e..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/WeightedRandom.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 19 : 20 @ 19 : 20 - -~ public static T getRandomItem(EaglercraftRandom random, Collection collection, - -> CHANGE 20 : 21 @ 20 : 21 - -~ public static T getRandomItem(EaglercraftRandom random, Collection collection) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/WeightedRandomChestContent.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/WeightedRandomChestContent.edit.java deleted file mode 100644 index 724e220..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/WeightedRandomChestContent.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 6 : 7 @ 6 : 7 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 33 : 35 @ 33 : 35 - -~ public static void generateChestContents(EaglercraftRandom random, List listIn, -~ IInventory inv, int max) { - -> CHANGE 20 : 21 @ 20 : 21 - -~ public static void generateDispenserContents(EaglercraftRandom random, List listIn, - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/WeightedRandomFishable.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/WeightedRandomFishable.edit.java deleted file mode 100644 index 8a88b24..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/WeightedRandomFishable.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 21 : 22 @ 21 : 22 - -~ public ItemStack getItemStack(EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/MerchantRecipe.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/MerchantRecipe.edit.java deleted file mode 100644 index 4df05a4..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/MerchantRecipe.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/MerchantRecipeList.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/MerchantRecipeList.edit.java deleted file mode 100644 index b30cd43..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/MerchantRecipeList.edit.java +++ /dev/null @@ -1,32 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 5 : 8 @ 5 : 8 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; -~ import net.minecraft.nbt.NBTUtil; - -> CHANGE 57 : 59 @ 57 : 59 - -~ buffer.writeItemStackToBuffer_server(merchantrecipe.getItemToBuy()); -~ buffer.writeItemStackToBuffer_server(merchantrecipe.getItemToSell()); - -> CHANGE 3 : 4 @ 3 : 4 - -~ buffer.writeItemStackToBuffer_server(itemstack); - -> CHANGE 14 : 16 @ 14 : 16 - -~ ItemStack itemstack = buffer.readItemStackFromBuffer_server(); -~ ItemStack itemstack1 = buffer.readItemStackFromBuffer_server(); - -> CHANGE 2 : 3 @ 2 : 3 - -~ itemstack2 = buffer.readItemStackFromBuffer_server(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/VillageCollection.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/VillageCollection.edit.java deleted file mode 100644 index f93d602..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/VillageCollection.edit.java +++ /dev/null @@ -1,13 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 8 : 10 @ 8 : 10 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/EnumDifficulty.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/EnumDifficulty.edit.java deleted file mode 100644 index 6cc3e75..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/EnumDifficulty.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 2 : 4 @ 2 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 4 : 8 @ 4 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/world/EnumDifficulty"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/EnumSkyBlock.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/EnumSkyBlock.edit.java deleted file mode 100644 index ae6a311..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/EnumSkyBlock.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 2 : 4 @ 2 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 3 : 7 @ 3 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/world/EnumSkyBlock"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/Explosion.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/Explosion.edit.java deleted file mode 100644 index ee0cee9..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/Explosion.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 8 : 9 @ 8 : 9 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 27 : 28 @ 27 : 28 - -~ private final EaglercraftRandom explosionRNG; - -> CHANGE 22 : 23 @ 22 : 23 - -~ this.explosionRNG = new EaglercraftRandom(); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/GameRules.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/GameRules.edit.java deleted file mode 100644 index e9d2439..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/GameRules.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> INSERT 27 : 33 @ 27 - -+ this.addGameRule("loadSpawnChunks", "false", GameRules.ValueType.BOOLEAN_VALUE); -+ this.addGameRule("bedSpawnPoint", "true", GameRules.ValueType.BOOLEAN_VALUE); -+ this.addGameRule("clickToRide", "false", GameRules.ValueType.BOOLEAN_VALUE); -+ this.addGameRule("clickToSit", "true", GameRules.ValueType.BOOLEAN_VALUE); -+ this.addGameRule("colorCodes", "true", GameRules.ValueType.BOOLEAN_VALUE); -+ this.addGameRule("doSignEditing", "true", GameRules.ValueType.BOOLEAN_VALUE); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/LockCode.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/LockCode.edit.java deleted file mode 100644 index 72a6117..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/LockCode.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/World.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/World.edit.java deleted file mode 100644 index fc37d1f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/World.edit.java +++ /dev/null @@ -1,143 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 5 : 6 @ 5 - -+ - -> CHANGE 5 : 8 @ 5 : 6 - -~ -~ import net.lax1dude.eaglercraft.v1_8.EagRuntime; -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 1 : 4 @ 1 : 2 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ import net.lax1dude.eaglercraft.v1_8.HString; -~ - -> INSERT 1 : 3 @ 1 - -+ -+ import net.lax1dude.eaglercraft.v1_8.sp.server.CrashReportHelper; - -> CHANGE 8 : 10 @ 8 : 10 - -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; - -> CHANGE 5 : 6 @ 5 : 6 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 61 : 62 @ 61 : 62 - -~ protected int updateLCG = (new EaglercraftRandom()).nextInt(); - -> CHANGE 6 : 7 @ 6 : 7 - -~ public final EaglercraftRandom rand = new EaglercraftRandom(); - -> CHANGE 9 : 10 @ 9 : 10 - -~ private final Calendar theCalendar = EagRuntime.getLocaleCalendar(); - -> DELETE 1 @ 1 : 2 - -> INSERT 10 : 12 @ 10 - -+ if (client) -+ throw new IllegalArgumentException("Cannot construct client instance!"); - -> DELETE 8 @ 8 : 9 - -> CHANGE 18 : 20 @ 18 : 19 - -~ return CrashReportCategory -~ .getCoordinateInfo(new net.minecraft.util.BlockPos(pos.getX(), pos.getY(), pos.getZ())); - -> CHANGE 111 : 112 @ 111 : 112 - -~ } else if (this.worldInfo.getTerrainType() == WorldType.DEBUG_WORLD) { - -> CHANGE 16 : 17 @ 16 : 17 - -~ if ((flags & 2) != 0) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ if ((flags & 1) != 0) { - -> CHANGE 113 : 114 @ 113 : 114 - -~ { - -> CHANGE 10 : 11 @ 10 : 11 - -~ return HString.format("ID #%d (%s // %s)", - -> CHANGE 7 : 8 @ 7 : 8 - -~ CrashReportHelper.addIntegratedServerBlockInfo(crashreportcategory, pos, iblockstate); - -> CHANGE 1408 : 1409 @ 1408 : 1409 - -~ { - -> CHANGE 11 : 12 @ 11 : 12 - -~ this.worldInfo.setThunderTime((this.rand.nextInt(12000) / 2) + 3600); - -> CHANGE 1 : 2 @ 1 : 2 - -~ this.worldInfo.setThunderTime((this.rand.nextInt(168000) + 12000) * 2); - -> CHANGE 20 : 21 @ 20 : 21 - -~ this.worldInfo.setRainTime((this.rand.nextInt(12000) + 12000) / 2); - -> CHANGE 1 : 2 @ 1 : 2 - -~ this.worldInfo.setRainTime((this.rand.nextInt(168000) + 12000) * 2); - -> CHANGE 60 : 61 @ 60 : 61 - -~ if (this.ambientTickCountdown == 0) { - -> CHANGE 30 : 31 @ 30 : 31 - -~ public void forceBlockUpdateTick(Block blockType, BlockPos pos, EaglercraftRandom random) { - -> CHANGE 263 : 264 @ 263 : 264 - -~ if (entityType.isAssignableFrom(entity.getClass()) && filter.apply((T) entity)) { - -> CHANGE 11 : 12 @ 11 : 12 - -~ if (playerType.isAssignableFrom(entity.getClass()) && filter.apply((T) entity)) { - -> CHANGE 232 : 233 @ 232 : 233 - -~ public EntityPlayer getPlayerEntityByUUID(EaglercraftUUID uuid) { - -> CHANGE 181 : 183 @ 181 : 182 - -~ crashreportcategory.addCrashSection("Block coordinates", CrashReportCategory -~ .getCoordinateInfo(new net.minecraft.util.BlockPos(pos.getX(), pos.getY(), pos.getZ()))); - -> CHANGE 15 : 16 @ 15 : 16 - -~ public EaglercraftRandom setRandomSeed(int parInt1, int parInt2, int parInt3) { - -> INSERT 129 : 132 @ 129 - -+ if (!MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() -+ .getBoolean("loadSpawnChunks")) -+ return false; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/WorldSavedData.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/WorldSavedData.edit.java deleted file mode 100644 index 72a6117..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/WorldSavedData.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenBase.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenBase.edit.java deleted file mode 100644 index 9517b26..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenBase.edit.java +++ /dev/null @@ -1,183 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 5 : 6 @ 5 - -+ - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 57 : 59 @ 57 : 59 - -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> CHANGE 26 : 70 @ 26 : 117 - -~ public static BiomeGenBase ocean; -~ public static BiomeGenBase plains; -~ public static BiomeGenBase desert; -~ public static BiomeGenBase extremeHills; -~ public static BiomeGenBase forest; -~ public static BiomeGenBase taiga; -~ public static BiomeGenBase swampland; -~ public static BiomeGenBase river; -~ public static BiomeGenBase hell; -~ public static BiomeGenBase sky; -~ public static BiomeGenBase frozenOcean; -~ public static BiomeGenBase frozenRiver; -~ public static BiomeGenBase icePlains; -~ public static BiomeGenBase iceMountains; -~ public static BiomeGenBase mushroomIsland; -~ public static BiomeGenBase mushroomIslandShore; -~ public static BiomeGenBase beach; -~ public static BiomeGenBase desertHills; -~ public static BiomeGenBase forestHills; -~ public static BiomeGenBase taigaHills; -~ public static BiomeGenBase extremeHillsEdge; -~ public static BiomeGenBase jungle; -~ public static BiomeGenBase jungleHills; -~ public static BiomeGenBase jungleEdge; -~ public static BiomeGenBase deepOcean; -~ public static BiomeGenBase stoneBeach; -~ public static BiomeGenBase coldBeach; -~ public static BiomeGenBase birchForest; -~ public static BiomeGenBase birchForestHills; -~ public static BiomeGenBase roofedForest; -~ public static BiomeGenBase coldTaiga; -~ public static BiomeGenBase coldTaigaHills; -~ public static BiomeGenBase megaTaiga; -~ public static BiomeGenBase megaTaigaHills; -~ public static BiomeGenBase extremeHillsPlus; -~ public static BiomeGenBase savanna; -~ public static BiomeGenBase savannaPlateau; -~ public static BiomeGenBase mesa; -~ public static BiomeGenBase mesaPlateau_F; -~ public static BiomeGenBase mesaPlateau; -~ public static BiomeGenBase field_180279_ad; -~ protected static NoiseGeneratorPerlin temperatureNoise; -~ protected static NoiseGeneratorPerlin GRASS_COLOR_NOISE; -~ protected static WorldGenDoublePlant DOUBLE_PLANT_GENERATOR; - -> CHANGE 81 : 82 @ 81 : 82 - -~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom rand) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public WorldGenerator getRandomWorldGenForGrass(EaglercraftRandom rand) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom rand, BlockPos pos) { - -> CHANGE 94 : 95 @ 94 : 95 - -~ public void decorate(World worldIn, EaglercraftRandom rand, BlockPos pos) { - -> CHANGE 19 : 21 @ 19 : 21 - -~ public void genTerrainBlocks(World worldIn, EaglercraftRandom rand, ChunkPrimer chunkPrimerIn, int parInt1, -~ int parInt2, double parDouble1) { - -> CHANGE 3 : 5 @ 3 : 5 - -~ public final void generateBiomeTerrain(World worldIn, EaglercraftRandom rand, ChunkPrimer chunkPrimerIn, -~ int parInt1, int parInt2, double parDouble1) { - -> CHANGE 101 : 177 @ 101 : 102 - -~ public static void doBootstrap() { -~ ocean = (new BiomeGenOcean(0)).setColor(112).setBiomeName("Ocean").setHeight(height_Oceans); -~ plains = (new BiomeGenPlains(1)).setColor(9286496).setBiomeName("Plains"); -~ desert = (new BiomeGenDesert(2)).setColor(16421912).setBiomeName("Desert").setDisableRain() -~ .setTemperatureRainfall(2.0F, 0.0F).setHeight(height_LowPlains); -~ extremeHills = (new BiomeGenHills(3, false)).setColor(6316128).setBiomeName("Extreme Hills") -~ .setHeight(height_MidHills).setTemperatureRainfall(0.2F, 0.3F); -~ forest = (new BiomeGenForest(4, 0)).setColor(353825).setBiomeName("Forest"); -~ taiga = (new BiomeGenTaiga(5, 0)).setColor(747097).setBiomeName("Taiga").setFillerBlockMetadata(5159473) -~ .setTemperatureRainfall(0.25F, 0.8F).setHeight(height_MidPlains); -~ swampland = (new BiomeGenSwamp(6)).setColor(522674).setBiomeName("Swampland").setFillerBlockMetadata(9154376) -~ .setHeight(height_PartiallySubmerged).setTemperatureRainfall(0.8F, 0.9F); -~ river = (new BiomeGenRiver(7)).setColor(255).setBiomeName("River").setHeight(height_ShallowWaters); -~ hell = (new BiomeGenHell(8)).setColor(16711680).setBiomeName("Hell").setDisableRain() -~ .setTemperatureRainfall(2.0F, 0.0F); -~ sky = (new BiomeGenEnd(9)).setColor(8421631).setBiomeName("The End").setDisableRain(); -~ frozenOcean = (new BiomeGenOcean(10)).setColor(9474208).setBiomeName("FrozenOcean").setEnableSnow() -~ .setHeight(height_Oceans).setTemperatureRainfall(0.0F, 0.5F); -~ frozenRiver = (new BiomeGenRiver(11)).setColor(10526975).setBiomeName("FrozenRiver").setEnableSnow() -~ .setHeight(height_ShallowWaters).setTemperatureRainfall(0.0F, 0.5F); -~ icePlains = (new BiomeGenSnow(12, false)).setColor(16777215).setBiomeName("Ice Plains").setEnableSnow() -~ .setTemperatureRainfall(0.0F, 0.5F).setHeight(height_LowPlains); -~ iceMountains = (new BiomeGenSnow(13, false)).setColor(10526880).setBiomeName("Ice Mountains").setEnableSnow() -~ .setHeight(height_LowHills).setTemperatureRainfall(0.0F, 0.5F); -~ mushroomIsland = (new BiomeGenMushroomIsland(14)).setColor(16711935).setBiomeName("MushroomIsland") -~ .setTemperatureRainfall(0.9F, 1.0F).setHeight(height_LowIslands); -~ mushroomIslandShore = (new BiomeGenMushroomIsland(15)).setColor(10486015).setBiomeName("MushroomIslandShore") -~ .setTemperatureRainfall(0.9F, 1.0F).setHeight(height_Shores); -~ beach = (new BiomeGenBeach(16)).setColor(16440917).setBiomeName("Beach").setTemperatureRainfall(0.8F, 0.4F) -~ .setHeight(height_Shores); -~ desertHills = (new BiomeGenDesert(17)).setColor(13786898).setBiomeName("DesertHills").setDisableRain() -~ .setTemperatureRainfall(2.0F, 0.0F).setHeight(height_LowHills); -~ forestHills = (new BiomeGenForest(18, 0)).setColor(2250012).setBiomeName("ForestHills") -~ .setHeight(height_LowHills); -~ taigaHills = (new BiomeGenTaiga(19, 0)).setColor(1456435).setBiomeName("TaigaHills") -~ .setFillerBlockMetadata(5159473).setTemperatureRainfall(0.25F, 0.8F).setHeight(height_LowHills); -~ extremeHillsEdge = (new BiomeGenHills(20, true)).setColor(7501978).setBiomeName("Extreme Hills Edge") -~ .setHeight(height_MidHills.attenuate()).setTemperatureRainfall(0.2F, 0.3F); -~ jungle = (new BiomeGenJungle(21, false)).setColor(5470985).setBiomeName("Jungle") -~ .setFillerBlockMetadata(5470985).setTemperatureRainfall(0.95F, 0.9F); -~ jungleHills = (new BiomeGenJungle(22, false)).setColor(2900485).setBiomeName("JungleHills") -~ .setFillerBlockMetadata(5470985).setTemperatureRainfall(0.95F, 0.9F).setHeight(height_LowHills); -~ jungleEdge = (new BiomeGenJungle(23, true)).setColor(6458135).setBiomeName("JungleEdge") -~ .setFillerBlockMetadata(5470985).setTemperatureRainfall(0.95F, 0.8F); -~ deepOcean = (new BiomeGenOcean(24)).setColor(48).setBiomeName("Deep Ocean").setHeight(height_DeepOceans); -~ stoneBeach = (new BiomeGenStoneBeach(25)).setColor(10658436).setBiomeName("Stone Beach") -~ .setTemperatureRainfall(0.2F, 0.3F).setHeight(height_RockyWaters); -~ coldBeach = (new BiomeGenBeach(26)).setColor(16445632).setBiomeName("Cold Beach") -~ .setTemperatureRainfall(0.05F, 0.3F).setHeight(height_Shores).setEnableSnow(); -~ birchForest = (new BiomeGenForest(27, 2)).setBiomeName("Birch Forest").setColor(3175492); -~ birchForestHills = (new BiomeGenForest(28, 2)).setBiomeName("Birch Forest Hills").setColor(2055986) -~ .setHeight(height_LowHills); -~ roofedForest = (new BiomeGenForest(29, 3)).setColor(4215066).setBiomeName("Roofed Forest"); -~ coldTaiga = (new BiomeGenTaiga(30, 0)).setColor(3233098).setBiomeName("Cold Taiga") -~ .setFillerBlockMetadata(5159473).setEnableSnow().setTemperatureRainfall(-0.5F, 0.4F) -~ .setHeight(height_MidPlains).func_150563_c(16777215); -~ coldTaigaHills = (new BiomeGenTaiga(31, 0)).setColor(2375478).setBiomeName("Cold Taiga Hills") -~ .setFillerBlockMetadata(5159473).setEnableSnow().setTemperatureRainfall(-0.5F, 0.4F) -~ .setHeight(height_LowHills).func_150563_c(16777215); -~ megaTaiga = (new BiomeGenTaiga(32, 1)).setColor(5858897).setBiomeName("Mega Taiga") -~ .setFillerBlockMetadata(5159473).setTemperatureRainfall(0.3F, 0.8F).setHeight(height_MidPlains); -~ megaTaigaHills = (new BiomeGenTaiga(33, 1)).setColor(4542270).setBiomeName("Mega Taiga Hills") -~ .setFillerBlockMetadata(5159473).setTemperatureRainfall(0.3F, 0.8F).setHeight(height_LowHills); -~ extremeHillsPlus = (new BiomeGenHills(34, true)).setColor(5271632).setBiomeName("Extreme Hills+") -~ .setHeight(height_MidHills).setTemperatureRainfall(0.2F, 0.3F); -~ savanna = (new BiomeGenSavanna(35)).setColor(12431967).setBiomeName("Savanna") -~ .setTemperatureRainfall(1.2F, 0.0F).setDisableRain().setHeight(height_LowPlains); -~ savannaPlateau = (new BiomeGenSavanna(36)).setColor(10984804).setBiomeName("Savanna Plateau") -~ .setTemperatureRainfall(1.0F, 0.0F).setDisableRain().setHeight(height_HighPlateaus); -~ mesa = (new BiomeGenMesa(37, false, false)).setColor(14238997).setBiomeName("Mesa"); -~ mesaPlateau_F = (new BiomeGenMesa(38, false, true)).setColor(11573093).setBiomeName("Mesa Plateau F") -~ .setHeight(height_HighPlateaus); -~ mesaPlateau = (new BiomeGenMesa(39, false, false)).setColor(13274213).setBiomeName("Mesa Plateau") -~ .setHeight(height_HighPlateaus); -~ field_180279_ad = ocean; -~ - -> INSERT 22 : 24 @ 22 - -+ explorationBiomesList.clear(); -+ - -> CHANGE 19 : 21 @ 19 : 21 - -~ temperatureNoise = new NoiseGeneratorPerlin(new EaglercraftRandom(1234L), 1); -~ GRASS_COLOR_NOISE = new NoiseGeneratorPerlin(new EaglercraftRandom(2345L), 1); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenDesert.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenDesert.edit.java deleted file mode 100644 index 1a6b6b7..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenDesert.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 26 : 27 @ 26 : 27 - -~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenForest.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenForest.edit.java deleted file mode 100644 index 56964da..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenForest.edit.java +++ /dev/null @@ -1,32 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 69 : 70 @ 69 : 70 - -~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { - -> CHANGE 4 : 5 @ 4 : 5 - -~ public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom random, BlockPos blockpos) { - -> CHANGE 14 : 15 @ 14 : 15 - -~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { - -> CHANGE 65 : 66 @ 65 : 66 - -~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenHills.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenHills.edit.java deleted file mode 100644 index e023092..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenHills.edit.java +++ /dev/null @@ -1,25 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 38 : 39 @ 38 : 39 - -~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { - -> CHANGE 3 : 4 @ 3 : 4 - -~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { - -> CHANGE 22 : 24 @ 22 : 23 - -~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, -~ double d0) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenJungle.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenJungle.edit.java deleted file mode 100644 index e28f5b1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenJungle.edit.java +++ /dev/null @@ -1,24 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 57 : 58 @ 57 : 58 - -~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { - -> CHANGE 8 : 9 @ 8 : 9 - -~ public WorldGenerator getRandomWorldGenForGrass(EaglercraftRandom random) { - -> CHANGE 4 : 5 @ 4 : 5 - -~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenMesa.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenMesa.edit.java deleted file mode 100644 index 10e7798..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenMesa.edit.java +++ /dev/null @@ -1,33 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 51 : 52 @ 51 : 52 - -~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom var1) { - -> CHANGE 11 : 12 @ 11 : 12 - -~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { - -> CHANGE 3 : 5 @ 3 : 4 - -~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, -~ double d0) { - -> CHANGE 5 : 6 @ 5 : 6 - -~ EaglercraftRandom random1 = new EaglercraftRandom(this.field_150622_aD); - -> CHANGE 111 : 112 @ 111 : 112 - -~ EaglercraftRandom random = new EaglercraftRandom(parLong1); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenMutated.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenMutated.edit.java deleted file mode 100644 index fefc0c2..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenMutated.edit.java +++ /dev/null @@ -1,25 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 41 : 42 @ 41 : 42 - -~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { - -> CHANGE 3 : 5 @ 3 : 4 - -~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, -~ double d0) { - -> CHANGE 7 : 8 @ 7 : 8 - -~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenOcean.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenOcean.edit.java deleted file mode 100644 index 07afa71..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenOcean.edit.java +++ /dev/null @@ -1,17 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 21 : 23 @ 21 : 22 - -~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, -~ double d0) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenPlains.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenPlains.edit.java deleted file mode 100644 index e371c43..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenPlains.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 27 : 28 @ 27 : 28 - -~ public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom random, BlockPos blockpos) { - -> CHANGE 24 : 25 @ 24 : 25 - -~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenSavanna.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenSavanna.edit.java deleted file mode 100644 index 6334814..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenSavanna.edit.java +++ /dev/null @@ -1,29 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 30 : 31 @ 30 : 31 - -~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { - -> CHANGE 11 : 12 @ 11 : 12 - -~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { - -> CHANGE 20 : 22 @ 20 : 21 - -~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, -~ double d0) { - -> CHANGE 13 : 14 @ 13 : 14 - -~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenSnow.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenSnow.edit.java deleted file mode 100644 index bbc69c5..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenSnow.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 31 : 32 @ 31 : 32 - -~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { - -> CHANGE 17 : 18 @ 17 : 18 - -~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom var1) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenSwamp.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenSwamp.edit.java deleted file mode 100644 index a557404..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenSwamp.edit.java +++ /dev/null @@ -1,25 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 34 : 35 @ 34 : 35 - -~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom var1) { - -> CHANGE 13 : 14 @ 13 : 14 - -~ public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom var1, BlockPos var2) { - -> CHANGE 3 : 5 @ 3 : 4 - -~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, -~ double d0) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenTaiga.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenTaiga.edit.java deleted file mode 100644 index 5df068f..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeGenTaiga.edit.java +++ /dev/null @@ -1,29 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 48 : 49 @ 48 : 49 - -~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { - -> CHANGE 6 : 7 @ 6 : 7 - -~ public WorldGenerator getRandomWorldGenForGrass(EaglercraftRandom random) { - -> CHANGE 4 : 5 @ 4 : 5 - -~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { - -> CHANGE 23 : 25 @ 23 : 24 - -~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, -~ double d0) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/border/EnumBorderStatus.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/border/EnumBorderStatus.edit.java deleted file mode 100644 index 3e2c8d0..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/border/EnumBorderStatus.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 2 : 4 @ 2 - -+ import static net.lax1dude.eaglercraft.v1_8.sp.server.classes.ContextUtil.__checkIntegratedContextValid; -+ - -> INSERT 3 : 7 @ 3 - -+ static { -+ __checkIntegratedContextValid("net/minecraft/world/border/EnumBorderStatus"); -+ } -+ - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/Chunk.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/Chunk.edit.java deleted file mode 100644 index 9b168c1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/Chunk.edit.java +++ /dev/null @@ -1,91 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 4 @ 4 : 5 - -> INSERT 1 : 2 @ 1 - -+ import java.util.LinkedList; - -> CHANGE 2 : 4 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ - -> INSERT 2 : 4 @ 2 - -+ -+ import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer; - -> CHANGE 4 : 6 @ 4 : 6 - -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; - -> CHANGE 20 : 22 @ 20 : 22 - -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -> CHANGE 31 : 32 @ 31 : 32 - -~ private List tileEntityPosQueue; - -> CHANGE 8 : 9 @ 8 : 9 - -~ this.tileEntityPosQueue = new LinkedList(); - -> INSERT 135 : 136 @ 135 - -+ ++EaglerMinecraftServer.counterLightUpdate; - -> INSERT 146 : 147 @ 146 - -+ ++EaglerMinecraftServer.counterLightUpdate; - -> CHANGE 37 : 39 @ 37 : 39 - -~ return CrashReportCategory.getCoordinateInfo(new net.minecraft.util.BlockPos( -~ Chunk.this.xPosition * 16 + x, y, Chunk.this.zPosition * 16 + z)); - -> CHANGE 14 : 16 @ 14 : 15 - -~ return CrashReportCategory.getCoordinateInfo( -~ new net.minecraft.util.BlockPos(blockpos.getX(), blockpos.getY(), blockpos.getZ())); - -> CHANGE 36 : 38 @ 36 : 37 - -~ return CrashReportCategory -~ .getCoordinateInfo(new net.minecraft.util.BlockPos(pos.getX(), pos.getY(), pos.getZ())); - -> CHANGE 50 : 51 @ 50 : 55 - -~ block1.breakBlock(this.worldObj, pos, iblockstate); - -> CHANGE 31 : 32 @ 31 : 32 - -~ if (block1 != block) { - -> CHANGE 254 : 256 @ 254 : 256 - -~ && (predicate == null || predicate.apply((T) entity))) { -~ list.add((T) entity); - -> CHANGE 18 : 20 @ 18 : 20 - -~ public EaglercraftRandom getRandomWithSeed(long i) { -~ return new EaglercraftRandom(this.worldObj.getSeed() + (long) (this.xPosition * this.xPosition * 4987142) - -> CHANGE 83 : 84 @ 83 : 84 - -~ this.recheckGaps(false); - -> CHANGE 8 : 9 @ 8 : 9 - -~ BlockPos blockpos = (BlockPos) this.tileEntityPosQueue.remove(0); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/EmptyChunk.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/EmptyChunk.edit.java deleted file mode 100644 index 18ae064..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/EmptyChunk.edit.java +++ /dev/null @@ -1,17 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 106 : 108 @ 106 : 108 - -~ public EaglercraftRandom getRandomWithSeed(long seed) { -~ return new EaglercraftRandom(this.getWorld().getSeed() + (long) (this.xPosition * this.xPosition * 4987142) - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/storage/ChunkLoader.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/storage/ChunkLoader.edit.java deleted file mode 100644 index 9b63df7..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/storage/ChunkLoader.edit.java +++ /dev/null @@ -1,13 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 4 @ 2 : 4 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/demo/DemoWorldServer.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/demo/DemoWorldServer.edit.java deleted file mode 100644 index dbc1131..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/demo/DemoWorldServer.edit.java +++ /dev/null @@ -1,17 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 12 : 14 @ 12 - -+ import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion; -+ - -> CHANGE 6 : 7 @ 6 : 7 - -~ private static final long demoWorldSeed = EaglercraftVersion.demoWorldSeed; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderSettings.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderSettings.edit.java deleted file mode 100644 index f66f24d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderSettings.edit.java +++ /dev/null @@ -1,427 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 2 @ 2 : 11 - -> CHANGE 1 : 7 @ 1 : 2 - -~ -~ import org.json.JSONException; -~ import org.json.JSONObject; -~ -~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeCodec; -~ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; - -> DELETE 171 @ 171 : 174 - -> CHANGE 84 : 85 @ 84 : 86 - -~ return JSONTypeProvider.deserialize(parString1, ChunkProviderSettings.Factory.class); - -> CHANGE 7 : 8 @ 7 : 8 - -~ return JSONTypeProvider.serialize(this).toString(); - -> CHANGE 365 : 367 @ 365 : 370 - -~ public static class Serializer implements JSONTypeCodec { -~ public ChunkProviderSettings.Factory deserialize(JSONObject jsonobject) throws JSONException { - -> CHANGE 3 : 4 @ 3 : 4 - -~ chunkprovidersettings$factory.coordinateScale = jsonobject.optFloat("coordinateScale", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.heightScale = jsonobject.optFloat("heightScale", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.lowerLimitScale = jsonobject.optFloat("lowerLimitScale", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.upperLimitScale = jsonobject.optFloat("upperLimitScale", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.depthNoiseScaleX = jsonobject.optFloat("depthNoiseScaleX", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.depthNoiseScaleZ = jsonobject.optFloat("depthNoiseScaleZ", - -> CHANGE 1 : 4 @ 1 : 4 - -~ chunkprovidersettings$factory.depthNoiseScaleExponent = jsonobject.optFloat("depthNoiseScaleExponent", -~ chunkprovidersettings$factory.depthNoiseScaleExponent); -~ chunkprovidersettings$factory.mainNoiseScaleX = jsonobject.optFloat("mainNoiseScaleX", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.mainNoiseScaleY = jsonobject.optFloat("mainNoiseScaleY", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.mainNoiseScaleZ = jsonobject.optFloat("mainNoiseScaleZ", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.baseSize = jsonobject.optFloat("baseSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.stretchY = jsonobject.optFloat("stretchY", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.biomeDepthWeight = jsonobject.optFloat("biomeDepthWeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.biomeDepthOffset = jsonobject.optFloat("biomeDepthOffset", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.biomeScaleWeight = jsonobject.optFloat("biomeScaleWeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.biomeScaleOffset = jsonobject.optFloat("biomeScaleOffset", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.seaLevel = jsonobject.optInt("seaLevel", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.useCaves = jsonobject.optBoolean("useCaves", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.useDungeons = jsonobject.optBoolean("useDungeons", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.dungeonChance = jsonobject.optInt("dungeonChance", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.useStrongholds = jsonobject.optBoolean("useStrongholds", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.useVillages = jsonobject.optBoolean("useVillages", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.useMineShafts = jsonobject.optBoolean("useMineShafts", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.useTemples = jsonobject.optBoolean("useTemples", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.useMonuments = jsonobject.optBoolean("useMonuments", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.useRavines = jsonobject.optBoolean("useRavines", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.useWaterLakes = jsonobject.optBoolean("useWaterLakes", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.waterLakeChance = jsonobject.optInt("waterLakeChance", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.useLavaLakes = jsonobject.optBoolean("useLavaLakes", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.lavaLakeChance = jsonobject.optInt("lavaLakeChance", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.useLavaOceans = jsonobject.optBoolean("useLavaOceans", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.fixedBiome = jsonobject.optInt("fixedBiome", - -> CHANGE 9 : 10 @ 9 : 10 - -~ chunkprovidersettings$factory.biomeSize = jsonobject.optInt("biomeSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.riverSize = jsonobject.optInt("riverSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.dirtSize = jsonobject.optInt("dirtSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.dirtCount = jsonobject.optInt("dirtCount", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.dirtMinHeight = jsonobject.optInt("dirtMinHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.dirtMaxHeight = jsonobject.optInt("dirtMaxHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.gravelSize = jsonobject.optInt("gravelSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.gravelCount = jsonobject.optInt("gravelCount", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.gravelMinHeight = jsonobject.optInt("gravelMinHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.gravelMaxHeight = jsonobject.optInt("gravelMaxHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.graniteSize = jsonobject.optInt("graniteSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.graniteCount = jsonobject.optInt("graniteCount", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.graniteMinHeight = jsonobject.optInt("graniteMinHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.graniteMaxHeight = jsonobject.optInt("graniteMaxHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.dioriteSize = jsonobject.optInt("dioriteSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.dioriteCount = jsonobject.optInt("dioriteCount", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.dioriteMinHeight = jsonobject.optInt("dioriteMinHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.dioriteMaxHeight = jsonobject.optInt("dioriteMaxHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.andesiteSize = jsonobject.optInt("andesiteSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.andesiteCount = jsonobject.optInt("andesiteCount", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.andesiteMinHeight = jsonobject.optInt("andesiteMinHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.andesiteMaxHeight = jsonobject.optInt("andesiteMaxHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.coalSize = jsonobject.optInt("coalSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.coalCount = jsonobject.optInt("coalCount", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.coalMinHeight = jsonobject.optInt("coalMinHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.coalMaxHeight = jsonobject.optInt("coalMaxHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.ironSize = jsonobject.optInt("ironSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.ironCount = jsonobject.optInt("ironCount", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.ironMinHeight = jsonobject.optInt("ironMinHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.ironMaxHeight = jsonobject.optInt("ironMaxHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.goldSize = jsonobject.optInt("goldSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.goldCount = jsonobject.optInt("goldCount", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.goldMinHeight = jsonobject.optInt("goldMinHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.goldMaxHeight = jsonobject.optInt("goldMaxHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.redstoneSize = jsonobject.optInt("redstoneSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.redstoneCount = jsonobject.optInt("redstoneCount", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.redstoneMinHeight = jsonobject.optInt("redstoneMinHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.redstoneMaxHeight = jsonobject.optInt("redstoneMaxHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.diamondSize = jsonobject.optInt("diamondSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.diamondCount = jsonobject.optInt("diamondCount", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.diamondMinHeight = jsonobject.optInt("diamondMinHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.diamondMaxHeight = jsonobject.optInt("diamondMaxHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.lapisSize = jsonobject.optInt("lapisSize", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.lapisCount = jsonobject.optInt("lapisCount", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.lapisCenterHeight = jsonobject.optInt("lapisCenterHeight", - -> CHANGE 1 : 2 @ 1 : 2 - -~ chunkprovidersettings$factory.lapisSpread = jsonobject.optInt("lapisSpread", - -> CHANGE 8 : 88 @ 8 : 89 - -~ public JSONObject serialize(ChunkProviderSettings.Factory parFactory) throws JSONException { -~ JSONObject jsonobject = new JSONObject(); -~ jsonobject.put("coordinateScale", Float.valueOf(parFactory.coordinateScale)); -~ jsonobject.put("heightScale", Float.valueOf(parFactory.heightScale)); -~ jsonobject.put("lowerLimitScale", Float.valueOf(parFactory.lowerLimitScale)); -~ jsonobject.put("upperLimitScale", Float.valueOf(parFactory.upperLimitScale)); -~ jsonobject.put("depthNoiseScaleX", Float.valueOf(parFactory.depthNoiseScaleX)); -~ jsonobject.put("depthNoiseScaleZ", Float.valueOf(parFactory.depthNoiseScaleZ)); -~ jsonobject.put("depthNoiseScaleExponent", Float.valueOf(parFactory.depthNoiseScaleExponent)); -~ jsonobject.put("mainNoiseScaleX", Float.valueOf(parFactory.mainNoiseScaleX)); -~ jsonobject.put("mainNoiseScaleY", Float.valueOf(parFactory.mainNoiseScaleY)); -~ jsonobject.put("mainNoiseScaleZ", Float.valueOf(parFactory.mainNoiseScaleZ)); -~ jsonobject.put("baseSize", Float.valueOf(parFactory.baseSize)); -~ jsonobject.put("stretchY", Float.valueOf(parFactory.stretchY)); -~ jsonobject.put("biomeDepthWeight", Float.valueOf(parFactory.biomeDepthWeight)); -~ jsonobject.put("biomeDepthOffset", Float.valueOf(parFactory.biomeDepthOffset)); -~ jsonobject.put("biomeScaleWeight", Float.valueOf(parFactory.biomeScaleWeight)); -~ jsonobject.put("biomeScaleOffset", Float.valueOf(parFactory.biomeScaleOffset)); -~ jsonobject.put("seaLevel", Integer.valueOf(parFactory.seaLevel)); -~ jsonobject.put("useCaves", Boolean.valueOf(parFactory.useCaves)); -~ jsonobject.put("useDungeons", Boolean.valueOf(parFactory.useDungeons)); -~ jsonobject.put("dungeonChance", Integer.valueOf(parFactory.dungeonChance)); -~ jsonobject.put("useStrongholds", Boolean.valueOf(parFactory.useStrongholds)); -~ jsonobject.put("useVillages", Boolean.valueOf(parFactory.useVillages)); -~ jsonobject.put("useMineShafts", Boolean.valueOf(parFactory.useMineShafts)); -~ jsonobject.put("useTemples", Boolean.valueOf(parFactory.useTemples)); -~ jsonobject.put("useMonuments", Boolean.valueOf(parFactory.useMonuments)); -~ jsonobject.put("useRavines", Boolean.valueOf(parFactory.useRavines)); -~ jsonobject.put("useWaterLakes", Boolean.valueOf(parFactory.useWaterLakes)); -~ jsonobject.put("waterLakeChance", Integer.valueOf(parFactory.waterLakeChance)); -~ jsonobject.put("useLavaLakes", Boolean.valueOf(parFactory.useLavaLakes)); -~ jsonobject.put("lavaLakeChance", Integer.valueOf(parFactory.lavaLakeChance)); -~ jsonobject.put("useLavaOceans", Boolean.valueOf(parFactory.useLavaOceans)); -~ jsonobject.put("fixedBiome", Integer.valueOf(parFactory.fixedBiome)); -~ jsonobject.put("biomeSize", Integer.valueOf(parFactory.biomeSize)); -~ jsonobject.put("riverSize", Integer.valueOf(parFactory.riverSize)); -~ jsonobject.put("dirtSize", Integer.valueOf(parFactory.dirtSize)); -~ jsonobject.put("dirtCount", Integer.valueOf(parFactory.dirtCount)); -~ jsonobject.put("dirtMinHeight", Integer.valueOf(parFactory.dirtMinHeight)); -~ jsonobject.put("dirtMaxHeight", Integer.valueOf(parFactory.dirtMaxHeight)); -~ jsonobject.put("gravelSize", Integer.valueOf(parFactory.gravelSize)); -~ jsonobject.put("gravelCount", Integer.valueOf(parFactory.gravelCount)); -~ jsonobject.put("gravelMinHeight", Integer.valueOf(parFactory.gravelMinHeight)); -~ jsonobject.put("gravelMaxHeight", Integer.valueOf(parFactory.gravelMaxHeight)); -~ jsonobject.put("graniteSize", Integer.valueOf(parFactory.graniteSize)); -~ jsonobject.put("graniteCount", Integer.valueOf(parFactory.graniteCount)); -~ jsonobject.put("graniteMinHeight", Integer.valueOf(parFactory.graniteMinHeight)); -~ jsonobject.put("graniteMaxHeight", Integer.valueOf(parFactory.graniteMaxHeight)); -~ jsonobject.put("dioriteSize", Integer.valueOf(parFactory.dioriteSize)); -~ jsonobject.put("dioriteCount", Integer.valueOf(parFactory.dioriteCount)); -~ jsonobject.put("dioriteMinHeight", Integer.valueOf(parFactory.dioriteMinHeight)); -~ jsonobject.put("dioriteMaxHeight", Integer.valueOf(parFactory.dioriteMaxHeight)); -~ jsonobject.put("andesiteSize", Integer.valueOf(parFactory.andesiteSize)); -~ jsonobject.put("andesiteCount", Integer.valueOf(parFactory.andesiteCount)); -~ jsonobject.put("andesiteMinHeight", Integer.valueOf(parFactory.andesiteMinHeight)); -~ jsonobject.put("andesiteMaxHeight", Integer.valueOf(parFactory.andesiteMaxHeight)); -~ jsonobject.put("coalSize", Integer.valueOf(parFactory.coalSize)); -~ jsonobject.put("coalCount", Integer.valueOf(parFactory.coalCount)); -~ jsonobject.put("coalMinHeight", Integer.valueOf(parFactory.coalMinHeight)); -~ jsonobject.put("coalMaxHeight", Integer.valueOf(parFactory.coalMaxHeight)); -~ jsonobject.put("ironSize", Integer.valueOf(parFactory.ironSize)); -~ jsonobject.put("ironCount", Integer.valueOf(parFactory.ironCount)); -~ jsonobject.put("ironMinHeight", Integer.valueOf(parFactory.ironMinHeight)); -~ jsonobject.put("ironMaxHeight", Integer.valueOf(parFactory.ironMaxHeight)); -~ jsonobject.put("goldSize", Integer.valueOf(parFactory.goldSize)); -~ jsonobject.put("goldCount", Integer.valueOf(parFactory.goldCount)); -~ jsonobject.put("goldMinHeight", Integer.valueOf(parFactory.goldMinHeight)); -~ jsonobject.put("goldMaxHeight", Integer.valueOf(parFactory.goldMaxHeight)); -~ jsonobject.put("redstoneSize", Integer.valueOf(parFactory.redstoneSize)); -~ jsonobject.put("redstoneCount", Integer.valueOf(parFactory.redstoneCount)); -~ jsonobject.put("redstoneMinHeight", Integer.valueOf(parFactory.redstoneMinHeight)); -~ jsonobject.put("redstoneMaxHeight", Integer.valueOf(parFactory.redstoneMaxHeight)); -~ jsonobject.put("diamondSize", Integer.valueOf(parFactory.diamondSize)); -~ jsonobject.put("diamondCount", Integer.valueOf(parFactory.diamondCount)); -~ jsonobject.put("diamondMinHeight", Integer.valueOf(parFactory.diamondMinHeight)); -~ jsonobject.put("diamondMaxHeight", Integer.valueOf(parFactory.diamondMaxHeight)); -~ jsonobject.put("lapisSize", Integer.valueOf(parFactory.lapisSize)); -~ jsonobject.put("lapisCount", Integer.valueOf(parFactory.lapisCount)); -~ jsonobject.put("lapisCenterHeight", Integer.valueOf(parFactory.lapisCenterHeight)); -~ jsonobject.put("lapisSpread", Integer.valueOf(parFactory.lapisSpread)); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/FlatGeneratorInfo.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/FlatGeneratorInfo.edit.java deleted file mode 100644 index 398972d..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/FlatGeneratorInfo.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> INSERT 9 : 10 @ 9 - -+ import java.util.Set; - -> CHANGE 74 : 75 @ 74 : 75 - -~ for (Entry entry1 : (Set) map.entrySet()) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/NoiseGeneratorImproved.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/NoiseGeneratorImproved.edit.java deleted file mode 100644 index 29e5966..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/NoiseGeneratorImproved.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 26 : 27 @ 26 : 27 - -~ this(new EaglercraftRandom()); - -> CHANGE 2 : 3 @ 2 : 3 - -~ public NoiseGeneratorImproved(EaglercraftRandom parRandom) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/NoiseGeneratorOctaves.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/NoiseGeneratorOctaves.edit.java deleted file mode 100644 index c5b035e..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/NoiseGeneratorOctaves.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 15 : 16 @ 15 : 16 - -~ public NoiseGeneratorOctaves(EaglercraftRandom parRandom, int parInt1) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/NoiseGeneratorPerlin.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/NoiseGeneratorPerlin.edit.java deleted file mode 100644 index e3b2130..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/NoiseGeneratorPerlin.edit.java +++ /dev/null @@ -1,16 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 14 : 15 @ 14 : 15 - -~ public NoiseGeneratorPerlin(EaglercraftRandom parRandom, int parInt1) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/NoiseGeneratorSimplex.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/NoiseGeneratorSimplex.edit.java deleted file mode 100644 index 77fa270..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/NoiseGeneratorSimplex.edit.java +++ /dev/null @@ -1,20 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; - -> CHANGE 21 : 22 @ 21 : 22 - -~ this(new EaglercraftRandom()); - -> CHANGE 2 : 3 @ 2 : 3 - -~ public NoiseGeneratorSimplex(EaglercraftRandom parRandom) { - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenStructureData.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenStructureData.edit.java deleted file mode 100644 index 72a6117..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenStructureData.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureBoundingBox.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureBoundingBox.edit.java deleted file mode 100644 index fc18821..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureBoundingBox.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.minecraft.nbt.NBTTagIntArray; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/DerivedWorldInfo.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/DerivedWorldInfo.edit.java deleted file mode 100644 index 72a6117..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/DerivedWorldInfo.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 3 @ 2 : 3 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/IPlayerFileData.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/IPlayerFileData.edit.java deleted file mode 100644 index ad25b18..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/IPlayerFileData.edit.java +++ /dev/null @@ -1,12 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 4 @ 3 : 4 - -~ import net.minecraft.nbt.NBTTagCompound; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/ISaveFormat.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/ISaveFormat.edit.java deleted file mode 100644 index 43d17d0..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/ISaveFormat.edit.java +++ /dev/null @@ -1,18 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 3 @ 3 : 4 - -> CHANGE 10 : 11 @ 10 : 11 - -~ List getSaveList(); - -> CHANGE 9 : 10 @ 9 : 10 - -~ boolean renameWorld(String var1, String var2); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/ISaveHandler.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/ISaveHandler.edit.java deleted file mode 100644 index 63cd20e..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/ISaveHandler.edit.java +++ /dev/null @@ -1,21 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 2 : 4 @ 2 : 4 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; - -> CHANGE 21 : 22 @ 21 : 22 - -~ VFile2 getWorldDirectory(); - -> CHANGE 1 : 2 @ 1 : 2 - -~ VFile2 getMapFileFromName(String var1); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/MapData.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/MapData.edit.java deleted file mode 100644 index 4834f34..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/MapData.edit.java +++ /dev/null @@ -1,13 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 9 : 11 @ 9 : 11 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/MapStorage.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/MapStorage.edit.java deleted file mode 100644 index 6f2b6d1..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/MapStorage.edit.java +++ /dev/null @@ -1,108 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 7 : 10 @ 7 : 10 - -~ import java.io.InputStream; -~ import java.io.OutputStream; -~ import java.util.HashMap; - -> CHANGE 2 : 10 @ 2 : 6 - -~ import net.minecraft.nbt.CompressedStreamTools; -~ import net.minecraft.nbt.NBTBase; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagShort; -~ import net.lax1dude.eaglercraft.v1_8.EagRuntime; -~ import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; -~ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.scoreboard.ScoreboardSaveData; -~ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.village.VillageCollection; - -> INSERT 1 : 2 @ 1 - -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.gen.structure.MapGenStructureData; - -> INSERT 15 : 28 @ 15 - -+ public static interface MapStorageProvider { -+ WorldSavedData createInstance(String mapFileName); -+ } -+ -+ public static final Map, MapStorageProvider> storageProviders = new HashMap(); -+ -+ static { -+ storageProviders.put(MapData.class, (s) -> new MapData(s)); -+ storageProviders.put(MapGenStructureData.class, (s) -> new MapGenStructureData(s)); -+ storageProviders.put(ScoreboardSaveData.class, (s) -> new ScoreboardSaveData(s)); -+ storageProviders.put(VillageCollection.class, (s) -> new VillageCollection(s)); -+ } -+ - -> CHANGE 12 : 13 @ 12 : 13 - -~ VFile2 file1 = this.saveHandler.getMapFileFromName(s); - -> CHANGE 2 : 3 @ 2 : 4 - -~ worldsaveddata = (WorldSavedData) storageProviders.get(oclass).createInstance(s); - -> CHANGE 3 : 7 @ 3 : 8 - -~ try (InputStream is = file1.getInputStream()) { -~ NBTTagCompound nbttagcompound = CompressedStreamTools.readCompressed(is); -~ worldsaveddata.readFromNBT(nbttagcompound.getCompoundTag("data")); -~ } - -> CHANGE 2 : 3 @ 2 : 3 - -~ EagRuntime.debugPrintStackTrace(exception1); - -> CHANGE 35 : 36 @ 35 : 36 - -~ VFile2 file1 = this.saveHandler.getMapFileFromName(parWorldSavedData.mapName); - -> CHANGE 5 : 9 @ 5 : 8 - -~ -~ try (OutputStream fileoutputstream = file1.getOutputStream()) { -~ CompressedStreamTools.writeCompressed(nbttagcompound1, fileoutputstream); -~ } - -> CHANGE 2 : 3 @ 2 : 3 - -~ EagRuntime.debugPrintStackTrace(exception); - -> CHANGE 12 : 13 @ 12 : 13 - -~ VFile2 file1 = this.saveHandler.getMapFileFromName("idcounts"); - -> CHANGE 1 : 5 @ 1 : 4 - -~ NBTTagCompound nbttagcompound; -~ try (DataInputStream datainputstream = new DataInputStream(file1.getInputStream())) { -~ nbttagcompound = CompressedStreamTools.read(datainputstream); -~ } - -> CHANGE 11 : 12 @ 11 : 12 - -~ EagRuntime.debugPrintStackTrace(exception); - -> CHANGE 17 : 18 @ 17 : 18 - -~ VFile2 file1 = this.saveHandler.getMapFileFromName("idcounts"); - -> CHANGE 8 : 11 @ 8 : 11 - -~ try (DataOutputStream dataoutputstream = new DataOutputStream(file1.getOutputStream())) { -~ CompressedStreamTools.write(nbttagcompound, (DataOutput) dataoutputstream); -~ } - -> CHANGE 2 : 3 @ 2 : 3 - -~ EagRuntime.debugPrintStackTrace(exception); - -> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/WorldInfo.edit.java b/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/WorldInfo.edit.java deleted file mode 100644 index cee9bed..0000000 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/WorldInfo.edit.java +++ /dev/null @@ -1,35 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> CHANGE 3 : 6 @ 3 : 5 - -~ import net.minecraft.crash.CrashReportCategory; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.lax1dude.eaglercraft.v1_8.HString; - -> CHANGE 553 : 554 @ 553 : 554 - -~ return HString.format("ID %02d - %s, ver %d. Features enabled: %b", - -> CHANGE 19 : 21 @ 19 : 21 - -~ return HString.format("%d game time, %d day time", new Object[] { -~ Long.valueOf(WorldInfo.this.totalTime), Long.valueOf(WorldInfo.this.worldTime) }); - -> CHANGE 23 : 24 @ 23 : 24 - -~ return HString.format("0x%05X - %s", new Object[] { Integer.valueOf(WorldInfo.this.saveVersion), s }); - -> CHANGE 4 : 5 @ 4 : 5 - -~ return HString.format("Rain time: %d (now: %b), thunder time: %d (now: %b)", - -> CHANGE 7 : 8 @ 7 : 8 - -~ return HString.format("Game mode: %s (ID %d). Hardcore: %b. Cheats: %b", new Object[] { - -> EOF diff --git a/patches/minecraft/net/minecraft/block/Block.edit.java b/patches/minecraft/net/minecraft/block/Block.edit.java index 8bd99fb..4cd9ebb 100644 --- a/patches/minecraft/net/minecraft/block/Block.edit.java +++ b/patches/minecraft/net/minecraft/block/Block.edit.java @@ -10,9 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 9 @ 9 : 11 - -> CHANGE 343 : 344 @ 343 : 344 +> CHANGE 354 : 355 @ 354 : 355 ~ public void randomTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { @@ -32,17 +30,11 @@ ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> DELETE 15 @ 15 : 17 +> DELETE 26 @ 26 : 27 -> DELETE 1 @ 1 : 11 +> DELETE 25 @ 25 : 26 -> CHANGE 3 : 4 @ 3 : 13 - -~ - -> DELETE 3 @ 3 : 11 - -> CHANGE 252 : 253 @ 252 : 253 +> CHANGE 251 : 252 @ 251 : 252 ~ public int quantityDroppedWithBonus(int fortune, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java b/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java index 5903c4f..205a840 100644 --- a/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockAnvil.edit.java @@ -9,14 +9,6 @@ ~ -> DELETE 51 @ 51 : 60 - -> INSERT 41 : 46 @ 41 - -+ public boolean onBlockActivated(World worldIn, BlockPos pos, IBlockState state, EntityPlayer playerIn, -+ EnumFacing side, float hitX, float hitY, float hitZ) { -+ return true; -+ } -+ +> DELETE 56 @ 56 : 57 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java b/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java index db3b29b..2b08ce0 100644 --- a/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockBasePressurePlate.edit.java @@ -10,18 +10,16 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 4 @ 4 : 5 - -> CHANGE 73 : 74 @ 73 : 74 +> CHANGE 78 : 79 @ 78 : 79 ~ public void randomTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom random) { -> CHANGE 2 : 3 @ 2 : 8 +> CHANGE 2 : 3 @ 2 : 3 ~ public void updateTick(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) { -> DELETE 1 @ 1 : 2 +> DELETE 5 @ 5 : 6 -> DELETE 2 @ 2 : 12 +> DELETE 9 @ 9 : 10 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java b/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java index e40115b..9fbf5eb 100644 --- a/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockBeacon.edit.java @@ -7,18 +7,48 @@ > DELETE 2 @ 2 : 4 -> DELETE 6 @ 6 : 7 +> DELETE 14 @ 14 : 15 -> DELETE 1 @ 1 : 2 +> CHANGE 17 : 18 @ 17 : 20 -> DELETE 5 @ 5 : 6 +~ if (!world.isRemote) { -> DELETE 1 @ 1 : 3 +> DELETE 5 @ 5 : 7 -> CHANGE 14 : 15 @ 14 : 25 +> INSERT 1 : 2 @ 1 -~ return true; ++ return true; -> DELETE 39 @ 39 : 68 +> CHANGE 40 : 41 @ 40 : 43 + +~ Chunk chunk = worldIn.getChunkFromBlockCoords(glassPos); + +> CHANGE 1 : 6 @ 1 : 6 + +~ for (int i = glassPos.getY() - 1; i >= 0; --i) { +~ final BlockPos blockpos = new BlockPos(glassPos.getX(), i, glassPos.getZ()); +~ if (!chunk.canSeeSky(blockpos)) { +~ break; +~ } + +> CHANGE 1 : 10 @ 1 : 13 + +~ IBlockState iblockstate = worldIn.getBlockState(blockpos); +~ if (iblockstate.getBlock() == Blocks.beacon) { +~ ((WorldServer) worldIn).addScheduledTask(new Runnable() { +~ public void run() { +~ TileEntity tileentity = worldIn.getTileEntity(blockpos); +~ if (tileentity instanceof TileEntityBeacon) { +~ ((TileEntityBeacon) tileentity).updateBeacon(); +~ worldIn.addBlockEvent(blockpos, Blocks.beacon, 1, 0); +~ } + +> CHANGE 1 : 2 @ 1 : 3 + +~ }); + +> CHANGE 1 : 2 @ 1 : 2 + +~ } > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockBed.edit.java b/patches/minecraft/net/minecraft/block/BlockBed.edit.java index fad9b90..3042855 100644 --- a/patches/minecraft/net/minecraft/block/BlockBed.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockBed.edit.java @@ -10,13 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 6 @ 6 : 7 +> INSERT 10 : 11 @ 10 -> DELETE 4 @ 4 : 5 ++ import net.minecraft.server.MinecraftServer; -> DELETE 5 @ 5 : 6 - -> CHANGE 2 : 3 @ 2 : 4 +> CHANGE 10 : 11 @ 10 : 12 ~ public static PropertyEnum PART; @@ -27,15 +25,78 @@ + } + -> CHANGE 2 : 3 @ 2 : 54 +> INSERT 12 : 13 @ 12 -~ return true; ++ } -> DELETE 2 @ 2 : 12 +> CHANGE 1 : 9 @ 1 : 12 -> DELETE 20 @ 20 : 23 +~ if (world.provider.canRespawnHere() && world.getBiomeGenForCoords(blockpos) != BiomeGenBase.hell) { +~ if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() +~ .getBoolean("bedSpawnPoint") && Math.abs(entityplayer.posX - (double) blockpos.getX()) <= 3.0D +~ && Math.abs(entityplayer.posY - (double) blockpos.getY()) <= 2.0D +~ && Math.abs(entityplayer.posZ - (double) blockpos.getZ()) <= 3.0D) { +~ BlockPos blockpos1 = BlockBed.getSafeExitLocation(world, blockpos, 0); +~ if (blockpos1 == null) { +~ blockpos1 = blockpos.up(); -> CHANGE 4 : 5 @ 4 : 5 +> CHANGE 1 : 4 @ 1 : 6 + +~ entityplayer.setSpawnPoint(blockpos1.add(0.5F, 0.1F, 0.5F), false); +~ entityplayer.addChatComponentMessage(new ChatComponentTranslation("tile.bed.setspawn")); +~ if (entityplayer.isSneaking()) { + +> CHANGE 1 : 3 @ 1 : 9 + +~ } +~ } + +> INSERT 1 : 6 @ 1 + ++ if (((Boolean) iblockstate.getValue(OCCUPIED)).booleanValue()) { ++ EntityPlayer entityplayer1 = this.getPlayerInBed(world, blockpos); ++ if (entityplayer1 != null) { ++ entityplayer ++ .addChatComponentMessage(new ChatComponentTranslation("tile.bed.occupied", new Object[0])); + +> INSERT 2 : 12 @ 2 + ++ ++ iblockstate = iblockstate.withProperty(OCCUPIED, Boolean.valueOf(false)); ++ world.setBlockState(blockpos, iblockstate, 4); ++ } ++ ++ EntityPlayer.EnumStatus entityplayer$enumstatus = entityplayer.trySleep(blockpos); ++ if (entityplayer$enumstatus == EntityPlayer.EnumStatus.OK) { ++ iblockstate = iblockstate.withProperty(OCCUPIED, Boolean.valueOf(true)); ++ world.setBlockState(blockpos, iblockstate, 4); ++ return true; + +> CHANGE 1 : 7 @ 1 : 5 + +~ if (entityplayer$enumstatus == EntityPlayer.EnumStatus.NOT_POSSIBLE_NOW) { +~ entityplayer +~ .addChatComponentMessage(new ChatComponentTranslation("tile.bed.noSleep", new Object[0])); +~ } else if (entityplayer$enumstatus == EntityPlayer.EnumStatus.NOT_SAFE) { +~ entityplayer +~ .addChatComponentMessage(new ChatComponentTranslation("tile.bed.notSafe", new Object[0])); + +> DELETE 2 @ 2 : 4 + +> INSERT 2 : 12 @ 2 + ++ } else { ++ world.setBlockToAir(blockpos); ++ BlockPos blockpos1 = blockpos.offset(((EnumFacing) iblockstate.getValue(FACING)).getOpposite()); ++ if (world.getBlockState(blockpos1).getBlock() == this) { ++ world.setBlockToAir(blockpos1); ++ } ++ ++ world.newExplosion((Entity) null, (double) blockpos.getX() + 0.5D, (double) blockpos.getY() + 0.5D, ++ (double) blockpos.getZ() + 0.5D, 5.0F, true, true); ++ return true; + +> CHANGE 40 : 41 @ 40 : 41 ~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java b/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java index 8aff624..8282ec1 100644 --- a/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockBrewingStand.edit.java @@ -10,11 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 13 @ 13 : 14 +> CHANGE 69 : 70 @ 69 : 72 -> CHANGE 55 : 56 @ 55 : 66 +~ if (!world.isRemote) { -~ return true; +> DELETE 5 @ 5 : 7 + +> INSERT 1 : 2 @ 1 + ++ return true; > CHANGE 13 : 14 @ 13 : 14 diff --git a/patches/minecraft/net/minecraft/block/BlockButton.edit.java b/patches/minecraft/net/minecraft/block/BlockButton.edit.java index 20b9163..2ee76c3 100644 --- a/patches/minecraft/net/minecraft/block/BlockButton.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockButton.edit.java @@ -5,14 +5,18 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 5 +> CHANGE 3 : 4 @ 3 : 5 -> DELETE 7 @ 7 : 8 +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> DELETE 2 @ 2 : 3 +> CHANGE 164 : 165 @ 164 : 165 -> DELETE 153 @ 153 : 173 +~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { -> DELETE 7 @ 7 : 47 +> CHANGE 2 : 3 @ 2 : 3 + +~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { + +> DELETE 11 @ 11 : 12 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockCarpet.edit.java b/patches/minecraft/net/minecraft/block/BlockCarpet.edit.java index bfbb2b5..13d1c06 100644 --- a/patches/minecraft/net/minecraft/block/BlockCarpet.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockCarpet.edit.java @@ -9,4 +9,30 @@ ~ +> INSERT 7 : 9 @ 7 + ++ import net.minecraft.entity.player.EntityPlayer; ++ import net.minecraft.entity.projectile.EntityArrow; + +> INSERT 3 : 4 @ 3 + ++ import net.minecraft.server.MinecraftServer; + +> INSERT 92 : 106 @ 92 + ++ ++ public boolean onBlockActivated(World world, BlockPos blockpos, IBlockState var3, EntityPlayer entityplayer, ++ EnumFacing var5, float var6, float var7, float var8) { ++ if (!world.isRemote && MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() ++ .getBoolean("clickToSit") && entityplayer.getHeldItem() == null) { ++ EntityArrow arrow = new EntityArrow(world, blockpos.getX() + 0.5D, blockpos.getY() - 0.4375D, ++ blockpos.getZ() + 0.5D); ++ arrow.isChair = true; ++ world.spawnEntityInWorld(arrow); ++ entityplayer.mountEntity(arrow); ++ return true; ++ } ++ return super.onBlockActivated(world, blockpos, var3, entityplayer, var5, var6, var7, var8); ++ } + > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java b/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java index f068e17..650add7 100644 --- a/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockCauldron.edit.java @@ -10,19 +10,16 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 7 @ 7 : 8 +> CHANGE 71 : 72 @ 71 : 74 -> DELETE 1 @ 1 : 2 +~ if (!world.isRemote) { -> DELETE 2 @ 2 : 7 +> INSERT 84 : 86 @ 84 -> DELETE 42 @ 42 : 52 ++ } else { ++ return true; -> CHANGE 2 : 3 @ 2 : 90 - -~ return true; - -> CHANGE 17 : 18 @ 17 : 18 +> CHANGE 18 : 19 @ 18 : 19 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockChest.edit.java b/patches/minecraft/net/minecraft/block/BlockChest.edit.java index 2aa39b1..3abf9b7 100644 --- a/patches/minecraft/net/minecraft/block/BlockChest.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockChest.edit.java @@ -7,14 +7,18 @@ > DELETE 2 @ 2 : 4 -> DELETE 15 @ 15 : 16 +> CHANGE 130 : 131 @ 130 : 133 -> CHANGE 114 : 115 @ 114 : 186 +~ if (!worldIn.isRemote) { -~ return state; +> DELETE 67 @ 67 : 68 -> CHANGE 117 : 118 @ 117 : 132 +> INSERT 1 : 2 @ 1 -~ return true; ++ return state; + +> CHANGE 117 : 118 @ 117 : 120 + +~ { > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java b/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java index 22fcd41..9e65b1b 100644 --- a/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockCommandBlock.edit.java @@ -10,11 +10,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 28 : 29 @ 28 : 43 +> DELETE 39 @ 39 : 40 + +> CHANGE 2 : 3 @ 2 : 3 ~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { -> DELETE 40 @ 40 : 44 +> DELETE 43 @ 43 : 44 > CHANGE 3 : 4 @ 3 : 4 diff --git a/patches/minecraft/net/minecraft/block/BlockCrops.edit.java b/patches/minecraft/net/minecraft/block/BlockCrops.edit.java index cb754bb..28e7197 100644 --- a/patches/minecraft/net/minecraft/block/BlockCrops.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockCrops.edit.java @@ -10,13 +10,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 8 @ 8 : 9 - -> CHANGE 22 : 23 @ 22 : 23 +> CHANGE 31 : 32 @ 31 : 32 ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -> CHANGE 81 : 82 @ 81 : 99 +> DELETE 94 @ 94 : 95 + +> CHANGE 3 : 4 @ 3 : 4 ~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java b/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java index 0d24b42..22b38ab 100644 --- a/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDaylightDetector.edit.java @@ -10,9 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 65 : 66 @ 65 : 81 +> CHANGE 65 : 66 @ 65 : 68 -~ return true; +~ if (!world.isRemote) { + +> DELETE 10 @ 10 : 12 + +> INSERT 1 : 2 @ 1 + ++ return true; > CHANGE 5 : 6 @ 5 : 6 diff --git a/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java b/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java index cc16f6c..cb3af79 100644 --- a/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDeadBush.edit.java @@ -10,16 +10,8 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 3 @ 3 : 4 - -> DELETE 1 @ 1 : 2 - -> DELETE 1 @ 1 : 4 - -> CHANGE 23 : 24 @ 23 : 24 +> CHANGE 33 : 34 @ 33 : 34 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> DELETE 3 @ 3 : 14 - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java b/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java index f6c20d8..5050903 100644 --- a/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDispenser.edit.java @@ -10,20 +10,24 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 18 @ 18 : 19 - -> DELETE 2 @ 2 : 3 - -> CHANGE 10 : 11 @ 10 : 11 +> CHANGE 32 : 33 @ 32 : 33 ~ protected EaglercraftRandom rand = new EaglercraftRandom(); -> DELETE 12 @ 12 : 41 +> CHANGE 43 : 44 @ 43 : 46 -> CHANGE 2 : 3 @ 2 : 17 +~ if (!world.isRemote) { -~ return true; +> DELETE 9 @ 9 : 11 -> DELETE 37 @ 37 : 44 +> INSERT 1 : 2 @ 1 + ++ return true; + +> CHANGE 37 : 38 @ 37 : 38 + +~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { + +> DELETE 3 @ 3 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockDoor.edit.java b/patches/minecraft/net/minecraft/block/BlockDoor.edit.java index de291c3..2918a19 100644 --- a/patches/minecraft/net/minecraft/block/BlockDoor.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDoor.edit.java @@ -26,11 +26,7 @@ + } + -> CHANGE 135 : 136 @ 135 : 140 - -~ if (!flag1) { - -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 155 : 156 @ 155 : 156 ~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java b/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java index d5eb9ad..c91c92e 100644 --- a/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDoublePlant.edit.java @@ -10,9 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 12 @ 12 : 14 - -> CHANGE 8 : 10 @ 8 : 12 +> CHANGE 22 : 24 @ 22 : 26 ~ public static PropertyEnum VARIANT; ~ public static PropertyEnum HALF; @@ -29,13 +27,7 @@ ~ public Item getItemDropped(IBlockState iblockstate, EaglercraftRandom random, int var3) { -> DELETE 39 @ 39 : 49 - -> DELETE 10 @ 10 : 18 - -> DELETE 14 @ 14 : 30 - -> CHANGE 17 : 18 @ 17 : 18 +> CHANGE 114 : 115 @ 114 : 115 ~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { diff --git a/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java b/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java index 69bb36c..4fbd986 100644 --- a/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockDragonEgg.edit.java @@ -14,22 +14,4 @@ ~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { -> CHANGE 44 : 57 @ 44 : 62 - -~ for (int j = 0; j < 128; ++j) { -~ double d0 = worldIn.rand.nextDouble(); -~ float f = (worldIn.rand.nextFloat() - 0.5F) * 0.2F; -~ float f1 = (worldIn.rand.nextFloat() - 0.5F) * 0.2F; -~ float f2 = (worldIn.rand.nextFloat() - 0.5F) * 0.2F; -~ double d1 = (double) blockpos.getX() + (double) (pos.getX() - blockpos.getX()) * d0 -~ + (worldIn.rand.nextDouble() - 0.5D) * 1.0D + 0.5D; -~ double d2 = (double) blockpos.getY() + (double) (pos.getY() - blockpos.getY()) * d0 -~ + worldIn.rand.nextDouble() * 1.0D - 0.5D; -~ double d3 = (double) blockpos.getZ() + (double) (pos.getZ() - blockpos.getZ()) * d0 -~ + (worldIn.rand.nextDouble() - 0.5D) * 1.0D + 0.5D; -~ worldIn.spawnParticle(EnumParticleTypes.PORTAL, d1, d2, d3, (double) f, (double) f1, -~ (double) f2, new int[0]); - -> DELETE 1 @ 1 : 2 - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java b/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java index d6da4c3..286c939 100644 --- a/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockEnchantmentTable.edit.java @@ -14,8 +14,14 @@ ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -> CHANGE 43 : 44 @ 43 : 53 +> CHANGE 43 : 44 @ 43 : 46 -~ return true; +~ if (!world.isRemote) { + +> DELETE 4 @ 4 : 6 + +> INSERT 1 : 2 @ 1 + ++ return true; > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java b/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java index 6a0e9ed..0471034 100644 --- a/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockEndPortal.edit.java @@ -14,7 +14,7 @@ ~ public int quantityDropped(EaglercraftRandom var1) { -> CHANGE 3 : 4 @ 3 : 11 +> CHANGE 10 : 11 @ 10 : 11 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java b/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java index a120b1c..4b754ba 100644 --- a/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockEnderChest.edit.java @@ -10,11 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 9 @ 9 : 10 - -> DELETE 2 @ 2 : 3 - -> CHANGE 29 : 30 @ 29 : 30 +> CHANGE 42 : 43 @ 42 : 43 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { @@ -22,11 +18,7 @@ ~ public int quantityDropped(EaglercraftRandom var1) { -> CHANGE 20 : 21 @ 20 : 36 - -~ return true; - -> CHANGE 6 : 7 @ 6 : 7 +> CHANGE 42 : 43 @ 42 : 43 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/block/BlockFalling.edit.java b/patches/minecraft/net/minecraft/block/BlockFalling.edit.java index 711ec18..a9ba20b 100644 --- a/patches/minecraft/net/minecraft/block/BlockFalling.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFalling.edit.java @@ -5,8 +5,21 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 4 +> CHANGE 2 : 3 @ 2 : 4 -> DELETE 28 @ 28 : 62 +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; + +> CHANGE 28 : 29 @ 28 : 29 + +~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { + +> DELETE 3 @ 3 : 4 + +> CHANGE 6 : 10 @ 6 : 12 + +~ EntityFallingBlock entityfallingblock = new EntityFallingBlock(worldIn, (double) pos.getX() + 0.5D, +~ (double) pos.getY(), (double) pos.getZ() + 0.5D, worldIn.getBlockState(pos)); +~ this.onStartFalling(entityfallingblock); +~ worldIn.spawnEntityInWorld(entityfallingblock); > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java b/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java index b19ae23..a8b4a09 100644 --- a/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFarmland.edit.java @@ -10,15 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 7 @ 7 : 8 - -> CHANGE 32 : 33 @ 32 : 33 +> CHANGE 40 : 41 @ 40 : 41 ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { -> DELETE 15 @ 15 : 23 - -> CHANGE 43 : 44 @ 43 : 44 +> CHANGE 66 : 67 @ 66 : 67 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) { diff --git a/patches/minecraft/net/minecraft/block/BlockFence.edit.java b/patches/minecraft/net/minecraft/block/BlockFence.edit.java index 6bec815..7ecd9a8 100644 --- a/patches/minecraft/net/minecraft/block/BlockFence.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFence.edit.java @@ -9,10 +9,4 @@ ~ -> DELETE 10 @ 10 : 11 - -> CHANGE 130 : 131 @ 130 : 131 - -~ return true; - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java b/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java index d130b21..75c2154 100644 --- a/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFenceGate.edit.java @@ -7,6 +7,6 @@ > DELETE 2 @ 2 : 5 -> DELETE 112 @ 112 : 134 +> DELETE 130 @ 130 : 131 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java b/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java index a264051..b636cba 100644 --- a/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockFurnace.edit.java @@ -10,18 +10,12 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 12 @ 12 : 13 - -> CHANGE 18 : 19 @ 18 : 19 +> CHANGE 31 : 32 @ 31 : 32 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 3 : 4 @ 3 : 29 +> CHANGE 28 : 29 @ 28 : 29 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -> CHANGE 30 : 31 @ 30 : 41 - -~ return true; - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockGrass.edit.java b/patches/minecraft/net/minecraft/block/BlockGrass.edit.java index c6e0a48..2e1ccf7 100644 --- a/patches/minecraft/net/minecraft/block/BlockGrass.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockGrass.edit.java @@ -10,7 +10,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 42 : 43 @ 42 : 67 +> CHANGE 42 : 43 @ 42 : 43 + +~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { + +> DELETE 18 @ 18 : 19 + +> CHANGE 4 : 5 @ 4 : 5 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom random, int i) { diff --git a/patches/minecraft/net/minecraft/block/BlockHopper.edit.java b/patches/minecraft/net/minecraft/block/BlockHopper.edit.java index 27f33be..15f8ee7 100644 --- a/patches/minecraft/net/minecraft/block/BlockHopper.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockHopper.edit.java @@ -13,10 +13,4 @@ ~ import com.google.common.base.Predicate; ~ -> DELETE 14 @ 14 : 15 - -> CHANGE 77 : 78 @ 77 : 88 - -~ return true; - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java b/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java index 18afbd7..ad2d1ab 100644 --- a/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockJukebox.edit.java @@ -7,14 +7,4 @@ > DELETE 2 @ 2 : 3 -> DELETE 7 @ 7 : 8 - -> DELETE 22 @ 22 : 23 - -> DELETE 9 @ 9 : 18 - -> DELETE 1 @ 1 : 23 - -> DELETE 2 @ 2 : 13 - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java b/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java index e5de818..70bee8d 100644 --- a/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockLeaves.edit.java @@ -10,9 +10,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 6 @ 6 : 7 +> CHANGE 67 : 68 @ 67 : 68 -> CHANGE 60 : 61 @ 60 : 145 +~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { + +> DELETE 79 @ 79 : 80 + +> CHANGE 3 : 4 @ 3 : 4 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { @@ -24,6 +28,6 @@ ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> DELETE 3 @ 3 : 31 +> DELETE 28 @ 28 : 29 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockLever.edit.java b/patches/minecraft/net/minecraft/block/BlockLever.edit.java index 4956ed0..7d43dcf 100644 --- a/patches/minecraft/net/minecraft/block/BlockLever.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockLever.edit.java @@ -18,8 +18,4 @@ + } + -> CHANGE 121 : 122 @ 121 : 134 - -~ return true; - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java b/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java index bee627a..b2f97cb 100644 --- a/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockMushroom.edit.java @@ -10,18 +10,20 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 4 @ 4 : 5 - -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 13 : 14 @ 13 : 14 ~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { -> DELETE 52 @ 52 : 69 +> CHANGE 52 : 53 @ 52 : 53 -> CHANGE 4 : 5 @ 4 : 5 +~ public boolean generateBigMushroom(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) { + +> CHANGE 20 : 21 @ 20 : 21 ~ public boolean canUseBonemeal(World var1, EaglercraftRandom random, BlockPos var3, IBlockState var4) { -> DELETE 2 @ 2 : 6 +> CHANGE 3 : 4 @ 3 : 4 + +~ public void grow(World world, EaglercraftRandom random, BlockPos blockpos, IBlockState iblockstate) { > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java b/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java index 07f5c6b..d5830f9 100644 --- a/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockMycelium.edit.java @@ -10,7 +10,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 29 : 30 @ 29 : 55 +> CHANGE 29 : 30 @ 29 : 30 + +~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom random) { + +> DELETE 19 @ 19 : 20 + +> CHANGE 4 : 5 @ 4 : 5 ~ public void randomDisplayTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java b/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java index 1b04f9d..7d8eaaf 100644 --- a/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockNetherWart.edit.java @@ -10,13 +10,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 10 @ 10 : 11 - -> CHANGE 23 : 24 @ 23 : 24 +> CHANGE 34 : 35 @ 34 : 35 ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -> CHANGE 9 : 10 @ 9 : 27 +> DELETE 22 @ 22 : 23 + +> CHANGE 3 : 4 @ 3 : 4 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java b/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java index be6e78a..ad556c5 100644 --- a/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockNewLeaf.edit.java @@ -13,11 +13,7 @@ ~ import com.google.common.base.Predicate; ~ -> DELETE 5 @ 5 : 6 - -> DELETE 3 @ 3 : 5 - -> CHANGE 4 : 5 @ 4 : 10 +> CHANGE 15 : 16 @ 15 : 21 ~ public static PropertyEnum VARIANT; @@ -32,6 +28,6 @@ + } + -> DELETE 54 @ 54 : 65 +> DELETE 4 @ 4 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockNote.edit.java b/patches/minecraft/net/minecraft/block/BlockNote.edit.java index 8a364be..01a6d9d 100644 --- a/patches/minecraft/net/minecraft/block/BlockNote.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockNote.edit.java @@ -13,12 +13,6 @@ ~ import com.google.common.collect.Lists; ~ -> DELETE 4 @ 4 : 5 - -> CHANGE 34 : 35 @ 34 : 47 - -~ return true; - -> DELETE 2 @ 2 : 13 +> DELETE 61 @ 61 : 62 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java b/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java index 345ecb3..9ff6516 100644 --- a/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockOldLeaf.edit.java @@ -13,11 +13,7 @@ ~ import com.google.common.base.Predicate; ~ -> DELETE 5 @ 5 : 6 - -> DELETE 3 @ 3 : 5 - -> CHANGE 6 : 7 @ 6 : 12 +> CHANGE 17 : 18 @ 17 : 23 ~ public static PropertyEnum VARIANT; @@ -32,6 +28,4 @@ + } + -> DELETE 83 @ 83 : 94 - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java b/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java index a5c1b7c..6f053c0 100644 --- a/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPistonBase.edit.java @@ -9,10 +9,4 @@ ~ -> DELETE 44 @ 44 : 48 - -> DELETE 2 @ 2 : 16 - -> DELETE 45 @ 45 : 57 - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java b/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java index 61a5786..f28bb77 100644 --- a/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPistonMoving.edit.java @@ -10,9 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 6 @ 6 : 7 - -> CHANGE 14 : 15 @ 14 : 15 +> CHANGE 21 : 22 @ 21 : 22 ~ public static PropertyEnum TYPE; @@ -23,12 +21,10 @@ + } + -> CHANGE 45 : 46 @ 45 : 56 +> CHANGE 55 : 56 @ 55 : 56 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> DELETE 3 @ 3 : 13 - -> DELETE 4 @ 4 : 11 +> DELETE 21 @ 21 : 22 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockPotato.edit.java b/patches/minecraft/net/minecraft/block/BlockPotato.edit.java index 29555ed..2294a1c 100644 --- a/patches/minecraft/net/minecraft/block/BlockPotato.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockPotato.edit.java @@ -5,10 +5,8 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 4 +> DELETE 2 @ 2 : 3 -> DELETE 2 @ 2 : 5 - -> DELETE 10 @ 10 : 19 +> DELETE 22 @ 22 : 23 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java b/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java index 2a2f466..75d2c92 100644 --- a/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRailBase.edit.java @@ -13,10 +13,8 @@ ~ import com.google.common.collect.Lists; ~ -> DELETE 69 @ 69 : 112 +> DELETE 76 @ 76 : 77 -> CHANGE 5 : 6 @ 5 : 8 - -~ return parIBlockState; +> DELETE 31 @ 31 : 32 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java b/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java index c384e33..ac816b9 100644 --- a/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRailDetector.edit.java @@ -7,14 +7,16 @@ > DELETE 2 @ 2 : 3 -> CHANGE 1 : 4 @ 1 : 3 +> CHANGE 1 : 5 @ 1 : 3 ~ ~ import com.google.common.base.Predicate; ~ +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 18 : 19 @ 18 : 27 +> CHANGE 18 : 20 @ 18 : 27 +~ ~ public static PropertyEnum SHAPE; > INSERT 9 : 21 @ 9 @@ -32,6 +34,12 @@ + } + -> DELETE 8 @ 8 : 25 +> CHANGE 16 : 17 @ 16 : 17 + +~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { + +> CHANGE 2 : 3 @ 2 : 3 + +~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom var4) { > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java index 59160ab..6982aa7 100644 --- a/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRedstoneLight.edit.java @@ -10,7 +10,17 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 20 : 21 @ 20 : 52 +> DELETE 27 @ 27 : 28 + +> DELETE 10 @ 10 : 11 + +> CHANGE 3 : 4 @ 3 : 4 + +~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { + +> DELETE 4 @ 4 : 5 + +> CHANGE 3 : 4 @ 3 : 4 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java index a410501..8540495 100644 --- a/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockRedstoneWire.edit.java @@ -43,9 +43,13 @@ ~ ArrayList arraylist = Lists.newArrayList(this.blocksNeedingUpdate); -> DELETE 80 @ 80 : 129 +> DELETE 100 @ 100 : 101 -> CHANGE 9 : 10 @ 9 : 22 +> DELETE 24 @ 24 : 25 + +> DELETE 20 @ 20 : 21 + +> CHANGE 3 : 4 @ 3 : 4 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockSapling.edit.java b/patches/minecraft/net/minecraft/block/BlockSapling.edit.java index a351319..51dbe80 100644 --- a/patches/minecraft/net/minecraft/block/BlockSapling.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSapling.edit.java @@ -10,11 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 6 @ 6 : 7 - -> DELETE 5 @ 5 : 14 - -> CHANGE 2 : 3 @ 2 : 4 +> CHANGE 23 : 24 @ 23 : 25 ~ public static PropertyEnum TYPE; @@ -25,16 +21,26 @@ + } + -> CHANGE 5 : 6 @ 5 : 13 +> CHANGE 5 : 6 @ 5 : 6 ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -> DELETE 2 @ 2 : 103 +> DELETE 5 @ 5 : 6 -> CHANGE 28 : 29 @ 28 : 29 +> CHANGE 3 : 4 @ 3 : 4 + +~ public void grow(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) { + +> CHANGE 8 : 9 @ 8 : 9 + +~ public void generateTree(World worldIn, BlockPos pos, IBlockState state, EaglercraftRandom rand) { + +> CHANGE 119 : 120 @ 119 : 120 ~ public boolean canUseBonemeal(World world, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { -> DELETE 3 @ 3 : 7 +> CHANGE 3 : 4 @ 3 : 4 + +~ public void grow(World world, EaglercraftRandom random, BlockPos blockpos, IBlockState iblockstate) { > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockSign.edit.java b/patches/minecraft/net/minecraft/block/BlockSign.edit.java index e8c29cf..b453f80 100644 --- a/patches/minecraft/net/minecraft/block/BlockSign.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSign.edit.java @@ -14,8 +14,4 @@ ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 9 : 10 @ 9 : 16 - -~ return true; - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java b/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java index b5c3ae6..2003ac9 100644 --- a/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSilverfish.edit.java @@ -10,9 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 6 @ 6 : 7 - -> CHANGE 8 : 9 @ 8 : 10 +> CHANGE 15 : 16 @ 15 : 17 ~ public static PropertyEnum VARIANT; @@ -24,6 +22,4 @@ ~ ~ public int quantityDropped(EaglercraftRandom var1) { -> DELETE 26 @ 26 : 37 - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockSkull.edit.java b/patches/minecraft/net/minecraft/block/BlockSkull.edit.java index 488c718..d4533c3 100644 --- a/patches/minecraft/net/minecraft/block/BlockSkull.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSkull.edit.java @@ -14,28 +14,8 @@ ~ -> DELETE 11 @ 11 : 12 - -> DELETE 5 @ 5 : 8 - -> DELETE 5 @ 5 : 6 - -> DELETE 1 @ 1 : 2 - -> DELETE 94 @ 94 : 106 - -> DELETE 1 @ 1 : 7 - -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 143 : 144 @ 143 : 144 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> CHANGE 4 : 5 @ 4 : 6 - -~ return false; - -> DELETE 3 @ 3 : 13 - -> DELETE 1 @ 1 : 42 - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockSlab.edit.java b/patches/minecraft/net/minecraft/block/BlockSlab.edit.java index 9ee980b..fab609f 100644 --- a/patches/minecraft/net/minecraft/block/BlockSlab.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockSlab.edit.java @@ -10,7 +10,16 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 16 : 17 @ 16 : 18 +> INSERT 6 : 8 @ 6 + ++ import net.minecraft.entity.player.EntityPlayer; ++ import net.minecraft.entity.projectile.EntityArrow; + +> INSERT 2 : 3 @ 2 + ++ import net.minecraft.server.MinecraftServer; + +> CHANGE 8 : 9 @ 8 : 10 ~ public static PropertyEnum HALF; @@ -25,4 +34,20 @@ ~ public int quantityDropped(EaglercraftRandom var1) { +> INSERT 65 : 78 @ 65 + ++ ++ public boolean onBlockActivated(World world, BlockPos blockpos, IBlockState var3, EntityPlayer entityplayer, ++ EnumFacing var5, float var6, float var7, float var8) { ++ if (!world.isRemote && MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() ++ .getBoolean("clickToSit") && entityplayer.getHeldItem() == null) { ++ EntityArrow arrow = new EntityArrow(world, blockpos.getX() + 0.5D, blockpos.getY(), blockpos.getZ() + 0.5D); ++ arrow.isChair = true; ++ world.spawnEntityInWorld(arrow); ++ entityplayer.mountEntity(arrow); ++ return true; ++ } ++ return super.onBlockActivated(world, blockpos, var3, entityplayer, var5, var6, var7, var8); ++ } + > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java b/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java index 917c591..0060f1b 100644 --- a/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStainedGlass.edit.java @@ -14,8 +14,8 @@ ~ public int quantityDropped(EaglercraftRandom var1) { -> DELETE 16 @ 16 : 19 +> DELETE 19 @ 19 : 20 -> DELETE 4 @ 4 : 7 +> DELETE 6 @ 6 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java b/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java index 446fa59..28ec20e 100644 --- a/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStainedGlassPane.edit.java @@ -9,8 +9,8 @@ ~ -> DELETE 58 @ 58 : 61 +> DELETE 61 @ 61 : 62 -> DELETE 4 @ 4 : 7 +> DELETE 6 @ 6 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockStairs.edit.java b/patches/minecraft/net/minecraft/block/BlockStairs.edit.java index a0e7881..35cc091 100644 --- a/patches/minecraft/net/minecraft/block/BlockStairs.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStairs.edit.java @@ -10,7 +10,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 24 : 26 @ 24 : 28 +> INSERT 10 : 11 @ 10 + ++ import net.minecraft.entity.projectile.EntityArrow; + +> INSERT 1 : 2 @ 1 + ++ import net.minecraft.server.MinecraftServer; + +> CHANGE 13 : 15 @ 13 : 17 ~ public static PropertyEnum HALF; ~ public static PropertyEnum SHAPE; @@ -31,4 +39,15 @@ ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { +> INSERT 5 : 13 @ 5 + ++ if (!world.isRemote && MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() ++ .getBoolean("clickToSit") && entityplayer.getHeldItem() == null) { ++ EntityArrow arrow = new EntityArrow(world, blockpos.getX() + 0.5D, blockpos.getY(), blockpos.getZ() + 0.5D); ++ arrow.isChair = true; ++ world.spawnEntityInWorld(arrow); ++ entityplayer.mountEntity(arrow); ++ return true; ++ } + > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockStem.edit.java b/patches/minecraft/net/minecraft/block/BlockStem.edit.java index e503edb..047c10b 100644 --- a/patches/minecraft/net/minecraft/block/BlockStem.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockStem.edit.java @@ -14,15 +14,11 @@ ~ -> DELETE 10 @ 10 : 11 - -> CHANGE 42 : 43 @ 42 : 43 +> CHANGE 53 : 54 @ 53 : 54 ~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -> DELETE 60 @ 60 : 77 - -> CHANGE 5 : 6 @ 5 : 6 +> CHANGE 82 : 83 @ 82 : 83 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { diff --git a/patches/minecraft/net/minecraft/block/BlockTNT.edit.java b/patches/minecraft/net/minecraft/block/BlockTNT.edit.java index 307a219..876bc6f 100644 --- a/patches/minecraft/net/minecraft/block/BlockTNT.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockTNT.edit.java @@ -7,18 +7,6 @@ > DELETE 2 @ 2 : 3 -> DELETE 6 @ 6 : 7 - -> DELETE 1 @ 1 : 2 - -> DELETE 1 @ 1 : 2 - -> DELETE 33 @ 33 : 43 - -> DELETE 5 @ 5 : 12 - -> DELETE 1 @ 1 : 2 - -> DELETE 22 @ 22 : 37 +> DELETE 66 @ 66 : 67 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java b/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java index 8688697..65458a5 100644 --- a/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockTallGrass.edit.java @@ -10,11 +10,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 6 @ 6 : 7 - -> DELETE 4 @ 4 : 6 - -> CHANGE 7 : 8 @ 7 : 9 +> CHANGE 20 : 21 @ 20 : 22 ~ public static PropertyEnum TYPE; @@ -33,9 +29,7 @@ ~ public int quantityDroppedWithBonus(int i, EaglercraftRandom random) { -> DELETE 3 @ 3 : 16 - -> CHANGE 16 : 17 @ 16 : 17 +> CHANGE 32 : 33 @ 32 : 33 ~ public boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4) { diff --git a/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java b/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java index d8e2a3c..57a23f7 100644 --- a/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockTrapDoor.edit.java @@ -18,6 +18,6 @@ + } + -> DELETE 77 @ 77 : 97 +> DELETE 92 @ 92 : 93 > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java b/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java index 44c0b08..7942ae0 100644 --- a/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockTripWire.edit.java @@ -5,19 +5,27 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 6 +> CHANGE 3 : 5 @ 3 : 6 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 5 @ 5 : 7 - -> CHANGE 59 : 60 @ 59 : 60 +> CHANGE 66 : 67 @ 66 : 67 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { -> DELETE 42 @ 42 : 52 +> DELETE 48 @ 48 : 49 -> DELETE 20 @ 20 : 68 +> CHANGE 31 : 32 @ 31 : 32 + +~ public void randomTick(World var1, BlockPos var2, IBlockState var3, EaglercraftRandom var4) { + +> CHANGE 2 : 3 @ 2 : 3 + +~ public void updateTick(World world, BlockPos blockpos, IBlockState var3, EaglercraftRandom var4) { + +> CHANGE 16 : 17 @ 16 : 17 + +~ for (Entity entity : (List) list) { > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockVine.edit.java b/patches/minecraft/net/minecraft/block/BlockVine.edit.java index c7cbdf9..b0a375e 100644 --- a/patches/minecraft/net/minecraft/block/BlockVine.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockVine.edit.java @@ -10,13 +10,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> DELETE 7 @ 7 : 10 +> CHANGE 189 : 190 @ 189 : 190 -> DELETE 1 @ 1 : 4 +~ public void updateTick(World world, BlockPos blockpos, IBlockState iblockstate, EaglercraftRandom random) { -> DELETE 167 @ 167 : 301 +> DELETE 119 @ 119 : 120 -> CHANGE 10 : 11 @ 10 : 11 +> CHANGE 15 : 16 @ 15 : 16 ~ public Item getItemDropped(IBlockState var1, EaglercraftRandom var2, int var3) { @@ -24,6 +24,4 @@ ~ public int quantityDropped(EaglercraftRandom var1) { -> DELETE 3 @ 3 : 15 - > EOF diff --git a/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java b/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java index 144008c..ad2d1ab 100644 --- a/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java +++ b/patches/minecraft/net/minecraft/block/BlockWorkbench.edit.java @@ -7,10 +7,4 @@ > DELETE 2 @ 2 : 3 -> DELETE 8 @ 8 : 9 - -> CHANGE 15 : 16 @ 15 : 22 - -~ return true; - > EOF diff --git a/patches/minecraft/net/minecraft/block/IGrowable.edit.java b/patches/minecraft/net/minecraft/block/IGrowable.edit.java index 4e300f2..843bd17 100644 --- a/patches/minecraft/net/minecraft/block/IGrowable.edit.java +++ b/patches/minecraft/net/minecraft/block/IGrowable.edit.java @@ -10,8 +10,12 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ -> CHANGE 7 : 8 @ 7 : 10 +> CHANGE 7 : 8 @ 7 : 8 ~ boolean canUseBonemeal(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4); +> CHANGE 1 : 2 @ 1 : 2 + +~ void grow(World var1, EaglercraftRandom var2, BlockPos var3, IBlockState var4); + > EOF diff --git a/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java b/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java index 27299b3..538d9f9 100644 --- a/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java +++ b/patches/minecraft/net/minecraft/block/state/pattern/FactoryBlockPattern.edit.java @@ -24,10 +24,14 @@ > CHANGE 12 : 13 @ 12 : 13 -~ if (aisle.length > 0 && !StringUtils.isEmpty(aisle[0])) { +~ if (!(aisle == null || aisle.length <= 0) && !StringUtils.isEmpty(aisle[0])) { > CHANGE 18 : 19 @ 18 : 19 -~ this.symbolMap.put(Character.valueOf(c0), (Predicate) null); +~ this.symbolMap.put(Character.valueOf(c0), null); + +> CHANGE 27 : 28 @ 27 : 29 + +~ Predicate[][][] apredicate = new Predicate[this.depth.size()][this.aisleHeight][this.rowWidth]; > EOF diff --git a/patches/minecraft/net/minecraft/client/Minecraft.edit.java b/patches/minecraft/net/minecraft/client/Minecraft.edit.java index 101f648..3af372c 100644 --- a/patches/minecraft/net/minecraft/client/Minecraft.edit.java +++ b/patches/minecraft/net/minecraft/client/Minecraft.edit.java @@ -169,7 +169,7 @@ > CHANGE 2 : 3 @ 2 : 5 -~ StringTranslate.doCLINIT(); +~ StringTranslate.initClient(); > CHANGE 1 : 2 @ 1 : 9 @@ -714,7 +714,11 @@ > DELETE 36 @ 36 : 41 -> INSERT 14 : 16 @ 14 +> CHANGE 12 : 13 @ 12 : 13 + +~ return this.addScheduledTaskFuture(new Runnable() { + +> INSERT 1 : 3 @ 1 + Minecraft.this.loadingScreen.eaglerShow(I18n.format("resourcePack.load.refreshing"), + I18n.format("resourcePack.load.pleaseWait")); @@ -766,16 +770,31 @@ > DELETE 4 @ 4 : 12 -> CHANGE 11 : 15 @ 11 : 23 +> CHANGE 9 : 10 @ 9 : 10 + +~ public ListenableFuture addScheduledTaskFuture(Callable callableToSchedule) { + +> CHANGE 1 : 5 @ 1 : 13 ~ ListenableFutureTask listenablefuturetask = ListenableFutureTask.create(callableToSchedule); ~ synchronized (this.scheduledTasks) { ~ this.scheduledTasks.add(listenablefuturetask); ~ return listenablefuturetask; -> DELETE 8 @ 8 : 12 +> CHANGE 3 : 4 @ 3 : 4 -> DELETE 24 @ 24 : 32 +~ public ListenableFuture addScheduledTaskFuture(Runnable runnableToSchedule) { + +> CHANGE 1 : 2 @ 1 : 2 + +~ return this.addScheduledTaskFuture(Executors.callable(runnableToSchedule)); + +> CHANGE 2 : 4 @ 2 : 4 + +~ public void addScheduledTask(Runnable runnableToSchedule) { +~ this.addScheduledTaskFuture(Executors.callable(runnableToSchedule)); + +> DELETE 26 @ 26 : 34 > INSERT 7 : 27 @ 7 diff --git a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java index 5176aad..12a511e 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java +++ b/patches/minecraft/net/minecraft/client/gui/GuiOverlayDebug.edit.java @@ -321,7 +321,7 @@ > CHANGE 5 : 6 @ 5 : 6 -~ arraylist.add("Biome: " + chunk.getBiome(blockpos).biomeName); +~ arraylist.add("Biome: " + chunk.getBiome(blockpos, null).biomeName); > CHANGE 4 : 5 @ 4 : 14 diff --git a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java index 04e7cce..ace3b53 100644 --- a/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java +++ b/patches/minecraft/net/minecraft/client/network/NetHandlerPlayClient.edit.java @@ -9,7 +9,7 @@ > DELETE 4 @ 4 : 6 -> INSERT 1 : 16 @ 1 +> INSERT 1 : 18 @ 1 + + import net.lax1dude.eaglercraft.v1_8.EagRuntime; @@ -22,6 +22,8 @@ + import net.lax1dude.eaglercraft.v1_8.profile.ServerSkinCache; + import net.lax1dude.eaglercraft.v1_8.profile.SkinPackets; + import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager; ++ import net.lax1dude.eaglercraft.v1_8.sp.lan.LANClientNetworkManager; ++ import net.lax1dude.eaglercraft.v1_8.sp.socket.ClientIntegratedServerNetworkManager; + import net.lax1dude.eaglercraft.v1_8.update.UpdateService; + import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; @@ -49,8 +51,9 @@ ~ private final Map playerInfoMap = Maps.newHashMap(); -> CHANGE 2 : 4 @ 2 : 3 +> CHANGE 2 : 5 @ 2 : 3 +~ private boolean isIntegratedServer = false; ~ private final EaglercraftRandom avRandomizer = new EaglercraftRandom(); ~ private final ServerSkinCache skinCache; @@ -58,9 +61,11 @@ ~ public NetHandlerPlayClient(Minecraft mcIn, GuiScreen parGuiScreen, EaglercraftNetworkManager parNetworkManager, -> INSERT 5 : 6 @ 5 +> INSERT 5 : 8 @ 5 + this.skinCache = new ServerSkinCache(parNetworkManager, mcIn.getTextureManager()); ++ this.isIntegratedServer = (parNetworkManager instanceof ClientIntegratedServerNetworkManager) ++ || (parNetworkManager instanceof LANClientNetworkManager); > INSERT 4 : 5 @ 4 @@ -350,4 +355,11 @@ ~ public NetworkPlayerInfo getPlayerInfo(EaglercraftUUID parUUID) { +> INSERT 16 : 20 @ 16 + ++ ++ public boolean isClientInEaglerSingleplayerOrLAN() { ++ return isIntegratedServer; ++ } + > EOF diff --git a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java index 7c6e18d..712d857 100644 --- a/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java +++ b/patches/minecraft/net/minecraft/client/renderer/entity/RenderSnowball.edit.java @@ -5,10 +5,28 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 2 : 5 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; +~ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager; +~ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.texture.EmissiveItems; > DELETE 1 @ 1 : 4 +> CHANGE 24 : 26 @ 24 : 25 + +~ ItemStack itm = this.func_177082_d(entity); +~ this.field_177083_e.func_181564_a(itm, ItemCameraTransforms.TransformType.GROUND); + +> INSERT 2 : 10 @ 2 + ++ if (DynamicLightManager.isRenderingLights()) { ++ float[] emission = EmissiveItems.getItemEmission(itm); ++ if (emission != null) { ++ float mag = 0.1f; ++ DynamicLightManager.renderDynamicLight("entity_" + entity.getEntityId() + "_item_throw", d0, d1, d2, ++ emission[0] * mag, emission[1] * mag, emission[2] * mag, false); ++ } ++ } + > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandBase.edit.java b/patches/minecraft/net/minecraft/command/CommandBase.edit.java similarity index 86% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandBase.edit.java rename to patches/minecraft/net/minecraft/command/CommandBase.edit.java index 4627337..b78dbdb 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandBase.edit.java +++ b/patches/minecraft/net/minecraft/command/CommandBase.edit.java @@ -13,7 +13,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -> CHANGE 154 : 155 @ 154 : 155 +> INSERT 19 : 20 @ 19 + ++ + +> CHANGE 128 : 129 @ 128 : 129 ~ .getPlayerByUUID(EaglercraftUUID.fromString(username)); diff --git a/patches/minecraft/net/minecraft/command/CommandBlockData.edit.java b/patches/minecraft/net/minecraft/command/CommandBlockData.edit.java new file mode 100644 index 0000000..89a1d9e --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandBlockData.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 16 : 17 @ 16 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandClearInventory.edit.java b/patches/minecraft/net/minecraft/command/CommandClearInventory.edit.java new file mode 100644 index 0000000..50f8102 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandClearInventory.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 17 : 18 @ 17 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandClone.edit.java b/patches/minecraft/net/minecraft/command/CommandClone.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandClone.edit.java rename to patches/minecraft/net/minecraft/command/CommandClone.edit.java index b409c12..53f2c6c 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandClone.edit.java +++ b/patches/minecraft/net/minecraft/command/CommandClone.edit.java @@ -5,11 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 15 : 16 @ 15 : 16 +> INSERT 23 : 24 @ 23 -~ import net.minecraft.nbt.NBTTagCompound; ++ -> CHANGE 114 : 115 @ 114 : 115 +> CHANGE 100 : 101 @ 100 : 101 ~ for (BlockPos blockpos6 : (LinkedList) linkedlist) { diff --git a/patches/minecraft/net/minecraft/command/CommandCompare.edit.java b/patches/minecraft/net/minecraft/command/CommandCompare.edit.java new file mode 100644 index 0000000..50f8102 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandCompare.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 17 : 18 @ 17 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandDefaultGameMode.edit.java b/patches/minecraft/net/minecraft/command/CommandDefaultGameMode.edit.java new file mode 100644 index 0000000..9e4f0d7 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandDefaultGameMode.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 12 : 13 @ 12 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandDifficulty.edit.java b/patches/minecraft/net/minecraft/command/CommandDifficulty.edit.java new file mode 100644 index 0000000..b5da4fe --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandDifficulty.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 14 : 15 @ 14 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandEffect.edit.java b/patches/minecraft/net/minecraft/command/CommandEffect.edit.java new file mode 100644 index 0000000..89a1d9e --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandEffect.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 16 : 17 @ 16 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandEnchant.edit.java b/patches/minecraft/net/minecraft/command/CommandEnchant.edit.java new file mode 100644 index 0000000..50f8102 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandEnchant.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 17 : 18 @ 17 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandEntityData.edit.java b/patches/minecraft/net/minecraft/command/CommandEntityData.edit.java new file mode 100644 index 0000000..0c12581 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandEntityData.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 13 : 14 @ 13 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandExecuteAt.edit.java b/patches/minecraft/net/minecraft/command/CommandExecuteAt.edit.java new file mode 100644 index 0000000..6592a60 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandExecuteAt.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 19 : 20 @ 19 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandFill.edit.java b/patches/minecraft/net/minecraft/command/CommandFill.edit.java similarity index 51% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandFill.edit.java rename to patches/minecraft/net/minecraft/command/CommandFill.edit.java index 0382e98..fa309af 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandFill.edit.java +++ b/patches/minecraft/net/minecraft/command/CommandFill.edit.java @@ -5,13 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 14 : 17 @ 14 : 17 +> INSERT 22 : 23 @ 22 -~ import net.minecraft.nbt.JsonToNBT; -~ import net.minecraft.nbt.NBTException; -~ import net.minecraft.nbt.NBTTagCompound; ++ -> CHANGE 141 : 142 @ 141 : 142 +> CHANGE 129 : 130 @ 129 : 130 ~ for (BlockPos blockpos5 : (ArrayList) arraylist) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAITarget.edit.java b/patches/minecraft/net/minecraft/command/CommandGameMode.edit.java similarity index 100% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAITarget.edit.java rename to patches/minecraft/net/minecraft/command/CommandGameMode.edit.java diff --git a/patches/minecraft/net/minecraft/command/CommandGameRule.edit.java b/patches/minecraft/net/minecraft/command/CommandGameRule.edit.java new file mode 100644 index 0000000..d2c6452 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandGameRule.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 15 : 16 @ 15 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandGive.edit.java b/patches/minecraft/net/minecraft/command/CommandGive.edit.java new file mode 100644 index 0000000..e8768a1 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandGive.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 18 : 19 @ 18 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandHandler.edit.java b/patches/minecraft/net/minecraft/command/CommandHandler.edit.java similarity index 84% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandHandler.edit.java rename to patches/minecraft/net/minecraft/command/CommandHandler.edit.java index 57b4d48..cdd05b8 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandHandler.edit.java +++ b/patches/minecraft/net/minecraft/command/CommandHandler.edit.java @@ -10,7 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> CHANGE 36 : 37 @ 36 : 37 +> INSERT 2 : 3 @ 2 + ++ + +> CHANGE 27 : 28 @ 27 : 28 ~ for (Entity entity : (List) list) { diff --git a/patches/minecraft/net/minecraft/command/CommandHelp.edit.java b/patches/minecraft/net/minecraft/command/CommandHelp.edit.java new file mode 100644 index 0000000..e5dd790 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandHelp.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 23 : 24 @ 23 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandKill.edit.java b/patches/minecraft/net/minecraft/command/CommandKill.edit.java new file mode 100644 index 0000000..9e4f0d7 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandKill.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 12 : 13 @ 12 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFlower.edit.java b/patches/minecraft/net/minecraft/command/CommandNotFoundException.edit.java similarity index 100% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/block/BlockFlower.edit.java rename to patches/minecraft/net/minecraft/command/CommandNotFoundException.edit.java diff --git a/patches/minecraft/net/minecraft/command/CommandParticle.edit.java b/patches/minecraft/net/minecraft/command/CommandParticle.edit.java new file mode 100644 index 0000000..b5da4fe --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandParticle.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 14 : 15 @ 14 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandPlaySound.edit.java b/patches/minecraft/net/minecraft/command/CommandPlaySound.edit.java new file mode 100644 index 0000000..b5da4fe --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandPlaySound.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 14 : 15 @ 14 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandReplaceItem.edit.java b/patches/minecraft/net/minecraft/command/CommandReplaceItem.edit.java new file mode 100644 index 0000000..b5f0f4d --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandReplaceItem.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 26 : 27 @ 26 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandResultStats.edit.java b/patches/minecraft/net/minecraft/command/CommandResultStats.edit.java new file mode 100644 index 0000000..89a1d9e --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandResultStats.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 16 : 17 @ 16 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandServerKick.edit.java b/patches/minecraft/net/minecraft/command/CommandServerKick.edit.java similarity index 75% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandServerKick.edit.java rename to patches/minecraft/net/minecraft/command/CommandServerKick.edit.java index ba0afa1..5253965 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandServerKick.edit.java +++ b/patches/minecraft/net/minecraft/command/CommandServerKick.edit.java @@ -7,9 +7,13 @@ > INSERT 11 : 12 @ 11 -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.StringUtils; ++ import net.minecraft.util.StringUtils; -> INSERT 32 : 36 @ 32 +> INSERT 2 : 3 @ 2 + ++ + +> INSERT 23 : 27 @ 23 + if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() + .getBoolean("colorCodes")) { diff --git a/patches/minecraft/net/minecraft/command/CommandSetPlayerTimeout.edit.java b/patches/minecraft/net/minecraft/command/CommandSetPlayerTimeout.edit.java new file mode 100644 index 0000000..80304af --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandSetPlayerTimeout.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 9 : 10 @ 9 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandSetSpawnpoint.edit.java b/patches/minecraft/net/minecraft/command/CommandSetSpawnpoint.edit.java new file mode 100644 index 0000000..9e4f0d7 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandSetSpawnpoint.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 12 : 13 @ 12 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandShowSeed.edit.java b/patches/minecraft/net/minecraft/command/CommandShowSeed.edit.java new file mode 100644 index 0000000..e395576 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandShowSeed.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 11 : 12 @ 11 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandSpreadPlayers.edit.java b/patches/minecraft/net/minecraft/command/CommandSpreadPlayers.edit.java similarity index 94% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandSpreadPlayers.edit.java rename to patches/minecraft/net/minecraft/command/CommandSpreadPlayers.edit.java index f174d1f..4f34654 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandSpreadPlayers.edit.java +++ b/patches/minecraft/net/minecraft/command/CommandSpreadPlayers.edit.java @@ -10,7 +10,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.HString; -> CHANGE 88 : 89 @ 88 : 89 +> INSERT 20 : 21 @ 20 + ++ + +> CHANGE 61 : 62 @ 61 : 62 ~ EaglercraftRandom random = new EaglercraftRandom(); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandStats.edit.java b/patches/minecraft/net/minecraft/command/CommandStats.edit.java similarity index 76% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandStats.edit.java rename to patches/minecraft/net/minecraft/command/CommandStats.edit.java index 7981acb..0f97099 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandStats.edit.java +++ b/patches/minecraft/net/minecraft/command/CommandStats.edit.java @@ -5,7 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 184 : 185 @ 184 : 185 +> INSERT 21 : 22 @ 21 + ++ + +> CHANGE 156 : 157 @ 156 : 157 ~ for (ScoreObjective scoreobjective : (Collection) collection) { diff --git a/patches/minecraft/net/minecraft/command/CommandTime.edit.java b/patches/minecraft/net/minecraft/command/CommandTime.edit.java new file mode 100644 index 0000000..0c12581 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandTime.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 13 : 14 @ 13 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandTitle.edit.java b/patches/minecraft/net/minecraft/command/CommandTitle.edit.java similarity index 89% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandTitle.edit.java rename to patches/minecraft/net/minecraft/command/CommandTitle.edit.java index c74db41..d3b6972 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandTitle.edit.java +++ b/patches/minecraft/net/minecraft/command/CommandTitle.edit.java @@ -19,7 +19,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> CHANGE 59 : 60 @ 59 : 60 +> INSERT 2 : 3 @ 2 + ++ + +> CHANGE 50 : 51 @ 50 : 51 ~ } catch (JSONException jsonparseexception) { diff --git a/patches/minecraft/net/minecraft/command/CommandToggleDownfall.edit.java b/patches/minecraft/net/minecraft/command/CommandToggleDownfall.edit.java new file mode 100644 index 0000000..80304af --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandToggleDownfall.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 9 : 10 @ 9 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/CommandTrigger.edit.java b/patches/minecraft/net/minecraft/command/CommandTrigger.edit.java new file mode 100644 index 0000000..6592a60 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandTrigger.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 19 : 20 @ 19 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandWeather.edit.java b/patches/minecraft/net/minecraft/command/CommandWeather.edit.java similarity index 82% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandWeather.edit.java rename to patches/minecraft/net/minecraft/command/CommandWeather.edit.java index 01de2f5..09ff820 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandWeather.edit.java +++ b/patches/minecraft/net/minecraft/command/CommandWeather.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 31 : 32 @ 31 : 32 +> INSERT 10 : 11 @ 10 + ++ + +> CHANGE 14 : 15 @ 14 : 15 ~ int i = (300 + (new EaglercraftRandom()).nextInt(600)) * 20 * 2; diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandWorldBorder.edit.java b/patches/minecraft/net/minecraft/command/CommandWorldBorder.edit.java similarity index 96% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandWorldBorder.edit.java rename to patches/minecraft/net/minecraft/command/CommandWorldBorder.edit.java index 169e936..6c03d8f 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/CommandWorldBorder.edit.java +++ b/patches/minecraft/net/minecraft/command/CommandWorldBorder.edit.java @@ -10,7 +10,11 @@ + + import net.lax1dude.eaglercraft.v1_8.HString; -> CHANGE 49 : 51 @ 49 : 51 +> INSERT 12 : 13 @ 12 + ++ + +> CHANGE 30 : 32 @ 30 : 32 ~ new Object[] { HString.format("%.1f", new Object[] { Double.valueOf(d2) }), ~ HString.format("%.1f", new Object[] { Double.valueOf(d0) }), diff --git a/patches/minecraft/net/minecraft/command/CommandXP.edit.java b/patches/minecraft/net/minecraft/command/CommandXP.edit.java new file mode 100644 index 0000000..0c12581 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/CommandXP.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 13 : 14 @ 13 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/ICommandSender.edit.java b/patches/minecraft/net/minecraft/command/ICommandSender.edit.java index cbe9308..7572609 100644 --- a/patches/minecraft/net/minecraft/command/ICommandSender.edit.java +++ b/patches/minecraft/net/minecraft/command/ICommandSender.edit.java @@ -5,8 +5,4 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> DELETE 25 @ 25 : 26 - > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java b/patches/minecraft/net/minecraft/command/NumberInvalidException.edit.java similarity index 100% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/attributes/BaseAttributeMap.edit.java rename to patches/minecraft/net/minecraft/command/NumberInvalidException.edit.java diff --git a/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java b/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java index f7d1ad6..6b7e217 100644 --- a/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java +++ b/patches/minecraft/net/minecraft/command/PlayerSelector.edit.java @@ -5,116 +5,56 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 8 +> CHANGE 64 : 65 @ 64 : 65 -> DELETE 6 @ 6 : 7 +~ for (Entity entity : (ArrayList) list) { -> INSERT 1 : 2 @ 1 +> CHANGE 20 : 21 @ 20 : 21 -+ import java.util.Set; +~ for (World world : (ArrayList) list) { -> CHANGE 2 : 11 @ 2 : 4 +> CHANGE 49 : 50 @ 49 : 50 -~ -~ import com.google.common.base.Predicate; -~ import com.google.common.base.Predicates; -~ import com.google.common.collect.ComparisonChain; -~ import com.google.common.collect.Lists; -~ import com.google.common.collect.Maps; -~ import com.google.common.collect.Sets; -~ -~ import net.minecraft.client.Minecraft; +~ String s = func_179651_b(parMap, "type"); -> DELETE 4 @ 4 : 5 +> INSERT 16 : 17 @ 16 -> DELETE 4 @ 4 : 5 ++ final String ss = s; -> DELETE 17 @ 17 : 21 +> CHANGE 2 : 3 @ 2 : 3 -> CHANGE 13 : 14 @ 13 : 14 +~ return EntityList.isStringEntityName(entity, ss) != flag; -~ for (Entity entity : (List) list) { +> CHANGE 49 : 50 @ 49 : 50 -> CHANGE 3 : 4 @ 3 : 4 +~ String s = func_179651_b(parMap, "team"); -~ return IChatComponent.join(arraylist); +> INSERT 6 : 7 @ 6 + ++ final String ss = s; + +> CHANGE 8 : 9 @ 8 : 9 + +~ return s1.equals(ss) != flag; > CHANGE 16 : 17 @ 16 : 17 -~ for (World world : (List) list) { +~ for (Entry entry : (Set) map.entrySet()) { -> CHANGE 26 : 30 @ 26 : 27 +> CHANGE 39 : 40 @ 39 : 40 -~ Minecraft mc = Minecraft.getMinecraft(); -~ if (mc.theWorld != null) { -~ arraylist.add(mc.thePlayer); -~ } +~ String s = func_179651_b(parMap, "name"); -> CHANGE 22 : 24 @ 22 : 24 +> INSERT 6 : 7 @ 6 -~ String ss = func_179651_b(parMap, "type"); -~ final boolean flag = ss != null && ss.startsWith("!"); ++ final String ss = s; -> CHANGE 1 : 2 @ 1 : 2 +> CHANGE 2 : 3 @ 2 : 3 -~ ss = ss.substring(1); +~ return entity.getName().equals(ss) != flag; -> INSERT 1 : 2 @ 1 +> CHANGE 135 : 136 @ 135 : 136 -+ final String s = ss; - -> CHANGE 29 : 30 @ 29 : 36 - -~ return false; - -> CHANGE 13 : 14 @ 13 : 19 - -~ return false; - -> CHANGE 9 : 11 @ 9 : 11 - -~ String ss = func_179651_b(parMap, "team"); -~ final boolean flag = ss != null && ss.startsWith("!"); - -> CHANGE 1 : 2 @ 1 : 2 - -~ ss = ss.substring(1); - -> INSERT 1 : 2 @ 1 - -+ final String s = ss; - -> CHANGE 21 : 22 @ 21 : 22 - -~ final Map map = func_96560_a(parMap); - -> CHANGE 3 : 4 @ 3 : 4 - -~ Scoreboard scoreboard = Minecraft.getMinecraft().theWorld.getScoreboard(); - -> CHANGE 14 : 15 @ 14 : 16 - -~ String s1 = entity instanceof EntityPlayer ? entity.getName() : entity.getUniqueID().toString(); - -> CHANGE 25 : 27 @ 25 : 27 - -~ String ss = func_179651_b(parMap, "name"); -~ final boolean flag = ss != null && ss.startsWith("!"); - -> CHANGE 1 : 2 @ 1 : 2 - -~ ss = ss.substring(1); - -> INSERT 1 : 2 @ 1 - -+ final String s = ss; - -> CHANGE 140 : 141 @ 140 : 141 - -~ parList = (List) Lists.newArrayList(new Entity[] { entity }); - -> INSERT 133 : 134 @ 133 - -+ +~ parList = (List) Lists.newArrayList(entity); > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/ServerCommandManager.edit.java b/patches/minecraft/net/minecraft/command/ServerCommandManager.edit.java similarity index 91% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/ServerCommandManager.edit.java rename to patches/minecraft/net/minecraft/command/ServerCommandManager.edit.java index b9342d2..dd1c99d 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/ServerCommandManager.edit.java +++ b/patches/minecraft/net/minecraft/command/ServerCommandManager.edit.java @@ -21,12 +21,16 @@ > DELETE 1 @ 1 : 2 -> INSERT 6 : 8 @ 6 +> INSERT 4 : 6 @ 4 + import net.lax1dude.eaglercraft.v1_8.sp.server.ClientCommandDummy; + -> DELETE 25 @ 25 : 26 +> INSERT 1 : 2 @ 1 + ++ + +> DELETE 19 @ 19 : 20 > CHANGE 24 : 28 @ 24 : 44 diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatComponentStyle.edit.java b/patches/minecraft/net/minecraft/command/SyntaxErrorException.edit.java similarity index 100% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/ChatComponentStyle.edit.java rename to patches/minecraft/net/minecraft/command/SyntaxErrorException.edit.java diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/Enchantment.edit.java b/patches/minecraft/net/minecraft/command/WrongUsageException.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/Enchantment.edit.java rename to patches/minecraft/net/minecraft/command/WrongUsageException.edit.java index 1307512..613846d 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/enchantment/Enchantment.edit.java +++ b/patches/minecraft/net/minecraft/command/WrongUsageException.edit.java @@ -5,7 +5,7 @@ # Version: 1.0 # Author: lax1dude -> INSERT 4 : 5 @ 4 +> INSERT 5 : 6 @ 5 + diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandAchievement.edit.java b/patches/minecraft/net/minecraft/command/server/CommandAchievement.edit.java similarity index 88% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandAchievement.edit.java rename to patches/minecraft/net/minecraft/command/server/CommandAchievement.edit.java index afb3d2d..beb1aeb 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandAchievement.edit.java +++ b/patches/minecraft/net/minecraft/command/server/CommandAchievement.edit.java @@ -5,7 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 87 : 88 @ 87 : 88 +> INSERT 20 : 21 @ 20 + ++ + +> CHANGE 60 : 61 @ 60 : 61 ~ for (Achievement achievement1 : (List) Lists.reverse(arraylist)) { diff --git a/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java b/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java index af848e5..e8deda0 100644 --- a/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java +++ b/patches/minecraft/net/minecraft/command/server/CommandBlockLogic.edit.java @@ -5,45 +5,18 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> CHANGE 2 : 5 @ 2 : 3 -> CHANGE 1 : 4 @ 1 : 8 - -~ ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime; ~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; +~ -> DELETE 2 @ 2 : 3 +> CHANGE 82 : 83 @ 82 : 83 -> DELETE 2 @ 2 : 3 +~ if (minecraftserver != null && minecraftserver.isCommandBlockEnabled()) { -> CHANGE 2 : 4 @ 2 : 4 +> CHANGE 49 : 50 @ 49 : 50 -~ public abstract class CommandBlockLogic { -~ private static final SimpleDateFormat timestampFormat = EagRuntime.fixDateFormat(new SimpleDateFormat("HH:mm:ss")); - -> DELETE 5 @ 5 : 6 - -> DELETE 17 @ 17 : 19 - -> DELETE 16 @ 16 : 18 - -> DELETE 16 @ 16 : 19 - -> DELETE 1 @ 1 : 27 - -> DELETE 15 @ 15 : 20 - -> CHANGE 4 : 5 @ 4 : 7 - -~ return true; - -> DELETE 2 @ 2 : 6 - -> CHANGE 22 : 23 @ 22 : 26 - -~ playerIn.openEditCommandBlock(this); - -> DELETE 3 @ 3 : 7 +~ return minecraftserver == null > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandBroadcast.edit.java b/patches/minecraft/net/minecraft/command/server/CommandBroadcast.edit.java similarity index 68% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandBroadcast.edit.java rename to patches/minecraft/net/minecraft/command/server/CommandBroadcast.edit.java index ca9a1c8..f531632 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandBroadcast.edit.java +++ b/patches/minecraft/net/minecraft/command/server/CommandBroadcast.edit.java @@ -7,13 +7,17 @@ > INSERT 9 : 10 @ 9 -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.ChatComponentText; ++ import net.minecraft.util.ChatComponentText; > INSERT 2 : 3 @ 2 -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.StringUtils; ++ import net.minecraft.util.StringUtils; -> INSERT 24 : 29 @ 24 +> INSERT 2 : 3 @ 2 + ++ + +> INSERT 15 : 20 @ 15 + if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() + .getBoolean("colorCodes")) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandEmote.edit.java b/patches/minecraft/net/minecraft/command/server/CommandEmote.edit.java similarity index 68% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandEmote.edit.java rename to patches/minecraft/net/minecraft/command/server/CommandEmote.edit.java index f90e62c..859dc3a 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandEmote.edit.java +++ b/patches/minecraft/net/minecraft/command/server/CommandEmote.edit.java @@ -7,13 +7,17 @@ > INSERT 10 : 11 @ 10 -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.ChatComponentText; ++ import net.minecraft.util.ChatComponentText; > INSERT 2 : 3 @ 2 -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.StringUtils; ++ import net.minecraft.util.StringUtils; -> INSERT 27 : 32 @ 27 +> INSERT 2 : 3 @ 2 + ++ + +> INSERT 18 : 23 @ 18 + if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() + .getBoolean("colorCodes")) { diff --git a/patches/minecraft/net/minecraft/command/server/CommandListPlayers.edit.java b/patches/minecraft/net/minecraft/command/server/CommandListPlayers.edit.java new file mode 100644 index 0000000..e395576 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/server/CommandListPlayers.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 11 : 12 @ 11 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandMessage.edit.java b/patches/minecraft/net/minecraft/command/server/CommandMessage.edit.java similarity index 68% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandMessage.edit.java rename to patches/minecraft/net/minecraft/command/server/CommandMessage.edit.java index a415c7d..8a83cca 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandMessage.edit.java +++ b/patches/minecraft/net/minecraft/command/server/CommandMessage.edit.java @@ -7,13 +7,17 @@ > INSERT 13 : 14 @ 13 -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.ChatComponentText; ++ import net.minecraft.util.ChatComponentText; > INSERT 3 : 4 @ 3 -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.StringUtils; ++ import net.minecraft.util.StringUtils; -> INSERT 35 : 40 @ 35 +> INSERT 2 : 3 @ 2 + ++ + +> INSERT 26 : 31 @ 26 + if (MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() + .getBoolean("colorCodes")) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandMessageRaw.edit.java b/patches/minecraft/net/minecraft/command/server/CommandMessageRaw.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandMessageRaw.edit.java rename to patches/minecraft/net/minecraft/command/server/CommandMessageRaw.edit.java index 60a6601..50ed407 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandMessageRaw.edit.java +++ b/patches/minecraft/net/minecraft/command/server/CommandMessageRaw.edit.java @@ -16,7 +16,11 @@ > DELETE 10 @ 10 : 11 -> CHANGE 32 : 33 @ 32 : 33 +> INSERT 2 : 3 @ 2 + ++ + +> CHANGE 23 : 24 @ 23 : 24 ~ } catch (JSONException jsonparseexception) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandScoreboard.edit.java b/patches/minecraft/net/minecraft/command/server/CommandScoreboard.edit.java similarity index 79% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandScoreboard.edit.java rename to patches/minecraft/net/minecraft/command/server/CommandScoreboard.edit.java index a31ce09..8adb6ba 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/command/server/CommandScoreboard.edit.java +++ b/patches/minecraft/net/minecraft/command/server/CommandScoreboard.edit.java @@ -5,14 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 19 : 23 @ 19 : 23 +> INSERT 36 : 37 @ 36 -~ import net.minecraft.nbt.JsonToNBT; -~ import net.minecraft.nbt.NBTException; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTUtil; ++ -> CHANGE 209 : 210 @ 209 : 210 +> CHANGE 189 : 190 @ 189 : 190 ~ for (String s1 : (ArrayList) arraylist1) { diff --git a/patches/minecraft/net/minecraft/command/server/CommandSetBlock.edit.java b/patches/minecraft/net/minecraft/command/server/CommandSetBlock.edit.java new file mode 100644 index 0000000..bc82325 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/server/CommandSetBlock.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 20 : 21 @ 20 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/server/CommandSetDefaultSpawnpoint.edit.java b/patches/minecraft/net/minecraft/command/server/CommandSetDefaultSpawnpoint.edit.java new file mode 100644 index 0000000..9e4f0d7 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/server/CommandSetDefaultSpawnpoint.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 12 : 13 @ 12 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/server/CommandSummon.edit.java b/patches/minecraft/net/minecraft/command/server/CommandSummon.edit.java new file mode 100644 index 0000000..9ea56e6 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/server/CommandSummon.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 21 : 22 @ 21 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/server/CommandTeleport.edit.java b/patches/minecraft/net/minecraft/command/server/CommandTeleport.edit.java new file mode 100644 index 0000000..89a1d9e --- /dev/null +++ b/patches/minecraft/net/minecraft/command/server/CommandTeleport.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 16 : 17 @ 16 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/server/CommandTestFor.edit.java b/patches/minecraft/net/minecraft/command/server/CommandTestFor.edit.java new file mode 100644 index 0000000..89a1d9e --- /dev/null +++ b/patches/minecraft/net/minecraft/command/server/CommandTestFor.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 16 : 17 @ 16 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/command/server/CommandTestForBlock.edit.java b/patches/minecraft/net/minecraft/command/server/CommandTestForBlock.edit.java new file mode 100644 index 0000000..bc82325 --- /dev/null +++ b/patches/minecraft/net/minecraft/command/server/CommandTestForBlock.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 20 : 21 @ 20 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/Entity.edit.java b/patches/minecraft/net/minecraft/entity/Entity.edit.java index 198db8d..9f44834 100644 --- a/patches/minecraft/net/minecraft/entity/Entity.edit.java +++ b/patches/minecraft/net/minecraft/entity/Entity.edit.java @@ -17,51 +17,25 @@ + -> CHANGE 7 : 8 @ 7 : 10 +> INSERT 8 : 9 @ 8 -~ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; ++ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -> DELETE 4 @ 4 : 7 +> DELETE 6 @ 6 : 9 -> DELETE 3 @ 3 : 4 - -> DELETE 8 @ 8 : 9 - -> DELETE 14 @ 14 : 15 - -> CHANGE 1 : 2 @ 1 : 2 - -~ public abstract class Entity { - -> CHANGE 44 : 45 @ 44 : 45 +> CHANGE 74 : 75 @ 74 : 75 ~ protected EaglercraftRandom rand; -> CHANGE 27 : 28 @ 27 : 29 +> CHANGE 27 : 28 @ 27 : 28 ~ protected EaglercraftUUID entityUniqueID; -> CHANGE 20 : 21 @ 20 : 21 +> CHANGE 21 : 22 @ 21 : 22 ~ this.rand = new EaglercraftRandom(); -> DELETE 3 @ 3 : 4 - -> DELETE 59 @ 59 : 62 - -> DELETE 45 @ 45 : 60 - -> DELETE 1 @ 1 : 23 - -> CHANGE 2 : 3 @ 2 : 14 - -~ this.fire = 0; - -> DELETE 1 @ 1 : 5 - -> DELETE 9 @ 9 : 13 - -> CHANGE 116 : 117 @ 116 : 117 +> CHANGE 297 : 298 @ 297 : 298 ~ for (AxisAlignedBB axisalignedbb1 : (List) list1) { @@ -101,9 +75,7 @@ ~ for (AxisAlignedBB axisalignedbb12 : (List) list) { -> DELETE 595 @ 595 : 596 - -> CHANGE 55 : 57 @ 55 : 56 +> CHANGE 651 : 653 @ 651 : 652 ~ this.entityUniqueID = new EaglercraftUUID(tagCompund.getLong("UUIDMost"), ~ tagCompund.getLong("UUIDLeast")); @@ -112,45 +84,19 @@ ~ this.entityUniqueID = EaglercraftUUID.fromString(tagCompund.getString("UUID")); -> DELETE 9 @ 9 : 10 - -> CHANGE 216 : 217 @ 216 : 217 +> CHANGE 226 : 227 @ 226 : 227 ~ for (AxisAlignedBB axisalignedbb : (List) list) { -> DELETE 23 @ 23 : 44 - -> CHANGE 28 : 29 @ 28 : 29 - -~ boolean flag = this.worldObj != null; - -> CHANGE 183 : 184 @ 183 : 184 +> CHANGE 256 : 257 @ 256 : 257 ~ return HString.format("%s[\'%s\'/%d, l=\'%s\', x=%.2f, y=%.2f, z=%.2f]", -> DELETE 25 @ 25 : 59 - -> CHANGE 30 : 31 @ 30 : 31 - -~ return EntityList.getEntityString(Entity.this) + " (" + Entity.this.getClass().getName() + ")"; - -> CHANGE 8 : 9 @ 8 : 9 - -~ category.addCrashSection("Entity\'s Exact location", HString.format("%.2f, %.2f, %.2f", - -> CHANGE 4 : 5 @ 4 : 5 - -~ category.addCrashSection("Entity\'s Momentum", HString.format("%.2f, %.2f, %.2f", new Object[] { - -> CHANGE 17 : 18 @ 17 : 18 +> CHANGE 121 : 122 @ 121 : 122 ~ public EaglercraftUUID getUniqueID() { -> DELETE 62 @ 62 : 66 - -> DELETE 51 @ 51 : 63 - -> INSERT 22 : 48 @ 22 +> INSERT 151 : 177 @ 151 + + public void renderDynamicLightsEagler(float partialTicks, boolean isInFrustum) { diff --git a/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java b/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java index b43e63a..8b7360a 100644 --- a/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityAgeable.edit.java @@ -7,28 +7,4 @@ > DELETE 2 @ 2 : 4 -> DELETE 24 @ 24 : 47 - -> CHANGE 12 : 13 @ 12 : 13 - -~ return this.dataWatcher.getWatchableObjectByte(12); - -> CHANGE 52 : 59 @ 52 : 63 - -~ if (this.field_175503_c > 0) { -~ if (this.field_175503_c % 4 == 0) { -~ this.worldObj.spawnParticle(EnumParticleTypes.VILLAGER_HAPPY, -~ this.posX + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, -~ this.posY + 0.5D + (double) (this.rand.nextFloat() * this.height), -~ this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width, 0.0D, -~ 0.0D, 0.0D, new int[0]); - -> CHANGE 2 : 3 @ 2 : 15 - -~ --this.field_175503_c; - -> INSERT 2 : 3 @ 2 - -+ this.setScaleForAge(this.isChild()); - > EOF diff --git a/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java b/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java index 5303082..9e1b32b 100644 --- a/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityCreature.edit.java @@ -5,28 +5,14 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 7 +> CHANGE 2 : 4 @ 2 : 5 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ -> DELETE 2 @ 2 : 3 - -> CHANGE 4 : 6 @ 4 : 5 +> CHANGE 9 : 11 @ 9 : 10 ~ public static final EaglercraftUUID FLEEING_SPEED_MODIFIER_UUID = EaglercraftUUID ~ .fromString("E199AD21-BA8A-4C53-8D13-6182D5C69D3A"); -> DELETE 4 @ 4 : 5 - -> CHANGE 16 : 17 @ 16 : 17 - -~ return false; - -> DELETE 48 @ 48 : 53 - -> DELETE 4 @ 4 : 8 - -> DELETE 14 @ 14 : 19 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java b/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java index 683bc48..630e259 100644 --- a/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityHanging.edit.java @@ -5,23 +5,10 @@ # Version: 1.0 # Author: lax1dude -> INSERT 2 : 4 @ 2 +> DELETE 4 @ 4 : 5 + +> INSERT 7 : 8 @ 7 -+ import org.apache.commons.lang3.Validate; + -> DELETE 2 @ 2 : 3 - -> DELETE 7 @ 7 : 8 - -> CHANGE 68 : 69 @ 68 : 76 - -~ this.tickCounter1++; - -> DELETE 46 @ 46 : 60 - -> DELETE 1 @ 1 : 5 - -> DELETE 4 @ 4 : 8 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java b/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java index 0d654f5..9c2c149 100644 --- a/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityLeashKnot.edit.java @@ -7,8 +7,4 @@ > DELETE 3 @ 3 : 6 -> DELETE 1 @ 1 : 3 - -> DELETE 59 @ 59 : 88 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/EntityList.edit.java b/patches/minecraft/net/minecraft/entity/EntityList.edit.java index 66710a2..48a9c87 100644 --- a/patches/minecraft/net/minecraft/entity/EntityList.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityList.edit.java @@ -27,7 +27,12 @@ + private static final Map> idToConstructorMapping = Maps.newHashMap(); -> CHANGE 4 : 6 @ 4 : 5 +> INSERT 1 : 3 @ 1 + ++ private static final Map, EntityConstructor> classToConstructorMapping = Maps ++ .newHashMap(); + +> CHANGE 3 : 5 @ 3 : 4 ~ private static void addMapping(Class entityClass, ~ EntityConstructor entityConstructor, String entityName, int id) { @@ -40,7 +45,11 @@ + idToConstructorMapping.put(Integer.valueOf(id), entityConstructor); -> CHANGE 5 : 7 @ 5 : 6 +> INSERT 1 : 2 @ 1 + ++ classToConstructorMapping.put(entityClass, entityConstructor); + +> CHANGE 4 : 6 @ 4 : 5 ~ private static void addMapping(Class entityClass, ~ EntityConstructor entityConstructor, String entityName, int entityID, int baseColor, @@ -59,7 +68,33 @@ ~ logger.error("Could not create entity", exception); -> CHANGE 13 : 16 @ 13 : 17 +> INSERT 5 : 28 @ 5 + ++ public static Entity createEntityByClass(Class entityClass, World worldIn) { ++ Entity entity = null; ++ ++ try { ++ EntityConstructor constructor = classToConstructorMapping.get(entityClass); ++ if (constructor != null) { ++ entity = constructor.createEntity(worldIn); ++ } ++ } catch (Exception exception) { ++ logger.error("Could not create entity", exception); ++ } ++ ++ return entity; ++ } ++ ++ public static Entity createEntityByClassUnsafe(Class entityClass, World worldIn) { ++ EntityConstructor constructor = classToConstructorMapping.get(entityClass); ++ if (constructor != null) { ++ return constructor.createEntity(worldIn); ++ } ++ return null; ++ } ++ + +> CHANGE 8 : 11 @ 8 : 12 ~ EntityConstructor constructor = stringToConstructorMapping.get(nbt.getString("id")); ~ if (constructor != null) { @@ -105,7 +140,7 @@ ~ addMapping(EntityEnderEye.class, (w) -> new EntityEnderEye(w), "EyeOfEnderSignal", 15); ~ addMapping(EntityPotion.class, (w) -> new EntityPotion(w), "ThrownPotion", 16); ~ addMapping(EntityExpBottle.class, (w) -> new EntityExpBottle(w), "ThrownExpBottle", 17); -~ addMapping(EntityItemFrame.class, (w) -> new EntityItem(w), "ItemFrame", 18); +~ addMapping(EntityItemFrame.class, (w) -> new EntityItemFrame(w), "ItemFrame", 18); ~ addMapping(EntityWitherSkull.class, (w) -> new EntityWitherSkull(w), "WitherSkull", 19); ~ addMapping(EntityTNTPrimed.class, (w) -> new EntityTNTPrimed(w), "PrimedTnt", 20); ~ addMapping(EntityFallingBlock.class, (w) -> new EntityFallingBlock(w), "FallingSand", 21); diff --git a/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java b/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java index 5233301..5365500 100644 --- a/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityLiving.edit.java @@ -5,55 +5,13 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ - -> DELETE 1 @ 1 : 13 - -> DELETE 17 @ 17 : 20 - -> DELETE 7 @ 7 : 8 - -> DELETE 4 @ 4 : 7 - -> DELETE 1 @ 1 : 4 - -> DELETE 1 @ 1 : 2 - -> DELETE 10 @ 10 : 16 > DELETE 1 @ 1 : 8 -> DELETE 7 @ 7 : 31 - -> CHANGE 61 : 71 @ 61 : 76 - -~ for (int i = 0; i < 20; ++i) { -~ double d0 = this.rand.nextGaussian() * 0.02D; -~ double d1 = this.rand.nextGaussian() * 0.02D; -~ double d2 = this.rand.nextGaussian() * 0.02D; -~ double d3 = 10.0D; -~ this.worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_NORMAL, -~ this.posX + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width - d0 * d3, -~ this.posY + (double) (this.rand.nextFloat() * this.height) - d1 * d3, -~ this.posZ + (double) (this.rand.nextFloat() * this.width * 2.0F) - (double) this.width - d2 * d3, -~ d0, d1, d2, new int[0]); - -> DELETE 1 @ 1 : 2 - -> DELETE 11 @ 11 : 19 - -> DELETE 113 @ 113 : 129 - -> DELETE 95 @ 95 : 123 - -> DELETE 328 @ 328 : 336 - -> DELETE 19 @ 19 : 24 - -> CHANGE 5 : 7 @ 5 : 6 +> CHANGE 815 : 817 @ 815 : 816 ~ EaglercraftUUID uuid = new EaglercraftUUID(this.leashNBTTag.getLong("UUIDMost"), ~ this.leashNBTTag.getLong("UUIDLeast")); diff --git a/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java b/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java index f7674d2..1b184af 100644 --- a/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityLivingBase.edit.java @@ -5,112 +5,31 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 5 +> INSERT 5 : 6 @ 5 -> CHANGE 4 : 11 @ 4 : 6 ++ + +> CHANGE 4 : 6 @ 4 : 6 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ -~ import com.google.common.base.Predicate; -~ import com.google.common.base.Predicates; -~ import com.google.common.collect.Maps; -~ -> CHANGE 2 : 3 @ 2 : 3 +> INSERT 3 : 4 @ 3 -~ import net.minecraft.client.Minecraft; ++ import net.minecraft.client.Minecraft; > DELETE 1 @ 1 : 5 -> DELETE 5 @ 5 : 8 - -> DELETE 1 @ 1 : 3 - -> DELETE 9 @ 9 : 12 - -> DELETE 13 @ 13 : 14 - -> CHANGE 2 : 4 @ 2 : 3 +> CHANGE 39 : 41 @ 39 : 40 ~ private static final EaglercraftUUID sprintingSpeedBoostModifierUUID = EaglercraftUUID ~ .fromString("662A6B8D-DA3E-4C1C-8813-96EA6097278D"); -> DELETE 93 @ 93 : 110 - -> CHANGE 25 : 26 @ 25 : 28 - -~ this.extinguish(); - -> DELETE 22 @ 22 : 25 - -> CHANGE 14 : 15 @ 14 : 15 - -~ if (this.hurtResistantTime > 0) { - -> DELETE 41 @ 41 : 44 - -> DELETE 1 @ 1 : 9 - -> CHANGE 33 : 34 @ 33 : 34 +> CHANGE 264 : 265 @ 264 : 265 ~ public EaglercraftRandom getRNG() { -> DELETE 74 @ 74 : 77 - -> CHANGE 37 : 38 @ 37 : 43 - -~ if (potioneffect.onUpdate(this) && potioneffect.getDuration() % 600 == 0) { - -> CHANGE 4 : 5 @ 4 : 8 - -~ this.potionsNeedUpdate = false; - -> DELETE 1 @ 1 : 4 - -> DELETE 47 @ 47 : 48 - -> DELETE 1 @ 1 : 10 - -> DELETE 62 @ 62 : 67 - -> DELETE 4 @ 4 : 11 - -> DELETE 4 @ 4 : 9 - -> CHANGE 19 : 20 @ 19 : 112 - -~ return false; - -> DELETE 33 @ 33 : 38 - -> DELETE 1 @ 1 : 10 - -> DELETE 190 @ 190 : 194 - -> DELETE 59 @ 59 : 60 - -> CHANGE 154 : 157 @ 154 : 159 - -~ if (!this.worldObj.isBlockLoaded(new BlockPos((int) this.posX, 0, (int) this.posZ)) -~ || !this.worldObj.getChunkFromBlockCoords(new BlockPos((int) this.posX, 0, (int) this.posZ)) -~ .isLoaded()) { - -> DELETE 87 @ 87 : 123 - -> DELETE 158 @ 158 : 162 - -> DELETE 29 @ 29 : 33 - -> DELETE 31 @ 31 : 37 - -> DELETE 1 @ 1 : 12 - -> CHANGE 31 : 32 @ 31 : 32 - -~ return false; - -> INSERT 60 : 71 @ 60 +> INSERT 1309 : 1320 @ 1309 + + protected void renderDynamicLightsEaglerAt(double entityX, double entityY, double entityZ, double renderX, diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/profiler/Profiler.edit.java b/patches/minecraft/net/minecraft/entity/EntityTracker.edit.java similarity index 80% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/profiler/Profiler.edit.java rename to patches/minecraft/net/minecraft/entity/EntityTracker.edit.java index c5ac28e..37eea41 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/profiler/Profiler.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityTracker.edit.java @@ -5,9 +5,13 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 8 : 10 @ 8 : 10 +> CHANGE 42 : 44 @ 42 : 44 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; +> INSERT 2 : 3 @ 2 + ++ + > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityTrackerEntry.edit.java b/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.edit.java similarity index 52% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityTrackerEntry.edit.java rename to patches/minecraft/net/minecraft/entity/EntityTrackerEntry.edit.java index 1fb268d..0d38ae8 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityTrackerEntry.edit.java +++ b/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.edit.java @@ -5,13 +5,18 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 41 : 42 @ 41 : 42 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 21 : 23 @ 21 : 23 +> CHANGE 63 : 65 @ 63 : 65 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; +> INSERT 2 : 3 @ 2 + ++ + +> CHANGE 405 : 407 @ 405 : 406 + +~ s0epacketspawnobject2 = new S0EPacketSpawnObject(this.trackedEntity, b0, +~ this.trackedEntity.getEntityId()); + > EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIArrowAttack.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIArrowAttack.edit.java new file mode 100644 index 0000000..80304af --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIArrowAttack.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 9 : 10 @ 9 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIAttackOnCollide.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIAttackOnCollide.edit.java new file mode 100644 index 0000000..e395576 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIAttackOnCollide.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 11 : 12 @ 11 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIAvoidEntity.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIAvoidEntity.edit.java similarity index 74% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIAvoidEntity.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAIAvoidEntity.edit.java index 23b514f..95d8743 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIAvoidEntity.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIAvoidEntity.edit.java @@ -5,7 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 64 : 65 @ 64 : 65 +> INSERT 15 : 16 @ 15 + ++ + +> CHANGE 42 : 43 @ 42 : 43 ~ this.closestLivingEntity = (T) list.get(0); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/scoreboard/Team.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIBase.edit.java similarity index 100% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/scoreboard/Team.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAIBase.edit.java diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIBeg.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIBeg.edit.java new file mode 100644 index 0000000..61e0fa2 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIBeg.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 10 : 11 @ 10 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIBreakDoor.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIBreakDoor.edit.java new file mode 100644 index 0000000..80304af --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIBreakDoor.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 9 : 10 @ 9 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIControlledByPlayer.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIControlledByPlayer.edit.java new file mode 100644 index 0000000..50f8102 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIControlledByPlayer.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 17 : 18 @ 17 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/network/status/client/C01PacketPing.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAICreeperSwell.edit.java similarity index 85% rename from patches/minecraft/net/minecraft/network/status/client/C01PacketPing.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAICreeperSwell.edit.java index 6d88f89..8477115 100644 --- a/patches/minecraft/net/minecraft/network/status/client/C01PacketPing.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAICreeperSwell.edit.java @@ -5,7 +5,7 @@ # Version: 1.0 # Author: lax1dude -> INSERT 3 : 4 @ 3 +> INSERT 7 : 8 @ 7 + diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIDefendVillage.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIDefendVillage.edit.java new file mode 100644 index 0000000..80304af --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIDefendVillage.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 9 : 10 @ 9 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIDoorInteract.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIDoorInteract.edit.java new file mode 100644 index 0000000..0c12581 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIDoorInteract.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 13 : 14 @ 13 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIEatGrass.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIEatGrass.edit.java new file mode 100644 index 0000000..d2c6452 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIEatGrass.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 15 : 16 @ 15 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFindEntityNearest.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIFindEntityNearest.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFindEntityNearest.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAIFindEntityNearest.edit.java index b253420..6983727 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFindEntityNearest.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIFindEntityNearest.edit.java @@ -10,4 +10,8 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; +> INSERT 2 : 3 @ 2 + ++ + > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.edit.java index 43ec655..a5a3f5e 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIFindEntityNearestPlayer.edit.java @@ -10,4 +10,8 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; +> INSERT 2 : 3 @ 2 + ++ + > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFleeSun.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIFleeSun.edit.java similarity index 82% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFleeSun.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAIFleeSun.edit.java index 1cf393f..3f043f8 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFleeSun.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIFleeSun.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 58 : 59 @ 58 : 59 +> INSERT 7 : 8 @ 7 + ++ + +> CHANGE 44 : 45 @ 44 : 45 ~ EaglercraftRandom random = this.theCreature.getRNG(); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFollowGolem.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIFollowGolem.edit.java similarity index 78% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFollowGolem.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAIFollowGolem.edit.java index c828a8a..12a0693 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFollowGolem.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIFollowGolem.edit.java @@ -5,7 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 36 : 37 @ 36 : 37 +> INSERT 8 : 9 @ 8 + ++ + +> CHANGE 21 : 22 @ 21 : 22 ~ for (EntityIronGolem entityirongolem : (List) list) { diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIFollowOwner.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIFollowOwner.edit.java new file mode 100644 index 0000000..89a1d9e --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIFollowOwner.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 16 : 17 @ 16 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFollowParent.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIFollowParent.edit.java similarity index 77% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFollowParent.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAIFollowParent.edit.java index 081ba92..fc46c9d 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIFollowParent.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIFollowParent.edit.java @@ -5,7 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 33 : 34 @ 33 : 34 +> INSERT 7 : 8 @ 7 + ++ + +> CHANGE 19 : 20 @ 19 : 20 ~ for (EntityAnimal entityanimal1 : (List) list) { diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIHarvestFarmland.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIHarvestFarmland.edit.java new file mode 100644 index 0000000..d2c6452 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIHarvestFarmland.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 15 : 16 @ 15 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/network/status/server/S01PacketPong.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIHurtByTarget.edit.java similarity index 85% rename from patches/minecraft/net/minecraft/network/status/server/S01PacketPong.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAIHurtByTarget.edit.java index 6d88f89..3215e29 100644 --- a/patches/minecraft/net/minecraft/network/status/server/S01PacketPong.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIHurtByTarget.edit.java @@ -5,7 +5,7 @@ # Version: 1.0 # Author: lax1dude -> INSERT 3 : 4 @ 3 +> INSERT 8 : 9 @ 8 + diff --git a/patches/minecraft/net/minecraft/network/status/client/C00PacketServerQuery.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAILeapAtTarget.edit.java similarity index 85% rename from patches/minecraft/net/minecraft/network/status/client/C00PacketServerQuery.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAILeapAtTarget.edit.java index 6d88f89..3215e29 100644 --- a/patches/minecraft/net/minecraft/network/status/client/C00PacketServerQuery.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAILeapAtTarget.edit.java @@ -5,7 +5,7 @@ # Version: 1.0 # Author: lax1dude -> INSERT 3 : 4 @ 3 +> INSERT 8 : 9 @ 8 + diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAILookAtTradePlayer.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAILookAtTradePlayer.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAILookAtTradePlayer.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAILookAtVillager.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAILookAtVillager.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAILookAtVillager.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAILookIdle.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAILookIdle.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAILookIdle.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIMate.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIMate.edit.java similarity index 86% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIMate.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAIMate.edit.java index 088d07f..3fed841 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIMate.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIMate.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 68 : 69 @ 68 : 69 +> INSERT 12 : 13 @ 12 + ++ + +> CHANGE 49 : 50 @ 49 : 50 ~ for (EntityAnimal entityanimal1 : (List) list) { diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveIndoors.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveIndoors.edit.java new file mode 100644 index 0000000..e395576 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveIndoors.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 11 : 12 @ 11 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveThroughVillage.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveThroughVillage.edit.java new file mode 100644 index 0000000..89a1d9e --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveThroughVillage.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 16 : 17 @ 16 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveToBlock.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveToBlock.edit.java new file mode 100644 index 0000000..3215e29 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveToBlock.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 8 : 9 @ 8 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.edit.java new file mode 100644 index 0000000..80304af --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveTowardsRestriction.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 9 : 10 @ 9 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.edit.java new file mode 100644 index 0000000..80304af --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIMoveTowardsTarget.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 9 : 10 @ 9 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAINearestAttackableTarget.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAINearestAttackableTarget.edit.java new file mode 100644 index 0000000..d2c6452 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAINearestAttackableTarget.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 15 : 16 @ 15 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIOcelotAttack.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIOcelotAttack.edit.java new file mode 100644 index 0000000..3215e29 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIOcelotAttack.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 8 : 9 @ 8 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIOcelotSit.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIOcelotSit.edit.java new file mode 100644 index 0000000..b5da4fe --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIOcelotSit.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 14 : 15 @ 14 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIOpenDoor.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIOpenDoor.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIOpenDoor.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIOwnerHurtByTarget.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIOwnerHurtTarget.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIPanic.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIPanic.edit.java new file mode 100644 index 0000000..3215e29 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIPanic.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 8 : 9 @ 8 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIPlay.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIPlay.edit.java similarity index 77% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIPlay.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAIPlay.edit.java index 9f93108..b7ec52c 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAIPlay.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIPlay.edit.java @@ -5,7 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 38 : 39 @ 38 : 39 +> INSERT 10 : 11 @ 10 + ++ + +> CHANGE 21 : 22 @ 21 : 22 ~ for (EntityVillager entityvillager : (List) list) { diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.edit.java new file mode 100644 index 0000000..61e0fa2 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIRestrictOpenDoor.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 10 : 11 @ 10 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIRestrictSun.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIRestrictSun.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIRestrictSun.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.edit.java new file mode 100644 index 0000000..61e0fa2 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIRunAroundLikeCrazy.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 10 : 11 @ 10 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAISit.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAISit.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAISit.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAISwimming.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAISwimming.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAISwimming.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAITarget.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAITarget.edit.java new file mode 100644 index 0000000..968176e --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAITarget.edit.java @@ -0,0 +1,16 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 15 : 16 @ 15 + ++ + +> INSERT 3 : 4 @ 3 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAITargetNonTamed.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAITargetNonTamed.edit.java new file mode 100644 index 0000000..3215e29 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAITargetNonTamed.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 8 : 9 @ 8 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAITasks.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAITasks.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAITasks.edit.java rename to patches/minecraft/net/minecraft/entity/ai/EntityAITasks.edit.java index 0a48e73..3627264 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/EntityAITasks.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAITasks.edit.java @@ -10,4 +10,8 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; +> INSERT 2 : 3 @ 2 + ++ + > EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAITempt.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAITempt.edit.java new file mode 100644 index 0000000..61e0fa2 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAITempt.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 10 : 11 @ 10 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAITradePlayer.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAITradePlayer.edit.java new file mode 100644 index 0000000..3215e29 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAITradePlayer.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 8 : 9 @ 8 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIVillagerInteract.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIVillagerInteract.edit.java new file mode 100644 index 0000000..9e4f0d7 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIVillagerInteract.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 12 : 13 @ 12 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIVillagerMate.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIVillagerMate.edit.java new file mode 100644 index 0000000..61e0fa2 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIVillagerMate.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 10 : 11 @ 10 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIWander.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIWander.edit.java new file mode 100644 index 0000000..3215e29 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIWander.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 8 : 9 @ 8 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIWatchClosest.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIWatchClosest.edit.java new file mode 100644 index 0000000..3215e29 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIWatchClosest.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 8 : 9 @ 8 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityAIWatchClosest2.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityAIWatchClosest2.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityAIWatchClosest2.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityJumpHelper.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityJumpHelper.edit.java new file mode 100644 index 0000000..613846d --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityJumpHelper.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 5 : 6 @ 5 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityLookHelper.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityLookHelper.edit.java new file mode 100644 index 0000000..3215e29 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityLookHelper.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 8 : 9 @ 8 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntityMoveHelper.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntityMoveHelper.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntityMoveHelper.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/entity/ai/EntitySenses.edit.java b/patches/minecraft/net/minecraft/entity/ai/EntitySenses.edit.java new file mode 100644 index 0000000..3215e29 --- /dev/null +++ b/patches/minecraft/net/minecraft/entity/ai/EntitySenses.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 8 : 9 @ 8 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/RandomPositionGenerator.edit.java b/patches/minecraft/net/minecraft/entity/ai/RandomPositionGenerator.edit.java similarity index 82% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/RandomPositionGenerator.edit.java rename to patches/minecraft/net/minecraft/entity/ai/RandomPositionGenerator.edit.java index b6fca8e..9d9ff6b 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/ai/RandomPositionGenerator.edit.java +++ b/patches/minecraft/net/minecraft/entity/ai/RandomPositionGenerator.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 31 : 32 @ 31 : 32 +> INSERT 6 : 7 @ 6 + ++ + +> CHANGE 18 : 19 @ 18 : 19 ~ EaglercraftRandom random = entitycreatureIn.getRNG(); diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java index 833804e..fd1d62f 100644 --- a/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java +++ b/patches/minecraft/net/minecraft/entity/boss/EntityDragon.edit.java @@ -5,68 +5,8 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 5 - -> CHANGE 1 : 2 @ 1 : 4 - -~ - -> DELETE 2 @ 2 : 3 - -> DELETE 2 @ 2 : 4 - -> DELETE 1 @ 1 : 2 - -> DELETE 2 @ 2 : 5 - -> DELETE 2 @ 2 : 3 - -> DELETE 2 @ 2 : 4 - -> CHANGE 71 : 76 @ 71 : 78 - -~ float f = MathHelper.cos(this.animTime * 3.1415927F * 2.0F); -~ float f1 = MathHelper.cos(this.prevAnimTime * 3.1415927F * 2.0F); -~ if (f1 <= -0.3F && f >= -0.3F && !this.isSilent()) { -~ this.worldObj.playSound(this.posX, this.posY, this.posZ, "mob.enderdragon.wings", 5.0F, -~ 0.8F + this.rand.nextFloat() * 0.3F, false); - -> CHANGE 38 : 51 @ 38 : 132 - -~ if (this.newPosRotationIncrements > 0) { -~ double d10 = this.posX + (this.newPosX - this.posX) / (double) this.newPosRotationIncrements; -~ double d0 = this.posY + (this.newPosY - this.posY) / (double) this.newPosRotationIncrements; -~ double d1 = this.posZ + (this.newPosZ - this.posZ) / (double) this.newPosRotationIncrements; -~ double d2 = MathHelper.wrapAngleTo180_double(this.newRotationYaw - (double) this.rotationYaw); -~ this.rotationYaw = (float) ((double) this.rotationYaw -~ + d2 / (double) this.newPosRotationIncrements); -~ this.rotationPitch = (float) ((double) this.rotationPitch -~ + (this.newRotationPitch - (double) this.rotationPitch) -~ / (double) this.newPosRotationIncrements); -~ --this.newPosRotationIncrements; -~ this.setPosition(d10, d0, d1); -~ this.setRotation(this.rotationYaw, this.rotationPitch); - -> DELETE 29 @ 29 : 39 - -> DELETE 37 @ 37 : 42 - -> DELETE 7 @ 7 : 12 - -> CHANGE 13 : 14 @ 13 : 14 +> CHANGE 346 : 347 @ 346 : 347 ~ for (EntityEnderCrystal entityendercrystal1 : (List) list) { -> DELETE 12 @ 12 : 74 - -> DELETE 4 @ 4 : 45 - -> DELETE 45 @ 45 : 63 - -> DELETE 2 @ 2 : 5 - -> DELETE 1 @ 1 : 13 - -> DELETE 2 @ 2 : 45 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java b/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java index 2cdcb54..7572609 100644 --- a/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java +++ b/patches/minecraft/net/minecraft/entity/boss/EntityWither.edit.java @@ -5,29 +5,4 @@ # Version: 1.0 # Author: lax1dude -> INSERT 2 : 4 @ 2 - -+ import java.util.List; -+ - -> CHANGE 2 : 3 @ 2 : 3 - -~ - -> DELETE 3 @ 3 : 4 - -> DELETE 4 @ 4 : 12 - -> DELETE 8 @ 8 : 9 - -> DELETE 1 @ 1 : 2 - -> DELETE 28 @ 28 : 37 - -> DELETE 35 @ 35 : 42 - -> DELETE 1 @ 1 : 15 - -> DELETE 311 @ 311 : 318 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java b/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java index fb87d26..7572609 100644 --- a/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java +++ b/patches/minecraft/net/minecraft/entity/effect/EntityLightningBolt.edit.java @@ -5,16 +5,4 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 7 - -> DELETE 1 @ 1 : 4 - -> DELETE 13 @ 13 : 32 - -> DELETE 19 @ 19 : 26 - -> CHANGE 4 : 5 @ 4 : 16 - -~ this.worldObj.setLastLightningBolt(2); - > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java index fae05d8..57614da 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityArmorStand.edit.java @@ -5,28 +5,6 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 3 : 4 @ 3 : 4 - -~ - -> DELETE 3 @ 3 : 4 - -> DELETE 1 @ 1 : 6 - -> DELETE 4 @ 4 : 5 - -> DELETE 1 @ 1 : 2 - -> DELETE 3 @ 3 : 4 - -> DELETE 248 @ 248 : 311 - -> DELETE 5 @ 5 : 32 - -> CHANGE 1 : 2 @ 1 : 56 - -~ return false; - -> DELETE 12 @ 12 : 52 +> DELETE 7 @ 7 : 8 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java index 43dfe4a..7572609 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityBoat.edit.java @@ -5,28 +5,4 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> DELETE 6 @ 6 : 8 - -> DELETE 3 @ 3 : 5 - -> DELETE 62 @ 62 : 95 - -> CHANGE 109 : 110 @ 109 : 110 - -~ if (this.isBoatEmpty) { - -> CHANGE 93 : 94 @ 93 : 107 - -~ if (!(this.isCollidedHorizontally && d9 > 0.2975D)) { - -> DELETE 24 @ 24 : 41 - -> CHANGE 19 : 20 @ 19 : 29 - -~ return true; - -> DELETE 6 @ 6 : 19 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java index f9594c1..7572609 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderCrystal.edit.java @@ -5,8 +5,4 @@ # Version: 1.0 # Author: lax1dude -> DELETE 6 @ 6 : 7 - -> DELETE 55 @ 55 : 72 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java index 6fc0658..a8dd664 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderEye.edit.java @@ -5,12 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 3 @ 3 : 6 - -> DELETE 105 @ 105 : 115 - -> DELETE 1 @ 1 : 10 - -> DELETE 15 @ 15 : 29 +> DELETE 3 @ 3 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java index ed5359e..7572609 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityEnderPearl.edit.java @@ -5,12 +5,4 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> DELETE 1 @ 1 : 2 - -> DELETE 1 @ 1 : 2 - -> DELETE 38 @ 38 : 67 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java index 05ba6a6..a8dd664 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityExpBottle.edit.java @@ -7,10 +7,4 @@ > DELETE 3 @ 3 : 4 -> DELETE 1 @ 1 : 2 - -> DELETE 29 @ 29 : 32 - -> DELETE 1 @ 1 : 10 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java index a86aac5..475f025 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityFallingBlock.edit.java @@ -5,31 +5,8 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> CHANGE 143 : 144 @ 143 : 144 -> INSERT 1 : 5 @ 1 - -+ import java.util.List; -+ -+ import com.google.common.collect.Lists; -+ - -> DELETE 2 @ 2 : 4 - -> DELETE 5 @ 5 : 7 - -> DELETE 1 @ 1 : 2 - -> DELETE 2 @ 2 : 3 - -> DELETE 55 @ 55 : 58 - -> DELETE 8 @ 8 : 23 - -> DELETE 1 @ 1 : 34 - -> CHANGE 13 : 14 @ 13 : 14 - -~ for (Entity entity : (List) arraylist) { +~ ArrayList arraylist = Lists.newArrayList( > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java index e40d1c2..7572609 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityFireworkRocket.edit.java @@ -5,14 +5,4 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 99 : 100 @ 99 : 100 - -~ if (this.fireworkAge % 2 < 2) { - -> DELETE 5 @ 5 : 10 - -> CHANGE 3 : 4 @ 3 : 4 - -~ if (b0 == 17) { - > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java index 37fa536..cfbc2cc 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityItem.edit.java @@ -14,23 +14,9 @@ + import net.minecraft.client.Minecraft; -> DELETE 4 @ 4 : 5 +> DELETE 13 @ 13 : 15 -> DELETE 2 @ 2 : 3 - -> DELETE 5 @ 5 : 7 - -> DELETE 68 @ 68 : 72 - -> DELETE 21 @ 21 : 24 - -> DELETE 136 @ 136 : 145 - -> DELETE 1 @ 1 : 36 - -> DELETE 11 @ 11 : 19 - -> INSERT 66 : 75 @ 66 +> INSERT 362 : 371 @ 362 + + public boolean eaglerEmissiveFlag = false; diff --git a/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java index 0926ad7..f670b53 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityItemFrame.edit.java @@ -9,11 +9,7 @@ + import net.minecraft.client.Minecraft; -> DELETE 39 @ 39 : 44 - -> DELETE 126 @ 126 : 139 - -> INSERT 6 : 15 @ 6 +> INSERT 189 : 198 @ 189 + + public boolean eaglerEmissiveFlag = false; diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java index 5d91b19..af33d1f 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecart.edit.java @@ -13,38 +13,6 @@ + import com.google.common.collect.Maps; + -> DELETE 8 @ 8 : 15 - -> DELETE 4 @ 4 : 5 - -> DELETE 11 @ 11 : 12 - -> CHANGE 85 : 86 @ 85 : 112 - -~ return true; - -> CHANGE 42 : 53 @ 42 : 97 - -~ if (this.turnProgress > 0) { -~ double d4 = this.posX + (this.minecartX - this.posX) / (double) this.turnProgress; -~ double d5 = this.posY + (this.minecartY - this.posY) / (double) this.turnProgress; -~ double d6 = this.posZ + (this.minecartZ - this.posZ) / (double) this.turnProgress; -~ double d1 = MathHelper.wrapAngleTo180_double(this.minecartYaw - (double) this.rotationYaw); -~ this.rotationYaw = (float) ((double) this.rotationYaw + d1 / (double) this.turnProgress); -~ this.rotationPitch = (float) ((double) this.rotationPitch -~ + (this.minecartPitch - (double) this.rotationPitch) / (double) this.turnProgress); -~ --this.turnProgress; -~ this.setPosition(d4, d5, d6); -~ this.setRotation(this.rotationYaw, this.rotationPitch); - -> CHANGE 1 : 2 @ 1 : 41 - -~ this.setPosition(this.posX, this.posY, this.posZ); - -> DELETE 1 @ 1 : 18 - -> DELETE 351 @ 351 : 361 - -> DELETE 1 @ 1 : 68 +> DELETE 8 @ 8 : 13 > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java index 09056b1..ad2d1ab 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartContainer.edit.java @@ -7,6 +7,4 @@ > DELETE 2 @ 2 : 3 -> DELETE 142 @ 142 : 146 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java index d41a163..a8dd664 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartEmpty.edit.java @@ -7,6 +7,4 @@ > DELETE 3 @ 3 : 4 -> DELETE 19 @ 19 : 23 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java index 5b6bb9c..2586cd9 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartHopper.edit.java @@ -11,8 +11,4 @@ > DELETE 1 @ 1 : 4 -> DELETE 44 @ 44 : 48 - -> DELETE 35 @ 35 : 56 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java index 7a3b62c..970b21a 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityMinecartTNT.edit.java @@ -5,12 +5,24 @@ # Version: 1.0 # Author: lax1dude -> DELETE 5 @ 5 : 6 +> INSERT 2 : 3 @ 2 -> DELETE 75 @ 75 : 80 ++ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager; -> DELETE 1 @ 1 : 6 +> DELETE 3 @ 3 : 4 -> DELETE 29 @ 29 : 36 +> INSERT 159 : 170 @ 159 + ++ ++ protected void renderDynamicLightsEaglerAt(double entityX, double entityY, double entityZ, double renderX, ++ double renderY, double renderZ, float partialTicks, boolean isInFrustum) { ++ super.renderDynamicLightsEaglerAt(entityX, entityY, entityZ, renderX, renderY, renderZ, partialTicks, ++ isInFrustum); ++ if (minecartTNTFuse > -1 && minecartTNTFuse / 5 % 2 == 0) { ++ float dynamicLightMag = 10.0f; ++ DynamicLightManager.renderDynamicLight("entity_" + getEntityId() + "_tnt_flash", entityX, entityY + 0.5, ++ entityZ, dynamicLightMag, dynamicLightMag * 0.7792f, dynamicLightMag * 0.618f, false); ++ } ++ } > EOF diff --git a/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java index 527b933..ce06b6a 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityTNTPrimed.edit.java @@ -9,11 +9,7 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager; -> DELETE 59 @ 59 : 62 - -> DELETE 8 @ 8 : 13 - -> INSERT 15 : 26 @ 15 +> INSERT 90 : 101 @ 90 + + protected void renderDynamicLightsEaglerAt(double entityX, double entityY, double entityZ, double renderX, diff --git a/patches/minecraft/net/minecraft/entity/item/EntityXPOrb.edit.java b/patches/minecraft/net/minecraft/entity/item/EntityXPOrb.edit.java index f61777c..43a3622 100644 --- a/patches/minecraft/net/minecraft/entity/item/EntityXPOrb.edit.java +++ b/patches/minecraft/net/minecraft/entity/item/EntityXPOrb.edit.java @@ -9,9 +9,7 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager; -> DELETE 158 @ 158 : 172 - -> INSERT 33 : 44 @ 33 +> INSERT 205 : 216 @ 205 + + protected void renderDynamicLightsEaglerAt(double entityX, double entityY, double entityZ, double renderX, diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java index 4770d68..0a8daba 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityBlaze.edit.java @@ -9,35 +9,16 @@ + import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager; -> DELETE 2 @ 2 : 12 +> DELETE 9 @ 9 : 10 -> DELETE 2 @ 2 : 3 +> INSERT 222 : 229 @ 222 -> DELETE 2 @ 2 : 3 - -> DELETE 10 @ 10 : 17 - -> CHANGE 39 : 43 @ 39 : 44 - -~ if (this.rand.nextInt(24) == 0 && !this.isSilent()) { -~ this.worldObj.playSound(this.posX + 0.5D, this.posY + 0.5D, this.posZ + 0.5D, "fire.fire", -~ 1.0F + this.rand.nextFloat(), this.rand.nextFloat() * 0.7F + 0.3F, false); -~ } - -> CHANGE 1 : 6 @ 1 : 8 - -~ for (int i = 0; i < 2; ++i) { -~ this.worldObj.spawnParticle(EnumParticleTypes.SMOKE_LARGE, -~ this.posX + (this.rand.nextDouble() - 0.5D) * (double) this.width, -~ this.posY + this.rand.nextDouble() * (double) this.height, -~ this.posZ + (this.rand.nextDouble() - 0.5D) * (double) this.width, 0.0D, 0.0D, 0.0D, new int[0]); - -> CHANGE 67 : 72 @ 67 : 144 - -~ protected void renderDynamicLightsEaglerAt(double entityX, double entityY, double entityZ, double renderX, -~ double renderY, double renderZ, float partialTicks, boolean isInFrustum) { -~ float mag = 5.0f; -~ DynamicLightManager.renderDynamicLight("entity_" + getEntityId() + "_blaze", entityX, entityY + 0.75, entityZ, -~ mag, 0.487f * mag, 0.1411f * mag, false); ++ ++ protected void renderDynamicLightsEaglerAt(double entityX, double entityY, double entityZ, double renderX, ++ double renderY, double renderZ, float partialTicks, boolean isInFrustum) { ++ float mag = 5.0f; ++ DynamicLightManager.renderDynamicLight("entity_" + getEntityId() + "_blaze", entityX, entityY + 0.75, entityZ, ++ mag, 0.487f * mag, 0.1411f * mag, false); ++ } > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java index e4d2ad0..1953bed 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityCreeper.edit.java @@ -5,25 +5,14 @@ # Version: 1.0 # Author: lax1dude -> INSERT 2 : 5 @ 2 +> INSERT 2 : 4 @ 2 + import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; + import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager; -+ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -> DELETE 2 @ 2 : 11 +> DELETE 12 @ 12 : 14 -> DELETE 1 @ 1 : 4 - -> DELETE 17 @ 17 : 26 - -> DELETE 74 @ 74 : 75 - -> DELETE 66 @ 66 : 71 - -> DELETE 5 @ 5 : 16 - -> INSERT 15 : 28 @ 15 +> INSERT 204 : 217 @ 204 + + protected void renderDynamicLightsEaglerAt(double entityX, double entityY, double entityZ, double renderX, diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java index f345072..3ba7c10 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityEnderman.edit.java @@ -5,63 +5,31 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 7 +> CHANGE 6 : 7 @ 6 : 7 -> CHANGE 1 : 6 @ 1 : 2 +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; + +> CHANGE 1 : 2 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DynamicLightManager; -~ -~ import com.google.common.collect.Sets; -~ -> DELETE 1 @ 1 : 2 +> DELETE 16 @ 16 : 18 -> INSERT 1 : 2 @ 1 - -+ import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; - -> DELETE 3 @ 3 : 11 - -> DELETE 1 @ 1 : 4 - -> DELETE 1 @ 1 : 2 - -> DELETE 3 @ 3 : 4 - -> DELETE 6 @ 6 : 7 - -> CHANGE 4 : 6 @ 4 : 5 +> CHANGE 17 : 19 @ 17 : 18 ~ private static final EaglercraftUUID attackingSpeedBoostModifierUUID = EaglercraftUUID ~ .fromString("020E0DFB-87AE-4653-9556-831010E291A0"); -> DELETE 9 @ 9 : 24 - -> DELETE 38 @ 38 : 54 - -> CHANGE 5 : 12 @ 5 : 14 - -~ for (int i = 0; i < 2; ++i) { -~ this.worldObj.spawnParticle(EnumParticleTypes.PORTAL, -~ this.posX + (this.rand.nextDouble() - 0.5D) * (double) this.width, -~ this.posY + this.rand.nextDouble() * (double) this.height - 0.25D, -~ this.posZ + (this.rand.nextDouble() - 0.5D) * (double) this.width, -~ (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), -~ (this.rand.nextDouble() - 0.5D) * 2.0D, new int[0]); - -> DELETE 1 @ 1 : 2 - -> DELETE 143 @ 143 : 146 - -> CHANGE 2 : 3 @ 2 : 8 - -~ this.isAggressive = true; - -> CHANGE 32 : 33 @ 32 : 33 +> CHANGE 280 : 281 @ 280 : 281 ~ public static void bootstrap() { -> DELETE 16 @ 16 : 167 +> CHANGE 115 : 116 @ 115 : 116 + +~ EaglercraftRandom random = this.enderman.getRNG(); + +> CHANGE 36 : 37 @ 36 : 37 + +~ EaglercraftRandom random = this.enderman.getRNG(); > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java index 5ff2c3c..128526c 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityEndermite.edit.java @@ -5,20 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 5 @ 5 : 13 - -> DELETE 15 @ 15 : 22 - -> CHANGE 64 : 71 @ 64 : 81 - -~ for (int i = 0; i < 2; ++i) { -~ this.worldObj.spawnParticle(EnumParticleTypes.PORTAL, -~ this.posX + (this.rand.nextDouble() - 0.5D) * (double) this.width, -~ this.posY + this.rand.nextDouble() * (double) this.height, -~ this.posZ + (this.rand.nextDouble() - 0.5D) * (double) this.width, -~ (this.rand.nextDouble() - 0.5D) * 2.0D, -this.rand.nextDouble(), -~ (this.rand.nextDouble() - 0.5D) * 2.0D, new int[0]); - -> DELETE 1 @ 1 : 2 +> DELETE 12 @ 12 : 13 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java index 7beb8d2..8e04921 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityGhast.edit.java @@ -5,22 +5,14 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 -> DELETE 1 @ 1 : 2 +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> DELETE 1 @ 1 : 5 +> DELETE 6 @ 6 : 7 -> DELETE 1 @ 1 : 2 +> CHANGE 247 : 248 @ 247 : 248 -> DELETE 4 @ 4 : 6 - -> DELETE 1 @ 1 : 3 - -> DELETE 11 @ 11 : 16 - -> DELETE 14 @ 14 : 22 - -> DELETE 85 @ 85 : 252 +~ EaglercraftRandom random = this.parentEntity.getRNG(); > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java index fd5ac42..ffbb9b2 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityGuardian.edit.java @@ -5,122 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> DELETE 4 @ 4 : 16 - -> DELETE 6 @ 6 : 11 - -> DELETE 3 @ 3 : 4 - -> DELETE 3 @ 3 : 4 - -> DELETE 11 @ 11 : 12 - -> DELETE 5 @ 5 : 17 - -> DELETE 21 @ 21 : 25 - -> DELETE 24 @ 24 : 28 - -> DELETE 16 @ 16 : 17 - -> DELETE 9 @ 9 : 13 - -> CHANGE 7 : 8 @ 7 : 8 - -~ } else { - -> DELETE 11 @ 11 : 13 - -> CHANGE 50 : 55 @ 50 : 68 - -~ this.field_175484_c = this.field_175482_b; -~ if (!this.isInWater()) { -~ this.field_175483_bk = 2.0F; -~ if (this.motionY > 0.0D && this.field_175480_bp && !this.isSilent()) { -~ this.worldObj.playSound(this.posX, this.posY, this.posZ, "mob.guardian.flop", 1.0F, 1.0F, false); - -> CHANGE 2 : 7 @ 2 : 8 - -~ this.field_175480_bp = this.motionY < 0.0D -~ && this.worldObj.isBlockNormalCube((new BlockPos(this)).down(), false); -~ } else if (this.func_175472_n()) { -~ if (this.field_175483_bk < 0.5F) { -~ this.field_175483_bk = 4.0F; - -> CHANGE 1 : 2 @ 1 : 2 - -~ this.field_175483_bk += (0.5F - this.field_175483_bk) * 0.1F; - -> INSERT 1 : 4 @ 1 - -+ } else { -+ this.field_175483_bk += (0.125F - this.field_175483_bk) * 0.2F; -+ } - -> CHANGE 1 : 10 @ 1 : 3 - -~ this.field_175482_b += this.field_175483_bk; -~ this.field_175486_bm = this.field_175485_bl; -~ if (!this.isInWater()) { -~ this.field_175485_bl = this.rand.nextFloat(); -~ } else if (this.func_175472_n()) { -~ this.field_175485_bl += (0.0F - this.field_175485_bl) * 0.25F; -~ } else { -~ this.field_175485_bl += (1.0F - this.field_175485_bl) * 0.06F; -~ } - -> CHANGE 1 : 10 @ 1 : 8 - -~ if (this.func_175472_n() && this.isInWater()) { -~ Vec3 vec3 = this.getLook(0.0F); -~ -~ for (int i = 0; i < 2; ++i) { -~ this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, -~ this.posX + (this.rand.nextDouble() - 0.5D) * (double) this.width - vec3.xCoord * 1.5D, -~ this.posY + this.rand.nextDouble() * (double) this.height - vec3.yCoord * 1.5D, -~ this.posZ + (this.rand.nextDouble() - 0.5D) * (double) this.width - vec3.zCoord * 1.5D, 0.0D, -~ 0.0D, 0.0D, new int[0]); - -> INSERT 1 : 2 @ 1 - -+ } - -> CHANGE 1 : 5 @ 1 : 5 - -~ if (this.hasTargetedEntity()) { -~ if (this.field_175479_bo < this.func_175464_ck()) { -~ ++this.field_175479_bo; -~ } - -> CHANGE 1 : 13 @ 1 : 15 - -~ EntityLivingBase entitylivingbase = this.getTargetedEntity(); -~ if (entitylivingbase != null) { -~ double d5 = (double) this.func_175477_p(0.0F); -~ double d0 = entitylivingbase.posX - this.posX; -~ double d1 = entitylivingbase.posY + (double) (entitylivingbase.height * 0.5F) -~ - (this.posY + (double) this.getEyeHeight()); -~ double d2 = entitylivingbase.posZ - this.posZ; -~ double d3 = Math.sqrt(d0 * d0 + d1 * d1 + d2 * d2); -~ d0 = d0 / d3; -~ d1 = d1 / d3; -~ d2 = d2 / d3; -~ double d4 = this.rand.nextDouble(); - -> CHANGE 1 : 6 @ 1 : 7 - -~ while (d4 < d3) { -~ d4 += 1.8D - d5 + this.rand.nextDouble() * (1.7D - d5); -~ this.worldObj.spawnParticle(EnumParticleTypes.WATER_BUBBLE, this.posX + d0 * d4, -~ this.posY + d1 * d4 + (double) this.getEyeHeight(), this.posZ + d2 * d4, 0.0D, 0.0D, 0.0D, -~ new int[0]); - -> DELETE 34 @ 34 : 67 - -> DELETE 48 @ 48 : 49 - -> DELETE 27 @ 27 : 163 +> DELETE 15 @ 15 : 16 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java index d8c66e3..293623c 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityIronGolem.edit.java @@ -5,24 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> DELETE 5 @ 5 : 7 - -> DELETE 2 @ 2 : 16 - -> DELETE 5 @ 5 : 6 - -> DELETE 4 @ 4 : 5 - -> DELETE 4 @ 4 : 5 - -> DELETE 6 @ 6 : 19 - -> DELETE 7 @ 7 : 22 - -> DELETE 87 @ 87 : 91 - -> DELETE 54 @ 54 : 101 +> DELETE 23 @ 23 : 26 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java index a5280a5..57614da 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityMob.edit.java @@ -7,6 +7,4 @@ > DELETE 7 @ 7 : 8 -> DELETE 23 @ 23 : 31 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java index 1801b4e..86c6b21 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityPigZombie.edit.java @@ -5,16 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ -> DELETE 1 @ 1 : 2 - -> DELETE 3 @ 3 : 5 - -> DELETE 2 @ 2 : 3 +> DELETE 9 @ 9 : 10 > CHANGE 10 : 11 @ 10 : 11 @@ -24,12 +19,8 @@ ~ private EaglercraftUUID angerTargetUUID; -> DELETE 14 @ 14 : 19 - -> CHANGE 64 : 65 @ 64 : 65 +> CHANGE 83 : 84 @ 83 : 84 ~ this.angerTargetUUID = EaglercraftUUID.fromString(s); -> DELETE 82 @ 82 : 105 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java index b5550ab..4577c80 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntitySilverfish.edit.java @@ -5,20 +5,18 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 -> DELETE 1 @ 1 : 3 +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> DELETE 2 @ 2 : 9 +> DELETE 11 @ 11 : 12 -> DELETE 4 @ 4 : 7 +> CHANGE 118 : 119 @ 118 : 119 -> DELETE 3 @ 3 : 4 +~ EaglercraftRandom random = this.field_179485_a.getRNG(); -> DELETE 4 @ 4 : 10 +> CHANGE 62 : 63 @ 62 : 63 -> DELETE 33 @ 33 : 45 - -> DELETE 35 @ 35 : 144 +~ EaglercraftRandom random = this.silverfish.getRNG(); > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java index a06ce2a..afcfc7e 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntitySkeleton.edit.java @@ -5,28 +5,6 @@ # Version: 1.0 # Author: lax1dude -> INSERT 3 : 4 @ 3 - -+ - -> DELETE 10 @ 10 : 25 - -> DELETE 14 @ 14 : 15 - -> DELETE 2 @ 2 : 5 - -> DELETE 3 @ 3 : 17 - -> DELETE 45 @ 45 : 59 - -> CHANGE 1 : 2 @ 1 : 11 - -~ if (this.getSkeletonType() == 1) { - -> DELETE 76 @ 76 : 86 - -> DELETE 15 @ 15 : 24 - -> DELETE 56 @ 56 : 64 +> DELETE 24 @ 24 : 27 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java index 74b6839..8433a56 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntitySlime.edit.java @@ -5,16 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 7 @ 7 : 13 - -> DELETE 4 @ 4 : 5 - -> DELETE 19 @ 19 : 26 - -> DELETE 48 @ 48 : 53 - -> DELETE 59 @ 59 : 86 - -> DELETE 109 @ 109 : 267 +> DELETE 11 @ 11 : 13 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java index bf2ebd7..b92cc67 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntitySnowman.edit.java @@ -5,16 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 4 - -> DELETE 3 @ 3 : 11 - -> DELETE 1 @ 1 : 2 - -> DELETE 2 @ 2 : 5 - -> DELETE 7 @ 7 : 14 - -> DELETE 8 @ 8 : 39 +> DELETE 12 @ 12 : 14 > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java index 2c59c12..4bbf235 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntitySpider.edit.java @@ -5,26 +5,13 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ -> DELETE 1 @ 1 : 3 +> DELETE 14 @ 14 : 17 -> DELETE 3 @ 3 : 15 - -> DELETE 2 @ 2 : 4 - -> DELETE 11 @ 11 : 21 - -> DELETE 6 @ 6 : 10 - -> DELETE 5 @ 5 : 13 - -> DELETE 97 @ 97 : 128 - -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 180 : 181 @ 180 : 181 ~ public void func_111104_a(EaglercraftRandom rand) { diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java index 58db8dc..ccfa58f 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityWitch.edit.java @@ -5,26 +5,19 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ -> DELETE 3 @ 3 : 10 +> DELETE 13 @ 13 : 14 -> DELETE 1 @ 1 : 4 - -> DELETE 3 @ 3 : 4 - -> DELETE 1 @ 1 : 2 - -> CHANGE 6 : 8 @ 6 : 7 +> CHANGE 13 : 15 @ 13 : 14 ~ private static final EaglercraftUUID MODIFIER_UUID = EaglercraftUUID ~ .fromString("5CD17E52-A79A-43D3-A529-90FDE04B181E"); -> DELETE 9 @ 9 : 16 +> CHANGE 57 : 58 @ 57 : 58 -> DELETE 33 @ 33 : 90 +~ List list = Items.potionitem.getEffects(itemstack); > EOF diff --git a/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java b/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java index da74629..685bb33 100644 --- a/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java +++ b/patches/minecraft/net/minecraft/entity/monster/EntityZombie.edit.java @@ -5,44 +5,15 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 4 : 6 @ 4 : 5 +> CHANGE 4 : 5 @ 4 : 5 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ -> DELETE 7 @ 7 : 17 +> DELETE 21 @ 21 : 25 -> DELETE 2 @ 2 : 3 - -> DELETE 1 @ 1 : 5 - -> DELETE 8 @ 8 : 9 - -> CHANGE 13 : 15 @ 13 : 14 +> CHANGE 22 : 24 @ 22 : 23 ~ private static final EaglercraftUUID babySpeedBoostUUID = EaglercraftUUID ~ .fromString("B9766B59-9566-4402-BC1F-2EE2A276D836"); -> DELETE 2 @ 2 : 3 - -> DELETE 7 @ 7 : 15 - -> DELETE 3 @ 3 : 13 - -> DELETE 29 @ 29 : 41 - -> DELETE 14 @ 14 : 22 - -> DELETE 11 @ 11 : 43 - -> DELETE 53 @ 53 : 65 - -> DELETE 90 @ 90 : 92 - -> DELETE 86 @ 86 : 87 - -> DELETE 24 @ 24 : 25 - -> DELETE 17 @ 17 : 21 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java index f34bb06..97688dc 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityBat.edit.java @@ -5,14 +5,6 @@ # Version: 1.0 # Author: lax1dude -> INSERT 3 : 4 @ 3 - -+ - -> DELETE 3 @ 3 : 4 - -> DELETE 3 @ 3 : 4 - -> DELETE 141 @ 141 : 153 +> DELETE 6 @ 6 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java index f855ed4..5464f90 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityChicken.edit.java @@ -5,10 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 6 @ 6 : 15 - -> DELETE 22 @ 22 : 30 - -> DELETE 28 @ 28 : 34 +> DELETE 14 @ 14 : 15 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java index f47d151..66c6944 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityCow.edit.java @@ -5,10 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 5 @ 5 : 14 - -> DELETE 4 @ 4 : 5 - -> DELETE 7 @ 7 : 16 +> DELETE 13 @ 13 : 14 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java index 55401cf..73edf4d 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityHorse.edit.java @@ -5,52 +5,34 @@ # Version: 1.0 # Author: lax1dude -> INSERT 3 : 4 @ 3 +> INSERT 3 : 5 @ 3 + ++ import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController; -> DELETE 7 @ 7 : 15 +> DELETE 18 @ 18 : 19 -> DELETE 3 @ 3 : 4 +> DELETE 12 @ 12 : 13 -> DELETE 10 @ 10 : 11 +> CHANGE 1015 : 1020 @ 1015 : 1016 -> DELETE 1 @ 1 : 2 +~ if (worldObj.isRemote && !SingleplayerServerController.isClientInEaglerSingleplayerOrLAN()) { +~ nbttagcompound.setString("OwnerUUID", this.getOwnerId()); +~ } else { +~ nbttagcompound.setString("Owner", this.getOwnerId()); +~ } -> DELETE 59 @ 59 : 68 +> CHANGE 37 : 41 @ 37 : 39 -> CHANGE 212 : 213 @ 212 : 216 +~ if (worldObj.isRemote && !SingleplayerServerController.isClientInEaglerSingleplayerOrLAN()) { +~ if (nbttagcompound.hasKey("OwnerUUID", 8)) { +~ s = nbttagcompound.getString("OwnerUUID"); +~ } -~ +> CHANGE 1 : 4 @ 1 : 3 -> DELETE 61 @ 61 : 67 - -> DELETE 215 @ 215 : 220 - -> DELETE 146 @ 146 : 149 - -> DELETE 34 @ 34 : 42 - -> DELETE 6 @ 6 : 32 - -> CHANGE 4 : 5 @ 4 : 5 - -~ if (this.dataWatcher.hasObjectChanged()) { - -> DELETE 9 @ 9 : 14 - -> DELETE 56 @ 56 : 60 - -> DELETE 25 @ 25 : 29 - -> DELETE 18 @ 18 : 25 - -> DELETE 1 @ 1 : 2 - -> DELETE 48 @ 48 : 53 - -> CHANGE 70 : 71 @ 70 : 78 - -~ String s = nbttagcompound.getString("OwnerUUID"); +~ if (nbttagcompound.hasKey("Owner", 8)) { +~ s = nbttagcompound.getString("Owner"); +~ } > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java index c32012a..0d7c65a 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityMooshroom.edit.java @@ -5,10 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 3 @ 3 : 5 - -> DELETE 34 @ 34 : 42 - -> DELETE 1 @ 1 : 12 +> DELETE 4 @ 4 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java index c7b74f6..c0a52cd 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityOcelot.edit.java @@ -5,22 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> DELETE 6 @ 6 : 21 - -> DELETE 5 @ 5 : 6 - -> DELETE 7 @ 7 : 9 - -> DELETE 4 @ 4 : 16 - -> DELETE 7 @ 7 : 27 - -> DELETE 53 @ 53 : 54 - -> DELETE 7 @ 7 : 43 - -> DELETE 67 @ 67 : 79 +> DELETE 20 @ 20 : 23 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java index 085af7a..32b22a3 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityPig.edit.java @@ -5,22 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 5 @ 5 : 14 - -> DELETE 1 @ 1 : 3 - -> DELETE 5 @ 5 : 6 - -> DELETE 5 @ 5 : 6 - -> DELETE 4 @ 4 : 15 - -> DELETE 44 @ 44 : 56 - -> DELETE 35 @ 35 : 44 - -> DELETE 1 @ 1 : 4 - -> DELETE 17 @ 17 : 21 +> DELETE 16 @ 16 : 17 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java index 40ba30e..a1aeef4 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityRabbit.edit.java @@ -5,38 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 3 @ 3 : 5 - -> DELETE 2 @ 2 : 3 - -> DELETE 2 @ 2 : 17 - -> DELETE 6 @ 6 : 9 - -> DELETE 2 @ 2 : 5 - -> DELETE 4 @ 4 : 5 - -> DELETE 12 @ 12 : 28 - -> DELETE 2 @ 2 : 7 - -> DELETE 9 @ 9 : 14 - -> DELETE 7 @ 7 : 8 - -> DELETE 22 @ 22 : 77 - -> DELETE 3 @ 3 : 25 - -> DELETE 3 @ 3 : 7 - -> DELETE 106 @ 106 : 117 - -> DELETE 23 @ 23 : 27 - -> DELETE 24 @ 24 : 137 - -> DELETE 33 @ 33 : 80 +> DELETE 23 @ 23 : 25 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java index fed2433..888b696 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntitySheep.edit.java @@ -5,32 +5,13 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> CHANGE 1 : 5 @ 1 : 2 +> CHANGE 4 : 5 @ 4 : 5 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ -~ import com.google.common.collect.Maps; -~ -> DELETE 4 @ 4 : 15 +> DELETE 14 @ 14 : 15 -> DELETE 10 @ 10 : 11 - -> DELETE 13 @ 13 : 14 - -> DELETE 8 @ 8 : 18 - -> DELETE 4 @ 4 : 9 - -> CHANGE 1 : 2 @ 1 : 5 - -~ this.sheepTimer = Math.max(0, this.sheepTimer - 1); - -> DELETE 64 @ 64 : 78 - -> CHANGE 58 : 59 @ 58 : 59 +> CHANGE 193 : 194 @ 193 : 194 ~ public static EnumDyeColor getRandomSheepColor(EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java index 1b7e365..be6673d 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntitySquid.edit.java @@ -5,18 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 4 @ 4 : 6 - -> DELETE 28 @ 28 : 29 - -> CHANGE 57 : 58 @ 57 : 67 - -~ this.squidRotation = 6.2831855F; - -> DELETE 18 @ 18 : 24 - -> DELETE 9 @ 9 : 16 - -> DELETE 32 @ 32 : 57 +> DELETE 5 @ 5 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java index 9a29ad3..e741155 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityTameable.edit.java @@ -8,26 +8,48 @@ > CHANGE 2 : 4 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ +~ import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController; -> DELETE 2 @ 2 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 2 @ 2 : 4 +> DELETE 3 @ 3 : 4 -> DELETE 4 @ 4 : 5 +> INSERT 5 : 6 @ 5 -> CHANGE 25 : 26 @ 25 : 33 ++ -~ String s = nbttagcompound.getString("OwnerUUID"); +> CHANGE 15 : 21 @ 15 : 17 -> DELETE 4 @ 4 : 6 +~ if (worldObj.isRemote && !SingleplayerServerController.isClientInEaglerSingleplayerOrLAN()) { +~ if (this.getOwnerId() == null) { +~ nbttagcompound.setString("OwnerUUID", ""); +~ } else { +~ nbttagcompound.setString("OwnerUUID", this.getOwnerId()); +~ } -> CHANGE 75 : 76 @ 75 : 76 +> CHANGE 1 : 6 @ 1 : 2 + +~ if (this.getOwnerId() == null) { +~ nbttagcompound.setString("Owner", ""); +~ } else { +~ nbttagcompound.setString("Owner", this.getOwnerId()); +~ } + +> CHANGE 8 : 12 @ 8 : 10 + +~ if (worldObj.isRemote && !SingleplayerServerController.isClientInEaglerSingleplayerOrLAN()) { +~ if (nbttagcompound.hasKey("OwnerUUID", 8)) { +~ s = nbttagcompound.getString("OwnerUUID"); +~ } + +> CHANGE 1 : 4 @ 1 : 3 + +~ if (nbttagcompound.hasKey("Owner", 8)) { +~ s = nbttagcompound.getString("Owner"); +~ } + +> CHANGE 83 : 84 @ 83 : 84 ~ EaglercraftUUID uuid = EaglercraftUUID.fromString(this.getOwnerId()); -> DELETE 10 @ 10 : 14 - -> DELETE 29 @ 29 : 38 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java index a8f17b8..38b6206 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityVillager.edit.java @@ -5,28 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ -> DELETE 3 @ 3 : 4 - -> DELETE 1 @ 1 : 3 - -> DELETE 4 @ 4 : 20 - -> DELETE 3 @ 3 : 6 - -> DELETE 9 @ 9 : 12 - -> DELETE 4 @ 4 : 5 - -> DELETE 6 @ 6 : 7 - -> DELETE 7 @ 7 : 8 - -> CHANGE 12 : 13 @ 12 : 164 +> CHANGE 77 : 78 @ 77 : 229 ~ private static EntityVillager.ITradeList[][][][] DEFAULT_TRADE_LIST_MAP = null; @@ -198,27 +181,15 @@ + } + -> DELETE 9 @ 9 : 25 +> CHANGE 125 : 130 @ 125 : 126 -> DELETE 3 @ 3 : 23 +~ try { +~ nbttagcompound.setTag("Offers", this.buyingList.getRecipiesAsTags()); +~ } catch (Throwable t) { +~ this.buyingList = null; // workaround +~ } -> DELETE 5 @ 5 : 48 - -> DELETE 4 @ 4 : 9 - -> DELETE 57 @ 57 : 58 - -> DELETE 42 @ 42 : 81 - -> DELETE 73 @ 73 : 81 - -> DELETE 140 @ 140 : 141 - -> DELETE 19 @ 19 : 29 - -> DELETE 1 @ 1 : 4 - -> CHANGE 94 : 95 @ 94 : 95 +> CHANGE 467 : 468 @ 467 : 468 ~ public void modifyMerchantRecipeList(MerchantRecipeList recipeList, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java b/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java index e42c2b5..f507e8b 100644 --- a/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java +++ b/patches/minecraft/net/minecraft/entity/passive/EntityWolf.edit.java @@ -5,22 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> DELETE 5 @ 5 : 19 - -> DELETE 2 @ 2 : 8 - -> DELETE 8 @ 8 : 9 - -> DELETE 17 @ 17 : 38 - -> DELETE 80 @ 80 : 95 - -> DELETE 84 @ 84 : 85 - -> DELETE 61 @ 61 : 68 - -> DELETE 9 @ 9 : 25 +> DELETE 25 @ 25 : 30 > EOF diff --git a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java index 09cfcba..0b50ac5 100644 --- a/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayer.edit.java @@ -5,90 +5,44 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 5 +> CHANGE 4 : 6 @ 4 : 5 -> CHANGE 2 : 8 @ 2 : 3 +~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; +~ + +> CHANGE 2 : 3 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ -~ import com.google.common.base.Charsets; -~ import com.google.common.collect.Lists; -~ -~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; > INSERT 5 : 6 @ 5 + import net.minecraft.command.ICommandSender; -> DELETE 15 @ 15 : 16 +> DELETE 19 @ 19 : 23 -> DELETE 3 @ 3 : 7 - -> DELETE 16 @ 16 : 17 - -> DELETE 7 @ 7 : 8 - -> CHANGE 20 : 21 @ 20 : 21 +> CHANGE 45 : 46 @ 45 : 46 ~ public abstract class EntityPlayer extends EntityLivingBase implements ICommandSender { -> CHANGE 42 : 43 @ 42 : 43 +> CHANGE 458 : 459 @ 458 : 459 -~ this.inventoryContainer = new ContainerPlayer(this.inventory, false, this); +~ Collection collection = this.getWorldScoreboard() -> DELETE 49 @ 49 : 53 +> INSERT 348 : 359 @ 348 -> CHANGE 19 : 20 @ 19 : 22 ++ } else if (!this.worldObj.isRemote && MinecraftServer.getServer().worldServers[0].getWorldInfo() ++ .getGameRulesInstance().getBoolean("clickToRide") && itemstack == null ++ && parEntity instanceof EntityPlayer) { ++ EntityPlayer otherPlayer = (EntityPlayer) parEntity; ++ while (otherPlayer.riddenByEntity instanceof EntityPlayer) { ++ otherPlayer = (EntityPlayer) otherPlayer.riddenByEntity; ++ } ++ if (otherPlayer.riddenByEntity == null && otherPlayer != this) { ++ mountEntity(otherPlayer); ++ return true; ++ } -~ --this.itemInUseCount; - -> DELETE 14 @ 14 : 22 - -> DELETE 8 @ 8 : 12 - -> DELETE 43 @ 43 : 51 - -> CHANGE 100 : 113 @ 100 : 119 - -~ double d0 = this.posX; -~ double d1 = this.posY; -~ double d2 = this.posZ; -~ float f = this.rotationYaw; -~ float f1 = this.rotationPitch; -~ super.updateRidden(); -~ this.prevCameraYaw = this.cameraYaw; -~ this.cameraYaw = 0.0F; -~ this.addMountedMovementStat(this.posX - d0, this.posY - d1, this.posZ - d2); -~ if (this.ridingEntity instanceof EntityPig) { -~ this.rotationPitch = f1; -~ this.rotationYaw = f; -~ this.renderYawOffset = ((EntityPig) this.ridingEntity).renderYawOffset; - -> DELETE 36 @ 36 : 39 - -> CHANGE 108 : 109 @ 108 : 109 - -~ for (ScoreObjective scoreobjective : (Collection) collection) { - -> DELETE 211 @ 211 : 215 - -> DELETE 201 @ 201 : 210 - -> DELETE 82 @ 82 : 86 - -> DELETE 1 @ 1 : 26 - -> DELETE 36 @ 36 : 39 - -> DELETE 39 @ 39 : 42 - -> DELETE 292 @ 292 : 296 - -> DELETE 1 @ 1 : 2 - -> DELETE 18 @ 18 : 22 - -> CHANGE 156 : 158 @ 156 : 158 +> CHANGE 757 : 759 @ 757 : 759 ~ public static EaglercraftUUID getUUID(GameProfile profile) { ~ EaglercraftUUID uuid = profile.getId(); @@ -98,8 +52,4 @@ ~ public static EaglercraftUUID getOfflineUUID(String username) { ~ return EaglercraftUUID.nameUUIDFromBytes(("OfflinePlayer:" + username).getBytes(Charsets.UTF_8)); -> CHANGE 18 : 19 @ 18 : 19 - -~ return true; - > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/EntityPlayerMP.edit.java b/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.edit.java similarity index 82% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/EntityPlayerMP.edit.java rename to patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.edit.java index eeb88c5..1d368b7 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/player/EntityPlayerMP.edit.java +++ b/patches/minecraft/net/minecraft/entity/player/EntityPlayerMP.edit.java @@ -10,23 +10,18 @@ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; ~ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled; -> CHANGE 10 : 12 @ 10 : 12 - -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; - -> CHANGE 20 : 21 @ 20 : 21 - -~ import net.minecraft.nbt.NBTTagCompound; - -> DELETE 36 @ 36 : 37 +> DELETE 69 @ 69 : 70 > CHANGE 22 : 24 @ 22 : 24 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> INSERT 33 : 34 @ 33 +> INSERT 2 : 3 @ 2 + ++ + +> INSERT 24 : 25 @ 24 + public byte[] updateCertificate = null; diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java index ef1f0a4..057f232 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityArrow.edit.java @@ -5,18 +5,19 @@ # Version: 1.0 # Author: lax1dude -> INSERT 3 : 4 @ 3 +> INSERT 156 : 158 @ 156 ++ public boolean isChair = false; + -> DELETE 9 @ 9 : 12 +> INSERT 2 : 9 @ 2 -> DELETE 1 @ 1 : 2 - -> DELETE 250 @ 250 : 254 - -> DELETE 17 @ 17 : 24 - -> DELETE 141 @ 141 : 160 ++ if (isChair) { ++ if (!(riddenByEntity instanceof EntityPlayer)) { ++ isChair = false; ++ setDead(); ++ } ++ return; ++ } > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java index f45744e..0d7c65a 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityEgg.edit.java @@ -5,10 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 3 @ 3 : 5 - -> DELETE 26 @ 26 : 40 - -> DELETE 8 @ 8 : 12 +> DELETE 4 @ 4 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java index c69144c..6d88f89 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityFireball.edit.java @@ -9,8 +9,4 @@ + -> CHANGE 74 : 75 @ 74 : 76 - -~ if (this.worldObj.isBlockLoaded(new BlockPos(this))) { - > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java index 0dd1d87..7572609 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityFishHook.edit.java @@ -5,32 +5,4 @@ # Version: 1.0 # Author: lax1dude -> INSERT 4 : 5 @ 4 - -+ - -> DELETE 2 @ 2 : 3 - -> DELETE 1 @ 1 : 3 - -> DELETE 7 @ 7 : 8 - -> DELETE 3 @ 3 : 4 - -> DELETE 4 @ 4 : 5 - -> DELETE 2 @ 2 : 3 - -> DELETE 165 @ 165 : 174 - -> DELETE 1 @ 1 : 14 - -> DELETE 118 @ 118 : 219 - -> CHANGE 40 : 41 @ 40 : 79 - -~ return 0; - -> DELETE 2 @ 2 : 27 - > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java index 8fc57d2..0d7c65a 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityLargeFireball.edit.java @@ -5,12 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> DELETE 1 @ 1 : 2 - -> DELETE 1 @ 1 : 2 - -> DELETE 20 @ 20 : 33 +> DELETE 4 @ 4 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java index 3b13896..2a9912e 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityPotion.edit.java @@ -5,14 +5,14 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> DELETE 4 @ 4 : 5 -> DELETE 1 @ 1 : 2 +> CHANGE 70 : 71 @ 70 : 71 -> DELETE 3 @ 3 : 7 +~ for (EntityLivingBase entitylivingbase : (List) list1) { -> DELETE 57 @ 57 : 70 +> CHANGE 7 : 8 @ 7 : 8 -> DELETE 1 @ 1 : 23 +~ for (PotionEffect potioneffect : (List) list) { > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java index 2243ebb..0d7c65a 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntitySmallFireball.edit.java @@ -5,12 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> DELETE 1 @ 1 : 4 - -> DELETE 22 @ 22 : 37 - -> DELETE 1 @ 1 : 12 +> DELETE 4 @ 4 : 5 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java index a10feac..440554e 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntitySnowball.edit.java @@ -7,6 +7,6 @@ > DELETE 4 @ 4 : 5 -> DELETE 34 @ 34 : 38 +> DELETE 37 @ 37 : 38 > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java index 6b79229..7b85b73 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityThrowable.edit.java @@ -5,14 +5,13 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 4 +> CHANGE 3 : 4 @ 3 : 4 -> DELETE 7 @ 7 : 8 +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -> DELETE 7 @ 7 : 8 +> CHANGE 290 : 292 @ 290 : 291 -> DELETE 142 @ 142 : 171 - -> DELETE 101 @ 101 : 111 +~ Entity entity = ((WorldServer) this.worldObj) +~ .getEntityFromUuid(EaglercraftUUID.fromString(this.throwerName)); > EOF diff --git a/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java b/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java index 8a7f127..97688dc 100644 --- a/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java +++ b/patches/minecraft/net/minecraft/entity/projectile/EntityWitherSkull.edit.java @@ -5,12 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 6 @ 6 : 9 - -> DELETE 3 @ 3 : 4 - -> DELETE 38 @ 38 : 52 - -> DELETE 1 @ 1 : 21 +> DELETE 6 @ 6 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/init/Bootstrap.edit.java b/patches/minecraft/net/minecraft/init/Bootstrap.edit.java index d44007e..05803e7 100644 --- a/patches/minecraft/net/minecraft/init/Bootstrap.edit.java +++ b/patches/minecraft/net/minecraft/init/Bootstrap.edit.java @@ -5,23 +5,21 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 -> CHANGE 1 : 5 @ 1 : 3 +~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; + +> CHANGE 1 : 3 @ 1 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; > INSERT 22 : 24 @ 22 + import net.minecraft.entity.monster.EntityEnderman; + import net.minecraft.entity.passive.EntityVillager; -> DELETE 5 @ 5 : 7 - -> INSERT 2 : 3 @ 2 +> INSERT 9 : 10 @ 9 + import net.minecraft.item.ItemAxe; @@ -33,36 +31,42 @@ + import net.minecraft.item.ItemSpade; -> DELETE 1 @ 1 : 3 +> INSERT 3 : 4 @ 3 -> DELETE 1 @ 1 : 2 ++ import net.minecraft.util.LoggingPrintStream; -> DELETE 1 @ 1 : 2 +> DELETE 6 @ 6 : 7 -> DELETE 3 @ 3 : 4 - -> CHANGE 1 : 2 @ 1 : 3 +> CHANGE 2 : 5 @ 2 : 4 ~ import net.minecraft.world.biome.BiomeGenBase; +~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; +~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; > CHANGE 102 : 103 @ 102 : 103 ~ EaglercraftRandom random = world.rand; -> CHANGE 138 : 139 @ 138 : 143 +> CHANGE 139 : 140 @ 139 : 142 -~ if (!ItemDye.applyBonemeal(itemstack, world, blockpos)) { +~ world.playAuxSFX(2005, blockpos, 0); -> CHANGE 40 : 41 @ 40 : 74 +> CHANGE 42 : 43 @ 42 : 43 -~ if (!(world.isAirBlock(blockpos) && blockskull.canDispenserPlace(world, blockpos, itemstack))) { +~ { -> DELETE 25 @ 25 : 29 +> CHANGE 14 : 15 @ 14 : 15 + +~ gameprofile = new GameProfile((EaglercraftUUID) null, s); + +> CHANGE 42 : 43 @ 42 : 46 + +~ world.setBlockState(blockpos, blockpumpkin.getDefaultState(), 3); > INSERT 27 : 29 @ 27 + Blocks.doBootstrap(); -+ BiomeGenBase.bootstrap(); ++ BiomeGenBase.doBootstrap(); > INSERT 1 : 5 @ 1 diff --git a/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java index 8fc1d04..5c93954 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java +++ b/patches/minecraft/net/minecraft/inventory/ContainerBeacon.edit.java @@ -7,6 +7,4 @@ > DELETE 4 @ 4 : 8 -> DELETE 37 @ 37 : 48 - > EOF diff --git a/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java index b18b2bf..f0714ce 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java +++ b/patches/minecraft/net/minecraft/inventory/ContainerEnchantment.edit.java @@ -5,16 +5,13 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 3 : 5 @ 3 : 4 +> CHANGE 3 : 4 @ 3 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ > DELETE 6 @ 6 : 11 -> DELETE 2 @ 2 : 3 - -> CHANGE 7 : 8 @ 7 : 8 +> CHANGE 10 : 11 @ 10 : 11 ~ private EaglercraftRandom rand; @@ -22,12 +19,4 @@ ~ this.rand = new EaglercraftRandom(); -> CHANGE 76 : 77 @ 76 : 145 - -~ if (!(itemstack != null && itemstack.isItemEnchantable())) { - -> DELETE 18 @ 18 : 50 - -> DELETE 21 @ 21 : 34 - > EOF diff --git a/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java index 758d330..6f470b4 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java +++ b/patches/minecraft/net/minecraft/inventory/ContainerMerchant.edit.java @@ -7,6 +7,6 @@ > DELETE 5 @ 5 : 11 -> DELETE 101 @ 101 : 113 +> DELETE 111 @ 111 : 112 > EOF diff --git a/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java index 529a783..0499261 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java +++ b/patches/minecraft/net/minecraft/inventory/ContainerRepair.edit.java @@ -5,20 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 4 : 9 @ 4 : 6 +> DELETE 12 @ 12 : 18 + +> CHANGE 4 : 6 @ 4 : 6 -~ -~ import org.apache.commons.lang3.StringUtils; -~ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 6 @ 6 : 12 - -> DELETE 3 @ 3 : 6 - -> DELETE 60 @ 60 : 76 - -> DELETE 219 @ 219 : 232 - > EOF diff --git a/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java b/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java index c71dd36..850a8e0 100644 --- a/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java +++ b/patches/minecraft/net/minecraft/inventory/ContainerWorkbench.edit.java @@ -7,6 +7,6 @@ > DELETE 5 @ 5 : 11 -> DELETE 41 @ 41 : 54 +> DELETE 50 @ 50 : 51 > EOF diff --git a/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java b/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java index aa8d753..41da09f 100644 --- a/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java +++ b/patches/minecraft/net/minecraft/inventory/SlotFurnaceOutput.edit.java @@ -5,16 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> DELETE 2 @ 2 : 4 - -> DELETE 1 @ 1 : 2 - -> DELETE 1 @ 1 : 2 - -> DELETE 34 @ 34 : 45 - -> DELETE 1 @ 1 : 12 +> DELETE 5 @ 5 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java b/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java index 8ec6bf3..b298ca7 100644 --- a/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemAppleGold.edit.java @@ -5,16 +5,6 @@ # Version: 1.0 # Author: lax1dude -> INSERT 3 : 4 @ 3 - -+ - -> DELETE 2 @ 2 : 8 - -> CHANGE 17 : 18 @ 17 : 28 - -~ if (itemstack.getMetadata() == 0) { - -> DELETE 2 @ 2 : 3 +> DELETE 5 @ 5 : 9 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java b/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java index 5f6c443..67f9ab1 100644 --- a/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemArmorStand.edit.java @@ -7,16 +7,12 @@ > CHANGE 3 : 4 @ 3 : 4 -~ +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> DELETE 2 @ 2 : 3 +> DELETE 4 @ 4 : 6 -> DELETE 1 @ 1 : 4 +> CHANGE 68 : 69 @ 68 : 69 -> DELETE 3 @ 3 : 5 - -> DELETE 33 @ 33 : 54 - -> DELETE 7 @ 7 : 19 +~ private void applyRandomRotations(EntityArmorStand armorStand, EaglercraftRandom rand) { > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemBanner.edit.java b/patches/minecraft/net/minecraft/item/ItemBanner.edit.java index e25e5b8..3e21c15 100644 --- a/patches/minecraft/net/minecraft/item/ItemBanner.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBanner.edit.java @@ -5,18 +5,6 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 3 : 4 @ 3 : 5 - -~ - -> DELETE 3 @ 3 : 7 - -> DELETE 2 @ 2 : 3 - -> DELETE 3 @ 3 : 4 - -> DELETE 24 @ 24 : 26 - -> DELETE 1 @ 1 : 17 +> DELETE 8 @ 8 : 12 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemBed.edit.java b/patches/minecraft/net/minecraft/item/ItemBed.edit.java index 8fbb30e..b723c56 100644 --- a/patches/minecraft/net/minecraft/item/ItemBed.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBed.edit.java @@ -5,14 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 5 - -> DELETE 2 @ 2 : 5 - -> DELETE 2 @ 2 : 3 - -> CHANGE 9 : 10 @ 9 : 49 - -~ return true; +> DELETE 8 @ 8 : 10 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemBlock.edit.java b/patches/minecraft/net/minecraft/item/ItemBlock.edit.java index 406b7e2..37072b7 100644 --- a/patches/minecraft/net/minecraft/item/ItemBlock.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBlock.edit.java @@ -5,14 +5,6 @@ # Version: 1.0 # Author: lax1dude -> INSERT 3 : 4 @ 3 - -+ - -> DELETE 6 @ 6 : 11 - -> CHANGE 53 : 54 @ 53 : 84 - -~ return false; +> DELETE 9 @ 9 : 11 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemBoat.edit.java b/patches/minecraft/net/minecraft/item/ItemBoat.edit.java index bb6e295..7caedb4 100644 --- a/patches/minecraft/net/minecraft/item/ItemBoat.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBoat.edit.java @@ -11,6 +11,4 @@ > DELETE 5 @ 5 : 7 -> DELETE 73 @ 73 : 77 - > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemBow.edit.java b/patches/minecraft/net/minecraft/item/ItemBow.edit.java index 4e18757..3f5c9b6 100644 --- a/patches/minecraft/net/minecraft/item/ItemBow.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBow.edit.java @@ -7,6 +7,4 @@ > DELETE 8 @ 8 : 11 -> DELETE 56 @ 56 : 59 - > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemBucket.edit.java b/patches/minecraft/net/minecraft/item/ItemBucket.edit.java index 01b8548..2e74d30 100644 --- a/patches/minecraft/net/minecraft/item/ItemBucket.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBucket.edit.java @@ -7,6 +7,4 @@ > DELETE 10 @ 10 : 12 -> DELETE 105 @ 105 : 109 - > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java b/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java index 0e8fcea..3e397c6 100644 --- a/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemBucketMilk.edit.java @@ -7,6 +7,4 @@ > DELETE 5 @ 5 : 8 -> DELETE 13 @ 13 : 18 - > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java b/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java index cd566e0..6422a38 100644 --- a/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemCarrotOnAStick.edit.java @@ -5,10 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 3 @ 3 : 4 - -> DELETE 1 @ 1 : 5 - -> DELETE 18 @ 18 : 33 +> DELETE 6 @ 6 : 8 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemDye.edit.java b/patches/minecraft/net/minecraft/item/ItemDye.edit.java index 7f8eff6..d7ebedc 100644 --- a/patches/minecraft/net/minecraft/item/ItemDye.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemDye.edit.java @@ -11,10 +11,4 @@ > DELETE 10 @ 10 : 13 -> DELETE 28 @ 28 : 32 - -> CHANGE 36 : 37 @ 36 : 45 - -~ if (igrowable.canGrow(worldIn, target, iblockstate, true)) { - > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java b/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java index aadce17..0dbac23 100644 --- a/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemEditableBook.edit.java @@ -9,12 +9,6 @@ + -> DELETE 1 @ 1 : 6 - -> DELETE 3 @ 3 : 4 - -> DELETE 57 @ 57 : 61 - -> DELETE 28 @ 28 : 35 +> DELETE 3 @ 3 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemEgg.edit.java b/patches/minecraft/net/minecraft/item/ItemEgg.edit.java index d4cc81d..41da09f 100644 --- a/patches/minecraft/net/minecraft/item/ItemEgg.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemEgg.edit.java @@ -5,8 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 4 @ 4 : 7 - -> DELETE 15 @ 15 : 18 +> DELETE 5 @ 5 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java b/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java index 4264f68..b723c56 100644 --- a/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemEnderEye.edit.java @@ -5,16 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 5 @ 5 : 6 - -> DELETE 2 @ 2 : 5 - -> DELETE 2 @ 2 : 4 - -> CHANGE 13 : 14 @ 13 : 96 - -~ return true; - -> DELETE 5 @ 5 : 33 +> DELETE 8 @ 8 : 10 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java b/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java index 0e52e65..c8d222d 100644 --- a/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemEnderPearl.edit.java @@ -5,10 +5,21 @@ # Version: 1.0 # Author: lax1dude -> DELETE 3 @ 3 : 4 +> INSERT 2 : 3 @ 2 -> DELETE 1 @ 1 : 3 ++ import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController; -> DELETE 15 @ 15 : 18 +> DELETE 3 @ 3 : 5 + +> CHANGE 10 : 12 @ 10 : 11 + +~ if (entityplayer.capabilities.isCreativeMode && world.isRemote +~ && !SingleplayerServerController.isClientInEaglerSingleplayerOrLAN()) { + +> CHANGE 2 : 5 @ 2 : 3 + +~ if (!entityplayer.capabilities.isCreativeMode) { +~ --itemstack.stackSize; +~ } > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java b/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java index a2f77b5..41da09f 100644 --- a/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemExpBottle.edit.java @@ -5,10 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 3 @ 3 : 4 - -> DELETE 1 @ 1 : 3 - -> DELETE 18 @ 18 : 21 +> DELETE 5 @ 5 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemFireball.edit.java b/patches/minecraft/net/minecraft/item/ItemFireball.edit.java index 68270d5..6422a38 100644 --- a/patches/minecraft/net/minecraft/item/ItemFireball.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemFireball.edit.java @@ -5,12 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> DELETE 2 @ 2 : 5 - -> CHANGE 11 : 12 @ 11 : 32 - -~ return true; +> DELETE 6 @ 6 : 8 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemFirework.edit.java b/patches/minecraft/net/minecraft/item/ItemFirework.edit.java index d2ee3b3..a2b2fd6 100644 --- a/patches/minecraft/net/minecraft/item/ItemFirework.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemFirework.edit.java @@ -5,22 +5,10 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> DELETE 7 @ 7 : 10 -> CHANGE 2 : 5 @ 2 : 3 +> INSERT 8 : 9 @ 8 -~ -~ import com.google.common.collect.Lists; -~ - -> DELETE 1 @ 1 : 4 - -> DELETE 2 @ 2 : 4 - -> DELETE 1 @ 1 : 2 - -> DELETE 2 @ 2 : 12 - -> DELETE 1 @ 1 : 7 ++ > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java b/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java index ace59fc..41da09f 100644 --- a/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemFishingRod.edit.java @@ -5,8 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 4 @ 4 : 7 - -> DELETE 25 @ 25 : 29 +> DELETE 5 @ 5 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemFood.edit.java b/patches/minecraft/net/minecraft/item/ItemFood.edit.java index 7b75446..0401ba9 100644 --- a/patches/minecraft/net/minecraft/item/ItemFood.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemFood.edit.java @@ -5,8 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 4 @ 4 : 8 - -> DELETE 36 @ 36 : 41 +> DELETE 4 @ 4 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java b/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java index d2f5b95..f8c581e 100644 --- a/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemHangingEntity.edit.java @@ -7,6 +7,6 @@ > DELETE 7 @ 7 : 9 -> DELETE 25 @ 25 : 29 +> DELETE 28 @ 28 : 29 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemHoe.edit.java b/patches/minecraft/net/minecraft/item/ItemHoe.edit.java index 6cf2417..37072b7 100644 --- a/patches/minecraft/net/minecraft/item/ItemHoe.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemHoe.edit.java @@ -7,8 +7,4 @@ > DELETE 9 @ 9 : 11 -> CHANGE 48 : 49 @ 48 : 55 - -~ return true; - > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemLead.edit.java b/patches/minecraft/net/minecraft/item/ItemLead.edit.java index 85d1b2f..b723c56 100644 --- a/patches/minecraft/net/minecraft/item/ItemLead.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemLead.edit.java @@ -7,8 +7,4 @@ > DELETE 8 @ 8 : 10 -> CHANGE 14 : 15 @ 14 : 20 - -~ return true; - > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemMap.edit.java b/patches/minecraft/net/minecraft/item/ItemMap.edit.java index 20fb864..a9a6a81 100644 --- a/patches/minecraft/net/minecraft/item/ItemMap.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemMap.edit.java @@ -16,8 +16,4 @@ > DELETE 9 @ 9 : 11 -> DELETE 26 @ 26 : 38 - -> DELETE 137 @ 137 : 152 - > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java b/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java index e21bd03..b92cc67 100644 --- a/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemMinecart.edit.java @@ -7,6 +7,4 @@ > DELETE 12 @ 12 : 14 -> DELETE 75 @ 75 : 95 - > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java b/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java index 7e5fb23..7572609 100644 --- a/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemMonsterPlacer.edit.java @@ -5,18 +5,4 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 3 : 4 @ 3 : 6 - -~ - -> DELETE 7 @ 7 : 14 - -> DELETE 3 @ 3 : 4 - -> CHANGE 29 : 30 @ 29 : 70 - -~ return true; - -> DELETE 2 @ 2 : 43 - > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemPotion.edit.java b/patches/minecraft/net/minecraft/item/ItemPotion.edit.java index 5ff8c85..f7ae9d5 100644 --- a/patches/minecraft/net/minecraft/item/ItemPotion.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemPotion.edit.java @@ -16,15 +16,13 @@ + import com.google.common.collect.Maps; + -> DELETE 4 @ 4 : 5 +> DELETE 6 @ 6 : 9 -> DELETE 1 @ 1 : 4 +> CHANGE 64 : 65 @ 64 : 65 -> DELETE 61 @ 61 : 70 +~ for (PotionEffect potioneffect : (List) list) { -> DELETE 27 @ 27 : 30 - -> CHANGE 24 : 25 @ 24 : 25 +> CHANGE 59 : 60 @ 59 : 60 ~ for (PotionEffect potioneffect : (List) list) { @@ -34,10 +32,10 @@ > CHANGE 4 : 5 @ 4 : 5 -~ for (Entry entry : (Set) map.entrySet()) { +~ for (Entry entry : (Set>) map.entrySet()) { > CHANGE 33 : 34 @ 33 : 34 -~ for (Entry entry1 : (Set) hashmultimap.entries()) { +~ for (Entry entry1 : (Set>) hashmultimap.entries()) { > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemRecord.edit.java b/patches/minecraft/net/minecraft/item/ItemRecord.edit.java index 6a499e2..01394b0 100644 --- a/patches/minecraft/net/minecraft/item/ItemRecord.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemRecord.edit.java @@ -13,10 +13,6 @@ + import com.google.common.collect.Maps; + -> DELETE 5 @ 5 : 9 - -> CHANGE 21 : 22 @ 21 : 30 - -~ return true; +> DELETE 5 @ 5 : 8 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemSign.edit.java b/patches/minecraft/net/minecraft/item/ItemSign.edit.java index f84a39c..c153820 100644 --- a/patches/minecraft/net/minecraft/item/ItemSign.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemSign.edit.java @@ -5,14 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 4 - -> DELETE 3 @ 3 : 8 - -> DELETE 2 @ 2 : 3 - -> DELETE 20 @ 20 : 22 - -> DELETE 1 @ 1 : 18 +> DELETE 7 @ 7 : 10 > EOF diff --git a/patches/minecraft/net/minecraft/item/ItemSkull.edit.java b/patches/minecraft/net/minecraft/item/ItemSkull.edit.java index 16a1a22..83d3f63 100644 --- a/patches/minecraft/net/minecraft/item/ItemSkull.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemSkull.edit.java @@ -5,25 +5,22 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 -> CHANGE 1 : 4 @ 1 : 2 - -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; -> DELETE 1 @ 1 : 2 +> CHANGE 1 : 2 @ 1 : 2 -> DELETE 4 @ 4 : 6 +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -> DELETE 2 @ 2 : 3 +> DELETE 6 @ 6 : 8 -> DELETE 3 @ 3 : 4 +> CHANGE 60 : 62 @ 60 : 61 -> DELETE 33 @ 33 : 69 +~ gameprofile = new GameProfile((EaglercraftUUID) null, +~ nbttagcompound.getString("SkullOwner")); -> CHANGE 47 : 48 @ 47 : 48 +> CHANGE 62 : 63 @ 62 : 63 ~ GameProfile gameprofile = new GameProfile((EaglercraftUUID) null, nbt.getString("SkullOwner")); diff --git a/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java b/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java index d4cc81d..41da09f 100644 --- a/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java +++ b/patches/minecraft/net/minecraft/item/ItemSnowball.edit.java @@ -5,8 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 4 @ 4 : 7 - -> DELETE 15 @ 15 : 18 +> DELETE 5 @ 5 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java b/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java index ee02049..3974175 100644 --- a/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java +++ b/patches/minecraft/net/minecraft/network/EnumConnectionState.edit.java @@ -5,20 +5,18 @@ # Version: 1.0 # Author: lax1dude -> INSERT 2 : 5 @ 2 +> INSERT 5 : 7 @ 5 -+ import java.util.Collection; -+ import java.util.Map; + ++ import java.util.Collection; -> CHANGE 3 : 5 @ 3 : 6 +> CHANGE 104 : 105 @ 104 : 109 -~ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -> DELETE 105 @ 105 : 106 +> DELETE 111 @ 111 : 119 -> CHANGE 147 : 148 @ 147 : 148 +> CHANGE 28 : 29 @ 28 : 29 ~ this.directionMaps.put(direction, (BiMap>) object); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/NetHandlerPlayServer.edit.java b/patches/minecraft/net/minecraft/network/NetHandlerPlayServer.edit.java similarity index 81% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/NetHandlerPlayServer.edit.java rename to patches/minecraft/net/minecraft/network/NetHandlerPlayServer.edit.java index 7ee89b0..324cc75 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/network/NetHandlerPlayServer.edit.java +++ b/patches/minecraft/net/minecraft/network/NetHandlerPlayServer.edit.java @@ -14,21 +14,13 @@ + + import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer; -> CHANGE 2 : 4 @ 2 : 4 - -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; - -> CHANGE 19 : 21 @ 19 : 22 - -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagString; +> DELETE 25 @ 25 : 26 > DELETE 2 @ 2 : 3 > INSERT 33 : 34 @ 33 -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.network.play.server.S3FPacketCustomPayload; ++ import net.minecraft.network.play.server.S3FPacketCustomPayload; > DELETE 2 @ 2 : 3 @@ -42,7 +34,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> CHANGE 10 : 11 @ 10 : 11 +> INSERT 2 : 3 @ 2 + ++ + +> CHANGE 1 : 2 @ 1 : 2 ~ public final IntegratedServerPlayerNetworkManager netManager; @@ -97,12 +93,11 @@ > DELETE 10 @ 10 : 11 -> INSERT 20 : 25 @ 20 +> INSERT 20 : 24 @ 20 + if (this.serverController.worldServers[0].getWorldInfo().getGameRulesInstance() + .getBoolean("colorCodes")) { -+ s = net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.StringUtils -+ .translateControlCodesAlternate(s); ++ s = net.minecraft.util.StringUtils.translateControlCodesAlternate(s); + } > DELETE 19 @ 19 : 20 @@ -127,13 +122,12 @@ > DELETE 11 @ 11 : 12 -> CHANGE 19 : 26 @ 19 : 21 +> CHANGE 19 : 25 @ 19 : 21 ~ String s = EnumChatFormatting.getTextWithoutFormattingCodes(aichatcomponent[i].getUnformattedText()); ~ if (this.serverController.worldServers[0].getWorldInfo().getGameRulesInstance() ~ .getBoolean("colorCodes")) { -~ s = net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.StringUtils -~ .translateControlCodesAlternate(s); +~ s = net.minecraft.util.StringUtils.translateControlCodesAlternate(s); ~ } ~ tileentitysign.signText[i] = new ChatComponentText(s); @@ -149,11 +143,7 @@ ~ PacketBuffer packetbuffer3 = c17packetcustompayload.getBufferData(); -> CHANGE 2 : 3 @ 2 : 3 - -~ ItemStack itemstack1 = packetbuffer3.readItemStackFromBuffer_server(); - -> INSERT 18 : 19 @ 18 +> INSERT 21 : 22 @ 21 + logger.error(exception3); @@ -163,11 +153,7 @@ ~ PacketBuffer packetbuffer2 = c17packetcustompayload.getBufferData(); -> CHANGE 2 : 3 @ 2 : 3 - -~ ItemStack itemstack = packetbuffer2.readItemStackFromBuffer_server(); - -> INSERT 21 : 22 @ 21 +> INSERT 24 : 25 @ 24 + logger.error(exception4); @@ -175,12 +161,11 @@ > DELETE 51 @ 51 : 53 -> INSERT 31 : 36 @ 31 +> INSERT 31 : 35 @ 31 + if (this.serverController.worldServers[0].getWorldInfo().getGameRulesInstance() + .getBoolean("colorCodes")) { -+ s = net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.StringUtils -+ .translateControlCodesAlternate(s); ++ s = net.minecraft.util.StringUtils.translateControlCodesAlternate(s); + } > INSERT 5 : 22 @ 5 diff --git a/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java b/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java index 04a1570..bc905f1 100644 --- a/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java +++ b/patches/minecraft/net/minecraft/network/login/client/C00PacketLoginStart.edit.java @@ -5,13 +5,13 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 -> CHANGE 1 : 4 @ 1 : 2 +~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; + +> CHANGE 1 : 2 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ -~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; > INSERT 6 : 7 @ 6 @@ -34,4 +34,11 @@ + parPacketBuffer.writeByteArray(this.skin); +> INSERT 9 : 13 @ 9 + ++ ++ public byte[] getSkin() { ++ return this.skin; ++ } + > EOF diff --git a/patches/minecraft/net/minecraft/network/play/client/C15PacketClientSettings.edit.java b/patches/minecraft/net/minecraft/network/play/client/C15PacketClientSettings.edit.java index 6d88f89..8f6b137 100644 --- a/patches/minecraft/net/minecraft/network/play/client/C15PacketClientSettings.edit.java +++ b/patches/minecraft/net/minecraft/network/play/client/C15PacketClientSettings.edit.java @@ -5,8 +5,11 @@ # Version: 1.0 # Author: lax1dude -> INSERT 3 : 4 @ 3 +> INSERT 62 : 66 @ 62 + ++ public int getViewDistance() { ++ return this.view; ++ } > EOF diff --git a/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java b/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java index 57c3d64..b3c0e2f 100644 --- a/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java +++ b/patches/minecraft/net/minecraft/network/play/client/C18PacketSpectate.edit.java @@ -5,14 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 3 : 5 @ 3 : 5 +> CHANGE 3 : 4 @ 3 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ -> DELETE 3 @ 3 : 4 - -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 7 : 8 @ 7 : 8 ~ private EaglercraftUUID id; @@ -20,6 +17,4 @@ ~ public C18PacketSpectate(EaglercraftUUID id) { -> DELETE 15 @ 15 : 18 - > EOF diff --git a/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java b/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java index 6be5d1d..0dd348a 100644 --- a/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java +++ b/patches/minecraft/net/minecraft/network/play/server/S38PacketPlayerListItem.edit.java @@ -5,21 +5,9 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 6 +> CHANGE 4 : 6 @ 4 : 6 -> CHANGE 2 : 8 @ 2 : 3 - -~ -~ import com.google.common.base.Objects; -~ import com.google.common.collect.Lists; -~ ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.Property; -> DELETE 13 @ 13 : 35 - -> CHANGE 58 : 59 @ 58 : 111 - -~ // server only - > EOF diff --git a/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java b/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java deleted file mode 100644 index 171bb08..0000000 --- a/patches/minecraft/net/minecraft/network/status/server/S00PacketServerInfo.edit.java +++ /dev/null @@ -1,41 +0,0 @@ - -# Eagler Context Redacted Diff -# Copyright (c) 2024 lax1dude. All rights reserved. - -# Version: 1.0 -# Author: lax1dude - -> DELETE 2 @ 2 : 4 - -> INSERT 1 : 6 @ 1 - -+ -+ import org.json.JSONException; -+ import org.json.JSONObject; -+ -+ import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; - -> DELETE 5 @ 5 : 6 - -> CHANGE 3 : 4 @ 3 : 12 - -~ - -> CHANGE 10 : 16 @ 10 : 12 - -~ try { -~ this.response = (ServerStatusResponse) JSONTypeProvider.deserialize( -~ new JSONObject(parPacketBuffer.readStringFromBuffer(32767)), ServerStatusResponse.class); -~ } catch (JSONException exc) { -~ throw new IOException("Invalid ServerStatusResponse JSON payload", exc); -~ } - -> CHANGE 3 : 8 @ 3 : 4 - -~ try { -~ parPacketBuffer.writeString(((JSONObject) JSONTypeProvider.serialize(this.response)).toString()); -~ } catch (JSONException exc) { -~ throw new IOException("Invalid ServerStatusResponse JSON payload", exc); -~ } - -> EOF diff --git a/patches/minecraft/net/minecraft/pathfinding/Path.edit.java b/patches/minecraft/net/minecraft/pathfinding/Path.edit.java new file mode 100644 index 0000000..613846d --- /dev/null +++ b/patches/minecraft/net/minecraft/pathfinding/Path.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 5 : 6 @ 5 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/pathfinding/PathEntity.edit.java b/patches/minecraft/net/minecraft/pathfinding/PathEntity.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/pathfinding/PathEntity.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/pathfinding/PathFinder.edit.java b/patches/minecraft/net/minecraft/pathfinding/PathFinder.edit.java new file mode 100644 index 0000000..e395576 --- /dev/null +++ b/patches/minecraft/net/minecraft/pathfinding/PathFinder.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 11 : 12 @ 11 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/pathfinding/PathNavigate.edit.java b/patches/minecraft/net/minecraft/pathfinding/PathNavigate.edit.java similarity index 75% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/pathfinding/PathNavigate.edit.java rename to patches/minecraft/net/minecraft/pathfinding/PathNavigate.edit.java index 5a8cca5..2e2d6bf 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/pathfinding/PathNavigate.edit.java +++ b/patches/minecraft/net/minecraft/pathfinding/PathNavigate.edit.java @@ -5,7 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 155 : 156 @ 155 : 156 +> INSERT 17 : 18 @ 17 + ++ + +> CHANGE 131 : 132 @ 131 : 132 ~ for (AxisAlignedBB axisalignedbb : (List) list) { diff --git a/patches/minecraft/net/minecraft/pathfinding/PathNavigateClimber.edit.java b/patches/minecraft/net/minecraft/pathfinding/PathNavigateClimber.edit.java new file mode 100644 index 0000000..e395576 --- /dev/null +++ b/patches/minecraft/net/minecraft/pathfinding/PathNavigateClimber.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 11 : 12 @ 11 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/pathfinding/PathNavigateGround.edit.java b/patches/minecraft/net/minecraft/pathfinding/PathNavigateGround.edit.java new file mode 100644 index 0000000..e8768a1 --- /dev/null +++ b/patches/minecraft/net/minecraft/pathfinding/PathNavigateGround.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 18 : 19 @ 18 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/pathfinding/PathNavigateSwimmer.edit.java b/patches/minecraft/net/minecraft/pathfinding/PathNavigateSwimmer.edit.java new file mode 100644 index 0000000..e395576 --- /dev/null +++ b/patches/minecraft/net/minecraft/pathfinding/PathNavigateSwimmer.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 11 : 12 @ 11 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/pathfinding/PathPoint.edit.java b/patches/minecraft/net/minecraft/pathfinding/PathPoint.edit.java new file mode 100644 index 0000000..613846d --- /dev/null +++ b/patches/minecraft/net/minecraft/pathfinding/PathPoint.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 5 : 6 @ 5 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/potion/Potion.edit.java b/patches/minecraft/net/minecraft/potion/Potion.edit.java index 9cdcc7a..a7314cb 100644 --- a/patches/minecraft/net/minecraft/potion/Potion.edit.java +++ b/patches/minecraft/net/minecraft/potion/Potion.edit.java @@ -19,11 +19,7 @@ > DELETE 8 @ 8 : 13 -> CHANGE 123 : 124 @ 123 : 126 - -~ // multiplayer only - -> CHANGE 101 : 103 @ 101 : 103 +> CHANGE 227 : 229 @ 227 : 229 ~ AttributeModifier attributemodifier = new AttributeModifier(EaglercraftUUID.fromString(parString1), ~ this.getName(), parDouble1, parInt1); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/scoreboard/ServerScoreboard.edit.java b/patches/minecraft/net/minecraft/scoreboard/ServerScoreboard.edit.java similarity index 80% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/scoreboard/ServerScoreboard.edit.java rename to patches/minecraft/net/minecraft/scoreboard/ServerScoreboard.edit.java index 46968f6..7ade005 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/scoreboard/ServerScoreboard.edit.java +++ b/patches/minecraft/net/minecraft/scoreboard/ServerScoreboard.edit.java @@ -5,7 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 179 : 180 @ 179 : 180 +> INSERT 22 : 23 @ 22 + ++ + +> CHANGE 150 : 151 @ 150 : 151 ~ for (Packet packet : (List) list) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/MinecraftServer.edit.java b/patches/minecraft/net/minecraft/server/MinecraftServer.edit.java similarity index 96% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/MinecraftServer.edit.java rename to patches/minecraft/net/minecraft/server/MinecraftServer.edit.java index 4a58a58..284b327 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/MinecraftServer.edit.java +++ b/patches/minecraft/net/minecraft/server/MinecraftServer.edit.java @@ -28,11 +28,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.futures.FutureTask; ~ import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerIntegratedServerWorker; -> CHANGE 5 : 6 @ 5 : 6 - -~ import net.minecraft.crash.CrashReport; - -> DELETE 3 @ 3 : 5 +> DELETE 9 @ 9 : 11 > DELETE 1 @ 1 : 3 @@ -40,18 +36,19 @@ > CHANGE 19 : 20 @ 19 : 20 -~ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.chunk.Chunk; +~ import net.minecraft.world.chunk.Chunk; > CHANGE 5 : 7 @ 5 : 7 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 1 : 3 @ 1 : 2 ~ public abstract class MinecraftServer implements Runnable, ICommandSender, IThreadListener { +~ -> DELETE 6 @ 6 : 7 +> DELETE 1 @ 1 : 2 > CHANGE 1 : 2 @ 1 : 5 diff --git a/patches/minecraft/net/minecraft/server/management/ItemInWorldManager.edit.java b/patches/minecraft/net/minecraft/server/management/ItemInWorldManager.edit.java new file mode 100644 index 0000000..e5dd790 --- /dev/null +++ b/patches/minecraft/net/minecraft/server/management/ItemInWorldManager.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 23 : 24 @ 23 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/PlayerManager.edit.java b/patches/minecraft/net/minecraft/server/management/PlayerManager.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/PlayerManager.edit.java rename to patches/minecraft/net/minecraft/server/management/PlayerManager.edit.java index 80b12c4..be49b2b 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/PlayerManager.edit.java +++ b/patches/minecraft/net/minecraft/server/management/PlayerManager.edit.java @@ -10,4 +10,8 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; +> INSERT 2 : 3 @ 2 + ++ + > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/ServerConfigurationManager.edit.java b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.edit.java similarity index 96% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/ServerConfigurationManager.edit.java rename to patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.edit.java index 4cafb70..9fe3e0c 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/management/ServerConfigurationManager.edit.java +++ b/patches/minecraft/net/minecraft/server/management/ServerConfigurationManager.edit.java @@ -18,11 +18,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> DELETE 1 @ 1 : 2 +> DELETE 6 @ 6 : 7 > DELETE 23 @ 23 : 25 @@ -30,7 +26,7 @@ > INSERT 3 : 4 @ 3 -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.ChatComponentText; ++ import net.minecraft.util.ChatComponentText; > CHANGE 12 : 15 @ 12 : 14 @@ -38,7 +34,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 9 @ 9 : 13 +> CHANGE 2 : 3 @ 2 : 6 + +~ > CHANGE 4 : 6 @ 4 : 10 diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/network/NetHandlerLoginServer.edit.java b/patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.edit.java similarity index 95% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/network/NetHandlerLoginServer.edit.java rename to patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.edit.java index 130b5c0..9d10035 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/server/network/NetHandlerLoginServer.edit.java +++ b/patches/minecraft/net/minecraft/server/network/NetHandlerLoginServer.edit.java @@ -14,7 +14,7 @@ > CHANGE 1 : 2 @ 1 : 2 -~ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.network.EnumConnectionState; +~ import net.minecraft.network.EnumConnectionState; > DELETE 4 @ 4 : 5 @@ -32,7 +32,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 9 @ 9 : 10 +> CHANGE 2 : 3 @ 2 : 3 + +~ > CHANGE 1 : 2 @ 1 : 2 diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/stats/StatisticsFile.edit.java b/patches/minecraft/net/minecraft/stats/StatisticsFile.edit.java similarity index 97% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/stats/StatisticsFile.edit.java rename to patches/minecraft/net/minecraft/stats/StatisticsFile.edit.java index 277cb64..084d8ac 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/stats/StatisticsFile.edit.java +++ b/patches/minecraft/net/minecraft/stats/StatisticsFile.edit.java @@ -19,7 +19,11 @@ + import net.lax1dude.eaglercraft.v1_8.log4j.Logger; + -> CHANGE 10 : 11 @ 10 : 11 +> INSERT 1 : 2 @ 1 + ++ + +> CHANGE 2 : 3 @ 2 : 3 ~ private final VFile2 statsFile; diff --git a/patches/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java b/patches/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java index 92c64cf..bfb412b 100644 --- a/patches/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/MobSpawnerBaseLogic.edit.java @@ -13,26 +13,4 @@ + import com.google.common.collect.Lists; + -> DELETE 9 @ 9 : 10 - -> CHANGE 47 : 55 @ 47 : 117 - -~ double d3 = (double) ((float) blockpos.getX() + this.getSpawnerWorld().rand.nextFloat()); -~ double d4 = (double) ((float) blockpos.getY() + this.getSpawnerWorld().rand.nextFloat()); -~ double d5 = (double) ((float) blockpos.getZ() + this.getSpawnerWorld().rand.nextFloat()); -~ this.getSpawnerWorld().spawnParticle(EnumParticleTypes.SMOKE_NORMAL, d3, d4, d5, 0.0D, 0.0D, 0.0D, -~ new int[0]); -~ this.getSpawnerWorld().spawnParticle(EnumParticleTypes.FLAME, d3, d4, d5, 0.0D, 0.0D, 0.0D, new int[0]); -~ if (this.spawnDelay > 0) { -~ --this.spawnDelay; - -> INSERT 2 : 4 @ 2 - -+ this.prevMobRotation = this.mobRotation; -+ this.mobRotation = (this.mobRotation + (double) (1000.0F / ((float) this.spawnDelay + 200.0F))) % 360.0D; - -> CHANGE 156 : 157 @ 156 : 157 - -~ if (delay == 1) { - > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java index 44cf624..b1d1654 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityBeacon.edit.java @@ -5,20 +5,10 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> DELETE 25 @ 25 : 26 -> INSERT 2 : 5 @ 2 +> CHANGE 43 : 44 @ 43 : 44 -+ -+ import com.google.common.collect.Lists; -+ - -> DELETE 18 @ 18 : 22 - -> DELETE 29 @ 29 : 35 - -> DELETE 1 @ 1 : 20 - -> DELETE 82 @ 82 : 90 +~ List list = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, axisalignedbb); > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.edit.java index ecbe28a..a66a645 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityBrewingStand.edit.java @@ -5,14 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 - -> CHANGE 1 : 2 @ 1 : 3 - -~ - -> DELETE 12 @ 12 : 13 - -> DELETE 46 @ 46 : 64 +> DELETE 18 @ 18 : 19 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityChest.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityChest.edit.java index c022049..9aa5be3 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityChest.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityChest.edit.java @@ -5,12 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 9 @ 9 : 10 - -> DELETE 3 @ 3 : 6 - -> DELETE 207 @ 207 : 210 - -> DELETE 1 @ 1 : 15 +> DELETE 13 @ 13 : 15 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.edit.java index 41a1682..501a633 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityCommandBlock.edit.java @@ -5,12 +5,10 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 3 @ 2 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.netty.ByteBuf; -> DELETE 5 @ 5 : 6 - -> DELETE 68 @ 68 : 71 +> DELETE 6 @ 6 : 7 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java index b29884d..a8dd664 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityDaylightDetector.edit.java @@ -5,8 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 4 - -> DELETE 4 @ 4 : 11 +> DELETE 3 @ 3 : 4 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.edit.java index de92d5c..51ecb45 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.edit.java @@ -5,14 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 3 @ 3 : 4 - -> DELETE 19 @ 19 : 20 - -> DELETE 2 @ 2 : 3 - -> DELETE 136 @ 136 : 138 - -> DELETE 3 @ 3 : 45 +> DELETE 23 @ 23 : 24 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.edit.java index 7ea5567..e75cfa5 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntityHopper.edit.java @@ -5,22 +5,6 @@ # Version: 1.0 # Author: lax1dude -> INSERT 3 : 4 @ 3 - -+ - -> DELETE 2 @ 2 : 3 - -> DELETE 11 @ 11 : 15 - -> DELETE 136 @ 136 : 144 - -> CHANGE 3 : 4 @ 3 : 25 - -~ return false; - -> DELETE 2 @ 2 : 50 - -> DELETE 188 @ 188 : 195 +> DELETE 17 @ 17 : 21 > EOF diff --git a/patches/minecraft/net/minecraft/tileentity/TileEntitySign.edit.java b/patches/minecraft/net/minecraft/tileentity/TileEntitySign.edit.java index bed9294..0aa6b77 100644 --- a/patches/minecraft/net/minecraft/tileentity/TileEntitySign.edit.java +++ b/patches/minecraft/net/minecraft/tileentity/TileEntitySign.edit.java @@ -5,33 +5,17 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 3 - -~ import org.json.JSONException; -~ - -> DELETE 1 @ 1 : 2 - -> DELETE 3 @ 3 : 4 - -> DELETE 3 @ 3 : 5 - -> DELETE 3 @ 3 : 4 +> DELETE 2 @ 2 : 3 > DELETE 10 @ 10 : 11 -> DELETE 9 @ 9 : 10 +> INSERT 8 : 10 @ 8 -> DELETE 42 @ 42 : 44 ++ import org.json.JSONException; ++ -> CHANGE 14 : 15 @ 14 : 15 +> CHANGE 75 : 76 @ 75 : 76 ~ } catch (JSONException var8) { -> DELETE 4 @ 4 : 5 - -> DELETE 33 @ 33 : 86 - -> DELETE 3 @ 3 : 6 - > EOF diff --git a/patches/minecraft/net/minecraft/util/ChatComponentScore.edit.java b/patches/minecraft/net/minecraft/util/ChatComponentScore.edit.java index b19831f..b5dcabb 100644 --- a/patches/minecraft/net/minecraft/util/ChatComponentScore.edit.java +++ b/patches/minecraft/net/minecraft/util/ChatComponentScore.edit.java @@ -5,8 +5,19 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 10 +> DELETE 6 @ 6 : 9 -> DELETE 23 @ 23 : 35 +> INSERT 1 : 3 @ 1 + ++ import net.lax1dude.eaglercraft.v1_8.HString; ++ + +> CHANGE 24 : 25 @ 24 : 25 + +~ if (minecraftserver != null && StringUtils.isNullOrEmpty(this.value)) { + +> CHANGE 4 : 5 @ 4 : 5 + +~ this.setValue(HString.format("%d", new Object[] { Integer.valueOf(score.getScorePoints()) })); > EOF diff --git a/patches/minecraft/net/minecraft/util/IThreadListener.edit.java b/patches/minecraft/net/minecraft/util/IThreadListener.edit.java index 7375a88..49b3e73 100644 --- a/patches/minecraft/net/minecraft/util/IThreadListener.edit.java +++ b/patches/minecraft/net/minecraft/util/IThreadListener.edit.java @@ -5,10 +5,10 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 3 @ 2 : 3 +> DELETE 2 @ 2 : 4 -~ import net.lax1dude.eaglercraft.v1_8.futures.ListenableFuture; +> CHANGE 1 : 2 @ 1 : 4 -> DELETE 3 @ 3 : 5 +~ void addScheduledTask(Runnable var1); > EOF diff --git a/patches/minecraft/net/minecraft/util/Session.edit.java b/patches/minecraft/net/minecraft/util/Session.edit.java index be2cffe..f799854 100644 --- a/patches/minecraft/net/minecraft/util/Session.edit.java +++ b/patches/minecraft/net/minecraft/util/Session.edit.java @@ -11,7 +11,7 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; ~ import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; ~ import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile; -~ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.player.EntityPlayer; +~ import net.minecraft.entity.player.EntityPlayer; > CHANGE 2 : 3 @ 2 : 6 diff --git a/patches/minecraft/net/minecraft/util/StatCollector.edit.java b/patches/minecraft/net/minecraft/util/StatCollector.edit.java index 8b7360a..20d9aa5 100644 --- a/patches/minecraft/net/minecraft/util/StatCollector.edit.java +++ b/patches/minecraft/net/minecraft/util/StatCollector.edit.java @@ -5,6 +5,11 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 4 +> DELETE 6 @ 6 : 7 + +> CHANGE 10 : 12 @ 10 : 11 + +~ return StringTranslate.fallbackInstance != null ? StringTranslate.fallbackInstance.translateKey(key) +~ : localizedName.translateKey(key); > EOF diff --git a/patches/minecraft/net/minecraft/util/StringTranslate.edit.java b/patches/minecraft/net/minecraft/util/StringTranslate.edit.java index 6539ea1..bd922aa 100644 --- a/patches/minecraft/net/minecraft/util/StringTranslate.edit.java +++ b/patches/minecraft/net/minecraft/util/StringTranslate.edit.java @@ -5,29 +5,8 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 6 +> INSERT 5 : 11 @ 5 -> INSERT 1 : 2 @ 1 - -+ import java.util.ArrayList; - -> INSERT 1 : 2 @ 1 - -+ import java.util.List; - -> INSERT 1 : 3 @ 1 - -+ import java.util.Map.Entry; -+ import java.util.regex.Matcher; - -> DELETE 1 @ 1 : 3 - -> INSERT 1 : 11 @ 1 - -+ import com.google.common.base.Charsets; -+ import com.google.common.base.Splitter; -+ import com.google.common.collect.Iterables; -+ import com.google.common.collect.Maps; + + import net.lax1dude.eaglercraft.v1_8.EagRuntime; + import net.lax1dude.eaglercraft.v1_8.HString; @@ -35,16 +14,46 @@ + import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController; + -> CHANGE 8 : 10 @ 8 : 10 +> INSERT 2 : 4 @ 2 -~ this.lastUpdateTimeInMilliseconds = System.currentTimeMillis(); ++ import java.nio.charset.StandardCharsets; ++ import java.util.ArrayList; + +> INSERT 1 : 2 @ 1 + ++ import java.util.List; + +> INSERT 1 : 2 @ 1 + ++ import java.util.Map.Entry; + +> DELETE 1 @ 1 : 3 + +> INSERT 5 : 6 @ 5 + ++ static StringTranslate fallbackInstance = null; + +> CHANGE 3 : 5 @ 3 : 6 + +~ private StringTranslate() { ~ } -> CHANGE 1 : 13 @ 1 : 9 +> CHANGE 1 : 24 @ 1 : 9 -~ public static void doCLINIT() { -~ InputStream inputstream = EagRuntime.getResourceStream("/assets/minecraft/lang/en_US.lang"); -~ for (String s : IOUtils.readLines(inputstream, Charsets.UTF_8)) { +~ public static void initClient() { +~ try (InputStream inputstream = EagRuntime.getResourceStream("/assets/minecraft/lang/en_US.lang")) { +~ initServer(IOUtils.readLines(inputstream, StandardCharsets.UTF_8)); +~ fallbackInstance = new StringTranslate(); +~ fallbackInstance.replaceWith(instance.languageList); +~ SingleplayerServerController.updateLocale(dump()); +~ } catch (IOException e) { +~ EagRuntime.debugPrintStackTrace(e); +~ } +~ } +~ +~ public static void initServer(List strs) { +~ instance.languageList.clear(); +~ for (String s : strs) { ~ if (!s.isEmpty() && s.charAt(0) != 35) { ~ String[] astring = (String[]) Iterables.toArray(equalSignSplitter.split(s), String.class); ~ if (astring != null && astring.length == 2) { @@ -65,11 +74,7 @@ ~ public static void replaceWith(Map parMap) { -> INSERT 3 : 4 @ 3 - -+ SingleplayerServerController.updateLocale(dump()); - -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 5 : 6 @ 5 : 6 ~ public String translateKey(String key) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/StringUtils.edit.java b/patches/minecraft/net/minecraft/util/StringUtils.edit.java similarity index 94% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/StringUtils.edit.java rename to patches/minecraft/net/minecraft/util/StringUtils.edit.java index 4f7aff9..b0b5782 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/util/StringUtils.edit.java +++ b/patches/minecraft/net/minecraft/util/StringUtils.edit.java @@ -5,7 +5,7 @@ # Version: 1.0 # Author: lax1dude -> INSERT 28 : 34 @ 28 +> INSERT 21 : 27 @ 21 + + private static final Pattern patternControlCodeAlternate = Pattern.compile("(?i)&([0-9A-FK-OR])"); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/Village.edit.java b/patches/minecraft/net/minecraft/village/Village.edit.java similarity index 77% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/Village.edit.java rename to patches/minecraft/net/minecraft/village/Village.edit.java index 0e1b00f..e6a2823 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/Village.edit.java +++ b/patches/minecraft/net/minecraft/village/Village.edit.java @@ -13,14 +13,13 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -> CHANGE 7 : 9 @ 7 : 9 +> DELETE 10 @ 10 : 11 -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; +> INSERT 8 : 9 @ 8 -> DELETE 1 @ 1 : 2 ++ -> CHANGE 363 : 364 @ 363 : 371 +> CHANGE 348 : 349 @ 348 : 356 ~ if (nbttagcompound1.hasKey("Name")) { diff --git a/patches/minecraft/net/minecraft/village/VillageCollection.edit.java b/patches/minecraft/net/minecraft/village/VillageCollection.edit.java new file mode 100644 index 0000000..6592a60 --- /dev/null +++ b/patches/minecraft/net/minecraft/village/VillageCollection.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 19 : 20 @ 19 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/village/VillageDoorInfo.edit.java b/patches/minecraft/net/minecraft/village/VillageDoorInfo.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/village/VillageDoorInfo.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/VillageSiege.edit.java b/patches/minecraft/net/minecraft/village/VillageSiege.edit.java similarity index 80% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/VillageSiege.edit.java rename to patches/minecraft/net/minecraft/village/VillageSiege.edit.java index 3f7b09c..d3fd3f1 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/village/VillageSiege.edit.java +++ b/patches/minecraft/net/minecraft/village/VillageSiege.edit.java @@ -10,7 +10,11 @@ + + import net.lax1dude.eaglercraft.v1_8.EagRuntime; -> CHANGE 144 : 145 @ 144 : 145 +> INSERT 12 : 13 @ 12 + ++ + +> CHANGE 125 : 126 @ 125 : 126 ~ EagRuntime.debugPrintStackTrace(exception); diff --git a/patches/minecraft/net/minecraft/world/GameRules.edit.java b/patches/minecraft/net/minecraft/world/GameRules.edit.java index 1307512..a0dab68 100644 --- a/patches/minecraft/net/minecraft/world/GameRules.edit.java +++ b/patches/minecraft/net/minecraft/world/GameRules.edit.java @@ -9,4 +9,13 @@ + +> INSERT 21 : 27 @ 21 + ++ this.addGameRule("loadSpawnChunks", "false", GameRules.ValueType.BOOLEAN_VALUE); ++ this.addGameRule("bedSpawnPoint", "true", GameRules.ValueType.BOOLEAN_VALUE); ++ this.addGameRule("clickToRide", "false", GameRules.ValueType.BOOLEAN_VALUE); ++ this.addGameRule("clickToSit", "true", GameRules.ValueType.BOOLEAN_VALUE); ++ this.addGameRule("colorCodes", "true", GameRules.ValueType.BOOLEAN_VALUE); ++ this.addGameRule("doSignEditing", "true", GameRules.ValueType.BOOLEAN_VALUE); + > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/SpawnerAnimals.edit.java b/patches/minecraft/net/minecraft/world/SpawnerAnimals.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/SpawnerAnimals.edit.java rename to patches/minecraft/net/minecraft/world/SpawnerAnimals.edit.java index 826825c..e998eb2 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/SpawnerAnimals.edit.java +++ b/patches/minecraft/net/minecraft/world/SpawnerAnimals.edit.java @@ -17,9 +17,13 @@ > INSERT 2 : 3 @ 2 -+ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.EntityList; ++ import net.minecraft.entity.EntityList; -> CHANGE 44 : 47 @ 44 : 45 +> INSERT 16 : 17 @ 16 + ++ + +> CHANGE 21 : 24 @ 21 : 22 ~ if (!this.eligibleChunksForSpawning.contains(chunkcoordintpair) ~ && spawnHostileMobs.theChunkProviderServer.chunkExists(chunkcoordintpair.chunkXPos, diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/Teleporter.edit.java b/patches/minecraft/net/minecraft/world/Teleporter.edit.java similarity index 86% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/Teleporter.edit.java rename to patches/minecraft/net/minecraft/world/Teleporter.edit.java index 75a2432..72a4b9e 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/Teleporter.edit.java +++ b/patches/minecraft/net/minecraft/world/Teleporter.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 21 : 22 @ 21 : 22 +> INSERT 13 : 14 @ 13 + ++ + +> CHANGE 1 : 2 @ 1 : 2 ~ private final EaglercraftRandom random; diff --git a/patches/minecraft/net/minecraft/world/World.edit.java b/patches/minecraft/net/minecraft/world/World.edit.java index 470c8d4..e12c6c5 100644 --- a/patches/minecraft/net/minecraft/world/World.edit.java +++ b/patches/minecraft/net/minecraft/world/World.edit.java @@ -5,7 +5,9 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 5 +> INSERT 5 : 6 @ 5 + ++ > CHANGE 5 : 8 @ 5 : 6 @@ -13,27 +15,19 @@ ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 1 : 2 @ 1 : 2 +> CHANGE 1 : 4 @ 1 : 2 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; +~ import net.lax1dude.eaglercraft.v1_8.HString; +~ -> INSERT 1 : 6 @ 1 +> INSERT 1 : 2 @ 1 -+ -+ import com.google.common.base.Predicate; -+ import com.google.common.collect.Lists; -+ import com.google.common.collect.Sets; + -> DELETE 18 @ 18 : 19 +> DELETE 32 @ 32 : 46 -> DELETE 12 @ 12 : 27 - -> DELETE 1 @ 1 : 2 - -> DELETE 3 @ 3 : 4 - -> CHANGE 18 : 19 @ 18 : 19 +> CHANGE 24 : 25 @ 24 : 25 ~ protected int updateLCG = (new EaglercraftRandom()).nextInt(); @@ -41,71 +35,61 @@ ~ public final EaglercraftRandom rand = new EaglercraftRandom(); -> DELETE 7 @ 7 : 8 - -> CHANGE 1 : 2 @ 1 : 2 +> CHANGE 9 : 10 @ 9 : 10 ~ private final Calendar theCalendar = EagRuntime.getLocaleCalendar(); > DELETE 1 @ 1 : 2 -> INSERT 10 : 13 @ 10 +> INSERT 7 : 8 @ 7 -+ if (!client) { -+ throw new IllegalStateException("Singleplayer is unavailable because all of it's code was deleted"); -+ } ++ public final boolean isRemote; -> DELETE 8 @ 8 : 9 +> DELETE 11 @ 11 : 12 -> CHANGE 12 : 13 @ 12 : 13 +> INSERT 1 : 2 @ 1 -~ return chunk.getBiome(pos); ++ this.isRemote = client; -> CHANGE 11 : 12 @ 11 : 12 +> CHANGE 17 : 19 @ 17 : 18 -~ return BiomeGenBase.plains; +~ return CrashReportCategory +~ .getCoordinateInfo(new net.minecraft.util.BlockPos(pos.getX(), pos.getY(), pos.getZ())); -> DELETE 3 @ 3 : 7 +> CHANGE 257 : 258 @ 257 : 258 -> DELETE 54 @ 54 : 62 +~ return HString.format("ID #%d (%s // %s)", -> DELETE 36 @ 36 : 38 - -> CHANGE 15 : 16 @ 15 : 16 - -~ if ((flags & 2) != 0 && ((flags & 4) == 0) && chunk.isPopulated()) { - -> DELETE 3 @ 3 : 10 - -> CHANGE 36 : 37 @ 36 : 40 - -~ this.notifyNeighborsOfStateChange(pos, blockType); - -> DELETE 67 @ 67 : 69 - -> DELETE 1 @ 1 : 21 - -> CHANGE 117 : 118 @ 117 : 118 +> CHANGE 128 : 129 @ 128 : 129 ~ return Chunk.getNoSkyLightValue(); -> DELETE 1286 @ 1286 : 1344 +> CHANGE 1299 : 1300 @ 1299 : 1300 -> DELETE 40 @ 40 : 64 +~ this.worldInfo.setThunderTime((this.rand.nextInt(12000) / 2) + 3600); -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 1 : 2 @ 1 : 2 + +~ this.worldInfo.setThunderTime((this.rand.nextInt(168000) + 12000) * 2); + +> CHANGE 20 : 21 @ 20 : 21 + +~ this.worldInfo.setRainTime((this.rand.nextInt(12000) + 12000) / 2); + +> CHANGE 1 : 2 @ 1 : 2 + +~ this.worldInfo.setRainTime((this.rand.nextInt(168000) + 12000) * 2); + +> CHANGE 91 : 92 @ 91 : 92 ~ public void forceBlockUpdateTick(Block blockType, BlockPos pos, EaglercraftRandom random) { -> DELETE 231 @ 231 : 235 - -> CHANGE 28 : 29 @ 28 : 29 +> CHANGE 263 : 264 @ 263 : 264 ~ if (entityType.isAssignableFrom(entity.getClass()) && filter.apply((T) entity)) { -> CHANGE 10 : 12 @ 10 : 12 +> CHANGE 11 : 12 @ 11 : 12 -~ for (EntityPlayer entity : this.playerEntities) { ~ if (playerType.isAssignableFrom(entity.getClass()) && filter.apply((T) entity)) { > CHANGE 232 : 233 @ 232 : 233 @@ -116,10 +100,10 @@ ~ public EaglercraftRandom setRandomSeed(int parInt1, int parInt2, int parInt3) { -> CHANGE 52 : 53 @ 52 : 53 +> INSERT 129 : 132 @ 129 -~ this.theCalendar.setTimeInMillis(System.currentTimeMillis()); - -> DELETE 67 @ 67 : 71 ++ if (!MinecraftServer.getServer().worldServers[0].getWorldInfo().getGameRulesInstance() ++ .getBoolean("loadSpawnChunks")) ++ return false; > EOF diff --git a/patches/minecraft/net/minecraft/world/WorldManager.edit.java b/patches/minecraft/net/minecraft/world/WorldManager.edit.java new file mode 100644 index 0000000..b5da4fe --- /dev/null +++ b/patches/minecraft/net/minecraft/world/WorldManager.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 14 : 15 @ 14 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/WorldProvider.edit.java b/patches/minecraft/net/minecraft/world/WorldProvider.edit.java index 325ca35..7ab1fe2 100644 --- a/patches/minecraft/net/minecraft/world/WorldProvider.edit.java +++ b/patches/minecraft/net/minecraft/world/WorldProvider.edit.java @@ -5,20 +5,10 @@ # Version: 1.0 # Author: lax1dude -> DELETE 6 @ 6 : 14 +> DELETE 6 @ 6 : 11 -> DELETE 1 @ 1 : 6 - -> DELETE 6 @ 6 : 7 - -> DELETE 25 @ 25 : 37 - -> DELETE 3 @ 3 : 15 - -> CHANGE 31 : 32 @ 31 : 32 +> CHANGE 99 : 100 @ 99 : 100 ~ float f2 = 0.0F; -> DELETE 63 @ 63 : 67 - > EOF diff --git a/patches/minecraft/net/minecraft/world/WorldProviderEnd.edit.java b/patches/minecraft/net/minecraft/world/WorldProviderEnd.edit.java index 6cd8f7b..be6673d 100644 --- a/patches/minecraft/net/minecraft/world/WorldProviderEnd.edit.java +++ b/patches/minecraft/net/minecraft/world/WorldProviderEnd.edit.java @@ -5,10 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 5 @ 5 : 10 - -> DELETE 3 @ 3 : 4 - -> DELETE 4 @ 4 : 8 +> DELETE 5 @ 5 : 6 > EOF diff --git a/patches/minecraft/net/minecraft/world/WorldProviderHell.edit.java b/patches/minecraft/net/minecraft/world/WorldProviderHell.edit.java index 7cb77d8..a8dd664 100644 --- a/patches/minecraft/net/minecraft/world/WorldProviderHell.edit.java +++ b/patches/minecraft/net/minecraft/world/WorldProviderHell.edit.java @@ -5,12 +5,6 @@ # Version: 1.0 # Author: lax1dude -> DELETE 3 @ 3 : 6 - -> DELETE 1 @ 1 : 3 - > DELETE 3 @ 3 : 4 -> DELETE 19 @ 19 : 24 - > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/WorldServer.edit.java b/patches/minecraft/net/minecraft/world/WorldServer.edit.java similarity index 71% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/WorldServer.edit.java rename to patches/minecraft/net/minecraft/world/WorldServer.edit.java index ee612b7..f38a959 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/WorldServer.edit.java +++ b/patches/minecraft/net/minecraft/world/WorldServer.edit.java @@ -11,23 +11,21 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 2 : 5 @ 2 : 3 +> CHANGE 2 : 4 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -~ import net.lax1dude.eaglercraft.v1_8.sp.server.CrashReportHelper; ~ import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer; -> CHANGE 4 : 6 @ 4 : 6 - -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; - -> CHANGE 59 : 61 @ 59 : 61 +> CHANGE 65 : 67 @ 65 : 67 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> CHANGE 15 : 16 @ 15 : 16 +> INSERT 2 : 3 @ 2 + ++ + +> CHANGE 6 : 7 @ 6 : 7 ~ private final Map entitiesByUuid = Maps.newHashMap(); @@ -47,12 +45,7 @@ + ++EaglerMinecraftServer.counterTileUpdate; -> CHANGE 5 : 7 @ 5 : 7 - -~ CrashReportHelper.addIntegratedServerBlockInfo(crashreportcategory, -~ nextticklistentry1.position, iblockstate); - -> CHANGE 153 : 154 @ 153 : 154 +> CHANGE 160 : 161 @ 160 : 161 ~ EaglercraftRandom random = new EaglercraftRandom(this.getSeed()); @@ -65,4 +58,6 @@ ~ public void addScheduledTask(Runnable runnable) { ~ this.mcServer.addScheduledTask(runnable); +> DELETE 2 @ 2 : 6 + > EOF diff --git a/patches/minecraft/net/minecraft/world/WorldServerMulti.edit.java b/patches/minecraft/net/minecraft/world/WorldServerMulti.edit.java new file mode 100644 index 0000000..b5da4fe --- /dev/null +++ b/patches/minecraft/net/minecraft/world/WorldServerMulti.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 14 : 15 @ 14 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeCache.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeCache.edit.java new file mode 100644 index 0000000..61e0fa2 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/biome/BiomeCache.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 10 : 11 @ 10 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeDecorator.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeDecorator.edit.java similarity index 88% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeDecorator.edit.java rename to patches/minecraft/net/minecraft/world/biome/BiomeDecorator.edit.java index dda7c8e..5d4ec2e 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/BiomeDecorator.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeDecorator.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 32 : 33 @ 32 : 33 +> INSERT 24 : 25 @ 24 + ++ + +> CHANGE 1 : 2 @ 1 : 2 ~ protected EaglercraftRandom randomGenerator; diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeEndDecorator.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeEndDecorator.edit.java new file mode 100644 index 0000000..61e0fa2 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/biome/BiomeEndDecorator.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 10 : 11 @ 10 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java index f2721d0..98e9ed2 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenBase.edit.java @@ -5,29 +5,22 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 5 +> INSERT 5 : 6 @ 5 + ++ > CHANGE 3 : 4 @ 3 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> INSERT 1 : 8 @ 1 +> DELETE 29 @ 29 : 48 -+ -+ import com.google.common.collect.Lists; -+ import com.google.common.collect.Maps; -+ import com.google.common.collect.Sets; -+ -+ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -+ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; +> CHANGE 9 : 11 @ 9 : 11 -> DELETE 2 @ 2 : 3 +~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; +~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> DELETE 25 @ 25 : 44 - -> DELETE 2 @ 2 : 11 - -> CHANGE 19 : 64 @ 19 : 110 +> CHANGE 19 : 63 @ 19 : 110 ~ public static BiomeGenBase ocean; ~ public static BiomeGenBase plains; @@ -70,28 +63,27 @@ ~ public static BiomeGenBase mesaPlateau_F; ~ public static BiomeGenBase mesaPlateau; ~ public static BiomeGenBase field_180279_ad; -~ protected static final NoiseGeneratorPerlin temperatureNoise = new NoiseGeneratorPerlin( -~ new EaglercraftRandom(1234L), 1); -~ protected static final NoiseGeneratorPerlin GRASS_COLOR_NOISE = new NoiseGeneratorPerlin( -~ new EaglercraftRandom(2345L), 1); +~ protected static NoiseGeneratorPerlin temperatureNoise; +~ protected static NoiseGeneratorPerlin GRASS_COLOR_NOISE; +~ protected static WorldGenDoublePlant DOUBLE_PLANT_GENERATOR; -> DELETE 11 @ 11 : 12 +> CHANGE 81 : 82 @ 81 : 82 -> DELETE 7 @ 7 : 10 +~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom rand) { -> DELETE 12 @ 12 : 15 +> CHANGE 3 : 4 @ 3 : 4 -> DELETE 2 @ 2 : 3 +~ public WorldGenerator getRandomWorldGenForGrass(EaglercraftRandom rand) { -> DELETE 16 @ 16 : 20 - -> CHANGE 21 : 22 @ 21 : 30 +> CHANGE 3 : 4 @ 3 : 4 ~ public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom rand, BlockPos pos) { -> DELETE 94 @ 94 : 98 +> CHANGE 94 : 95 @ 94 : 95 -> CHANGE 16 : 18 @ 16 : 18 +~ public void decorate(World worldIn, EaglercraftRandom rand, BlockPos pos) { + +> CHANGE 19 : 21 @ 19 : 21 ~ public void genTerrainBlocks(World worldIn, EaglercraftRandom rand, ChunkPrimer chunkPrimerIn, int parInt1, ~ int parInt2, double parDouble1) { @@ -101,46 +93,9 @@ ~ public final void generateBiomeTerrain(World worldIn, EaglercraftRandom rand, ChunkPrimer chunkPrimerIn, ~ int parInt1, int parInt2, double parDouble1) { -> CHANGE 101 : 214 @ 101 : 102 +> CHANGE 101 : 177 @ 101 : 102 -~ public static class Height { -~ public float rootHeight; -~ public float variation; -~ -~ public Height(float rootHeightIn, float variationIn) { -~ this.rootHeight = rootHeightIn; -~ this.variation = variationIn; -~ } -~ -~ public BiomeGenBase.Height attenuate() { -~ return new BiomeGenBase.Height(this.rootHeight * 0.8F, this.variation * 0.6F); -~ } -~ } -~ -~ public static class SpawnListEntry extends WeightedRandom.Item { -~ public Class entityClass; -~ public int minGroupCount; -~ public int maxGroupCount; -~ -~ public SpawnListEntry(Class entityclassIn, int weight, int groupCountMin, -~ int groupCountMax) { -~ super(weight); -~ this.entityClass = entityclassIn; -~ this.minGroupCount = groupCountMin; -~ this.maxGroupCount = groupCountMax; -~ } -~ -~ public String toString() { -~ return this.entityClass.getSimpleName() + "*(" + this.minGroupCount + "-" + this.maxGroupCount + "):" -~ + this.itemWeight; -~ } -~ } -~ -~ public static enum TempCategory { -~ OCEAN, COLD, MEDIUM, WARM; -~ } -~ -~ public static void bootstrap() { +~ public static void doBootstrap() { ~ ocean = (new BiomeGenOcean(0)).setColor(112).setBiomeName("Ocean").setHeight(height_Oceans); ~ plains = (new BiomeGenPlains(1)).setColor(9286496).setBiomeName("Plains"); ~ desert = (new BiomeGenDesert(2)).setColor(16421912).setBiomeName("Desert").setDisableRain() @@ -217,8 +172,14 @@ ~ field_180279_ad = ocean; ~ -> DELETE 41 @ 41 : 44 +> INSERT 22 : 24 @ 22 -> DELETE 2 @ 2 : 38 ++ explorationBiomesList.clear(); ++ + +> CHANGE 19 : 21 @ 19 : 21 + +~ temperatureNoise = new NoiseGeneratorPerlin(new EaglercraftRandom(1234L), 1); +~ GRASS_COLOR_NOISE = new NoiseGeneratorPerlin(new EaglercraftRandom(2345L), 1); > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenBeach.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenBeach.edit.java index 96aab9d..a8dd664 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenBeach.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenBeach.edit.java @@ -7,6 +7,4 @@ > DELETE 3 @ 3 : 4 -> DELETE 7 @ 7 : 11 - > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenDesert.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenDesert.edit.java index a31c9b3..f183e49 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenDesert.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenDesert.edit.java @@ -5,12 +5,14 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 -> DELETE 1 @ 1 : 5 +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> DELETE 7 @ 7 : 11 +> DELETE 3 @ 3 : 4 -> DELETE 2 @ 2 : 13 +> CHANGE 15 : 16 @ 15 : 16 + +~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenEnd.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenEnd.edit.java index b51d23a..a7f89c1 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenEnd.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenEnd.edit.java @@ -7,6 +7,4 @@ > DELETE 4 @ 4 : 6 -> DELETE 11 @ 11 : 12 - > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.edit.java index 23c315f..a65c812 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenForest.edit.java @@ -5,28 +5,30 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ -> DELETE 4 @ 4 : 11 +> DELETE 6 @ 6 : 8 -> DELETE 3 @ 3 : 6 +> CHANGE 54 : 55 @ 54 : 55 -> DELETE 4 @ 4 : 11 +~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { -> DELETE 13 @ 13 : 17 - -> CHANGE 16 : 17 @ 16 : 22 +> CHANGE 4 : 5 @ 4 : 5 ~ public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom random, BlockPos blockpos) { -> DELETE 14 @ 14 : 64 +> CHANGE 14 : 15 @ 14 : 15 -> CHANGE 15 : 17 @ 15 : 25 +~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { -~ && this.biomeID != BiomeGenBase.birchForestHills.biomeID ? new BiomeGenMutated(i, this) -~ : new BiomeGenMutated(i, this); +> CHANGE 65 : 66 @ 65 : 66 + +~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { + +> CHANGE 3 : 4 @ 3 : 4 + +~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.edit.java index 9120273..28eecd1 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenHills.edit.java @@ -5,22 +5,25 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ -> DELETE 1 @ 1 : 2 +> DELETE 4 @ 4 : 5 -> DELETE 1 @ 1 : 2 +> INSERT 7 : 8 @ 7 -> DELETE 1 @ 1 : 5 ++ -> DELETE 2 @ 2 : 6 +> CHANGE 19 : 20 @ 19 : 20 -> DELETE 9 @ 9 : 10 +~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { -> CHANGE 5 : 7 @ 5 : 33 +> CHANGE 3 : 4 @ 3 : 4 + +~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { + +> CHANGE 22 : 24 @ 22 : 23 ~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, ~ double d0) { diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenJungle.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenJungle.edit.java index 2295ed8..96dab79 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenJungle.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenJungle.edit.java @@ -5,13 +5,13 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 -> DELETE 4 @ 4 : 5 +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> DELETE 4 @ 4 : 15 +> DELETE 11 @ 11 : 12 -> CHANGE 3 : 6 @ 3 : 11 +> CHANGE 11 : 14 @ 11 : 19 ~ private final IBlockState field_181620_aE; ~ private final IBlockState field_181621_aF; @@ -26,8 +26,16 @@ + field_181622_aG = Blocks.leaves.getDefaultState().withProperty(BlockOldLeaf.VARIANT, BlockPlanks.EnumType.OAK) + .withProperty(BlockLeaves.CHECK_DECAY, Boolean.valueOf(false)); -> DELETE 1 @ 1 : 9 +> CHANGE 16 : 17 @ 16 : 17 -> DELETE 7 @ 7 : 37 +~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { + +> CHANGE 8 : 9 @ 8 : 9 + +~ public WorldGenerator getRandomWorldGenForGrass(EaglercraftRandom random) { + +> CHANGE 4 : 5 @ 4 : 5 + +~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenMesa.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenMesa.edit.java index aee709f..b5934f5 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenMesa.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenMesa.edit.java @@ -5,22 +5,19 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 3 : 5 @ 3 : 4 +> CHANGE 3 : 4 @ 3 : 4 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ -> DELETE 9 @ 9 : 10 +> CHANGE 44 : 45 @ 44 : 45 -> DELETE 2 @ 2 : 3 +~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom var1) { -> DELETE 19 @ 19 : 24 +> CHANGE 11 : 12 @ 11 : 12 -> DELETE 1 @ 1 : 5 +~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { -> DELETE 2 @ 2 : 6 - -> CHANGE 8 : 10 @ 8 : 13 +> CHANGE 3 : 5 @ 3 : 4 ~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, ~ double d0) { diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.edit.java index a48cd95..0d7c65a 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenMushroomIsland.edit.java @@ -7,6 +7,4 @@ > DELETE 4 @ 4 : 5 -> DELETE 4 @ 4 : 9 - > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenMutated.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenMutated.edit.java index 546cf32..8944248 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenMutated.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenMutated.edit.java @@ -16,13 +16,17 @@ > DELETE 2 @ 2 : 3 -> DELETE 1 @ 1 : 2 +> CHANGE 31 : 32 @ 31 : 32 -> CHANGE 29 : 31 @ 29 : 34 +~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { + +> CHANGE 3 : 5 @ 3 : 4 ~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, ~ double d0) { -> DELETE 7 @ 7 : 11 +> CHANGE 7 : 8 @ 7 : 8 + +~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.edit.java index 2414fea..fb25bdd 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenPlains.edit.java @@ -5,19 +5,18 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 4 +> CHANGE 2 : 3 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ -> DELETE 3 @ 3 : 5 +> DELETE 5 @ 5 : 6 -> DELETE 9 @ 9 : 12 - -> CHANGE 2 : 3 @ 2 : 3 +> CHANGE 14 : 15 @ 14 : 15 ~ public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom random, BlockPos blockpos) { -> DELETE 24 @ 24 : 57 +> CHANGE 24 : 25 @ 24 : 25 + +~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenSavanna.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenSavanna.edit.java index 0efd7d7..51cda40 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenSavanna.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenSavanna.edit.java @@ -5,34 +5,31 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ -> DELETE 1 @ 1 : 2 +> DELETE 6 @ 6 : 8 -> DELETE 2 @ 2 : 3 +> INSERT 5 : 6 @ 5 -> DELETE 1 @ 1 : 3 ++ -> DELETE 1 @ 1 : 3 +> CHANGE 10 : 11 @ 10 : 11 -> DELETE 2 @ 2 : 3 +~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { -> DELETE 4 @ 4 : 7 +> CHANGE 11 : 12 @ 11 : 12 -> DELETE 2 @ 2 : 6 +~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { -> DELETE 8 @ 8 : 21 - -> DELETE 3 @ 3 : 6 - -> CHANGE 2 : 4 @ 2 : 3 +> CHANGE 20 : 22 @ 20 : 21 ~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, ~ double d0) { -> DELETE 12 @ 12 : 16 +> CHANGE 13 : 14 @ 13 : 14 + +~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenSnow.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenSnow.edit.java index 633944a..afe7756 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenSnow.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenSnow.edit.java @@ -5,12 +5,18 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 -> DELETE 1 @ 1 : 8 +~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> DELETE 3 @ 3 : 5 +> DELETE 3 @ 3 : 4 -> DELETE 11 @ 11 : 33 +> CHANGE 20 : 21 @ 20 : 21 + +~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { + +> CHANGE 17 : 18 @ 17 : 18 + +~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom var1) { > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.edit.java index 96aab9d..a8dd664 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenStoneBeach.edit.java @@ -7,6 +7,4 @@ > DELETE 3 @ 3 : 4 -> DELETE 7 @ 7 : 11 - > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.edit.java index 978c837..d11854c 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenSwamp.edit.java @@ -5,25 +5,23 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ -> DELETE 1 @ 1 : 2 +> DELETE 6 @ 6 : 7 -> DELETE 1 @ 1 : 2 +> CHANGE 20 : 21 @ 20 : 21 -> DELETE 1 @ 1 : 5 +~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom var1) { -> DELETE 4 @ 4 : 14 - -> DELETE 4 @ 4 : 8 - -> CHANGE 10 : 11 @ 10 : 11 +> CHANGE 13 : 14 @ 13 : 14 ~ public BlockFlower.EnumFlowerType pickRandomFlower(EaglercraftRandom var1, BlockPos var2) { -> DELETE 2 @ 2 : 24 +> CHANGE 3 : 5 @ 3 : 4 + +~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, +~ double d0) { > EOF diff --git a/patches/minecraft/net/minecraft/world/biome/BiomeGenTaiga.edit.java b/patches/minecraft/net/minecraft/world/biome/BiomeGenTaiga.edit.java index 4389c12..304e65e 100644 --- a/patches/minecraft/net/minecraft/world/biome/BiomeGenTaiga.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/BiomeGenTaiga.edit.java @@ -5,28 +5,31 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 4 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ -> DELETE 1 @ 1 : 3 +> DELETE 7 @ 7 : 8 -> DELETE 2 @ 2 : 3 +> INSERT 10 : 11 @ 10 -> DELETE 1 @ 1 : 2 ++ -> DELETE 1 @ 1 : 8 +> CHANGE 23 : 24 @ 23 : 24 -> DELETE 2 @ 2 : 7 +~ public WorldGenAbstractTree genBigTreeChance(EaglercraftRandom random) { -> DELETE 6 @ 6 : 16 +> CHANGE 6 : 7 @ 6 : 7 -> CHANGE 2 : 4 @ 2 : 15 +~ public WorldGenerator getRandomWorldGenForGrass(EaglercraftRandom random) { + +> CHANGE 4 : 5 @ 4 : 5 + +~ public void decorate(World world, EaglercraftRandom random, BlockPos blockpos) { + +> CHANGE 23 : 25 @ 23 : 24 ~ public void genTerrainBlocks(World world, EaglercraftRandom random, ChunkPrimer chunkprimer, int i, int j, ~ double d0) { -> DELETE 1 @ 1 : 25 - > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/WorldChunkManager.edit.java b/patches/minecraft/net/minecraft/world/biome/WorldChunkManager.edit.java similarity index 66% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/WorldChunkManager.edit.java rename to patches/minecraft/net/minecraft/world/biome/WorldChunkManager.edit.java index 6eb3c7c..c5f6221 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/WorldChunkManager.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/WorldChunkManager.edit.java @@ -5,13 +5,15 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 4 : 7 @ 4 : 7 +> CHANGE 4 : 5 @ 4 : 5 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; -> CHANGE 180 : 181 @ 180 : 181 +> INSERT 12 : 13 @ 12 + ++ + +> CHANGE 163 : 164 @ 163 : 164 ~ public BlockPos findBiomePosition(int x, int z, int range, List biomes, EaglercraftRandom random) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/WorldChunkManagerHell.edit.java b/patches/minecraft/net/minecraft/world/biome/WorldChunkManagerHell.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/WorldChunkManagerHell.edit.java rename to patches/minecraft/net/minecraft/world/biome/WorldChunkManagerHell.edit.java index 2f8a813..eaecf53 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/biome/WorldChunkManagerHell.edit.java +++ b/patches/minecraft/net/minecraft/world/biome/WorldChunkManagerHell.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 55 : 56 @ 55 : 56 +> INSERT 5 : 6 @ 5 + ++ + +> CHANGE 43 : 44 @ 43 : 44 ~ public BlockPos findBiomePosition(int i, int j, int k, List list, EaglercraftRandom random) { diff --git a/patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java b/patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java index a648fa0..1e1e1bc 100644 --- a/patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java +++ b/patches/minecraft/net/minecraft/world/chunk/Chunk.edit.java @@ -5,29 +5,31 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 3 @ 2 : 5 +> DELETE 4 @ 4 : 5 -~ import java.util.ArrayList; +> INSERT 1 : 2 @ 1 -> CHANGE 3 : 4 @ 3 : 4 ++ import java.util.LinkedList; + +> CHANGE 2 : 4 @ 2 : 3 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; +~ -> CHANGE 1 : 8 @ 1 : 2 +> CHANGE 1 : 3 @ 1 : 2 ~ -~ import com.google.common.base.Predicate; -~ import com.google.common.collect.Maps; -~ -~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -~ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; +~ import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer; > DELETE 18 @ 18 : 19 -> DELETE 1 @ 1 : 5 +> DELETE 2 @ 2 : 5 -> DELETE 1 @ 1 : 4 +> CHANGE 1 : 4 @ 1 : 4 + +~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; +~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; +~ import net.lax1dude.eaglercraft.v1_8.opengl.ext.deferred.DeferredStateManager; > CHANGE 24 : 25 @ 24 : 25 @@ -35,9 +37,21 @@ > CHANGE 8 : 9 @ 8 : 9 -~ this.tileEntityPosQueue = new ArrayList(); +~ this.tileEntityPosQueue = new LinkedList(); -> CHANGE 342 : 351 @ 342 : 346 +> INSERT 135 : 138 @ 135 + ++ if (!this.worldObj.isRemote) { ++ ++EaglerMinecraftServer.counterLightUpdate; ++ } + +> INSERT 146 : 149 @ 146 + ++ if (!this.worldObj.isRemote) { ++ ++EaglerMinecraftServer.counterLightUpdate; ++ } + +> CHANGE 61 : 70 @ 61 : 65 ~ try { ~ if (pos.getY() >= 0 && pos.getY() >> 4 < this.storageArrays.length) { @@ -96,13 +110,7 @@ + }); + throw new ReportedException(crashreport); -> CHANGE 46 : 47 @ 46 : 49 - -~ if (block1 instanceof ITileEntityProvider) { - -> DELETE 33 @ 33 : 37 - -> CHANGE 24 : 26 @ 24 : 25 +> CHANGE 110 : 112 @ 110 : 111 ~ return extendedblockstorage == null ~ ? (this.canSeeSky(blockpos) ? enumskyblock.defaultLightValue : getNoSkyLightValue()) @@ -137,18 +145,12 @@ ~ public EaglercraftRandom getRandomWithSeed(long i) { ~ return new EaglercraftRandom(this.worldObj.getSeed() + (long) (this.xPosition * this.xPosition * 4987142) -> CHANGE 83 : 84 @ 83 : 84 - -~ this.recheckGaps(true); - -> CHANGE 8 : 9 @ 8 : 9 +> CHANGE 92 : 93 @ 92 : 93 ~ BlockPos blockpos = (BlockPos) this.tileEntityPosQueue.remove(0); -> CHANGE 109 : 110 @ 109 : 110 +> CHANGE 113 : 114 @ 113 : 114 -~ public BiomeGenBase getBiome(BlockPos pos) { - -> DELETE 3 @ 3 : 9 +~ if (chunkManager != null && k == 255) { > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/storage/AnvilChunkLoader.edit.java b/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.edit.java similarity index 74% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/storage/AnvilChunkLoader.edit.java rename to patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.edit.java index 37a4f72..472e046 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/storage/AnvilChunkLoader.edit.java +++ b/patches/minecraft/net/minecraft/world/chunk/storage/AnvilChunkLoader.edit.java @@ -7,26 +7,20 @@ > DELETE 5 @ 5 : 6 -> CHANGE 9 : 12 @ 9 : 12 - -~ import net.minecraft.nbt.CompressedStreamTools; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; - -> CHANGE 11 : 13 @ 11 : 16 +> CHANGE 23 : 25 @ 23 : 28 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> CHANGE 3 : 4 @ 3 : 4 +> CHANGE 1 : 2 @ 1 : 7 ~ public abstract class AnvilChunkLoader implements IChunkLoader { -> CHANGE 5 : 6 @ 5 : 10 +> CHANGE 1 : 2 @ 1 : 4 ~ private static final Logger logger = LogManager.getLogger("AnvilChunkLoader"); -> DELETE 1 @ 1 : 21 +> DELETE 1 @ 1 : 17 > CHANGE 24 : 25 @ 24 : 109 diff --git a/patches/minecraft/net/minecraft/world/chunk/storage/ChunkLoader.edit.java b/patches/minecraft/net/minecraft/world/chunk/storage/ChunkLoader.edit.java new file mode 100644 index 0000000..e395576 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/chunk/storage/ChunkLoader.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 11 : 12 @ 11 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/storage/RegionFile.edit.java b/patches/minecraft/net/minecraft/world/chunk/storage/RegionFile.edit.java similarity index 87% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/storage/RegionFile.edit.java rename to patches/minecraft/net/minecraft/world/chunk/storage/RegionFile.edit.java index 9c08114..d32d3a5 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/chunk/storage/RegionFile.edit.java +++ b/patches/minecraft/net/minecraft/world/chunk/storage/RegionFile.edit.java @@ -13,20 +13,15 @@ > DELETE 1 @ 1 : 5 -> CHANGE 1 : 2 @ 1 : 2 +> INSERT 1 : 6 @ 1 -~ import com.google.common.collect.Lists; ++ import com.google.common.collect.Lists; ++ ++ import net.lax1dude.eaglercraft.v1_8.EaglerZLIB; ++ import net.lax1dude.eaglercraft.v1_8.sp.server.export.RandomAccessMemoryFile; ++ -> CHANGE 1 : 3 @ 1 : 2 - -~ import net.lax1dude.eaglercraft.v1_8.EaglerZLIB; -~ import net.lax1dude.eaglercraft.v1_8.sp.server.export.RandomAccessMemoryFile; - -> CHANGE 1 : 2 @ 1 : 5 - -~ public class RegionFile { - -> CHANGE 1 : 2 @ 1 : 3 +> CHANGE 2 : 3 @ 2 : 4 ~ private RandomAccessMemoryFile dataFile; diff --git a/patches/minecraft/net/minecraft/world/demo/DemoWorldManager.edit.java b/patches/minecraft/net/minecraft/world/demo/DemoWorldManager.edit.java new file mode 100644 index 0000000..9e4f0d7 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/demo/DemoWorldManager.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 12 : 13 @ 12 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/demo/DemoWorldServer.edit.java b/patches/minecraft/net/minecraft/world/demo/DemoWorldServer.edit.java index 3b38f36..19d48a0 100644 --- a/patches/minecraft/net/minecraft/world/demo/DemoWorldServer.edit.java +++ b/patches/minecraft/net/minecraft/world/demo/DemoWorldServer.edit.java @@ -5,17 +5,14 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 2 : 3 @ 2 : 5 +> INSERT 10 : 12 @ 10 -~ import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion; ++ import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion; ++ -> DELETE 2 @ 2 : 4 +> CHANGE 1 : 3 @ 1 : 2 -> CHANGE 1 : 3 @ 1 : 3 - -~ public class DemoWorldServer { +~ ~ private static final long demoWorldSeed = EaglercraftVersion.demoWorldSeed; -> DELETE 2 @ 2 : 8 - > EOF diff --git a/patches/minecraft/net/minecraft/world/gen/ChunkProviderDebug.edit.java b/patches/minecraft/net/minecraft/world/gen/ChunkProviderDebug.edit.java new file mode 100644 index 0000000..e8768a1 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderDebug.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 18 : 19 @ 18 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderEnd.edit.java b/patches/minecraft/net/minecraft/world/gen/ChunkProviderEnd.edit.java similarity index 91% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderEnd.edit.java rename to patches/minecraft/net/minecraft/world/gen/ChunkProviderEnd.edit.java index 48491ca..fe98eb0 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderEnd.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderEnd.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 23 : 24 @ 23 : 24 +> CHANGE 16 : 18 @ 16 : 17 +~ ~ private EaglercraftRandom endRNG; > CHANGE 16 : 17 @ 16 : 17 diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderFlat.edit.java b/patches/minecraft/net/minecraft/world/gen/ChunkProviderFlat.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderFlat.edit.java rename to patches/minecraft/net/minecraft/world/gen/ChunkProviderFlat.edit.java index 3abc3a2..af2c971 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderFlat.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderFlat.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 32 : 33 @ 32 : 33 +> INSERT 24 : 25 @ 24 + ++ + +> CHANGE 1 : 2 @ 1 : 2 ~ private EaglercraftRandom random; diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderGenerate.edit.java b/patches/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderGenerate.edit.java rename to patches/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.edit.java index 93273c5..5669a87 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderGenerate.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderGenerate.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 37 : 38 @ 37 : 38 +> CHANGE 30 : 32 @ 30 : 31 +~ ~ private EaglercraftRandom rand; > CHANGE 32 : 33 @ 32 : 33 diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderHell.edit.java b/patches/minecraft/net/minecraft/world/gen/ChunkProviderHell.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderHell.edit.java rename to patches/minecraft/net/minecraft/world/gen/ChunkProviderHell.edit.java index 66f1a2d..f616a61 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderHell.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderHell.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 37 : 38 @ 37 : 38 +> INSERT 28 : 29 @ 28 + ++ + +> CHANGE 2 : 3 @ 2 : 3 ~ private final EaglercraftRandom hellRNG; diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderServer.edit.java b/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.edit.java similarity index 76% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderServer.edit.java rename to patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.edit.java index ebb4370..0804487 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/ChunkProviderServer.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/ChunkProviderServer.edit.java @@ -5,11 +5,9 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 9 : 12 @ 9 : 11 +> INSERT 11 : 12 @ 11 -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; -~ import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer; ++ import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer; > CHANGE 14 : 17 @ 14 : 16 @@ -17,7 +15,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> INSERT 65 : 66 @ 65 +> INSERT 2 : 3 @ 2 + ++ + +> INSERT 56 : 57 @ 56 + ++EaglerMinecraftServer.counterChunkGenerate; diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/GeneratorBushFeature.edit.java b/patches/minecraft/net/minecraft/world/gen/GeneratorBushFeature.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/GeneratorBushFeature.edit.java rename to patches/minecraft/net/minecraft/world/gen/GeneratorBushFeature.edit.java index 973c900..6be8807 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/GeneratorBushFeature.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/GeneratorBushFeature.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 19 : 20 @ 19 : 20 +> INSERT 6 : 7 @ 6 + ++ + +> CHANGE 6 : 7 @ 6 : 7 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/MapGenBase.edit.java b/patches/minecraft/net/minecraft/world/gen/MapGenBase.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/MapGenBase.edit.java rename to patches/minecraft/net/minecraft/world/gen/MapGenBase.edit.java index 22e9b08..877b528 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/MapGenBase.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/MapGenBase.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 13 : 14 @ 13 : 14 +> INSERT 5 : 6 @ 5 + ++ + +> CHANGE 1 : 2 @ 1 : 2 ~ protected EaglercraftRandom rand = new EaglercraftRandom(); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/MapGenCaves.edit.java b/patches/minecraft/net/minecraft/world/gen/MapGenCaves.edit.java similarity index 82% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/MapGenCaves.edit.java rename to patches/minecraft/net/minecraft/world/gen/MapGenCaves.edit.java index 3952ade..7e8b1cf 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/MapGenCaves.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/MapGenCaves.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 31 : 32 @ 31 : 32 +> INSERT 11 : 12 @ 11 + ++ + +> CHANGE 13 : 14 @ 13 : 14 ~ EaglercraftRandom random = new EaglercraftRandom(parLong1); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/MapGenCavesHell.edit.java b/patches/minecraft/net/minecraft/world/gen/MapGenCavesHell.edit.java similarity index 82% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/MapGenCavesHell.edit.java rename to patches/minecraft/net/minecraft/world/gen/MapGenCavesHell.edit.java index af0b5f9..d623e03 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/MapGenCavesHell.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/MapGenCavesHell.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 28 : 29 @ 28 : 29 +> INSERT 8 : 9 @ 8 + ++ + +> CHANGE 13 : 14 @ 13 : 14 ~ EaglercraftRandom random = new EaglercraftRandom(parLong1); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/MapGenRavine.edit.java b/patches/minecraft/net/minecraft/world/gen/MapGenRavine.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/MapGenRavine.edit.java rename to patches/minecraft/net/minecraft/world/gen/MapGenRavine.edit.java index 15f4c62..323f98c 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/MapGenRavine.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/MapGenRavine.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 21 : 22 @ 21 : 22 +> INSERT 9 : 10 @ 9 + ++ + +> CHANGE 5 : 6 @ 5 : 6 ~ EaglercraftRandom random = new EaglercraftRandom(parLong1); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenAbstractTree.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenAbstractTree.edit.java similarity index 84% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenAbstractTree.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenAbstractTree.edit.java index 45a38e1..8a84ecb 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenAbstractTree.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenAbstractTree.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 26 : 27 @ 26 : 27 +> INSERT 8 : 9 @ 8 + ++ + +> CHANGE 11 : 12 @ 11 : 12 ~ public void func_180711_a(World worldIn, EaglercraftRandom parRandom, BlockPos parBlockPos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenBigMushroom.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenBigMushroom.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.edit.java index a7b44fa..0f31d7b 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenBigMushroom.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigMushroom.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 27 : 28 @ 27 : 28 +> INSERT 9 : 10 @ 9 + ++ + +> CHANGE 11 : 12 @ 11 : 12 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenBigTree.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigTree.edit.java similarity index 95% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenBigTree.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigTree.edit.java index d6dd7a5..a2b7625 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenBigTree.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBigTree.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 19 : 20 @ 19 : 20 +> CHANGE 12 : 14 @ 12 : 13 +~ ~ private EaglercraftRandom rand; > CHANGE 37 : 39 @ 37 : 39 diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenBlockBlob.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBlockBlob.edit.java similarity index 84% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenBlockBlob.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenBlockBlob.edit.java index dc1b382..bf86377 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenBlockBlob.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenBlockBlob.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 23 : 24 @ 23 : 24 +> INSERT 7 : 8 @ 7 + ++ + +> CHANGE 9 : 10 @ 9 : 10 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenCactus.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenCactus.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenCactus.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenCactus.edit.java index 42f2a5f..afe4738 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenCactus.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenCactus.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 13 : 14 @ 13 : 14 +> CHANGE 6 : 8 @ 6 : 7 +~ ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenCanopyTree.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenCanopyTree.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenCanopyTree.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenCanopyTree.edit.java index fe7463a..30781c3 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenCanopyTree.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenCanopyTree.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 31 : 32 @ 31 : 32 +> INSERT 14 : 15 @ 14 + ++ + +> CHANGE 10 : 11 @ 10 : 11 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenClay.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenClay.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenClay.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenClay.edit.java index 89ac918..8600d62 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenClay.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenClay.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 22 : 23 @ 22 : 23 +> INSERT 8 : 9 @ 8 + ++ + +> CHANGE 7 : 8 @ 7 : 8 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenDeadBush.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenDeadBush.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.edit.java index 5f8ee89..dd92a3e 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenDeadBush.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDeadBush.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 8 : 10 @ 8 : 9 +~ ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenDesertWells.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDesertWells.edit.java similarity index 84% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenDesertWells.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenDesertWells.edit.java index 9328751..5b0dde8 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenDesertWells.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDesertWells.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 27 : 28 @ 27 : 28 +> INSERT 12 : 13 @ 12 + ++ + +> CHANGE 8 : 9 @ 8 : 9 ~ public boolean generate(World world, EaglercraftRandom var2, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenDoublePlant.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDoublePlant.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenDoublePlant.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenDoublePlant.edit.java index 7bd56b6..c13f33e 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenDoublePlant.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDoublePlant.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 20 : 21 @ 20 : 21 +> INSERT 7 : 8 @ 7 + ++ + +> CHANGE 6 : 7 @ 6 : 7 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenDungeons.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenDungeons.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.edit.java index 9ac2a9d..f1c39a2 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenDungeons.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenDungeons.edit.java @@ -14,7 +14,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> CHANGE 28 : 29 @ 28 : 29 +> INSERT 2 : 3 @ 2 + ++ + +> CHANGE 19 : 20 @ 19 : 20 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenFire.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenFire.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenFire.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenFire.edit.java index 42f2a5f..afe4738 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenFire.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenFire.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 13 : 14 @ 13 : 14 +> CHANGE 6 : 8 @ 6 : 7 +~ ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenFlowers.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenFlowers.edit.java similarity index 84% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenFlowers.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenFlowers.edit.java index a7b44fa..2354e9d 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenFlowers.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenFlowers.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 27 : 28 @ 27 : 28 +> INSERT 7 : 8 @ 7 + ++ + +> CHANGE 13 : 14 @ 13 : 14 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenForest.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenForest.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenForest.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenForest.edit.java index fe7463a..5edaf13 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenForest.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenForest.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 31 : 32 @ 31 : 32 +> INSERT 12 : 13 @ 12 + ++ + +> CHANGE 12 : 13 @ 12 : 13 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenGlowStone1.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenGlowStone1.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenGlowStone1.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenGlowStone1.edit.java index 5f8ee89..dd92a3e 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenGlowStone1.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenGlowStone1.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 8 : 10 @ 8 : 9 +~ ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenGlowStone2.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenGlowStone2.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenGlowStone2.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenGlowStone2.edit.java index 5f8ee89..dd92a3e 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenGlowStone2.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenGlowStone2.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 8 : 10 @ 8 : 9 +~ ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenHellLava.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenHellLava.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenHellLava.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenHellLava.edit.java index dc1b382..af6c975 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenHellLava.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenHellLava.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 23 : 24 @ 23 : 24 +> INSERT 8 : 9 @ 8 + ++ + +> CHANGE 8 : 9 @ 8 : 9 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenHugeTrees.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenHugeTrees.edit.java similarity index 87% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenHugeTrees.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenHugeTrees.edit.java index d4c1760..cdf7fd1 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenHugeTrees.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenHugeTrees.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 30 : 31 @ 30 : 31 +> INSERT 9 : 10 @ 9 + ++ + +> CHANGE 14 : 15 @ 14 : 15 ~ protected int func_150533_a(EaglercraftRandom parRandom) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenIcePath.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenIcePath.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenIcePath.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenIcePath.edit.java index 3095697..6c3f730 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenIcePath.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenIcePath.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 21 : 22 @ 21 : 22 +> INSERT 7 : 8 @ 7 + ++ + +> CHANGE 7 : 8 @ 7 : 8 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenIceSpike.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenIceSpike.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenIceSpike.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenIceSpike.edit.java index 38fabe1..3a5e0e4 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenIceSpike.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenIceSpike.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 16 : 17 @ 16 : 17 +> CHANGE 9 : 11 @ 9 : 10 +~ ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenLakes.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenLakes.edit.java similarity index 84% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenLakes.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenLakes.edit.java index dc1b382..43f9838 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenLakes.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenLakes.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 23 : 24 @ 23 : 24 +> INSERT 10 : 11 @ 10 + ++ + +> CHANGE 6 : 7 @ 6 : 7 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenLiquids.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenLiquids.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenLiquids.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenLiquids.edit.java index 3095697..d4da835 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenLiquids.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenLiquids.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 21 : 22 @ 21 : 22 +> INSERT 8 : 9 @ 8 + ++ + +> CHANGE 6 : 7 @ 6 : 7 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenMegaJungle.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenMegaJungle.edit.java similarity index 89% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenMegaJungle.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenMegaJungle.edit.java index f18755b..d6f96dd 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenMegaJungle.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenMegaJungle.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 22 : 23 @ 22 : 23 +> INSERT 10 : 11 @ 10 + ++ + +> CHANGE 5 : 6 @ 5 : 6 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenMegaPineTree.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenMegaPineTree.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenMegaPineTree.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenMegaPineTree.edit.java index 56405c2..ae1947d 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenMegaPineTree.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenMegaPineTree.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 36 : 37 @ 36 : 37 +> INSERT 15 : 16 @ 15 + ++ + +> CHANGE 14 : 15 @ 14 : 15 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenMelon.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenMelon.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenMelon.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenMelon.edit.java index 42f2a5f..afe4738 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenMelon.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenMelon.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 13 : 14 @ 13 : 14 +> CHANGE 6 : 8 @ 6 : 7 +~ ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenMinable.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenMinable.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenMinable.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenMinable.edit.java index 3fcd99c..2c42eba 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenMinable.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenMinable.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 30 : 31 @ 30 : 31 +> INSERT 9 : 10 @ 9 + ++ + +> CHANGE 14 : 15 @ 14 : 15 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenPumpkin.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenPumpkin.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenPumpkin.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenPumpkin.edit.java index 5f8ee89..dd92a3e 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenPumpkin.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenPumpkin.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 15 : 16 @ 15 : 16 +> CHANGE 8 : 10 @ 8 : 9 +~ ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenReed.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenReed.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenReed.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenReed.edit.java index 57aee5a..51a3b42 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenReed.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenReed.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 14 : 15 @ 14 : 15 +> CHANGE 7 : 9 @ 7 : 8 +~ ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenSand.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSand.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenSand.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenSand.edit.java index dc1b382..af6c975 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenSand.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSand.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 23 : 24 @ 23 : 24 +> INSERT 8 : 9 @ 8 + ++ + +> CHANGE 8 : 9 @ 8 : 9 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenSavannaTree.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSavannaTree.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenSavannaTree.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenSavannaTree.edit.java index fe7463a..30781c3 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenSavannaTree.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSavannaTree.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 31 : 32 @ 31 : 32 +> INSERT 14 : 15 @ 14 + ++ + +> CHANGE 10 : 11 @ 10 : 11 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenShrub.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.edit.java similarity index 84% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenShrub.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.edit.java index fffc44f..a3e741c 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenShrub.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenShrub.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 25 : 26 @ 25 : 26 +> INSERT 9 : 10 @ 9 + ++ + +> CHANGE 9 : 10 @ 9 : 10 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenSpikes.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSpikes.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenSpikes.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenSpikes.edit.java index 3095697..d4da835 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenSpikes.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSpikes.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 21 : 22 @ 21 : 22 +> INSERT 8 : 9 @ 8 + ++ + +> CHANGE 6 : 7 @ 6 : 7 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenSwamp.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenSwamp.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.edit.java index fe7463a..30781c3 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenSwamp.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenSwamp.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 31 : 32 @ 31 : 32 +> INSERT 14 : 15 @ 14 + ++ + +> CHANGE 10 : 11 @ 10 : 11 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenTaiga1.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenTaiga1.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.edit.java index d44f7d1..c699c4b 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenTaiga1.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga1.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 30 : 31 @ 30 : 31 +> INSERT 13 : 14 @ 13 + ++ + +> CHANGE 10 : 11 @ 10 : 11 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenTaiga2.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenTaiga2.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.edit.java index d44f7d1..c699c4b 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenTaiga2.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTaiga2.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 30 : 31 @ 30 : 31 +> INSERT 13 : 14 @ 13 + ++ + +> CHANGE 10 : 11 @ 10 : 11 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenTallGrass.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.edit.java similarity index 84% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenTallGrass.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.edit.java index dc1b382..43f9838 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenTallGrass.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTallGrass.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 23 : 24 @ 23 : 24 +> INSERT 10 : 11 @ 10 + ++ + +> CHANGE 6 : 7 @ 6 : 7 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenTrees.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenTrees.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.edit.java index caa06f6..536b65c 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenTrees.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenTrees.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 47 : 48 @ 47 : 48 +> INSERT 17 : 18 @ 17 + ++ + +> CHANGE 23 : 24 @ 23 : 24 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenVines.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenVines.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenVines.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenVines.edit.java index 38fabe1..3a5e0e4 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenVines.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenVines.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 16 : 17 @ 16 : 17 +> CHANGE 9 : 11 @ 9 : 10 +~ ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenWaterlily.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenWaterlily.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenWaterlily.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenWaterlily.edit.java index 42f2a5f..afe4738 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenWaterlily.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenWaterlily.edit.java @@ -9,8 +9,9 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 13 : 14 @ 13 : 14 +> CHANGE 6 : 8 @ 6 : 7 +~ ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenerator.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenerator.edit.java similarity index 84% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenerator.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGenerator.edit.java index 4f8994a..0c69b92 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGenerator.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGenerator.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 22 : 23 @ 22 : 23 +> INSERT 5 : 6 @ 5 + ++ + +> CHANGE 10 : 11 @ 10 : 11 ~ public abstract boolean generate(World var1, EaglercraftRandom var2, BlockPos var3); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.edit.java b/patches/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.edit.java similarity index 84% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.edit.java rename to patches/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.edit.java index 3f209d8..321f835 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/feature/WorldGeneratorBonusChest.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 26 : 27 @ 26 : 27 +> INSERT 11 : 12 @ 11 + ++ + +> CHANGE 8 : 9 @ 8 : 9 ~ public boolean generate(World world, EaglercraftRandom random, BlockPos blockpos) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/layer/GenLayer.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayer.edit.java similarity index 59% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/layer/GenLayer.edit.java rename to patches/minecraft/net/minecraft/world/gen/layer/GenLayer.edit.java index 230a75c..26984b9 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/layer/GenLayer.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayer.edit.java @@ -5,12 +5,11 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 3 : 5 @ 3 : 5 +> INSERT 30 : 31 @ 30 -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; ++ -> CHANGE 76 : 77 @ 76 : 77 +> CHANGE 44 : 45 @ 44 : 45 ~ GenLayer genlayerhills = new GenLayerHills(1000L, genlayerbiomeedge, genlayer1); diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerAddIsland.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerAddIsland.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerAddIsland.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerAddMushroomIsland.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerAddSnow.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerAddSnow.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerAddSnow.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerBiome.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerBiome.edit.java new file mode 100644 index 0000000..80304af --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerBiome.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 9 : 10 @ 9 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerBiomeEdge.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerBiomeEdge.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerBiomeEdge.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerDeepOcean.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerDeepOcean.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerDeepOcean.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerEdge.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerEdge.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerEdge.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerFuzzyZoom.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/layer/GenLayerHills.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerHills.edit.java similarity index 90% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/layer/GenLayerHills.edit.java rename to patches/minecraft/net/minecraft/world/gen/layer/GenLayerHills.edit.java index 65ccc39..91542f8 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/layer/GenLayerHills.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerHills.edit.java @@ -10,4 +10,8 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; +> INSERT 2 : 3 @ 2 + ++ + > EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerIsland.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerIsland.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerIsland.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRareBiome.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRareBiome.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRareBiome.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRemoveTooMuchOcean.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRiver.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRiver.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRiver.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRiverInit.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRiverInit.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRiverInit.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRiverMix.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRiverMix.edit.java new file mode 100644 index 0000000..8477115 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerRiverMix.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 7 : 8 @ 7 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerShore.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerShore.edit.java new file mode 100644 index 0000000..80304af --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerShore.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 9 : 10 @ 9 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerSmooth.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerSmooth.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerSmooth.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerVoronoiZoom.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/GenLayerZoom.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerZoom.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/GenLayerZoom.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/gen/layer/IntCache.edit.java b/patches/minecraft/net/minecraft/world/gen/layer/IntCache.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/layer/IntCache.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.edit.java similarity index 92% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.edit.java index 1da79cd..005c3f1 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/ComponentScatteredFeaturePieces.edit.java @@ -9,11 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 13 : 14 @ 13 : 14 +> INSERT 23 : 24 @ 23 -~ import net.minecraft.nbt.NBTTagCompound; ++ -> CHANGE 39 : 40 @ 39 : 40 +> CHANGE 23 : 24 @ 23 : 24 ~ public DesertPyramid(EaglercraftRandom parRandom, int parInt1, int parInt2) { diff --git a/patches/minecraft/net/minecraft/world/gen/structure/MapGenMineshaft.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/MapGenMineshaft.edit.java new file mode 100644 index 0000000..61e0fa2 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/structure/MapGenMineshaft.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 10 : 11 @ 10 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenNetherBridge.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/MapGenNetherBridge.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenNetherBridge.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/MapGenNetherBridge.edit.java index c18033c..bc172cf 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenNetherBridge.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/MapGenNetherBridge.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 53 : 54 @ 53 : 54 +> INSERT 12 : 13 @ 12 + ++ + +> CHANGE 34 : 35 @ 34 : 35 ~ public Start(World worldIn, EaglercraftRandom parRandom, int parInt1, int parInt2) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenScatteredFeature.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/MapGenScatteredFeature.edit.java similarity index 87% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenScatteredFeature.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/MapGenScatteredFeature.edit.java index 534c221..5912aa4 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenScatteredFeature.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/MapGenScatteredFeature.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 62 : 63 @ 62 : 63 +> INSERT 12 : 13 @ 12 + ++ + +> CHANGE 43 : 44 @ 43 : 44 ~ EaglercraftRandom random = this.worldObj.setRandomSeed(i1, j1, 14357617); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenStronghold.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStronghold.edit.java similarity index 86% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenStronghold.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/MapGenStronghold.edit.java index 7ebf9cf..ffa6754 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenStronghold.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStronghold.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 63 : 64 @ 63 : 64 +> INSERT 12 : 13 @ 12 + ++ + +> CHANGE 44 : 45 @ 44 : 45 ~ EaglercraftRandom random = new EaglercraftRandom(); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenStructure.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructure.edit.java similarity index 65% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenStructure.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/MapGenStructure.edit.java index c169ac7..4fb4bcc 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenStructure.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructure.edit.java @@ -15,15 +15,15 @@ ~ import net.lax1dude.eaglercraft.v1_8.HString; ~ -> CHANGE 1 : 6 @ 1 : 5 +> INSERT 5 : 6 @ 5 -~ import net.minecraft.crash.CrashReport; -~ import net.minecraft.crash.CrashReportCategory; -~ import net.minecraft.nbt.NBTBase; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.AxisAlignedBB; ++ import net.minecraft.util.AxisAlignedBB; -> CHANGE 48 : 49 @ 48 : 49 +> INSERT 13 : 14 @ 13 + ++ + +> CHANGE 28 : 29 @ 28 : 29 ~ HString.format("%d,%d", new Object[] { Integer.valueOf(i), Integer.valueOf(j) })); diff --git a/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructureData.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructureData.edit.java new file mode 100644 index 0000000..60f453f --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructureData.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 6 : 7 @ 6 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenStructureIO.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructureIO.edit.java similarity index 72% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenStructureIO.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/MapGenStructureIO.edit.java index fff2f25..40c4fbb 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenStructureIO.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/MapGenStructureIO.edit.java @@ -5,16 +5,16 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 4 : 5 @ 4 : 5 - -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 15 : 17 @ 15 : 17 +> CHANGE 20 : 22 @ 20 : 22 ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> CHANGE 43 : 44 @ 43 : 44 +> INSERT 2 : 3 @ 2 + ++ + +> CHANGE 34 : 35 @ 34 : 35 ~ logger.warn(exception); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenVillage.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/MapGenVillage.edit.java similarity index 80% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenVillage.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/MapGenVillage.edit.java index 371d138..bbab3a9 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/MapGenVillage.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/MapGenVillage.edit.java @@ -9,11 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 1 : 2 @ 1 : 2 +> INSERT 11 : 12 @ 11 -~ import net.minecraft.nbt.NBTTagCompound; ++ -> CHANGE 58 : 59 @ 58 : 59 +> CHANGE 42 : 43 @ 42 : 43 ~ EaglercraftRandom random = this.worldObj.setRandomSeed(i1, j1, 10387312); diff --git a/patches/minecraft/net/minecraft/world/gen/structure/StructureBoundingBox.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/StructureBoundingBox.edit.java new file mode 100644 index 0000000..80304af --- /dev/null +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureBoundingBox.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 9 : 10 @ 9 + ++ + +> EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureComponent.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/StructureComponent.edit.java similarity index 95% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureComponent.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/StructureComponent.edit.java index d2ae9c7..9266008 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureComponent.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureComponent.edit.java @@ -9,11 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 7 : 8 @ 7 : 8 +> INSERT 19 : 20 @ 19 -~ import net.minecraft.nbt.NBTTagCompound; ++ -> CHANGE 54 : 55 @ 54 : 55 +> CHANGE 36 : 37 @ 36 : 37 ~ public void buildComponent(StructureComponent var1, List var2, EaglercraftRandom var3) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureMineshaftPieces.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/StructureMineshaftPieces.edit.java similarity index 95% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureMineshaftPieces.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/StructureMineshaftPieces.edit.java index d2973b2..39b4975 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureMineshaftPieces.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureMineshaftPieces.edit.java @@ -9,12 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 7 : 9 @ 7 : 9 +> INSERT 20 : 21 @ 20 -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; ++ -> CHANGE 40 : 42 @ 40 : 42 +> CHANGE 22 : 24 @ 22 : 24 ~ private static StructureComponent func_175892_a(List listIn, EaglercraftRandom rand, int x, ~ int y, int z, EnumFacing facing, int type) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureMineshaftStart.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/StructureMineshaftStart.edit.java similarity index 85% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureMineshaftStart.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/StructureMineshaftStart.edit.java index 0d7dd23..6fb5c21 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureMineshaftStart.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureMineshaftStart.edit.java @@ -9,7 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 15 : 16 @ 15 : 16 +> INSERT 5 : 6 @ 5 + ++ + +> CHANGE 3 : 4 @ 3 : 4 ~ public StructureMineshaftStart(World worldIn, EaglercraftRandom rand, int chunkX, int chunkZ) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureNetherBridgePieces.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/StructureNetherBridgePieces.edit.java similarity index 98% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureNetherBridgePieces.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/StructureNetherBridgePieces.edit.java index 49ece60..4b551b6 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureNetherBridgePieces.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureNetherBridgePieces.edit.java @@ -9,11 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 3 : 4 @ 3 : 4 +> INSERT 15 : 16 @ 15 -~ import net.minecraft.nbt.NBTTagCompound; ++ -> CHANGE 53 : 55 @ 53 : 55 +> CHANGE 35 : 37 @ 35 : 37 ~ StructureNetherBridgePieces.PieceWeight parPieceWeight, List parList, ~ EaglercraftRandom parRandom, int parInt1, int parInt2, int parInt3, EnumFacing parEnumFacing, int parInt4) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureOceanMonument.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/StructureOceanMonument.edit.java similarity index 83% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureOceanMonument.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/StructureOceanMonument.edit.java index 6f511b8..a5439c3 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureOceanMonument.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureOceanMonument.edit.java @@ -9,12 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 3 : 5 @ 3 : 5 +> INSERT 17 : 18 @ 17 -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; ++ -> CHANGE 62 : 63 @ 62 : 63 +> CHANGE 43 : 44 @ 43 : 44 ~ EaglercraftRandom random = this.worldObj.setRandomSeed(i1, j1, 10387313); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.edit.java similarity index 98% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.edit.java index a202d40..118ef2c 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureOceanMonumentPieces.edit.java @@ -11,11 +11,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.ArrayUtils; ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 6 : 7 @ 6 : 7 +> INSERT 15 : 16 @ 15 -~ import net.minecraft.nbt.NBTTagCompound; ++ -> CHANGE 34 : 35 @ 34 : 35 +> CHANGE 19 : 20 @ 19 : 20 ~ EaglercraftRandom parRandom) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureStart.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/StructureStart.edit.java similarity index 80% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureStart.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/StructureStart.edit.java index bae5fc7..b719f97 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureStart.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureStart.edit.java @@ -5,13 +5,15 @@ # Version: 1.0 # Author: lax1dude -> CHANGE 4 : 7 @ 4 : 7 +> CHANGE 4 : 5 @ 4 : 5 ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.minecraft.nbt.NBTTagList; -> CHANGE 35 : 36 @ 35 : 36 +> INSERT 9 : 10 @ 9 + ++ + +> CHANGE 21 : 22 @ 21 : 22 ~ public void generateStructure(World world, EaglercraftRandom random, StructureBoundingBox structureboundingbox) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureStrongholdPieces.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/StructureStrongholdPieces.edit.java similarity index 98% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureStrongholdPieces.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/StructureStrongholdPieces.edit.java index 42af1e2..bfdb2d8 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureStrongholdPieces.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureStrongholdPieces.edit.java @@ -9,11 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 6 : 7 @ 6 : 7 +> INSERT 18 : 19 @ 18 -~ import net.minecraft.nbt.NBTTagCompound; ++ -> CHANGE 87 : 88 @ 87 : 88 +> CHANGE 69 : 70 @ 69 : 70 ~ EaglercraftRandom parRandom, int parInt1, int parInt2, int parInt3, EnumFacing parEnumFacing, int parInt4) { diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureVillagePieces.edit.java b/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.edit.java similarity index 98% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureVillagePieces.edit.java rename to patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.edit.java index a7feaf4..3a2bc8c 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/gen/structure/StructureVillagePieces.edit.java +++ b/patches/minecraft/net/minecraft/world/gen/structure/StructureVillagePieces.edit.java @@ -9,11 +9,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.EaglercraftRandom; -> CHANGE 12 : 13 @ 12 : 13 +> INSERT 26 : 27 @ 26 -~ import net.minecraft.nbt.NBTTagCompound; ++ -> CHANGE 36 : 38 @ 36 : 38 +> CHANGE 16 : 18 @ 16 : 18 ~ public static List getStructureVillageWeightedPieceList( ~ EaglercraftRandom random, int parInt1) { diff --git a/patches/minecraft/net/minecraft/world/pathfinder/NodeProcessor.edit.java b/patches/minecraft/net/minecraft/world/pathfinder/NodeProcessor.edit.java new file mode 100644 index 0000000..80304af --- /dev/null +++ b/patches/minecraft/net/minecraft/world/pathfinder/NodeProcessor.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 9 : 10 @ 9 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/pathfinder/SwimNodeProcessor.edit.java b/patches/minecraft/net/minecraft/world/pathfinder/SwimNodeProcessor.edit.java new file mode 100644 index 0000000..0c12581 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/pathfinder/SwimNodeProcessor.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 13 : 14 @ 13 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/pathfinder/WalkNodeProcessor.edit.java b/patches/minecraft/net/minecraft/world/pathfinder/WalkNodeProcessor.edit.java new file mode 100644 index 0000000..e8768a1 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/pathfinder/WalkNodeProcessor.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 18 : 19 @ 18 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/storage/DerivedWorldInfo.edit.java b/patches/minecraft/net/minecraft/world/storage/DerivedWorldInfo.edit.java new file mode 100644 index 0000000..e395576 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/storage/DerivedWorldInfo.edit.java @@ -0,0 +1,12 @@ + +# Eagler Context Redacted Diff +# Copyright (c) 2024 lax1dude. All rights reserved. + +# Version: 1.0 +# Author: lax1dude + +> INSERT 11 : 12 @ 11 + ++ + +> EOF diff --git a/patches/minecraft/net/minecraft/world/storage/ISaveFormat.edit.java b/patches/minecraft/net/minecraft/world/storage/ISaveFormat.edit.java index 58807b9..43d17d0 100644 --- a/patches/minecraft/net/minecraft/world/storage/ISaveFormat.edit.java +++ b/patches/minecraft/net/minecraft/world/storage/ISaveFormat.edit.java @@ -11,4 +11,8 @@ ~ List getSaveList(); +> CHANGE 9 : 10 @ 9 : 10 + +~ boolean renameWorld(String var1, String var2); + > EOF diff --git a/patches/minecraft/net/minecraft/world/storage/ISaveHandler.edit.java b/patches/minecraft/net/minecraft/world/storage/ISaveHandler.edit.java index 90c65ca..5d24928 100644 --- a/patches/minecraft/net/minecraft/world/storage/ISaveHandler.edit.java +++ b/patches/minecraft/net/minecraft/world/storage/ISaveHandler.edit.java @@ -7,10 +7,16 @@ > DELETE 2 @ 2 : 3 -> DELETE 2 @ 2 : 6 +> INSERT 1 : 2 @ 1 -> DELETE 6 @ 6 : 8 ++ import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; -> DELETE 8 @ 8 : 12 +> CHANGE 21 : 22 @ 21 : 22 + +~ VFile2 getWorldDirectory(); + +> CHANGE 1 : 2 @ 1 : 2 + +~ VFile2 getMapFileFromName(String var1); > EOF diff --git a/patches/minecraft/net/minecraft/world/storage/MapStorage.edit.java b/patches/minecraft/net/minecraft/world/storage/MapStorage.edit.java index 4769a2e..7a6b31b 100644 --- a/patches/minecraft/net/minecraft/world/storage/MapStorage.edit.java +++ b/patches/minecraft/net/minecraft/world/storage/MapStorage.edit.java @@ -5,33 +5,100 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 10 +> CHANGE 7 : 10 @ 7 : 10 -> CHANGE 2 : 6 @ 2 : 6 +~ import java.io.InputStream; +~ import java.io.OutputStream; +~ import java.util.HashMap; + +> INSERT 6 : 10 @ 6 + ++ import net.lax1dude.eaglercraft.v1_8.EagRuntime; ++ import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; ++ import net.minecraft.scoreboard.ScoreboardSaveData; ++ import net.minecraft.village.VillageCollection; + +> CHANGE 1 : 2 @ 1 : 2 + +~ import net.minecraft.world.gen.structure.MapGenStructureData; + +> INSERT 7 : 20 @ 7 + ++ public static interface MapStorageProvider { ++ WorldSavedData createInstance(String mapFileName); ++ } ++ ++ public static final Map, MapStorageProvider> storageProviders = new HashMap(); ++ ++ static { ++ storageProviders.put(MapData.class, (s) -> new MapData(s)); ++ storageProviders.put(MapGenStructureData.class, (s) -> new MapGenStructureData(s)); ++ storageProviders.put(ScoreboardSaveData.class, (s) -> new ScoreboardSaveData(s)); ++ storageProviders.put(VillageCollection.class, (s) -> new VillageCollection(s)); ++ } ++ + +> CHANGE 12 : 13 @ 12 : 13 + +~ VFile2 file1 = this.saveHandler.getMapFileFromName(s); + +> CHANGE 2 : 3 @ 2 : 4 + +~ worldsaveddata = (WorldSavedData) storageProviders.get(oclass).createInstance(s); + +> CHANGE 3 : 7 @ 3 : 8 + +~ try (InputStream is = file1.getInputStream()) { +~ NBTTagCompound nbttagcompound = CompressedStreamTools.readCompressed(is); +~ worldsaveddata.readFromNBT(nbttagcompound.getCompoundTag("data")); +~ } + +> CHANGE 2 : 3 @ 2 : 3 + +~ EagRuntime.debugPrintStackTrace(exception1); + +> CHANGE 35 : 36 @ 35 : 36 + +~ VFile2 file1 = this.saveHandler.getMapFileFromName(parWorldSavedData.mapName); + +> CHANGE 5 : 9 @ 5 : 8 ~ -~ import com.google.common.collect.Lists; -~ import com.google.common.collect.Maps; -~ +~ try (OutputStream fileoutputstream = file1.getOutputStream()) { +~ CompressedStreamTools.writeCompressed(nbttagcompound1, fileoutputstream); +~ } -> DELETE 1 @ 1 : 2 +> CHANGE 2 : 3 @ 2 : 3 -> CHANGE 13 : 14 @ 13 : 45 +~ EagRuntime.debugPrintStackTrace(exception); -~ return (WorldSavedData) this.loadedDataMap.get(s); +> CHANGE 12 : 13 @ 12 : 13 -> CHANGE 13 : 14 @ 13 : 18 +~ VFile2 file1 = this.saveHandler.getMapFileFromName("idcounts"); -~ ((WorldSavedData) this.loadedDataList.get(i)).setDirty(false); +> CHANGE 1 : 5 @ 1 : 4 -> DELETE 4 @ 4 : 24 +~ NBTTagCompound nbttagcompound; +~ try (DataInputStream datainputstream = new DataInputStream(file1.getInputStream())) { +~ nbttagcompound = CompressedStreamTools.read(datainputstream); +~ } -> CHANGE 1 : 2 @ 1 : 26 +> CHANGE 11 : 12 @ 11 : 12 -~ this.idCounts.clear(); +~ EagRuntime.debugPrintStackTrace(exception); -> CHANGE 11 : 12 @ 11 : 34 +> CHANGE 17 : 18 @ 17 : 18 -~ return oshort.shortValue(); +~ VFile2 file1 = this.saveHandler.getMapFileFromName("idcounts"); + +> CHANGE 8 : 11 @ 8 : 11 + +~ try (DataOutputStream dataoutputstream = new DataOutputStream(file1.getOutputStream())) { +~ CompressedStreamTools.write(nbttagcompound, (DataOutput) dataoutputstream); +~ } + +> CHANGE 2 : 3 @ 2 : 3 + +~ EagRuntime.debugPrintStackTrace(exception); > EOF diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/SaveFormatOld.edit.java b/patches/minecraft/net/minecraft/world/storage/SaveFormatOld.edit.java similarity index 93% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/SaveFormatOld.edit.java rename to patches/minecraft/net/minecraft/world/storage/SaveFormatOld.edit.java index 7cbe520..b225615 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/SaveFormatOld.edit.java +++ b/patches/minecraft/net/minecraft/world/storage/SaveFormatOld.edit.java @@ -11,11 +11,11 @@ ~ import java.io.InputStream; ~ import java.io.OutputStream; -> CHANGE 2 : 5 @ 2 : 5 +> DELETE 2 @ 2 : 3 -~ import net.minecraft.nbt.CompressedStreamTools; -~ import net.minecraft.nbt.NBTTagCompound; -~ import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerIntegratedServerWorker; +> INSERT 2 : 3 @ 2 + ++ import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerIntegratedServerWorker; > CHANGE 6 : 9 @ 6 : 8 @@ -23,7 +23,11 @@ ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> CHANGE 10 : 11 @ 10 : 11 +> INSERT 2 : 3 @ 2 + ++ + +> CHANGE 1 : 2 @ 1 : 2 ~ protected final VFile2 savesDirectory; @@ -35,7 +39,11 @@ ~ public List getSaveList() { -> CHANGE 19 : 20 @ 19 : 20 +> CHANGE 8 : 9 @ 8 : 9 + +~ worldinfo.areCommandsAllowed(), null)); + +> CHANGE 10 : 11 @ 10 : 11 ~ VFile2 file1 = new VFile2(this.savesDirectory, saveName); diff --git a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/SaveHandler.edit.java b/patches/minecraft/net/minecraft/world/storage/SaveHandler.edit.java similarity index 95% rename from patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/SaveHandler.edit.java rename to patches/minecraft/net/minecraft/world/storage/SaveHandler.edit.java index cc1fb79..f284e62 100644 --- a/patches/minecraft/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/world/storage/SaveHandler.edit.java +++ b/patches/minecraft/net/minecraft/world/storage/SaveHandler.edit.java @@ -14,19 +14,18 @@ + import java.util.List; + -> CHANGE 1 : 3 @ 1 : 3 - -~ import net.minecraft.nbt.CompressedStreamTools; -~ import net.minecraft.nbt.NBTTagCompound; - -> CHANGE 7 : 11 @ 7 : 9 +> CHANGE 10 : 14 @ 10 : 12 ~ import net.lax1dude.eaglercraft.v1_8.EagRuntime; ~ import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; ~ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; ~ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -> CHANGE 10 : 13 @ 10 : 13 +> INSERT 2 : 3 @ 2 + ++ + +> CHANGE 1 : 4 @ 1 : 4 ~ private final VFile2 worldDirectory; ~ private final VFile2 playersDirectory; diff --git a/patches/minecraft/net/minecraft/world/storage/SaveHandlerMP.edit.java b/patches/minecraft/net/minecraft/world/storage/SaveHandlerMP.edit.java index 4dd9675..88dde83 100644 --- a/patches/minecraft/net/minecraft/world/storage/SaveHandlerMP.edit.java +++ b/patches/minecraft/net/minecraft/world/storage/SaveHandlerMP.edit.java @@ -5,14 +5,36 @@ # Version: 1.0 # Author: lax1dude -> DELETE 2 @ 2 : 3 +> CHANGE 2 : 3 @ 2 : 3 -> DELETE 2 @ 2 : 7 - -> DELETE 9 @ 9 : 13 - -> DELETE 13 @ 13 : 17 +~ import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; > DELETE 4 @ 4 : 7 +> DELETE 9 @ 9 : 13 + +> CHANGE 13 : 19 @ 13 : 14 + +~ public String getWorldDirectoryName() { +~ return "none"; +~ } +~ +~ @Override +~ public IChunkLoader getChunkLoader(WorldProvider var1) { + +> CHANGE 3 : 6 @ 3 : 5 + +~ @Override +~ public VFile2 getWorldDirectory() { +~ return null; + +> CHANGE 2 : 4 @ 2 : 3 + +~ @Override +~ public VFile2 getMapFileFromName(String var1) { + +> INSERT 2 : 3 @ 2 + ++ + > EOF diff --git a/patches/minecraft/net/minecraft/world/storage/WorldInfo.edit.java b/patches/minecraft/net/minecraft/world/storage/WorldInfo.edit.java index 92e3f4c..d18b8b7 100644 --- a/patches/minecraft/net/minecraft/world/storage/WorldInfo.edit.java +++ b/patches/minecraft/net/minecraft/world/storage/WorldInfo.edit.java @@ -5,22 +5,12 @@ # Version: 1.0 # Author: lax1dude -> INSERT 3 : 4 @ 3 - -+ - -> DELETE 2 @ 2 : 3 - -> INSERT 6 : 8 @ 6 +> INSERT 12 : 14 @ 12 + import net.lax1dude.eaglercraft.v1_8.HString; + -> CHANGE 237 : 238 @ 237 : 238 - -~ // nbt.setLong("LastPlayed", MinecraftServer.getCurrentTimeMillis()); - -> CHANGE 301 : 302 @ 301 : 302 +> CHANGE 539 : 540 @ 539 : 540 ~ return HString.format("ID %02d - %s, ver %d. Features enabled: %b", diff --git a/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java b/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java index e3f0372..5c6af42 100644 --- a/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java +++ b/sources/lwjgl/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java @@ -7,7 +7,6 @@ import net.lax1dude.eaglercraft.v1_8.internal.IClientConfigAdapter; import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData; import net.lax1dude.eaglercraft.v1_8.internal.PlatformFilesystem; import net.lax1dude.eaglercraft.v1_8.internal.lwjgl.DesktopClientConfigAdapter; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.EaglerServerBootstrap; import net.lax1dude.eaglercraft.v1_8.sp.server.internal.lwjgl.MemoryConnection; /** @@ -29,7 +28,6 @@ public class ServerPlatformSingleplayer { public static void initializeContext() { PlatformFilesystem.initialize(); - EaglerServerBootstrap.staticInit(); } public static void sendPacket(IPCPacketData packet) { diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java index f94a58e..4d5402e 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/EaglercraftVersion.java @@ -10,22 +10,17 @@ public class EaglercraftVersion { /// Customize these to fit your fork: public static final String projectForkName = "EaglercraftX"; - public static final String projectForkVersion = "u22"; + public static final String projectForkVersion = "u23"; public static final String projectForkVendor = "lax1dude"; public static final String projectForkURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; ////////////////////////////////////////////////////////////////////// - - - // Do not change these, they must stay as credit to lax1dude's - // original repository for maintaining the project: - public static final String projectOriginName = "EaglercraftX"; public static final String projectOriginAuthor = "lax1dude"; public static final String projectOriginRevision = "1.8"; - public static final String projectOriginVersion = "u22"; + public static final String projectOriginVersion = "u23"; public static final String projectOriginURL = "https://gitlab.com/lax1dude/eaglercraftx-1.8"; // rest in peace @@ -36,7 +31,7 @@ public class EaglercraftVersion { public static final boolean enableUpdateService = true; public static final String updateBundlePackageName = "net.lax1dude.eaglercraft.v1_8.client"; - public static final int updateBundlePackageVersionInt = 22; + public static final int updateBundlePackageVersionInt = 23; public static final String updateLatestLocalStorageKey = "latestUpdate_" + updateBundlePackageName; diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java index 1762057..e4890d3 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/opengl/InstancedParticleRenderer.java @@ -17,7 +17,7 @@ import net.lax1dude.eaglercraft.v1_8.opengl.FixedFunctionShader.FixedFunctionCon import net.lax1dude.eaglercraft.v1_8.vector.Matrix4f; /** - * Copyright (c) 2023 lax1dude. All Rights Reserved. + * Copyright (c) 2022 lax1dude. All Rights Reserved. * * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java index 7901451..c41ec7a 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/opengl/ext/deferred/EaglerDeferredPipeline.java @@ -1620,6 +1620,24 @@ public class EaglerDeferredPipeline { DeferredStateManager.checkGLError("combineGBuffersAndIlluminate(): NETHER SKY IRRADIANCE MAP"); + }else if(dim == 1) { + + // =============== END SKY REFLECTION MAP ================ // + + _wglBindFramebuffer(_GL_FRAMEBUFFER, envMapSkyFramebuffer); + GlStateManager.clearColor(0.1f, 0.06f, 0.19f, 1.0f); + GlStateManager.clear(GL_COLOR_BUFFER_BIT); + + DeferredStateManager.checkGLError("combineGBuffersAndIlluminate(): END SKY REFLECTION MAP"); + + // =============== END SKY IRRADIANCE MAP ================ // + + _wglBindFramebuffer(_GL_FRAMEBUFFER, skyIrradianceFramebuffer); + GlStateManager.clearColor(0.05f, 0.03f, 0.09f, 1.0f); + GlStateManager.clear(GL_COLOR_BUFFER_BIT); + + DeferredStateManager.checkGLError("combineGBuffersAndIlluminate(): END SKY IRRADIANCE MAP"); + } } diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java index 9bfa57d..2ac1082 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/SingleplayerServerController.java @@ -12,16 +12,20 @@ import net.lax1dude.eaglercraft.v1_8.internal.PlatformWebRTC; import org.apache.commons.lang3.StringUtils; import net.lax1dude.eaglercraft.v1_8.EagRuntime; +import net.lax1dude.eaglercraft.v1_8.EaglercraftSoundManager; import net.lax1dude.eaglercraft.v1_8.internal.EnumEaglerConnectionState; import net.lax1dude.eaglercraft.v1_8.internal.IPCPacketData; import net.lax1dude.eaglercraft.v1_8.internal.PlatformApplication; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; import net.lax1dude.eaglercraft.v1_8.profile.EaglerProfile; +import net.lax1dude.eaglercraft.v1_8.socket.EaglercraftNetworkManager; import net.lax1dude.eaglercraft.v1_8.sp.internal.ClientPlatformSingleplayer; import net.lax1dude.eaglercraft.v1_8.sp.ipc.*; +import net.lax1dude.eaglercraft.v1_8.sp.lan.LANClientNetworkManager; import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController; import net.lax1dude.eaglercraft.v1_8.sp.socket.ClientIntegratedServerNetworkManager; +import net.minecraft.client.Minecraft; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.IProgressUpdate; import net.minecraft.util.StringTranslate; @@ -528,9 +532,10 @@ public class SingleplayerServerController implements ISaveFormat { } @Override - public void renameWorld(String var1, String var2) { + public boolean renameWorld(String var1, String var2) { sendIPCPacket(new IPCPacket06RenameWorldNBT(var1, var2, false)); statusState = IntegratedServerState.WORLD_RENAMING; + return true; } public static void duplicateWorld(String var1, String var2) { @@ -583,4 +588,9 @@ public class SingleplayerServerController implements ISaveFormat { public static void configureLAN(net.minecraft.world.WorldSettings.GameType enumGameType, boolean allowCommands) { sendIPCPacket(new IPCPacket17ConfigureLAN(enumGameType.getID(), allowCommands, LANServerController.currentICEServers)); } + + public static boolean isClientInEaglerSingleplayerOrLAN() { + Minecraft mc = Minecraft.getMinecraft(); + return mc != null && mc.thePlayer != null && mc.thePlayer.sendQueue.isClientInEaglerSingleplayerOrLAN(); + } } diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/ClientCommandDummy.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/ClientCommandDummy.java index 3654b0e..ef861b8 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/ClientCommandDummy.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/ClientCommandDummy.java @@ -1,9 +1,9 @@ package net.lax1dude.eaglercraft.v1_8.sp.server; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.command.CommandBase; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.command.CommandException; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.command.ICommandSender; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.ChatComponentTranslation; +import net.minecraft.command.CommandBase; +import net.minecraft.command.CommandException; +import net.minecraft.command.ICommandSender; +import net.minecraft.util.ChatComponentTranslation; /** * Copyright (c) 2024 lax1dude. All Rights Reserved. diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/CrashReportHelper.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/CrashReportHelper.java deleted file mode 100644 index e36ec2c..0000000 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/CrashReportHelper.java +++ /dev/null @@ -1,71 +0,0 @@ -package net.lax1dude.eaglercraft.v1_8.sp.server; - -import java.util.concurrent.Callable; - -import net.lax1dude.eaglercraft.v1_8.HString; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.block.Block; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.block.state.IBlockState; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.BlockPos; -import net.minecraft.crash.CrashReportCategory; - -/** - * Copyright (c) 2023-2024 lax1dude. All Rights Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ -public class CrashReportHelper { - - public static void addIntegratedServerBlockInfo(CrashReportCategory category, final BlockPos pos, final Block blockIn, - final int blockData) { - final int i = Block.getIdFromBlock(blockIn); - category.addCrashSectionCallable("Block type", new Callable() { - public String call() throws Exception { - try { - return HString.format("ID #%d (%s // %s)", new Object[] { Integer.valueOf(i), - blockIn.getUnlocalizedName(), blockIn.getClass().getName() }); - } catch (Throwable var2) { - return "ID #" + i; - } - } - }); - category.addCrashSectionCallable("Block data value", new Callable() { - public String call() throws Exception { - if (blockData < 0) { - return "Unknown? (Got " + blockData + ")"; - } else { - String s = HString.format("%4s", new Object[] { Integer.toBinaryString(blockData) }).replace(" ", - "0"); - return HString.format("%1$d / 0x%1$X / 0b%2$s", new Object[] { Integer.valueOf(blockData), s }); - } - } - }); - category.addCrashSectionCallable("Block location", new Callable() { - public String call() throws Exception { - return CrashReportCategory.getCoordinateInfo(new net.minecraft.util.BlockPos(pos.getX(), pos.getY(), pos.getZ())); - } - }); - } - - public static void addIntegratedServerBlockInfo(CrashReportCategory category, final BlockPos pos, final IBlockState state) { - category.addCrashSectionCallable("Block", new Callable() { - public String call() throws Exception { - return state.toString(); - } - }); - category.addCrashSectionCallable("Block location", new Callable() { - public String call() throws Exception { - return CrashReportCategory.getCoordinateInfo(new net.minecraft.util.BlockPos(pos.getX(), pos.getY(), pos.getZ())); - } - }); - } -} diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerChunkLoader.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerChunkLoader.java index 634c7d5..96f6a54 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerChunkLoader.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerChunkLoader.java @@ -7,11 +7,11 @@ import java.io.OutputStream; import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.ChunkCoordIntPair; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.MinecraftException; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.World; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.chunk.Chunk; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.chunk.storage.AnvilChunkLoader; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.world.MinecraftException; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.chunk.storage.AnvilChunkLoader; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java index a090efa..8ebdd99 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerIntegratedServerWorker.java @@ -18,15 +18,15 @@ import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController; import net.lax1dude.eaglercraft.v1_8.sp.ipc.*; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.network.EnumConnectionState; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.server.network.NetHandlerLoginServer; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.ChatComponentText; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.ReportedException; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.StringTranslate; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.EnumDifficulty; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.WorldSettings; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.WorldSettings.GameType; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.WorldType; +import net.minecraft.network.EnumConnectionState; +import net.minecraft.server.network.NetHandlerLoginServer; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.ReportedException; +import net.minecraft.util.StringTranslate; +import net.minecraft.world.EnumDifficulty; +import net.minecraft.world.WorldSettings; +import net.minecraft.world.WorldSettings.GameType; +import net.minecraft.world.WorldType; import net.lax1dude.eaglercraft.v1_8.sp.server.export.WorldConverterEPK; import net.lax1dude.eaglercraft.v1_8.sp.server.export.WorldConverterMCA; import net.lax1dude.eaglercraft.v1_8.sp.server.internal.ServerPlatformSingleplayer; @@ -341,7 +341,7 @@ public class EaglerIntegratedServerWorker { IPCPacket14StringList pkt = (IPCPacket14StringList)ipc; switch(pkt.opCode) { case IPCPacket14StringList.LOCALE: - StringTranslate.init(pkt.stringList); + StringTranslate.initServer(pkt.stringList); break; //case IPCPacket14StringList.STAT_GUID: // AchievementMap.init(pkt.stringList); diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerMinecraftServer.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerMinecraftServer.java index b325d0f..85a6969 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerMinecraftServer.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerMinecraftServer.java @@ -8,14 +8,14 @@ import java.util.List; import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.player.EntityPlayer; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.player.EntityPlayerMP; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.init.Bootstrap; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.server.MinecraftServer; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.EnumDifficulty; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.WorldServer; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.WorldSettings; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.WorldSettings.GameType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Bootstrap; +import net.minecraft.server.MinecraftServer; +import net.minecraft.world.EnumDifficulty; +import net.minecraft.world.WorldServer; +import net.minecraft.world.WorldSettings; +import net.minecraft.world.WorldSettings.GameType; import net.lax1dude.eaglercraft.v1_8.sp.server.skins.IntegratedSkinService; /** diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerPlayerList.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerPlayerList.java index f970123..32e2b88 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerPlayerList.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerPlayerList.java @@ -1,8 +1,8 @@ package net.lax1dude.eaglercraft.v1_8.sp.server; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.player.EntityPlayerMP; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.server.MinecraftServer; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.server.management.ServerConfigurationManager; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.MinecraftServer; +import net.minecraft.server.management.ServerConfigurationManager; import net.minecraft.nbt.NBTTagCompound; /** diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveFormat.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveFormat.java index 6d4a3f9..ce52dbc 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveFormat.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveFormat.java @@ -8,10 +8,10 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Lists; import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.storage.ISaveHandler; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.storage.SaveFormatComparator; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.storage.SaveFormatOld; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.storage.WorldInfo; +import net.minecraft.world.storage.ISaveHandler; +import net.minecraft.world.storage.SaveFormatComparator; +import net.minecraft.world.storage.SaveFormatOld; +import net.minecraft.world.storage.WorldInfo; /** * Copyright (c) 2023-2024 lax1dude. All Rights Reserved. @@ -62,7 +62,7 @@ public class EaglerSaveFormat extends SaveFormatOld { arraylist.add(new SaveFormatComparator(s, s1, worldinfo.getLastTimePlayed(), 0l, worldinfo.getGameType(), flag, worldinfo.isHardcoreModeEnabled(), - worldinfo.areCommandsAllowed())); + worldinfo.areCommandsAllowed(), null)); } } } diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveHandler.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveHandler.java index fea5398..0e7fe7a 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveHandler.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/EaglerSaveHandler.java @@ -1,10 +1,10 @@ package net.lax1dude.eaglercraft.v1_8.sp.server; import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.WorldProvider; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.chunk.storage.IChunkLoader; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.storage.SaveHandler; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.storage.WorldInfo; +import net.minecraft.world.WorldProvider; +import net.minecraft.world.chunk.storage.IChunkLoader; +import net.minecraft.world.storage.SaveHandler; +import net.minecraft.world.storage.WorldInfo; import net.minecraft.nbt.NBTTagCompound; /** diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/classes/ContextUtil.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/classes/ContextUtil.java deleted file mode 100644 index 46e9099..0000000 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/classes/ContextUtil.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.lax1dude.eaglercraft.v1_8.sp.server.classes; - -import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; -import net.lax1dude.eaglercraft.v1_8.log4j.Logger; - -/** - * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ -public class ContextUtil { - - public static final Logger LOGGER = LogManager.getLogger("ContextUtil"); - - private static boolean GUARD_CONTEXT = false; // disable guard, for stability - - public static void enterContext() { - if(!GUARD_CONTEXT) { - GUARD_CONTEXT = true; - LOGGER.info("Entered context"); - } - } - - public static void exitContext() { - if(GUARD_CONTEXT) { - GUARD_CONTEXT = false; - LOGGER.info("Exited context"); - } - } - - public static void __checkIntegratedContextValid(String id) { - if(GUARD_CONTEXT) { - throw new IllegalContextAccessException("Illegal integrated server class access: " + id); - } - } - -} diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/classes/EaglerServerBootstrap.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/classes/EaglerServerBootstrap.java deleted file mode 100644 index 615be18..0000000 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/classes/EaglerServerBootstrap.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.lax1dude.eaglercraft.v1_8.sp.server.classes; - -import net.lax1dude.eaglercraft.v1_8.json.JSONTypeProvider; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.ChatStyle; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.IChatComponent; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.gen.ChunkProviderSettings; - -/** - * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ -public class EaglerServerBootstrap { - - private static boolean isCLInit = false; - - public static void staticInit() { - if(isCLInit) { - return; - } - registerJSONTypes(); - isCLInit = true; - } - - public static void registerJSONTypes() { - JSONTypeProvider.registerType(IChatComponent.class, new IChatComponent.Serializer()); - JSONTypeProvider.registerType(ChatStyle.class, new ChatStyle.Serializer()); - JSONTypeProvider.registerType(ChunkProviderSettings.Factory.class, new ChunkProviderSettings.Serializer()); - } - -} diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/classes/IllegalContextAccessException.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/classes/IllegalContextAccessException.java deleted file mode 100644 index 5210684..0000000 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/classes/IllegalContextAccessException.java +++ /dev/null @@ -1,27 +0,0 @@ -package net.lax1dude.eaglercraft.v1_8.sp.server.classes; - -/** - * Copyright (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ -public class IllegalContextAccessException extends RuntimeException { - - public IllegalContextAccessException() { - } - - public IllegalContextAccessException(String s) { - super(s); - } - -} diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityConstructor.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityConstructor.java deleted file mode 100644 index 00f1da8..0000000 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/classes/net/minecraft/entity/EntityConstructor.java +++ /dev/null @@ -1,24 +0,0 @@ -package net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity; - -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.World; - -/** - * Copyright (c) 2024 lax1dude. All Rights Reserved. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, - * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * - */ -public interface EntityConstructor { - - T createEntity(World world); - -} diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterMCA.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterMCA.java index 4414050..ee01d68 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterMCA.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/export/WorldConverterMCA.java @@ -19,7 +19,7 @@ import net.lax1dude.eaglercraft.v1_8.log4j.Logger; import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerChunkLoader; import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerIntegratedServerWorker; import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerSaveFormat; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.world.chunk.storage.RegionFile; +import net.minecraft.world.chunk.storage.RegionFile; import net.minecraft.nbt.CompressedStreamTools; import net.minecraft.nbt.NBTTagCompound; diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinPackets.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinPackets.java index d6fa9c0..9080558 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinPackets.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinPackets.java @@ -3,7 +3,7 @@ package net.lax1dude.eaglercraft.v1_8.sp.server.skins; import java.io.IOException; import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.entity.player.EntityPlayerMP; /** * Copyright (c) 2022-2024 lax1dude. All Rights Reserved. diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinService.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinService.java index 4c47b83..e2a8917 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinService.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/skins/IntegratedSkinService.java @@ -13,13 +13,13 @@ import net.lax1dude.eaglercraft.v1_8.internal.vfs2.VFile2; import net.lax1dude.eaglercraft.v1_8.log4j.LogManager; import net.lax1dude.eaglercraft.v1_8.log4j.Logger; import net.lax1dude.eaglercraft.v1_8.netty.Unpooled; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.entity.player.EntityPlayerMP; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.init.Items; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.item.ItemStack; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.network.PacketBuffer; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.network.play.server.S3FPacketCustomPayload; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.ChatComponentTranslation; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.EnumChatFormatting; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; +import net.minecraft.network.play.server.S3FPacketCustomPayload; +import net.minecraft.util.ChatComponentTranslation; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagString; diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java index 8863c2a..e6915ca 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/IntegratedServerPlayerNetworkManager.java @@ -17,14 +17,14 @@ import net.lax1dude.eaglercraft.v1_8.netty.Unpooled; import net.lax1dude.eaglercraft.v1_8.socket.CompressionNotSupportedException; import net.lax1dude.eaglercraft.v1_8.sp.SingleplayerServerController; import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerIntegratedServerWorker; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.network.EnumConnectionState; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.network.EnumPacketDirection; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.network.INetHandler; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.network.Packet; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.network.PacketBuffer; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.ChatComponentText; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.IChatComponent; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.ITickable; +import net.minecraft.network.EnumConnectionState; +import net.minecraft.network.EnumPacketDirection; +import net.minecraft.network.INetHandler; +import net.minecraft.network.Packet; +import net.minecraft.network.PacketBuffer; +import net.minecraft.util.ChatComponentText; +import net.minecraft.util.IChatComponent; +import net.minecraft.util.ITickable; import net.lax1dude.eaglercraft.v1_8.sp.server.internal.ServerPlatformSingleplayer; /** diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/NetHandlerHandshakeEagler.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/NetHandlerHandshakeEagler.java index 88bb562..29764cc 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/NetHandlerHandshakeEagler.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/sp/server/socket/NetHandlerHandshakeEagler.java @@ -1,10 +1,10 @@ package net.lax1dude.eaglercraft.v1_8.sp.server.socket; import net.lax1dude.eaglercraft.v1_8.sp.server.EaglerMinecraftServer; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.network.handshake.INetHandlerHandshakeServer; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.network.handshake.client.C00Handshake; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.server.network.NetHandlerLoginServer; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.IChatComponent; +import net.minecraft.network.handshake.INetHandlerHandshakeServer; +import net.minecraft.network.handshake.client.C00Handshake; +import net.minecraft.server.network.NetHandlerLoginServer; +import net.minecraft.util.IChatComponent; /** * Copyright (c) 2023-2024 lax1dude. All Rights Reserved. diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateCheckerOverlay.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateCheckerOverlay.java index f967466..6828bfa 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateCheckerOverlay.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateCheckerOverlay.java @@ -1,9 +1,10 @@ package net.lax1dude.eaglercraft.v1_8.update; +import net.lax1dude.eaglercraft.v1_8.EagRuntime; import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; import net.lax1dude.eaglercraft.v1_8.sp.lan.LANServerController; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.Gui; import net.minecraft.client.gui.GuiButton; @@ -55,6 +56,9 @@ public class GuiUpdateCheckerOverlay extends Gui { } public void setResolution(Minecraft mc, int w, int h) { + if(!UpdateService.supported()) { + return; + } this.mc = mc; this.width = w; this.height = h; @@ -65,6 +69,9 @@ public class GuiUpdateCheckerOverlay extends Gui { } public void drawScreen(int mx, int my, float partialTicks) { + if(!UpdateService.supported()) { + return; + } UpdateProgressStruct progressState = UpdateService.getUpdatingStatus(); if(progressState.isBusy) { drawScreenBusy(mx, my, partialTicks, progressState); @@ -159,6 +166,9 @@ public class GuiUpdateCheckerOverlay extends Gui { } public void drawScreenBusy(int mx, int my, float partialTicks, UpdateProgressStruct progressState) { + if(!UpdateService.supported()) { + return; + } checkForUpdatesButton.visible = false; startDownloadButton.visible = false; viewAllUpdatesButton.visible = false; @@ -207,6 +217,9 @@ public class GuiUpdateCheckerOverlay extends Gui { } public void mouseClicked(int mx, int my, int btn) { + if(!UpdateService.supported()) { + return; + } if (btn == 0) { if(checkForUpdatesButton.mousePressed(mc, mx, my)) { mc.gameSettings.enableUpdateSvc = !mc.gameSettings.enableUpdateSvc; diff --git a/sources/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionSlot.java b/sources/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionSlot.java index 669f24a..0b9c76c 100644 --- a/sources/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionSlot.java +++ b/sources/main/java/net/lax1dude/eaglercraft/v1_8/update/GuiUpdateVersionSlot.java @@ -12,7 +12,7 @@ import net.lax1dude.eaglercraft.v1_8.EagRuntime; import net.lax1dude.eaglercraft.v1_8.EaglercraftVersion; import net.lax1dude.eaglercraft.v1_8.opengl.EaglercraftGPU; import net.lax1dude.eaglercraft.v1_8.opengl.GlStateManager; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.client.gui.GuiSlot; import net.minecraft.util.ResourceLocation; diff --git a/sources/resources/assets/eagler/glsl/deferred/skybox_render_end.fsh b/sources/resources/assets/eagler/glsl/deferred/skybox_render_end.fsh index 661f8c8..f8fd32c 100644 --- a/sources/resources/assets/eagler/glsl/deferred/skybox_render_end.fsh +++ b/sources/resources/assets/eagler/glsl/deferred/skybox_render_end.fsh @@ -24,7 +24,7 @@ in vec3 v_position3f; layout(location = 0) out vec4 output4f; -#define SKY_BRIGHTNESS 0.015 +#define SKY_BRIGHTNESS 0.05 uniform sampler2D u_skyTexture; diff --git a/sources/setup/workspace_template/CompileJS.bat b/sources/setup/workspace_template/CompileJS.bat new file mode 100644 index 0000000..7969fc9 --- /dev/null +++ b/sources/setup/workspace_template/CompileJS.bat @@ -0,0 +1,4 @@ +@echo off +title gradlew generateJavascript +gradlew generateJavascript +pause \ No newline at end of file diff --git a/sources/setup/workspace_template/CompileJS.sh b/sources/setup/workspace_template/CompileJS.sh new file mode 100644 index 0000000..4d6d4ca --- /dev/null +++ b/sources/setup/workspace_template/CompileJS.sh @@ -0,0 +1,3 @@ +#!/bin/sh +chmod +x gradlew +./gradlew generateJavascript \ No newline at end of file diff --git a/sources/setup/workspace_template/gradle.properties b/sources/setup/workspace_template/gradle.properties new file mode 100644 index 0000000..a36eb1c --- /dev/null +++ b/sources/setup/workspace_template/gradle.properties @@ -0,0 +1 @@ +org.gradle.jvmargs=-Xmx2G -Xms2G \ No newline at end of file diff --git a/sources/setup/workspace_template/gradle/wrapper/gradle-wrapper.properties b/sources/setup/workspace_template/gradle/wrapper/gradle-wrapper.properties index 6ce793f..17655d0 100644 --- a/sources/setup/workspace_template/gradle/wrapper/gradle-wrapper.properties +++ b/sources/setup/workspace_template/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/sources/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java b/sources/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java index 6acb922..7cb3401 100644 --- a/sources/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java +++ b/sources/teavm/java/net/lax1dude/eaglercraft/v1_8/sp/server/internal/ServerPlatformSingleplayer.java @@ -5,7 +5,6 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; -import net.lax1dude.eaglercraft.v1_8.sp.server.classes.EaglerServerBootstrap; import org.teavm.jso.JSBody; import org.teavm.jso.JSFunctor; import org.teavm.jso.JSObject; @@ -75,7 +74,6 @@ public class ServerPlatformSingleplayer { public static void initializeContext() { PlatformFilesystem.initialize(); - EaglerServerBootstrap.staticInit(); } @JSBody(params = { "ch", "dat" }, script = "postMessage({ ch: ch, dat : dat });")