Commit f329320a411e3f5fb42c1a515e4bc82ba8993b79
1 parent
c9b4172f
Initial 1.11 update
Showing
24 changed files
with
165 additions
and
209 deletions
build.gradle
| @@ -72,7 +72,7 @@ repositories { | @@ -72,7 +72,7 @@ repositories { | ||
| 72 | } | 72 | } |
| 73 | 73 | ||
| 74 | dependencies { | 74 | dependencies { |
| 75 | - compile('org.spongepowered:mixin:0.5.17-SNAPSHOT') { | 75 | + compile('org.spongepowered:mixin:0.6-SNAPSHOT') { |
| 76 | exclude module: 'asm-commons' | 76 | exclude module: 'asm-commons' |
| 77 | exclude module: 'asm-tree' | 77 | exclude module: 'asm-tree' |
| 78 | exclude module: 'launchwrapper' | 78 | exclude module: 'launchwrapper' |
gradle.properties
| @@ -5,6 +5,6 @@ description=LiteLoader | @@ -5,6 +5,6 @@ description=LiteLoader | ||
| 5 | url=http://www.liteloader.com | 5 | url=http://www.liteloader.com |
| 6 | organization=LiteLoader | 6 | organization=LiteLoader |
| 7 | buildType=SNAPSHOT | 7 | buildType=SNAPSHOT |
| 8 | -buildVersion=1.10.2 | ||
| 9 | -mcVersion=1.10.2 | ||
| 10 | -mcMappings=snapshot_20160628 | ||
| 11 | \ No newline at end of file | 8 | \ No newline at end of file |
| 9 | +buildVersion=1.11 | ||
| 10 | +mcVersion=1.11 | ||
| 11 | +mcMappings=snapshot_custom | ||
| 12 | \ No newline at end of file | 12 | \ No newline at end of file |
src/client/java/com/mumfrey/liteloader/client/ClientPluginChannelsClient.java
| @@ -113,9 +113,9 @@ public class ClientPluginChannelsClient extends ClientPluginChannels | @@ -113,9 +113,9 @@ public class ClientPluginChannelsClient extends ClientPluginChannels | ||
| 113 | { | 113 | { |
| 114 | Minecraft minecraft = Minecraft.getMinecraft(); | 114 | Minecraft minecraft = Minecraft.getMinecraft(); |
| 115 | 115 | ||
| 116 | - if (minecraft.thePlayer != null && minecraft.thePlayer.connection != null) | 116 | + if (minecraft.player != null && minecraft.player.connection != null) |
| 117 | { | 117 | { |
| 118 | - minecraft.thePlayer.connection.sendPacket(payload); | 118 | + minecraft.player.connection.sendPacket(payload); |
| 119 | return true; | 119 | return true; |
| 120 | } | 120 | } |
| 121 | } | 121 | } |
src/client/java/com/mumfrey/liteloader/client/GameEngineClient.java
| @@ -66,7 +66,7 @@ public class GameEngineClient implements GameEngine<Minecraft, IntegratedServer> | @@ -66,7 +66,7 @@ public class GameEngineClient implements GameEngine<Minecraft, IntegratedServer> | ||
| 66 | @Override | 66 | @Override |
| 67 | public boolean isInGame() | 67 | public boolean isInGame() |
| 68 | { | 68 | { |
| 69 | - return this.engine.thePlayer != null && this.engine.theWorld != null && this.engine.theWorld.isRemote; | 69 | + return this.engine.player != null && this.engine.world != null && this.engine.world.isRemote; |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | /* (non-Javadoc) | 72 | /* (non-Javadoc) |
src/client/java/com/mumfrey/liteloader/client/LiteLoaderEventBrokerClient.java
| @@ -439,7 +439,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft | @@ -439,7 +439,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft | ||
| 439 | 439 | ||
| 440 | // Flag indicates whether we are in game at the moment | 440 | // Flag indicates whether we are in game at the moment |
| 441 | Entity renderViewEntity = minecraft.getRenderViewEntity(); | 441 | Entity renderViewEntity = minecraft.getRenderViewEntity(); |
| 442 | - boolean inGame = renderViewEntity != null && renderViewEntity.worldObj != null; | 442 | + boolean inGame = renderViewEntity != null && renderViewEntity.world != null; |
| 443 | 443 | ||
| 444 | this.profiler.startSection("loader"); | 444 | this.profiler.startSection("loader"); |
| 445 | super.onTick(clock, partialTicks, inGame); | 445 | super.onTick(clock, partialTicks, inGame); |
| @@ -454,11 +454,11 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft | @@ -454,11 +454,11 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft | ||
| 454 | this.tickListeners.all().onTick(minecraft, partialTicks, inGame, clock); | 454 | this.tickListeners.all().onTick(minecraft, partialTicks, inGame, clock); |
| 455 | 455 | ||
| 456 | // Detected world change | 456 | // Detected world change |
| 457 | - int worldHashCode = (minecraft.theWorld != null) ? minecraft.theWorld.hashCode() : 0; | 457 | + int worldHashCode = (minecraft.world != null) ? minecraft.world.hashCode() : 0; |
| 458 | if (worldHashCode != this.worldHashCode) | 458 | if (worldHashCode != this.worldHashCode) |
| 459 | { | 459 | { |
| 460 | this.worldHashCode = worldHashCode; | 460 | this.worldHashCode = worldHashCode; |
| 461 | - super.onWorldChanged(minecraft.theWorld); | 461 | + super.onWorldChanged(minecraft.world); |
| 462 | } | 462 | } |
| 463 | } | 463 | } |
| 464 | 464 |
src/client/java/com/mumfrey/liteloader/client/gui/GuiLiteLoaderPanel.java
| @@ -296,7 +296,7 @@ public class GuiLiteLoaderPanel extends GuiScreen | @@ -296,7 +296,7 @@ public class GuiLiteLoaderPanel extends GuiScreen | ||
| 296 | this.buttonList.add(new GuiHoverLabel(2, LEFT_EDGE + MARGIN, this.height - PANEL_BOTTOM + 9, this.fontRendererObj, | 296 | this.buttonList.add(new GuiHoverLabel(2, LEFT_EDGE + MARGIN, this.height - PANEL_BOTTOM + 9, this.fontRendererObj, |
| 297 | I18n.format("gui.about.taboptions"), this.brandColour)); | 297 | I18n.format("gui.about.taboptions"), this.brandColour)); |
| 298 | 298 | ||
| 299 | - if (LiteLoaderVersion.getUpdateSite().canCheckForUpdate() && this.mc.theWorld == null && !this.isSnapshot) | 299 | + if (LiteLoaderVersion.getUpdateSite().canCheckForUpdate() && this.mc.world == null && !this.isSnapshot) |
| 300 | { | 300 | { |
| 301 | this.buttonList.add(new GuiHoverLabel(3, LEFT_EDGE + MARGIN + 38 + this.fontRendererObj.getStringWidth(this.versionText) + 6, 50, | 301 | this.buttonList.add(new GuiHoverLabel(3, LEFT_EDGE + MARGIN + 38 + this.fontRendererObj.getStringWidth(this.versionText) + 6, 50, |
| 302 | this.fontRendererObj, I18n.format("gui.about.checkupdates"), this.brandColour)); | 302 | this.fontRendererObj, I18n.format("gui.about.checkupdates"), this.brandColour)); |
src/client/java/com/mumfrey/liteloader/client/mixin/MixinEntityRenderer.java
| @@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
| 5 | */ | 5 | */ |
| 6 | package com.mumfrey.liteloader.client.mixin; | 6 | package com.mumfrey.liteloader.client.mixin; |
| 7 | 7 | ||
| 8 | +import org.spongepowered.asm.mixin.Final; | ||
| 8 | import org.spongepowered.asm.mixin.Mixin; | 9 | import org.spongepowered.asm.mixin.Mixin; |
| 9 | import org.spongepowered.asm.mixin.Shadow; | 10 | import org.spongepowered.asm.mixin.Shadow; |
| 10 | import org.spongepowered.asm.mixin.injection.At; | 11 | import org.spongepowered.asm.mixin.injection.At; |
| @@ -23,7 +24,7 @@ import net.minecraft.util.ResourceLocation; | @@ -23,7 +24,7 @@ import net.minecraft.util.ResourceLocation; | ||
| 23 | @Mixin(EntityRenderer.class) | 24 | @Mixin(EntityRenderer.class) |
| 24 | public abstract class MixinEntityRenderer implements IEntityRenderer | 25 | public abstract class MixinEntityRenderer implements IEntityRenderer |
| 25 | { | 26 | { |
| 26 | - @Shadow private static ResourceLocation[] SHADERS_TEXTURES; | 27 | + @Shadow @Final private static ResourceLocation[] SHADERS_TEXTURES; |
| 27 | @Shadow private boolean useShader; | 28 | @Shadow private boolean useShader; |
| 28 | @Shadow private int shaderIndex; | 29 | @Shadow private int shaderIndex; |
| 29 | @Shadow private ShaderGroup theShaderGroup; | 30 | @Shadow private ShaderGroup theShaderGroup; |
src/client/java/com/mumfrey/liteloader/client/mixin/MixinMinecraft.java
| @@ -29,7 +29,7 @@ import net.minecraft.util.Timer; | @@ -29,7 +29,7 @@ import net.minecraft.util.Timer; | ||
| 29 | @Mixin(Minecraft.class) | 29 | @Mixin(Minecraft.class) |
| 30 | public abstract class MixinMinecraft implements IMinecraft | 30 | public abstract class MixinMinecraft implements IMinecraft |
| 31 | { | 31 | { |
| 32 | - @Shadow private Timer timer; | 32 | + @Shadow @Final private Timer timer; |
| 33 | @Shadow volatile boolean running; | 33 | @Shadow volatile boolean running; |
| 34 | @Shadow @Final private List<IResourcePack> defaultResourcePacks; | 34 | @Shadow @Final private List<IResourcePack> defaultResourcePacks; |
| 35 | @Shadow private String serverName; | 35 | @Shadow private String serverName; |
| @@ -113,7 +113,7 @@ public abstract class MixinMinecraft implements IMinecraft | @@ -113,7 +113,7 @@ public abstract class MixinMinecraft implements IMinecraft | ||
| 113 | )) | 113 | )) |
| 114 | private void onClickMouse(Minecraft self) | 114 | private void onClickMouse(Minecraft self) |
| 115 | { | 115 | { |
| 116 | - if (ClientProxy.onClickMouse(self.thePlayer, MouseButton.LEFT)) | 116 | + if (ClientProxy.onClickMouse(self.player, MouseButton.LEFT)) |
| 117 | { | 117 | { |
| 118 | this.clickMouse(); | 118 | this.clickMouse(); |
| 119 | } | 119 | } |
| @@ -128,7 +128,7 @@ public abstract class MixinMinecraft implements IMinecraft | @@ -128,7 +128,7 @@ public abstract class MixinMinecraft implements IMinecraft | ||
| 128 | ) | 128 | ) |
| 129 | private void onMouseHeld(boolean leftClick, CallbackInfo ci) | 129 | private void onMouseHeld(boolean leftClick, CallbackInfo ci) |
| 130 | { | 130 | { |
| 131 | - if (!ClientProxy.onMouseHeld(((Minecraft)(Object)this).thePlayer, MouseButton.LEFT)) | 131 | + if (!ClientProxy.onMouseHeld(((Minecraft)(Object)this).player, MouseButton.LEFT)) |
| 132 | { | 132 | { |
| 133 | ci.cancel(); | 133 | ci.cancel(); |
| 134 | } | 134 | } |
| @@ -141,7 +141,7 @@ public abstract class MixinMinecraft implements IMinecraft | @@ -141,7 +141,7 @@ public abstract class MixinMinecraft implements IMinecraft | ||
| 141 | )) | 141 | )) |
| 142 | private void onRightClickMouse(Minecraft self) | 142 | private void onRightClickMouse(Minecraft self) |
| 143 | { | 143 | { |
| 144 | - if (ClientProxy.onClickMouse(self.thePlayer, MouseButton.RIGHT)) | 144 | + if (ClientProxy.onClickMouse(self.player, MouseButton.RIGHT)) |
| 145 | { | 145 | { |
| 146 | this.rightClickMouse(); | 146 | this.rightClickMouse(); |
| 147 | } | 147 | } |
| @@ -154,7 +154,7 @@ public abstract class MixinMinecraft implements IMinecraft | @@ -154,7 +154,7 @@ public abstract class MixinMinecraft implements IMinecraft | ||
| 154 | )) | 154 | )) |
| 155 | private void onRightMouseHeld(Minecraft self) | 155 | private void onRightMouseHeld(Minecraft self) |
| 156 | { | 156 | { |
| 157 | - if (ClientProxy.onMouseHeld(self.thePlayer, MouseButton.RIGHT)) | 157 | + if (ClientProxy.onMouseHeld(self.player, MouseButton.RIGHT)) |
| 158 | { | 158 | { |
| 159 | this.rightClickMouse(); | 159 | this.rightClickMouse(); |
| 160 | } | 160 | } |
| @@ -166,7 +166,7 @@ public abstract class MixinMinecraft implements IMinecraft | @@ -166,7 +166,7 @@ public abstract class MixinMinecraft implements IMinecraft | ||
| 166 | )) | 166 | )) |
| 167 | private void onMiddleClickMouse(Minecraft self) | 167 | private void onMiddleClickMouse(Minecraft self) |
| 168 | { | 168 | { |
| 169 | - if (ClientProxy.onClickMouse(self.thePlayer, MouseButton.MIDDLE)) | 169 | + if (ClientProxy.onClickMouse(self.player, MouseButton.MIDDLE)) |
| 170 | { | 170 | { |
| 171 | this.middleClickMouse(); | 171 | this.middleClickMouse(); |
| 172 | } | 172 | } |
src/client/java/com/mumfrey/liteloader/client/mixin/MixinRenderManager.java
| @@ -7,6 +7,7 @@ package com.mumfrey.liteloader.client.mixin; | @@ -7,6 +7,7 @@ package com.mumfrey.liteloader.client.mixin; | ||
| 7 | 7 | ||
| 8 | import java.util.Map; | 8 | import java.util.Map; |
| 9 | 9 | ||
| 10 | +import org.spongepowered.asm.mixin.Final; | ||
| 10 | import org.spongepowered.asm.mixin.Mixin; | 11 | import org.spongepowered.asm.mixin.Mixin; |
| 11 | import org.spongepowered.asm.mixin.Shadow; | 12 | import org.spongepowered.asm.mixin.Shadow; |
| 12 | import org.spongepowered.asm.mixin.injection.At; | 13 | import org.spongepowered.asm.mixin.injection.At; |
| @@ -22,7 +23,7 @@ import net.minecraft.entity.Entity; | @@ -22,7 +23,7 @@ import net.minecraft.entity.Entity; | ||
| 22 | @Mixin(RenderManager.class) | 23 | @Mixin(RenderManager.class) |
| 23 | public abstract class MixinRenderManager implements IRenderManager | 24 | public abstract class MixinRenderManager implements IRenderManager |
| 24 | { | 25 | { |
| 25 | - @Shadow private Map<Class<? extends Entity>, Render<? extends Entity>> entityRenderMap; | 26 | + @Shadow @Final private Map<Class<? extends Entity>, Render<? extends Entity>> entityRenderMap; |
| 26 | 27 | ||
| 27 | @Override | 28 | @Override |
| 28 | public Map<Class<? extends Entity>, Render<? extends Entity>> getRenderMap() | 29 | public Map<Class<? extends Entity>, Render<? extends Entity>> getRenderMap() |
src/client/java/com/mumfrey/liteloader/client/mixin/MixinSimpleReloadableResourceManager.java
| @@ -7,6 +7,7 @@ package com.mumfrey.liteloader.client.mixin; | @@ -7,6 +7,7 @@ package com.mumfrey.liteloader.client.mixin; | ||
| 7 | 7 | ||
| 8 | import java.util.List; | 8 | import java.util.List; |
| 9 | 9 | ||
| 10 | +import org.spongepowered.asm.mixin.Final; | ||
| 10 | import org.spongepowered.asm.mixin.Mixin; | 11 | import org.spongepowered.asm.mixin.Mixin; |
| 11 | import org.spongepowered.asm.mixin.Shadow; | 12 | import org.spongepowered.asm.mixin.Shadow; |
| 12 | 13 | ||
| @@ -18,7 +19,7 @@ import net.minecraft.client.resources.SimpleReloadableResourceManager; | @@ -18,7 +19,7 @@ import net.minecraft.client.resources.SimpleReloadableResourceManager; | ||
| 18 | @Mixin(SimpleReloadableResourceManager.class) | 19 | @Mixin(SimpleReloadableResourceManager.class) |
| 19 | public abstract class MixinSimpleReloadableResourceManager implements IReloadable | 20 | public abstract class MixinSimpleReloadableResourceManager implements IReloadable |
| 20 | { | 21 | { |
| 21 | - @Shadow private List<IResourceManagerReloadListener> reloadListeners; | 22 | + @Shadow @Final private List<IResourceManagerReloadListener> reloadListeners; |
| 22 | 23 | ||
| 23 | @Override | 24 | @Override |
| 24 | public List<IResourceManagerReloadListener> getReloadListeners() | 25 | public List<IResourceManagerReloadListener> getReloadListeners() |
src/client/java/com/mumfrey/liteloader/client/util/PrivateFieldsClient.java deleted
100644 → 0
| 1 | -/* | ||
| 2 | - * This file is part of LiteLoader. | ||
| 3 | - * Copyright (C) 2012-16 Adam Mummery-Smith | ||
| 4 | - * All Rights Reserved. | ||
| 5 | - */ | ||
| 6 | -package com.mumfrey.liteloader.client.util; | ||
| 7 | - | ||
| 8 | -import java.util.Map; | ||
| 9 | - | ||
| 10 | -import com.mumfrey.liteloader.core.runtime.Obf; | ||
| 11 | -import com.mumfrey.liteloader.util.PrivateFields; | ||
| 12 | - | ||
| 13 | -import net.minecraft.tileentity.TileEntity; | ||
| 14 | - | ||
| 15 | -@SuppressWarnings("rawtypes") | ||
| 16 | -public final class PrivateFieldsClient<P, T> extends PrivateFields<P, T> | ||
| 17 | -{ | ||
| 18 | - private PrivateFieldsClient(Class<P> owner, Obf obf) | ||
| 19 | - { | ||
| 20 | - super(owner, obf); | ||
| 21 | - } | ||
| 22 | - | ||
| 23 | - // CHECKSTYLE:OFF | ||
| 24 | - | ||
| 25 | - public static final PrivateFieldsClient<TileEntity, Map> tileEntityNameToClassMap = new PrivateFieldsClient<TileEntity, Map>(TileEntity.class, Obf.tileEntityNameToClassMap); | ||
| 26 | - public static final PrivateFieldsClient<TileEntity, Map> tileEntityClassToNameMap = new PrivateFieldsClient<TileEntity, Map>(TileEntity.class, Obf.tileEntityClassToNameMap); | ||
| 27 | -} |
src/client/java/com/mumfrey/liteloader/util/ModUtilities.java
| @@ -14,7 +14,6 @@ import org.lwjgl.opengl.DisplayMode; | @@ -14,7 +14,6 @@ import org.lwjgl.opengl.DisplayMode; | ||
| 14 | import com.mumfrey.liteloader.client.ducks.IRenderManager; | 14 | import com.mumfrey.liteloader.client.ducks.IRenderManager; |
| 15 | import com.mumfrey.liteloader.client.ducks.ITileEntityRendererDispatcher; | 15 | import com.mumfrey.liteloader.client.ducks.ITileEntityRendererDispatcher; |
| 16 | import com.mumfrey.liteloader.client.overlays.IMinecraft; | 16 | import com.mumfrey.liteloader.client.overlays.IMinecraft; |
| 17 | -import com.mumfrey.liteloader.client.util.PrivateFieldsClient; | ||
| 18 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; | 17 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
| 19 | 18 | ||
| 20 | import net.minecraft.client.Minecraft; | 19 | import net.minecraft.client.Minecraft; |
| @@ -94,20 +93,4 @@ public abstract class ModUtilities | @@ -94,20 +93,4 @@ public abstract class ModUtilities | ||
| 94 | renderer.getClass().getSimpleName(), tileEntityClass.getSimpleName()); | 93 | renderer.getClass().getSimpleName(), tileEntityClass.getSimpleName()); |
| 95 | } | 94 | } |
| 96 | } | 95 | } |
| 97 | - | ||
| 98 | - @SuppressWarnings("unchecked") | ||
| 99 | - public static void addTileEntity(String entityName, Class<? extends TileEntity> tileEntityClass) | ||
| 100 | - { | ||
| 101 | - try | ||
| 102 | - { | ||
| 103 | - Map<String, Class<? extends TileEntity>> nameToClassMap = PrivateFieldsClient.tileEntityNameToClassMap.get(null); | ||
| 104 | - Map<Class<? extends TileEntity>, String> classToNameMap = PrivateFieldsClient.tileEntityClassToNameMap.get(null); | ||
| 105 | - nameToClassMap.put(entityName, tileEntityClass); | ||
| 106 | - classToNameMap.put(tileEntityClass, entityName); | ||
| 107 | - } | ||
| 108 | - catch (Exception ex) | ||
| 109 | - { | ||
| 110 | - ex.printStackTrace(); | ||
| 111 | - } | ||
| 112 | - } | ||
| 113 | } | 96 | } |
src/main/java/com/mumfrey/liteloader/core/LiteLoaderEventBroker.java
| @@ -410,7 +410,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | @@ -410,7 +410,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | ||
| 410 | { | 410 | { |
| 411 | if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, player, hand, player.getHeldItem(hand), pos, facing)) | 411 | if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, player, hand, player.getHeldItem(hand), pos, facing)) |
| 412 | { | 412 | { |
| 413 | - SPacketBlockChange cancellation = new SPacketBlockChange(player.worldObj, pos.offset(facing)); | 413 | + SPacketBlockChange cancellation = new SPacketBlockChange(player.world, pos.offset(facing)); |
| 414 | netHandler.playerEntity.connection.sendPacket(cancellation); | 414 | netHandler.playerEntity.connection.sendPacket(cancellation); |
| 415 | player.sendContainerToPlayer(player.inventoryContainer); | 415 | player.sendContainerToPlayer(player.inventoryContainer); |
| 416 | return false; | 416 | return false; |
| @@ -428,7 +428,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | @@ -428,7 +428,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | ||
| 428 | { | 428 | { |
| 429 | if (!this.onPlayerInteract(action, player, EnumHand.MAIN_HAND, player.getHeldItemMainhand(), pos, EnumFacing.SOUTH)) | 429 | if (!this.onPlayerInteract(action, player, EnumHand.MAIN_HAND, player.getHeldItemMainhand(), pos, EnumFacing.SOUTH)) |
| 430 | { | 430 | { |
| 431 | - SPacketBlockChange cancellation = new SPacketBlockChange(player.worldObj, pos); | 431 | + SPacketBlockChange cancellation = new SPacketBlockChange(player.world, pos); |
| 432 | netHandler.playerEntity.connection.sendPacket(cancellation); | 432 | netHandler.playerEntity.connection.sendPacket(cancellation); |
| 433 | return false; | 433 | return false; |
| 434 | } | 434 | } |
| @@ -440,7 +440,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | @@ -440,7 +440,7 @@ public abstract class LiteLoaderEventBroker<TClient, TServer extends MinecraftSe | ||
| 440 | { | 440 | { |
| 441 | if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, player, hand, stack, pos, side)) | 441 | if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, player, hand, stack, pos, side)) |
| 442 | { | 442 | { |
| 443 | - SPacketBlockChange cancellation = new SPacketBlockChange(player.worldObj, pos); | 443 | + SPacketBlockChange cancellation = new SPacketBlockChange(player.world, pos); |
| 444 | player.connection.sendPacket(cancellation); | 444 | player.connection.sendPacket(cancellation); |
| 445 | return false; | 445 | return false; |
| 446 | } | 446 | } |
src/main/java/com/mumfrey/liteloader/core/LiteLoaderVersion.java
| @@ -48,12 +48,13 @@ public enum LiteLoaderVersion | @@ -48,12 +48,13 @@ public enum LiteLoaderVersion | ||
| 48 | MC_1_9_0_R0(35, 0, "1.9", "1.9.0", "1.9", "1.9.0"), | 48 | MC_1_9_0_R0(35, 0, "1.9", "1.9.0", "1.9", "1.9.0"), |
| 49 | MC_1_9_4_R0(36, 0, "1.9.4", "1.9.4", "1.9.4"), | 49 | MC_1_9_4_R0(36, 0, "1.9.4", "1.9.4", "1.9.4"), |
| 50 | MC_1_10_R0(37, 0, "1.10", "1.10", "1.10", "1.10.0", "1.10.r1"), | 50 | MC_1_10_R0(37, 0, "1.10", "1.10", "1.10", "1.10.0", "1.10.r1"), |
| 51 | - MC_1_10_2_R0(38, 0, "1.10.2", "1.10.2", "1.10.2", "1.10.r1"); | 51 | + MC_1_10_2_R0(38, 0, "1.10.2", "1.10.2", "1.10.2", "1.10.r1"), |
| 52 | + MC_1_11_0_R0(39, 0, "1.11", "1.11", "1.11", "1.11.0", "1.11.r1"); | ||
| 52 | 53 | ||
| 53 | /** | 54 | /** |
| 54 | * Current loader version | 55 | * Current loader version |
| 55 | */ | 56 | */ |
| 56 | - public static final LiteLoaderVersion CURRENT = LiteLoaderVersion.MC_1_10_2_R0; | 57 | + public static final LiteLoaderVersion CURRENT = LiteLoaderVersion.MC_1_11_0_R0; |
| 57 | 58 | ||
| 58 | private static final LiteLoaderUpdateSite updateSite = new LiteLoaderUpdateSite(LiteLoaderVersion.CURRENT.getMinecraftVersion(), | 59 | private static final LiteLoaderUpdateSite updateSite = new LiteLoaderUpdateSite(LiteLoaderVersion.CURRENT.getMinecraftVersion(), |
| 59 | LiteLoaderVersion.CURRENT.getReleaseTimestamp()); | 60 | LiteLoaderVersion.CURRENT.getReleaseTimestamp()); |
src/main/java/com/mumfrey/liteloader/core/runtime/Obf.java
| @@ -14,7 +14,7 @@ import java.util.Map; | @@ -14,7 +14,7 @@ import java.util.Map; | ||
| 14 | * Centralised obfuscation table for LiteLoader | 14 | * Centralised obfuscation table for LiteLoader |
| 15 | * | 15 | * |
| 16 | * @author Adam Mummery-Smith | 16 | * @author Adam Mummery-Smith |
| 17 | - * TODO Obfuscation 1.10.2 | 17 | + * TODO Obfuscation 1.11 |
| 18 | */ | 18 | */ |
| 19 | public class Obf | 19 | public class Obf |
| 20 | { | 20 | { |
| @@ -40,19 +40,14 @@ public class Obf | @@ -40,19 +40,14 @@ public class Obf | ||
| 40 | 40 | ||
| 41 | // Classes | 41 | // Classes |
| 42 | // ----------------------------------------------------------------------------------------- | 42 | // ----------------------------------------------------------------------------------------- |
| 43 | - public static final Obf Minecraft = new Obf("net.minecraft.client.Minecraft", "bcx" ); | ||
| 44 | - public static final Obf EntityRenderer = new Obf("net.minecraft.client.renderer.EntityRenderer", "bnz" ); | ||
| 45 | - public static final Obf Blocks = new Obf("net.minecraft.init.Blocks", "akg" ); | 43 | + public static final Obf Minecraft = new Obf("net.minecraft.client.Minecraft", "beq" ); |
| 44 | + public static final Obf EntityRenderer = new Obf("net.minecraft.client.renderer.EntityRenderer", "bqc" ); | ||
| 45 | + public static final Obf Blocks = new Obf("net.minecraft.init.Blocks", "alt" ); | ||
| 46 | public static final Obf CrashReport$6 = new Obf("net.minecraft.crash.CrashReport$6", "b$6" ); | 46 | public static final Obf CrashReport$6 = new Obf("net.minecraft.crash.CrashReport$6", "b$6" ); |
| 47 | - public static final Obf INetHandler = new Obf("net.minecraft.network.INetHandler", "et" ); | ||
| 48 | - public static final Obf Items = new Obf("net.minecraft.init.Items", "aeb" ); | ||
| 49 | - public static final Obf Profiler = new Obf("net.minecraft.profiler.Profiler", "oq" ); | ||
| 50 | - public static final Obf TileEntity = new Obf("net.minecraft.tileentity.TileEntity", "aqk" ); | ||
| 51 | - | ||
| 52 | - // Fields | ||
| 53 | - // ----------------------------------------------------------------------------------------- | ||
| 54 | - public static final Obf tileEntityNameToClassMap = new Obf(Obf.TileEntity, "field_145855_i", "f" ); | ||
| 55 | - public static final Obf tileEntityClassToNameMap = new Obf(Obf.TileEntity, "field_145853_j", "g" ); | 47 | + public static final Obf INetHandler = new Obf("net.minecraft.network.INetHandler", "ew" ); |
| 48 | + public static final Obf Items = new Obf("net.minecraft.init.Items", "afk" ); | ||
| 49 | + public static final Obf Profiler = new Obf("net.minecraft.profiler.Profiler", "ou" ); | ||
| 50 | + public static final Obf TileEntity = new Obf("net.minecraft.tileentity.TileEntity", "asa" ); | ||
| 56 | 51 | ||
| 57 | // Methods | 52 | // Methods |
| 58 | // ----------------------------------------------------------------------------------------- | 53 | // ----------------------------------------------------------------------------------------- |
src/main/java/com/mumfrey/liteloader/core/runtime/Packets.java
| @@ -12,7 +12,7 @@ import java.util.Map; | @@ -12,7 +12,7 @@ import java.util.Map; | ||
| 12 | * Packet obfuscation table | 12 | * Packet obfuscation table |
| 13 | * | 13 | * |
| 14 | * @author Adam Mummery-Smith | 14 | * @author Adam Mummery-Smith |
| 15 | - * TODO Obfuscation 1.10.2 | 15 | + * TODO Obfuscation 1.11 |
| 16 | */ | 16 | */ |
| 17 | public final class Packets extends Obf | 17 | public final class Packets extends Obf |
| 18 | { | 18 | { |
| @@ -37,123 +37,123 @@ public final class Packets extends Obf | @@ -37,123 +37,123 @@ public final class Packets extends Obf | ||
| 37 | 37 | ||
| 38 | private static Map<String, Packets> packetMap = new HashMap<String, Packets>(); | 38 | private static Map<String, Packets> packetMap = new HashMap<String, Packets>(); |
| 39 | 39 | ||
| 40 | - public static Packets C00Handshake = new Packets("net/minecraft/network/handshake/client/C00Handshake", "jm", Context.SERVER); | ||
| 41 | - public static Packets CPacketEncryptionResponse = new Packets("net/minecraft/network/login/client/CPacketEncryptionResponse", "jw", Context.SERVER); | ||
| 42 | - public static Packets CPacketLoginStart = new Packets("net/minecraft/network/login/client/CPacketLoginStart", "jv", Context.SERVER); | ||
| 43 | - public static Packets SPacketDisconnectLogin = new Packets("net/minecraft/network/login/server/SPacketDisconnect", "jt", Context.CLIENT); | ||
| 44 | - public static Packets SPacketEnableCompression = new Packets("net/minecraft/network/login/server/SPacketEnableCompression", "js", Context.CLIENT); | ||
| 45 | - public static Packets SPacketEncryptionRequest = new Packets("net/minecraft/network/login/server/SPacketEncryptionRequest", "jr", Context.CLIENT); | ||
| 46 | - public static Packets SPacketLoginSuccess = new Packets("net/minecraft/network/login/server/SPacketLoginSuccess", "jq", Context.CLIENT); | ||
| 47 | - public static Packets CPacketAnimation = new Packets("net/minecraft/network/play/client/CPacketAnimation", "jh", Context.SERVER); | ||
| 48 | - public static Packets CPacketChatMessage = new Packets("net/minecraft/network/play/client/CPacketChatMessage", "im", Context.SERVER); | ||
| 49 | - public static Packets CPacketClickWindow = new Packets("net/minecraft/network/play/client/CPacketClickWindow", "ir", Context.SERVER); | ||
| 50 | - public static Packets CPacketClientSettings = new Packets("net/minecraft/network/play/client/CPacketClientSettings", "io", Context.SERVER); | ||
| 51 | - public static Packets CPacketClientStatus = new Packets("net/minecraft/network/play/client/CPacketClientStatus", "in", Context.SERVER); | ||
| 52 | - public static Packets CPacketCloseWindow = new Packets("net/minecraft/network/play/client/CPacketCloseWindow", "is", Context.SERVER); | ||
| 53 | - public static Packets CPacketConfirmTeleport = new Packets("net/minecraft/network/play/client/CPacketConfirmTeleport", "ik", Context.SERVER); | ||
| 54 | - public static Packets CPacketConfirmTransaction = new Packets("net/minecraft/network/play/client/CPacketConfirmTransaction", "ip", Context.SERVER); | ||
| 55 | - public static Packets CPacketCreativeInventoryAction = new Packets("net/minecraft/network/play/client/CPacketCreativeInventoryAction", "jf", Context.SERVER); | ||
| 56 | - public static Packets CPacketCustomPayload = new Packets("net/minecraft/network/play/client/CPacketCustomPayload", "it", Context.SERVER); | ||
| 57 | - public static Packets CPacketEnchantItem = new Packets("net/minecraft/network/play/client/CPacketEnchantItem", "iq", Context.SERVER); | ||
| 58 | - public static Packets CPacketEntityAction = new Packets("net/minecraft/network/play/client/CPacketEntityAction", "jb", Context.SERVER); | ||
| 59 | - public static Packets CPacketHeldItemChange = new Packets("net/minecraft/network/play/client/CPacketHeldItemChange", "je", Context.SERVER); | ||
| 60 | - public static Packets CPacketInput = new Packets("net/minecraft/network/play/client/CPacketInput", "jc", Context.SERVER); | ||
| 61 | - public static Packets CPacketKeepAlive = new Packets("net/minecraft/network/play/client/CPacketKeepAlive", "iv", Context.SERVER); | ||
| 62 | - public static Packets CPacketPlayer = new Packets("net/minecraft/network/play/client/CPacketPlayer", "iw", Context.SERVER); | ||
| 63 | - public static Packets CPacketPlayerPosition = new Packets("net/minecraft/network/play/client/CPacketPlayer$Position", "iw$a", Context.SERVER); | ||
| 64 | - public static Packets CPacketPlayerPositionRotation = new Packets("net/minecraft/network/play/client/CPacketPlayer$PositionRotation", "iw$b", Context.SERVER); | ||
| 65 | - public static Packets CPacketPlayerRotation = new Packets("net/minecraft/network/play/client/CPacketPlayer$Rotation", "iw$c", Context.SERVER); | ||
| 66 | - public static Packets CPacketPlayerAbilities = new Packets("net/minecraft/network/play/client/CPacketPlayerAbilities", "iz", Context.SERVER); | ||
| 67 | - public static Packets CPacketPlayerDigging = new Packets("net/minecraft/network/play/client/CPacketPlayerDigging", "ja", Context.SERVER); | ||
| 68 | - public static Packets CPacketPlayerTryUseItem = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItem", "jk", Context.SERVER); | ||
| 69 | - public static Packets CPacketPlayerTryUseItemOnBlock = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItemOnBlock", "jj", Context.SERVER); | ||
| 70 | - public static Packets CPacketResourcePackStatus = new Packets("net/minecraft/network/play/client/CPacketResourcePackStatus", "jd", Context.SERVER); | ||
| 71 | - public static Packets CPacketSpectate = new Packets("net/minecraft/network/play/client/CPacketSpectate", "ji", Context.SERVER); | ||
| 72 | - public static Packets CPacketSteerBoat = new Packets("net/minecraft/network/play/client/CPacketSteerBoat", "iy", Context.SERVER); | ||
| 73 | - public static Packets CPacketTabComplete = new Packets("net/minecraft/network/play/client/CPacketTabComplete", "il", Context.SERVER); | ||
| 74 | - public static Packets CPacketUpdateSign = new Packets("net/minecraft/network/play/client/CPacketUpdateSign", "jg", Context.SERVER); | ||
| 75 | - public static Packets CPacketUseEntity = new Packets("net/minecraft/network/play/client/CPacketUseEntity", "iu", Context.SERVER); | ||
| 76 | - public static Packets CPacketVehicleMove = new Packets("net/minecraft/network/play/client/CPacketVehicleMove", "ix", Context.SERVER); | ||
| 77 | - public static Packets SPacketAnimation = new Packets("net/minecraft/network/play/server/SPacketAnimation", "ft", Context.CLIENT); | ||
| 78 | - public static Packets SPacketBlockAction = new Packets("net/minecraft/network/play/server/SPacketBlockAction", "fx", Context.CLIENT); | ||
| 79 | - public static Packets SPacketBlockBreakAnim = new Packets("net/minecraft/network/play/server/SPacketBlockBreakAnim", "fv", Context.CLIENT); | ||
| 80 | - public static Packets SPacketBlockChange = new Packets("net/minecraft/network/play/server/SPacketBlockChange", "fy", Context.CLIENT); | ||
| 81 | - public static Packets SPacketCamera = new Packets("net/minecraft/network/play/server/SPacketCamera", "hm", Context.CLIENT); | ||
| 82 | - public static Packets SPacketChangeGameState = new Packets("net/minecraft/network/play/server/SPacketChangeGameState", "gr", Context.CLIENT); | ||
| 83 | - public static Packets SPacketChat = new Packets("net/minecraft/network/play/server/SPacketChat", "gc", Context.CLIENT); | ||
| 84 | - public static Packets SPacketChunkData = new Packets("net/minecraft/network/play/server/SPacketChunkData", "gt", Context.CLIENT); | ||
| 85 | - public static Packets SPacketCloseWindow = new Packets("net/minecraft/network/play/server/SPacketCloseWindow", "gf", Context.CLIENT); | ||
| 86 | - public static Packets SPacketCollectItem = new Packets("net/minecraft/network/play/server/SPacketCollectItem", "ie", Context.CLIENT); | ||
| 87 | - public static Packets SPacketCombatEvent = new Packets("net/minecraft/network/play/server/SPacketCombatEvent", "hc", Context.CLIENT); | ||
| 88 | - public static Packets SPacketConfirmTransaction = new Packets("net/minecraft/network/play/server/SPacketConfirmTransaction", "ge", Context.CLIENT); | ||
| 89 | - public static Packets SPacketCooldown = new Packets("net/minecraft/network/play/server/SPacketCooldown", "gk", Context.CLIENT); | ||
| 90 | - public static Packets SPacketCustomPayload = new Packets("net/minecraft/network/play/server/SPacketCustomPayload", "gl", Context.CLIENT); | ||
| 91 | - public static Packets SPacketCustomSound = new Packets("net/minecraft/network/play/server/SPacketCustomSound", "gm", Context.CLIENT); | ||
| 92 | - public static Packets SPacketDestroyEntities = new Packets("net/minecraft/network/play/server/SPacketDestroyEntities", "hg", Context.CLIENT); | ||
| 93 | - public static Packets SPacketDisconnect = new Packets("net/minecraft/network/play/server/SPacketDisconnect", "gn", Context.CLIENT); | ||
| 94 | - public static Packets SPacketDisplayObjective = new Packets("net/minecraft/network/play/server/SPacketDisplayObjective", "ho", Context.CLIENT); | ||
| 95 | - public static Packets SPacketEffect = new Packets("net/minecraft/network/play/server/SPacketEffect", "gu", Context.CLIENT); | ||
| 96 | - public static Packets SPacketEntity = new Packets("net/minecraft/network/play/server/SPacketEntity", "gy", Context.CLIENT); | ||
| 97 | - public static Packets S15PacketEntityRelMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S15PacketEntityRelMove", "gy$a", Context.CLIENT); | ||
| 98 | - public static Packets S16PacketEntityLook = new Packets("net/minecraft/network/play/server/SPacketEntity$S16PacketEntityLook", "gy$c", Context.CLIENT); | ||
| 99 | - public static Packets S17PacketEntityLookMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S17PacketEntityLookMove", "gy$b", Context.CLIENT); | ||
| 100 | - public static Packets SPacketEntityAttach = new Packets("net/minecraft/network/play/server/SPacketEntityAttach", "hq", Context.CLIENT); | ||
| 101 | - public static Packets SPacketEntityEffect = new Packets("net/minecraft/network/play/server/SPacketEntityEffect", "ii", Context.CLIENT); | ||
| 102 | - public static Packets SPacketEntityEquipment = new Packets("net/minecraft/network/play/server/SPacketEntityEquipment", "hs", Context.CLIENT); | ||
| 103 | - public static Packets SPacketEntityHeadLook = new Packets("net/minecraft/network/play/server/SPacketEntityHeadLook", "hk", Context.CLIENT); | ||
| 104 | - public static Packets SPacketEntityMetadata = new Packets("net/minecraft/network/play/server/SPacketEntityMetadata", "hp", Context.CLIENT); | ||
| 105 | - public static Packets SPacketEntityProperties = new Packets("net/minecraft/network/play/server/SPacketEntityProperties", "ih", Context.CLIENT); | ||
| 106 | - public static Packets SPacketEntityStatus = new Packets("net/minecraft/network/play/server/SPacketEntityStatus", "go", Context.CLIENT); | ||
| 107 | - public static Packets SPacketEntityTeleport = new Packets("net/minecraft/network/play/server/SPacketEntityTeleport", "ig", Context.CLIENT); | ||
| 108 | - public static Packets SPacketEntityVelocity = new Packets("net/minecraft/network/play/server/SPacketEntityVelocity", "hr", Context.CLIENT); | ||
| 109 | - public static Packets SPacketExplosion = new Packets("net/minecraft/network/play/server/SPacketExplosion", "gp", Context.CLIENT); | ||
| 110 | - public static Packets SPacketHeldItemChange = new Packets("net/minecraft/network/play/server/SPacketHeldItemChange", "hn", Context.CLIENT); | ||
| 111 | - public static Packets SPacketJoinGame = new Packets("net/minecraft/network/play/server/SPacketJoinGame", "gw", Context.CLIENT); | ||
| 112 | - public static Packets SPacketKeepAlive = new Packets("net/minecraft/network/play/server/SPacketKeepAlive", "gs", Context.CLIENT); | ||
| 113 | - public static Packets SPacketMaps = new Packets("net/minecraft/network/play/server/SPacketMaps", "gx", Context.CLIENT); | ||
| 114 | - public static Packets SPacketMoveVehicle = new Packets("net/minecraft/network/play/server/SPacketMoveVehicle", "gz", Context.CLIENT); | ||
| 115 | - public static Packets SPacketMultiBlockChange = new Packets("net/minecraft/network/play/server/SPacketMultiBlockChange", "gd", Context.CLIENT); | ||
| 116 | - public static Packets SPacketOpenWindow = new Packets("net/minecraft/network/play/server/SPacketOpenWindow", "gg", Context.CLIENT); | ||
| 117 | - public static Packets SPacketParticles = new Packets("net/minecraft/network/play/server/SPacketParticles", "gv", Context.CLIENT); | ||
| 118 | - public static Packets SPacketPlayerAbilities = new Packets("net/minecraft/network/play/server/SPacketPlayerAbilities", "hb", Context.CLIENT); | ||
| 119 | - public static Packets SPacketPlayerListHeaderFooter = new Packets("net/minecraft/network/play/server/SPacketPlayerListHeaderFooter", "id", Context.CLIENT); | ||
| 120 | - public static Packets SPacketPlayerListItem = new Packets("net/minecraft/network/play/server/SPacketPlayerListItem", "hd", Context.CLIENT); | ||
| 121 | - public static Packets SPacketPlayerPosLook = new Packets("net/minecraft/network/play/server/SPacketPlayerPosLook", "he", Context.CLIENT); | ||
| 122 | - public static Packets SPacketRemoveEntityEffect = new Packets("net/minecraft/network/play/server/SPacketRemoveEntityEffect", "hh", Context.CLIENT); | ||
| 123 | - public static Packets SPacketResourcePackSend = new Packets("net/minecraft/network/play/server/SPacketResourcePackSend", "hi", Context.CLIENT); | ||
| 124 | - public static Packets SPacketRespawn = new Packets("net/minecraft/network/play/server/SPacketRespawn", "hj", Context.CLIENT); | ||
| 125 | - public static Packets SPacketScoreboardObjective = new Packets("net/minecraft/network/play/server/SPacketScoreboardObjective", "hv", Context.CLIENT); | ||
| 126 | - public static Packets SPacketServerDifficulty = new Packets("net/minecraft/network/play/server/SPacketServerDifficulty", "ga", Context.CLIENT); | ||
| 127 | - public static Packets SPacketSetExperience = new Packets("net/minecraft/network/play/server/SPacketSetExperience", "ht", Context.CLIENT); | ||
| 128 | - public static Packets SPacketSetPassengers = new Packets("net/minecraft/network/play/server/SPacketSetPassengers", "hw", Context.CLIENT); | ||
| 129 | - public static Packets SPacketSetSlot = new Packets("net/minecraft/network/play/server/SPacketSetSlot", "gj", Context.CLIENT); | ||
| 130 | - public static Packets SPacketSignEditorOpen = new Packets("net/minecraft/network/play/server/SPacketSignEditorOpen", "ha", Context.CLIENT); | ||
| 131 | - public static Packets SPacketSoundEffect = new Packets("net/minecraft/network/play/server/SPacketSoundEffect", "ic", Context.CLIENT); | ||
| 132 | - public static Packets SPacketSpawnExperienceOrb = new Packets("net/minecraft/network/play/server/SPacketSpawnExperienceOrb", "fo", Context.CLIENT); | ||
| 133 | - public static Packets SPacketSpawnGlobalEntity = new Packets("net/minecraft/network/play/server/SPacketSpawnGlobalEntity", "fp", Context.CLIENT); | ||
| 134 | - public static Packets SPacketSpawnMob = new Packets("net/minecraft/network/play/server/SPacketSpawnMob", "fq", Context.CLIENT); | ||
| 135 | - public static Packets SPacketSpawnObject = new Packets("net/minecraft/network/play/server/SPacketSpawnObject", "fn", Context.CLIENT); | ||
| 136 | - public static Packets SPacketSpawnPainting = new Packets("net/minecraft/network/play/server/SPacketSpawnPainting", "fr", Context.CLIENT); | ||
| 137 | - public static Packets SPacketSpawnPlayer = new Packets("net/minecraft/network/play/server/SPacketSpawnPlayer", "fs", Context.CLIENT); | ||
| 138 | - public static Packets SPacketSpawnPosition = new Packets("net/minecraft/network/play/server/SPacketSpawnPosition", "hz", Context.CLIENT); | ||
| 139 | - public static Packets SPacketStatistics = new Packets("net/minecraft/network/play/server/SPacketStatistics", "fu", Context.CLIENT); | ||
| 140 | - public static Packets SPacketTabComplete = new Packets("net/minecraft/network/play/server/SPacketTabComplete", "gb", Context.CLIENT); | ||
| 141 | - public static Packets SPacketTeams = new Packets("net/minecraft/network/play/server/SPacketTeams", "hx", Context.CLIENT); | ||
| 142 | - public static Packets SPacketTimeUpdate = new Packets("net/minecraft/network/play/server/SPacketTimeUpdate", "ia", Context.CLIENT); | ||
| 143 | - public static Packets SPacketTitle = new Packets("net/minecraft/network/play/server/SPacketTitle", "ib", Context.CLIENT); | ||
| 144 | - public static Packets SPacketUnloadChunk = new Packets("net/minecraft/network/play/server/SPacketUnloadChunk", "gq", Context.CLIENT); | ||
| 145 | - public static Packets SPacketUpdateBossInfo = new Packets("net/minecraft/network/play/server/SPacketUpdateBossInfo", "fz", Context.CLIENT); | ||
| 146 | - public static Packets SPacketUpdateHealth = new Packets("net/minecraft/network/play/server/SPacketUpdateHealth", "hu", Context.CLIENT); | ||
| 147 | - public static Packets SPacketUpdateScore = new Packets("net/minecraft/network/play/server/SPacketUpdateScore", "hy", Context.CLIENT); | ||
| 148 | - public static Packets SPacketUpdateTileEntity = new Packets("net/minecraft/network/play/server/SPacketUpdateTileEntity", "fw", Context.CLIENT); | ||
| 149 | - public static Packets SPacketUseBed = new Packets("net/minecraft/network/play/server/SPacketUseBed", "hf", Context.CLIENT); | ||
| 150 | - public static Packets SPacketWindowItems = new Packets("net/minecraft/network/play/server/SPacketWindowItems", "gh", Context.CLIENT); | ||
| 151 | - public static Packets SPacketWindowProperty = new Packets("net/minecraft/network/play/server/SPacketWindowProperty", "gi", Context.CLIENT); | ||
| 152 | - public static Packets SPacketWorldBorder = new Packets("net/minecraft/network/play/server/SPacketWorldBorder", "hl", Context.CLIENT); | ||
| 153 | - public static Packets CPacketPing = new Packets("net/minecraft/network/status/client/CPacketPing", "ke", Context.SERVER); | ||
| 154 | - public static Packets CPacketServerQuery = new Packets("net/minecraft/network/status/client/CPacketServerQuery", "kf", Context.SERVER); | ||
| 155 | - public static Packets SPacketPong = new Packets("net/minecraft/network/status/server/SPacketPong", "ka", Context.CLIENT); | ||
| 156 | - public static Packets SPacketServerInfo = new Packets("net/minecraft/network/status/server/SPacketServerInfo", "kb", Context.CLIENT); | 40 | + public static Packets C00Handshake = new Packets("net/minecraft/network/handshake/client/C00Handshake", "jp", Context.SERVER); |
| 41 | + public static Packets CPacketEncryptionResponse = new Packets("net/minecraft/network/login/client/CPacketEncryptionResponse", "jz", Context.SERVER); | ||
| 42 | + public static Packets CPacketLoginStart = new Packets("net/minecraft/network/login/client/CPacketLoginStart", "jy", Context.SERVER); | ||
| 43 | + public static Packets SPacketDisconnectLogin = new Packets("net/minecraft/network/login/server/SPacketDisconnect", "jw", Context.CLIENT); | ||
| 44 | + public static Packets SPacketEnableCompression = new Packets("net/minecraft/network/login/server/SPacketEnableCompression", "jv", Context.CLIENT); | ||
| 45 | + public static Packets SPacketEncryptionRequest = new Packets("net/minecraft/network/login/server/SPacketEncryptionRequest", "ju", Context.CLIENT); | ||
| 46 | + public static Packets SPacketLoginSuccess = new Packets("net/minecraft/network/login/server/SPacketLoginSuccess", "jt", Context.CLIENT); | ||
| 47 | + public static Packets CPacketAnimation = new Packets("net/minecraft/network/play/client/CPacketAnimation", "jk", Context.SERVER); | ||
| 48 | + public static Packets CPacketChatMessage = new Packets("net/minecraft/network/play/client/CPacketChatMessage", "ip", Context.SERVER); | ||
| 49 | + public static Packets CPacketClickWindow = new Packets("net/minecraft/network/play/client/CPacketClickWindow", "iu", Context.SERVER); | ||
| 50 | + public static Packets CPacketClientSettings = new Packets("net/minecraft/network/play/client/CPacketClientSettings", "ir", Context.SERVER); | ||
| 51 | + public static Packets CPacketClientStatus = new Packets("net/minecraft/network/play/client/CPacketClientStatus", "iq", Context.SERVER); | ||
| 52 | + public static Packets CPacketCloseWindow = new Packets("net/minecraft/network/play/client/CPacketCloseWindow", "iv", Context.SERVER); | ||
| 53 | + public static Packets CPacketConfirmTeleport = new Packets("net/minecraft/network/play/client/CPacketConfirmTeleport", "in", Context.SERVER); | ||
| 54 | + public static Packets CPacketConfirmTransaction = new Packets("net/minecraft/network/play/client/CPacketConfirmTransaction", "is", Context.SERVER); | ||
| 55 | + public static Packets CPacketCreativeInventoryAction = new Packets("net/minecraft/network/play/client/CPacketCreativeInventoryAction", "ji", Context.SERVER); | ||
| 56 | + public static Packets CPacketCustomPayload = new Packets("net/minecraft/network/play/client/CPacketCustomPayload", "iw", Context.SERVER); | ||
| 57 | + public static Packets CPacketEnchantItem = new Packets("net/minecraft/network/play/client/CPacketEnchantItem", "it", Context.SERVER); | ||
| 58 | + public static Packets CPacketEntityAction = new Packets("net/minecraft/network/play/client/CPacketEntityAction", "je", Context.SERVER); | ||
| 59 | + public static Packets CPacketHeldItemChange = new Packets("net/minecraft/network/play/client/CPacketHeldItemChange", "jh", Context.SERVER); | ||
| 60 | + public static Packets CPacketInput = new Packets("net/minecraft/network/play/client/CPacketInput", "jf", Context.SERVER); | ||
| 61 | + public static Packets CPacketKeepAlive = new Packets("net/minecraft/network/play/client/CPacketKeepAlive", "iy", Context.SERVER); | ||
| 62 | + public static Packets CPacketPlayer = new Packets("net/minecraft/network/play/client/CPacketPlayer", "iz", Context.SERVER); | ||
| 63 | + public static Packets CPacketPlayerPosition = new Packets("net/minecraft/network/play/client/CPacketPlayer$Position", "iz$a", Context.SERVER); | ||
| 64 | + public static Packets CPacketPlayerPositionRotation = new Packets("net/minecraft/network/play/client/CPacketPlayer$PositionRotation", "iz$b", Context.SERVER); | ||
| 65 | + public static Packets CPacketPlayerRotation = new Packets("net/minecraft/network/play/client/CPacketPlayer$Rotation", "iz$c", Context.SERVER); | ||
| 66 | + public static Packets CPacketPlayerAbilities = new Packets("net/minecraft/network/play/client/CPacketPlayerAbilities", "jc", Context.SERVER); | ||
| 67 | + public static Packets CPacketPlayerDigging = new Packets("net/minecraft/network/play/client/CPacketPlayerDigging", "jd", Context.SERVER); | ||
| 68 | + public static Packets CPacketPlayerTryUseItem = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItem", "jn", Context.SERVER); | ||
| 69 | + public static Packets CPacketPlayerTryUseItemOnBlock = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItemOnBlock", "jm", Context.SERVER); | ||
| 70 | + public static Packets CPacketResourcePackStatus = new Packets("net/minecraft/network/play/client/CPacketResourcePackStatus", "jg", Context.SERVER); | ||
| 71 | + public static Packets CPacketSpectate = new Packets("net/minecraft/network/play/client/CPacketSpectate", "jl", Context.SERVER); | ||
| 72 | + public static Packets CPacketSteerBoat = new Packets("net/minecraft/network/play/client/CPacketSteerBoat", "jb", Context.SERVER); | ||
| 73 | + public static Packets CPacketTabComplete = new Packets("net/minecraft/network/play/client/CPacketTabComplete", "io", Context.SERVER); | ||
| 74 | + public static Packets CPacketUpdateSign = new Packets("net/minecraft/network/play/client/CPacketUpdateSign", "jj", Context.SERVER); | ||
| 75 | + public static Packets CPacketUseEntity = new Packets("net/minecraft/network/play/client/CPacketUseEntity", "ix", Context.SERVER); | ||
| 76 | + public static Packets CPacketVehicleMove = new Packets("net/minecraft/network/play/client/CPacketVehicleMove", "ja", Context.SERVER); | ||
| 77 | + public static Packets SPacketAnimation = new Packets("net/minecraft/network/play/server/SPacketAnimation", "fw", Context.CLIENT); | ||
| 78 | + public static Packets SPacketBlockAction = new Packets("net/minecraft/network/play/server/SPacketBlockAction", "ga", Context.CLIENT); | ||
| 79 | + public static Packets SPacketBlockBreakAnim = new Packets("net/minecraft/network/play/server/SPacketBlockBreakAnim", "fy", Context.CLIENT); | ||
| 80 | + public static Packets SPacketBlockChange = new Packets("net/minecraft/network/play/server/SPacketBlockChange", "gb", Context.CLIENT); | ||
| 81 | + public static Packets SPacketCamera = new Packets("net/minecraft/network/play/server/SPacketCamera", "hp", Context.CLIENT); | ||
| 82 | + public static Packets SPacketChangeGameState = new Packets("net/minecraft/network/play/server/SPacketChangeGameState", "gu", Context.CLIENT); | ||
| 83 | + public static Packets SPacketChat = new Packets("net/minecraft/network/play/server/SPacketChat", "gf", Context.CLIENT); | ||
| 84 | + public static Packets SPacketChunkData = new Packets("net/minecraft/network/play/server/SPacketChunkData", "gw", Context.CLIENT); | ||
| 85 | + public static Packets SPacketCloseWindow = new Packets("net/minecraft/network/play/server/SPacketCloseWindow", "gi", Context.CLIENT); | ||
| 86 | + public static Packets SPacketCollectItem = new Packets("net/minecraft/network/play/server/SPacketCollectItem", "ii", Context.CLIENT); | ||
| 87 | + public static Packets SPacketCombatEvent = new Packets("net/minecraft/network/play/server/SPacketCombatEvent", "hf", Context.CLIENT); | ||
| 88 | + public static Packets SPacketConfirmTransaction = new Packets("net/minecraft/network/play/server/SPacketConfirmTransaction", "gh", Context.CLIENT); | ||
| 89 | + public static Packets SPacketCooldown = new Packets("net/minecraft/network/play/server/SPacketCooldown", "gn", Context.CLIENT); | ||
| 90 | + public static Packets SPacketCustomPayload = new Packets("net/minecraft/network/play/server/SPacketCustomPayload", "go", Context.CLIENT); | ||
| 91 | + public static Packets SPacketCustomSound = new Packets("net/minecraft/network/play/server/SPacketCustomSound", "gp", Context.CLIENT); | ||
| 92 | + public static Packets SPacketDestroyEntities = new Packets("net/minecraft/network/play/server/SPacketDestroyEntities", "hj", Context.CLIENT); | ||
| 93 | + public static Packets SPacketDisconnect = new Packets("net/minecraft/network/play/server/SPacketDisconnect", "gq", Context.CLIENT); | ||
| 94 | + public static Packets SPacketDisplayObjective = new Packets("net/minecraft/network/play/server/SPacketDisplayObjective", "hr", Context.CLIENT); | ||
| 95 | + public static Packets SPacketEffect = new Packets("net/minecraft/network/play/server/SPacketEffect", "gx", Context.CLIENT); | ||
| 96 | + public static Packets SPacketEntity = new Packets("net/minecraft/network/play/server/SPacketEntity", "hb", Context.CLIENT); | ||
| 97 | + public static Packets S15PacketEntityRelMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S15PacketEntityRelMove", "hb$a", Context.CLIENT); | ||
| 98 | + public static Packets S16PacketEntityLook = new Packets("net/minecraft/network/play/server/SPacketEntity$S16PacketEntityLook", "hb$c", Context.CLIENT); | ||
| 99 | + public static Packets S17PacketEntityLookMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S17PacketEntityLookMove", "hb$b", Context.CLIENT); | ||
| 100 | + public static Packets SPacketEntityAttach = new Packets("net/minecraft/network/play/server/SPacketEntityAttach", "ht", Context.CLIENT); | ||
| 101 | + public static Packets SPacketEntityEffect = new Packets("net/minecraft/network/play/server/SPacketEntityEffect", "il", Context.CLIENT); | ||
| 102 | + public static Packets SPacketEntityEquipment = new Packets("net/minecraft/network/play/server/SPacketEntityEquipment", "hv", Context.CLIENT); | ||
| 103 | + public static Packets SPacketEntityHeadLook = new Packets("net/minecraft/network/play/server/SPacketEntityHeadLook", "hn", Context.CLIENT); | ||
| 104 | + public static Packets SPacketEntityMetadata = new Packets("net/minecraft/network/play/server/SPacketEntityMetadata", "hs", Context.CLIENT); | ||
| 105 | + public static Packets SPacketEntityProperties = new Packets("net/minecraft/network/play/server/SPacketEntityProperties", "ik", Context.CLIENT); | ||
| 106 | + public static Packets SPacketEntityStatus = new Packets("net/minecraft/network/play/server/SPacketEntityStatus", "gr", Context.CLIENT); | ||
| 107 | + public static Packets SPacketEntityTeleport = new Packets("net/minecraft/network/play/server/SPacketEntityTeleport", "ij", Context.CLIENT); | ||
| 108 | + public static Packets SPacketEntityVelocity = new Packets("net/minecraft/network/play/server/SPacketEntityVelocity", "hu", Context.CLIENT); | ||
| 109 | + public static Packets SPacketExplosion = new Packets("net/minecraft/network/play/server/SPacketExplosion", "gs", Context.CLIENT); | ||
| 110 | + public static Packets SPacketHeldItemChange = new Packets("net/minecraft/network/play/server/SPacketHeldItemChange", "hq", Context.CLIENT); | ||
| 111 | + public static Packets SPacketJoinGame = new Packets("net/minecraft/network/play/server/SPacketJoinGame", "gz", Context.CLIENT); | ||
| 112 | + public static Packets SPacketKeepAlive = new Packets("net/minecraft/network/play/server/SPacketKeepAlive", "gv", Context.CLIENT); | ||
| 113 | + public static Packets SPacketMaps = new Packets("net/minecraft/network/play/server/SPacketMaps", "ha", Context.CLIENT); | ||
| 114 | + public static Packets SPacketMoveVehicle = new Packets("net/minecraft/network/play/server/SPacketMoveVehicle", "hc", Context.CLIENT); | ||
| 115 | + public static Packets SPacketMultiBlockChange = new Packets("net/minecraft/network/play/server/SPacketMultiBlockChange", "gg", Context.CLIENT); | ||
| 116 | + public static Packets SPacketOpenWindow = new Packets("net/minecraft/network/play/server/SPacketOpenWindow", "gj", Context.CLIENT); | ||
| 117 | + public static Packets SPacketParticles = new Packets("net/minecraft/network/play/server/SPacketParticles", "gy", Context.CLIENT); | ||
| 118 | + public static Packets SPacketPlayerAbilities = new Packets("net/minecraft/network/play/server/SPacketPlayerAbilities", "he", Context.CLIENT); | ||
| 119 | + public static Packets SPacketPlayerListHeaderFooter = new Packets("net/minecraft/network/play/server/SPacketPlayerListHeaderFooter", "ih", Context.CLIENT); | ||
| 120 | + public static Packets SPacketPlayerListItem = new Packets("net/minecraft/network/play/server/SPacketPlayerListItem", "hg", Context.CLIENT); | ||
| 121 | + public static Packets SPacketPlayerPosLook = new Packets("net/minecraft/network/play/server/SPacketPlayerPosLook", "hh", Context.CLIENT); | ||
| 122 | + public static Packets SPacketRemoveEntityEffect = new Packets("net/minecraft/network/play/server/SPacketRemoveEntityEffect", "hk", Context.CLIENT); | ||
| 123 | + public static Packets SPacketResourcePackSend = new Packets("net/minecraft/network/play/server/SPacketResourcePackSend", "hl", Context.CLIENT); | ||
| 124 | + public static Packets SPacketRespawn = new Packets("net/minecraft/network/play/server/SPacketRespawn", "hm", Context.CLIENT); | ||
| 125 | + public static Packets SPacketScoreboardObjective = new Packets("net/minecraft/network/play/server/SPacketScoreboardObjective", "hy", Context.CLIENT); | ||
| 126 | + public static Packets SPacketServerDifficulty = new Packets("net/minecraft/network/play/server/SPacketServerDifficulty", "gd", Context.CLIENT); | ||
| 127 | + public static Packets SPacketSetExperience = new Packets("net/minecraft/network/play/server/SPacketSetExperience", "hw", Context.CLIENT); | ||
| 128 | + public static Packets SPacketSetPassengers = new Packets("net/minecraft/network/play/server/SPacketSetPassengers", "hz", Context.CLIENT); | ||
| 129 | + public static Packets SPacketSetSlot = new Packets("net/minecraft/network/play/server/SPacketSetSlot", "gm", Context.CLIENT); | ||
| 130 | + public static Packets SPacketSignEditorOpen = new Packets("net/minecraft/network/play/server/SPacketSignEditorOpen", "hd", Context.CLIENT); | ||
| 131 | + public static Packets SPacketSoundEffect = new Packets("net/minecraft/network/play/server/SPacketSoundEffect", "ig", Context.CLIENT); | ||
| 132 | + public static Packets SPacketSpawnExperienceOrb = new Packets("net/minecraft/network/play/server/SPacketSpawnExperienceOrb", "fr", Context.CLIENT); | ||
| 133 | + public static Packets SPacketSpawnGlobalEntity = new Packets("net/minecraft/network/play/server/SPacketSpawnGlobalEntity", "fs", Context.CLIENT); | ||
| 134 | + public static Packets SPacketSpawnMob = new Packets("net/minecraft/network/play/server/SPacketSpawnMob", "ft", Context.CLIENT); | ||
| 135 | + public static Packets SPacketSpawnObject = new Packets("net/minecraft/network/play/server/SPacketSpawnObject", "fq", Context.CLIENT); | ||
| 136 | + public static Packets SPacketSpawnPainting = new Packets("net/minecraft/network/play/server/SPacketSpawnPainting", "fu", Context.CLIENT); | ||
| 137 | + public static Packets SPacketSpawnPlayer = new Packets("net/minecraft/network/play/server/SPacketSpawnPlayer", "fv", Context.CLIENT); | ||
| 138 | + public static Packets SPacketSpawnPosition = new Packets("net/minecraft/network/play/server/SPacketSpawnPosition", "ic", Context.CLIENT); | ||
| 139 | + public static Packets SPacketStatistics = new Packets("net/minecraft/network/play/server/SPacketStatistics", "fx", Context.CLIENT); | ||
| 140 | + public static Packets SPacketTabComplete = new Packets("net/minecraft/network/play/server/SPacketTabComplete", "ge", Context.CLIENT); | ||
| 141 | + public static Packets SPacketTeams = new Packets("net/minecraft/network/play/server/SPacketTeams", "ia", Context.CLIENT); | ||
| 142 | + public static Packets SPacketTimeUpdate = new Packets("net/minecraft/network/play/server/SPacketTimeUpdate", "id", Context.CLIENT); | ||
| 143 | + public static Packets SPacketTitle = new Packets("net/minecraft/network/play/server/SPacketTitle", "ie", Context.CLIENT); | ||
| 144 | + public static Packets SPacketUnloadChunk = new Packets("net/minecraft/network/play/server/SPacketUnloadChunk", "gt", Context.CLIENT); | ||
| 145 | + public static Packets SPacketUpdateBossInfo = new Packets("net/minecraft/network/play/server/SPacketUpdateBossInfo", "gc", Context.CLIENT); | ||
| 146 | + public static Packets SPacketUpdateHealth = new Packets("net/minecraft/network/play/server/SPacketUpdateHealth", "hx", Context.CLIENT); | ||
| 147 | + public static Packets SPacketUpdateScore = new Packets("net/minecraft/network/play/server/SPacketUpdateScore", "ib", Context.CLIENT); | ||
| 148 | + public static Packets SPacketUpdateTileEntity = new Packets("net/minecraft/network/play/server/SPacketUpdateTileEntity", "fz", Context.CLIENT); | ||
| 149 | + public static Packets SPacketUseBed = new Packets("net/minecraft/network/play/server/SPacketUseBed", "hi", Context.CLIENT); | ||
| 150 | + public static Packets SPacketWindowItems = new Packets("net/minecraft/network/play/server/SPacketWindowItems", "gk", Context.CLIENT); | ||
| 151 | + public static Packets SPacketWindowProperty = new Packets("net/minecraft/network/play/server/SPacketWindowProperty", "gl", Context.CLIENT); | ||
| 152 | + public static Packets SPacketWorldBorder = new Packets("net/minecraft/network/play/server/SPacketWorldBorder", "ho", Context.CLIENT); | ||
| 153 | + public static Packets CPacketPing = new Packets("net/minecraft/network/status/client/CPacketPing", "kh", Context.SERVER); | ||
| 154 | + public static Packets CPacketServerQuery = new Packets("net/minecraft/network/status/client/CPacketServerQuery", "ki", Context.SERVER); | ||
| 155 | + public static Packets SPacketPong = new Packets("net/minecraft/network/status/server/SPacketPong", "kd", Context.CLIENT); | ||
| 156 | + public static Packets SPacketServerInfo = new Packets("net/minecraft/network/status/server/SPacketServerInfo", "ke", Context.CLIENT); | ||
| 157 | 157 | ||
| 158 | // CHECKSTYLE:ON | 158 | // CHECKSTYLE:ON |
| 159 | 159 |
src/main/java/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
| @@ -38,8 +38,8 @@ public class LiteLoaderTweaker implements ITweaker | @@ -38,8 +38,8 @@ public class LiteLoaderTweaker implements ITweaker | ||
| 38 | public static final int ENV_TYPE_CLIENT = 0; | 38 | public static final int ENV_TYPE_CLIENT = 0; |
| 39 | public static final int ENV_TYPE_DEDICATEDSERVER = 1; | 39 | public static final int ENV_TYPE_DEDICATEDSERVER = 1; |
| 40 | 40 | ||
| 41 | - // TODO Version - 1.10.2 | ||
| 42 | - public static final String VERSION = "1.10.2"; | 41 | + // TODO Version - 1.11 |
| 42 | + public static final String VERSION = "1.11"; | ||
| 43 | 43 | ||
| 44 | protected static final String bootstrapClassName = "com.mumfrey.liteloader.core.LiteLoaderBootstrap"; | 44 | protected static final String bootstrapClassName = "com.mumfrey.liteloader.core.LiteLoaderBootstrap"; |
| 45 | 45 |
src/main/java/com/mumfrey/liteloader/transformers/access/AccessorTransformer.java renamed to src/main/java/com/mumfrey/liteloader/transformers/event/AccessorTransformer.java
| @@ -3,7 +3,7 @@ | @@ -3,7 +3,7 @@ | ||
| 3 | * Copyright (C) 2012-16 Adam Mummery-Smith | 3 | * Copyright (C) 2012-16 Adam Mummery-Smith |
| 4 | * All Rights Reserved. | 4 | * All Rights Reserved. |
| 5 | */ | 5 | */ |
| 6 | -package com.mumfrey.liteloader.transformers.access; | 6 | +package com.mumfrey.liteloader.transformers.event; |
| 7 | 7 | ||
| 8 | import java.io.IOException; | 8 | import java.io.IOException; |
| 9 | import java.util.ArrayList; | 9 | import java.util.ArrayList; |
| @@ -30,6 +30,9 @@ import com.mumfrey.liteloader.core.runtime.Obf; | @@ -30,6 +30,9 @@ import com.mumfrey.liteloader.core.runtime.Obf; | ||
| 30 | import com.mumfrey.liteloader.transformers.ByteCodeUtilities; | 30 | import com.mumfrey.liteloader.transformers.ByteCodeUtilities; |
| 31 | import com.mumfrey.liteloader.transformers.ClassTransformer; | 31 | import com.mumfrey.liteloader.transformers.ClassTransformer; |
| 32 | import com.mumfrey.liteloader.transformers.ObfProvider; | 32 | import com.mumfrey.liteloader.transformers.ObfProvider; |
| 33 | +import com.mumfrey.liteloader.transformers.access.Accessor; | ||
| 34 | +import com.mumfrey.liteloader.transformers.access.Invoker; | ||
| 35 | +import com.mumfrey.liteloader.transformers.access.ObfTableClass; | ||
| 33 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; | 36 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
| 34 | 37 | ||
| 35 | import net.minecraft.launchwrapper.Launch; | 38 | import net.minecraft.launchwrapper.Launch; |
| @@ -40,7 +43,7 @@ import net.minecraft.launchwrapper.Launch; | @@ -40,7 +43,7 @@ import net.minecraft.launchwrapper.Launch; | ||
| 40 | * | 43 | * |
| 41 | * @author Adam Mummery-Smith | 44 | * @author Adam Mummery-Smith |
| 42 | */ | 45 | */ |
| 43 | -public abstract class AccessorTransformer extends ClassTransformer | 46 | +abstract class AccessorTransformer extends ClassTransformer |
| 44 | { | 47 | { |
| 45 | static final String EXCEPTION = "com/mumfrey/liteloader/transformers/access/AccessorException"; | 48 | static final String EXCEPTION = "com/mumfrey/liteloader/transformers/access/AccessorException"; |
| 46 | 49 |
src/main/java/com/mumfrey/liteloader/transformers/event/EventTransformer.java
| @@ -31,7 +31,6 @@ import com.mumfrey.liteloader.core.runtime.Obf; | @@ -31,7 +31,6 @@ import com.mumfrey.liteloader.core.runtime.Obf; | ||
| 31 | import com.mumfrey.liteloader.transformers.ByteCodeUtilities; | 31 | import com.mumfrey.liteloader.transformers.ByteCodeUtilities; |
| 32 | import com.mumfrey.liteloader.transformers.ClassTransformer; | 32 | import com.mumfrey.liteloader.transformers.ClassTransformer; |
| 33 | import com.mumfrey.liteloader.transformers.ObfProvider; | 33 | import com.mumfrey.liteloader.transformers.ObfProvider; |
| 34 | -import com.mumfrey.liteloader.transformers.access.AccessorTransformer; | ||
| 35 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; | 34 | import com.mumfrey.liteloader.util.log.LiteLoaderLogger; |
| 36 | 35 | ||
| 37 | /** | 36 | /** |
src/main/java/com/mumfrey/liteloader/util/EntityUtilities.java
| @@ -121,7 +121,7 @@ public abstract class EntityUtilities | @@ -121,7 +121,7 @@ public abstract class EntityUtilities | ||
| 121 | { | 121 | { |
| 122 | AxisAlignedBB boundingBox = source.getEntityBoundingBox(); | 122 | AxisAlignedBB boundingBox = source.getEntityBoundingBox(); |
| 123 | AxisAlignedBB traceBox = boundingBox.addCoord(dir.xCoord, dir.yCoord, dir.zCoord); | 123 | AxisAlignedBB traceBox = boundingBox.addCoord(dir.xCoord, dir.yCoord, dir.zCoord); |
| 124 | - List<Entity> entities = source.worldObj.getEntitiesInAABBexcluding(source, traceBox.expand(1.0F, 1.0F, 1.0F), filter); | 124 | + List<Entity> entities = source.world.getEntitiesInAABBexcluding(source, traceBox.expand(1.0F, 1.0F, 1.0F), filter); |
| 125 | return entities; | 125 | return entities; |
| 126 | } | 126 | } |
| 127 | 127 | ||
| @@ -130,7 +130,7 @@ public abstract class EntityUtilities | @@ -130,7 +130,7 @@ public abstract class EntityUtilities | ||
| 130 | Vec3d traceStart = EntityUtilities.getPositionEyes(source, partialTicks); | 130 | Vec3d traceStart = EntityUtilities.getPositionEyes(source, partialTicks); |
| 131 | Vec3d lookDir = source.getLook(partialTicks).scale(traceDistance); | 131 | Vec3d lookDir = source.getLook(partialTicks).scale(traceDistance); |
| 132 | Vec3d traceEnd = traceStart.add(lookDir); | 132 | Vec3d traceEnd = traceStart.add(lookDir); |
| 133 | - return source.worldObj.rayTraceBlocks(traceStart, traceEnd, false, false, true); | 133 | + return source.world.rayTraceBlocks(traceStart, traceEnd, false, false, true); |
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | public static Vec3d getPositionEyes(Entity entity, float partialTicks) | 136 | public static Vec3d getPositionEyes(Entity entity, float partialTicks) |
src/main/java/com/mumfrey/liteloader/util/log/LiteLoaderLogger.java
| @@ -296,8 +296,7 @@ public class LiteLoaderLogger extends AbstractAppender | @@ -296,8 +296,7 @@ public class LiteLoaderLogger extends AbstractAppender | ||
| 296 | { | 296 | { |
| 297 | if (LiteLoaderLogger.DEBUG) | 297 | if (LiteLoaderLogger.DEBUG) |
| 298 | { | 298 | { |
| 299 | - System.err.print("[DEBUG] "); | ||
| 300 | - System.err.println(String.format(format, data)); | 299 | + System.err.printf("[DEBUG] %s\n", String.format(format, data)); |
| 301 | } | 300 | } |
| 302 | } | 301 | } |
| 303 | 302 |
src/main/resources/assets/liteloader/lang/en_US.lang renamed to src/main/resources/assets/liteloader/lang/en_us.lang
src/main/resources/assets/liteloader/lang/pt_BR.lang renamed to src/main/resources/assets/liteloader/lang/pt_br.lang
src/main/resources/assets/liteloader/lang/zh_CN.lang renamed to src/main/resources/assets/liteloader/lang/zh_cn.lang