LiteLoader / LiteLoader · Commits

Commit f7c2ee1f30a243f4b63b469d76f48d95d02cb0bb

Authored by Mumfrey
1 parent 53881326
build: skipped

Initial 1.12 update

Inline Side-by-side
Showing 41 changed files with 398 additions and 376 deletions
README.MD
  View file @f7c2ee1
@@ -23,7 +23,7 @@ event callbacks, this makes its event handlers blazing fast @@ -23,7 +23,7 @@ event callbacks, this makes its event handlers blazing fast
23 23
24 ### License and Permissions 24 ### License and Permissions
25 25
26 -LiteLoader is Copyright 2012-2016 Adam Mummery-Smith All Rights Reserved 26 +LiteLoader is Copyright 2012-2017 Adam Mummery-Smith All Rights Reserved
27 You are free to use the source code for personal reference. 27 You are free to use the source code for personal reference.
28 You may not redistribute modified versions of the loader. 28 You may not redistribute modified versions of the loader.
29 You may not redistribute the source code in any form without written permission. 29 You may not redistribute the source code in any form without written permission.
build.gradle
  View file @f7c2ee1
@@ -17,7 +17,7 @@ buildscript { @@ -17,7 +17,7 @@ buildscript {
17 } 17 }
18 } 18 }
19 dependencies { 19 dependencies {
20 - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' 20 + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
21 classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3' 21 classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.3'
22 classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT' 22 classpath 'org.spongepowered:mixingradle:0.4-SNAPSHOT'
23 } 23 }
@@ -60,8 +60,8 @@ archivesBaseName = "liteloader" @@ -60,8 +60,8 @@ archivesBaseName = "liteloader"
60 version = buildVersion + (project.isReleaseBuild ? '' : '-' + project.classifier) 60 version = buildVersion + (project.isReleaseBuild ? '' : '-' + project.classifier)
61 61
62 // Minimum version of Java required 62 // Minimum version of Java required
63 -sourceCompatibility = '1.6'  
64 -targetCompatibility = '1.6' 63 +sourceCompatibility = '1.8'
  64 +targetCompatibility = '1.8'
65 65
66 repositories { 66 repositories {
67 mavenLocal() 67 mavenLocal()
@@ -72,7 +72,7 @@ repositories { @@ -72,7 +72,7 @@ repositories {
72 } 72 }
73 73
74 dependencies { 74 dependencies {
75 - compile('org.spongepowered:mixin:0.6.8-SNAPSHOT') { 75 + compile('org.spongepowered:mixin:0.6.10-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'
@@ -89,11 +89,11 @@ minecraft { @@ -89,11 +89,11 @@ minecraft {
89 89
90 sourceSets { 90 sourceSets {
91 main { 91 main {
92 - refMap = "mixins.liteloader.core.refmap.json" 92 + ext.refMap = "mixins.liteloader.core.refmap.json"
93 } 93 }
94 client { 94 client {
95 compileClasspath += main.compileClasspath + main.output 95 compileClasspath += main.compileClasspath + main.output
96 - refMap = "mixins.liteloader.client.refmap.json" 96 + ext.refMap = "mixins.liteloader.client.refmap.json"
97 } 97 }
98 debug { 98 debug {
99 compileClasspath += client.compileClasspath + client.output 99 compileClasspath += client.compileClasspath + client.output
@@ -123,7 +123,7 @@ javadoc { @@ -123,7 +123,7 @@ javadoc {
123 afterEvaluate { 123 afterEvaluate {
124 logger.lifecycle '=================================================' 124 logger.lifecycle '================================================='
125 logger.lifecycle ' LiteLoader' 125 logger.lifecycle ' LiteLoader'
126 - logger.lifecycle ' Copyright (C) 2011-2016 Adam Mummery-Smith' 126 + logger.lifecycle ' Copyright (C) 2011-2017 Adam Mummery-Smith'
127 logger.lifecycle ' Running in {} mode', (project.isReleaseBuild ? "RELEASE" : "SNAPSHOT") 127 logger.lifecycle ' Running in {} mode', (project.isReleaseBuild ? "RELEASE" : "SNAPSHOT")
128 logger.lifecycle '=================================================' 128 logger.lifecycle '================================================='
129 129
gradle.properties
  View file @f7c2ee1
@@ -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.11.2  
9 -mcVersion=1.11.2  
10 -mcMappings=snapshot_20161224  
11 \ No newline at end of file 8 \ No newline at end of file
  9 +buildVersion=1.12
  10 +mcVersion=1.12
  11 +mcMappings=snapshot_20170609
12 \ No newline at end of file 12 \ No newline at end of file
src/client/java/com/mumfrey/liteloader/client/LiteLoaderEventBrokerClient.java
  View file @f7c2ee1
@@ -432,7 +432,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft @@ -432,7 +432,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft
432 this.profiler.endStartSection("litemods"); 432 this.profiler.endStartSection("litemods");
433 433
434 Timer minecraftTimer = ((IMinecraft)this.engine.getClient()).getTimer(); 434 Timer minecraftTimer = ((IMinecraft)this.engine.getClient()).getTimer();
435 - float partialTicks = minecraftTimer.renderPartialTicks; 435 + float partialTicks = minecraftTimer.field_194147_b; // TODO propagate
436 boolean clock = minecraftTimer.elapsedTicks > 0; 436 boolean clock = minecraftTimer.elapsedTicks > 0;
437 437
438 Minecraft minecraft = this.engine.getClient(); 438 Minecraft minecraft = this.engine.getClient();
@@ -548,7 +548,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft @@ -548,7 +548,7 @@ public class LiteLoaderEventBrokerClient extends LiteLoaderEventBroker<Minecraft
548 } 548 }
549 549
550 /** 550 /**
551 - * @param e 551 + * @param ci
552 * @param name 552 * @param name
553 * @param width 553 * @param width
554 * @param height 554 * @param height
src/client/java/com/mumfrey/liteloader/client/api/LiteLoaderBrandingProvider.java
  View file @f7c2ee1
@@ -59,7 +59,7 @@ public class LiteLoaderBrandingProvider implements BrandingProvider @@ -59,7 +59,7 @@ public class LiteLoaderBrandingProvider implements BrandingProvider
59 @Override 59 @Override
60 public String getCopyrightText() 60 public String getCopyrightText()
61 { 61 {
62 - return "Copyright (c) 2012-2016 Adam Mummery-Smith"; 62 + return "Copyright (c) 2012-2017 Adam Mummery-Smith";
63 } 63 }
64 64
65 /* (non-Javadoc) 65 /* (non-Javadoc)
src/client/java/com/mumfrey/liteloader/client/gui/GuiCheckbox.java
  View file @f7c2ee1
@@ -23,22 +23,22 @@ public class GuiCheckbox extends GuiButton @@ -23,22 +23,22 @@ public class GuiCheckbox extends GuiButton
23 23
24 public GuiCheckbox(int controlId, int xPosition, int yPosition, String displayString) 24 public GuiCheckbox(int controlId, int xPosition, int yPosition, String displayString)
25 { 25 {
26 - super(controlId, xPosition, yPosition, Minecraft.getMinecraft().fontRendererObj.getStringWidth(displayString) + 16, 12, displayString); 26 + super(controlId, xPosition, yPosition, Minecraft.getMinecraft().fontRenderer.getStringWidth(displayString) + 16, 12, displayString);
27 } 27 }
28 28
29 @Override 29 @Override
30 - public void drawButton(Minecraft minecraft, int mouseX, int mouseY) 30 + public void func_191745_a(Minecraft minecraft, int mouseX, int mouseY, float partialTicks) // drawButton
31 { 31 {
32 if (this.visible) 32 if (this.visible)
33 { 33 {
34 minecraft.getTextureManager().bindTexture(LiteLoaderBrandingProvider.ABOUT_TEXTURE); 34 minecraft.getTextureManager().bindTexture(LiteLoaderBrandingProvider.ABOUT_TEXTURE);
35 glColor4f(1.0F, 1.0F, 1.0F, 1.0F); 35 glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
36 - this.hovered = mouseX >= this.xPosition  
37 - && mouseY >= this.yPosition  
38 - && mouseX < this.xPosition + this.width  
39 - && mouseY < this.yPosition + this.height; 36 + this.hovered = mouseX >= this.x
  37 + && mouseY >= this.y
  38 + && mouseX < this.x + this.width
  39 + && mouseY < this.y + this.height;
40 40
41 - this.drawTexturedModalRect(this.xPosition, this.yPosition, this.checked ? 134 : 122, 80, 12, 12); 41 + this.drawTexturedModalRect(this.x, this.y, this.checked ? 134 : 122, 80, 12, 12);
42 this.mouseDragged(minecraft, mouseX, mouseY); 42 this.mouseDragged(minecraft, mouseX, mouseY);
43 43
44 int colour = 0xE0E0E0; 44 int colour = 0xE0E0E0;
@@ -51,7 +51,7 @@ public class GuiCheckbox extends GuiButton @@ -51,7 +51,7 @@ public class GuiCheckbox extends GuiButton
51 colour = 0xFFFFA0; 51 colour = 0xFFFFA0;
52 } 52 }
53 53
54 - this.drawString(minecraft.fontRendererObj, this.displayString, this.xPosition + 16, this.yPosition + 2, colour); 54 + this.drawString(minecraft.fontRenderer, this.displayString, this.x + 16, this.y + 2, colour);
55 } 55 }
56 } 56 }
57 } 57 }
src/client/java/com/mumfrey/liteloader/client/gui/GuiHoverLabel.java
  View file @f7c2ee1
@@ -37,15 +37,15 @@ public class GuiHoverLabel extends GuiButton @@ -37,15 +37,15 @@ public class GuiHoverLabel extends GuiButton
37 } 37 }
38 38
39 @Override 39 @Override
40 - public void drawButton(Minecraft minecraft, int mouseX, int mouseY) 40 + public void func_191745_a(Minecraft minecraft, int mouseX, int mouseY, float partialTicks) // drawButton
41 { 41 {
42 if (this.visible) 42 if (this.visible)
43 { 43 {
44 - this.hovered = mouseX >= this.xPosition  
45 - && mouseY >= this.yPosition  
46 - && mouseX < this.xPosition + this.width  
47 - && mouseY < this.yPosition + this.height;  
48 - this.fontRenderer.drawString(this.displayString, this.xPosition, this.yPosition, this.hovered ? this.hoverColour : this.colour); 44 + this.hovered = mouseX >= this.x
  45 + && mouseY >= this.y
  46 + && mouseX < this.x + this.width
  47 + && mouseY < this.y + this.height;
  48 + this.fontRenderer.drawString(this.displayString, this.x, this.y, this.hovered ? this.hoverColour : this.colour);
49 } 49 }
50 else 50 else
51 { 51 {
src/client/java/com/mumfrey/liteloader/client/gui/GuiLiteLoaderPanel.java
  View file @f7c2ee1
@@ -36,7 +36,7 @@ import net.minecraft.client.gui.GuiButton; @@ -36,7 +36,7 @@ import net.minecraft.client.gui.GuiButton;
36 import net.minecraft.client.gui.GuiMainMenu; 36 import net.minecraft.client.gui.GuiMainMenu;
37 import net.minecraft.client.gui.GuiScreen; 37 import net.minecraft.client.gui.GuiScreen;
38 import net.minecraft.client.renderer.Tessellator; 38 import net.minecraft.client.renderer.Tessellator;
39 -import net.minecraft.client.renderer.VertexBuffer; 39 +import net.minecraft.client.renderer.BufferBuilder;
40 import net.minecraft.client.resources.I18n; 40 import net.minecraft.client.resources.I18n;
41 import net.minecraft.util.ResourceLocation; 41 import net.minecraft.util.ResourceLocation;
42 42
@@ -156,7 +156,7 @@ public class GuiLiteLoaderPanel extends GuiScreen @@ -156,7 +156,7 @@ public class GuiLiteLoaderPanel extends GuiScreen
156 LoaderProperties properties, ConfigManager configManager, boolean showTab) 156 LoaderProperties properties, ConfigManager configManager, boolean showTab)
157 { 157 {
158 this.mc = minecraft; 158 this.mc = minecraft;
159 - this.fontRendererObj = minecraft.fontRendererObj; 159 + this.fontRenderer = minecraft.fontRenderer;
160 this.parentScreen = parentScreen; 160 this.parentScreen = parentScreen;
161 this.showTab = showTab; 161 this.showTab = showTab;
162 162
@@ -293,13 +293,13 @@ public class GuiLiteLoaderPanel extends GuiScreen @@ -293,13 +293,13 @@ public class GuiLiteLoaderPanel extends GuiScreen
293 293
294 this.currentPanel.setSize(this.width - LEFT_EDGE, this.height); 294 this.currentPanel.setSize(this.width - LEFT_EDGE, this.height);
295 295
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.fontRenderer,
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.world == 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,  
302 - this.fontRendererObj, I18n.format("gui.about.checkupdates"), this.brandColour)); 301 + this.buttonList.add(new GuiHoverLabel(3, LEFT_EDGE + MARGIN + 38 + this.fontRenderer.getStringWidth(this.versionText) + 6, 50,
  302 + this.fontRenderer, I18n.format("gui.about.checkupdates"), this.brandColour));
303 } 303 }
304 304
305 Keyboard.enableRepeatEvents(true); 305 Keyboard.enableRepeatEvents(true);
@@ -499,8 +499,8 @@ public class GuiLiteLoaderPanel extends GuiScreen @@ -499,8 +499,8 @@ public class GuiLiteLoaderPanel extends GuiScreen
499 glDrawTexturedRect(right - this.iconCoords.getIconWidth(), MARGIN, this.iconCoords, 1.0F); 499 glDrawTexturedRect(right - this.iconCoords.getIconWidth(), MARGIN, this.iconCoords, 1.0F);
500 500
501 // Draw header text 501 // Draw header text
502 - this.fontRendererObj.drawString(this.versionText, left + 38, 50, GuiLiteLoaderPanel.HEADER_TEXT_COLOUR);  
503 - this.fontRendererObj.drawString(this.activeModText, left + 38, 60, GuiLiteLoaderPanel.HEADER_TEXT_COLOUR_SUB); 502 + this.fontRenderer.drawString(this.versionText, left + 38, 50, GuiLiteLoaderPanel.HEADER_TEXT_COLOUR);
  503 + this.fontRenderer.drawString(this.activeModText, left + 38, 60, GuiLiteLoaderPanel.HEADER_TEXT_COLOUR_SUB);
504 504
505 // Draw top and bottom horizontal rules 505 // Draw top and bottom horizontal rules
506 drawRect(left, 80, right, 81, GuiLiteLoaderPanel.HEADER_HR_COLOUR); 506 drawRect(left, 80, right, 81, GuiLiteLoaderPanel.HEADER_HR_COLOUR);
@@ -517,9 +517,9 @@ public class GuiLiteLoaderPanel extends GuiScreen @@ -517,9 +517,9 @@ public class GuiLiteLoaderPanel extends GuiScreen
517 517
518 if (mouseOverTab && this.tweenAmount < 0.01) 518 if (mouseOverTab && this.tweenAmount < 0.01)
519 { 519 {
520 - GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, LiteLoader.getVersionDisplayString(), mouseX, mouseY, this.width, this.height, 520 + GuiLiteLoaderPanel.drawTooltip(this.fontRenderer, LiteLoader.getVersionDisplayString(), mouseX, mouseY, this.width, this.height,
521 GuiLiteLoaderPanel.TOOLTIP_FOREGROUND, GuiLiteLoaderPanel.TOOLTIP_BACKGROUND); 521 GuiLiteLoaderPanel.TOOLTIP_FOREGROUND, GuiLiteLoaderPanel.TOOLTIP_BACKGROUND);
522 - GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, this.activeModText, mouseX, mouseY + 13, this.width, this.height, 522 + GuiLiteLoaderPanel.drawTooltip(this.fontRenderer, this.activeModText, mouseX, mouseY + 13, this.width, this.height,
523 GuiLiteLoaderPanel.TOOLTIP_FOREGROUND_SUB, GuiLiteLoaderPanel.TOOLTIP_BACKGROUND); 523 GuiLiteLoaderPanel.TOOLTIP_FOREGROUND_SUB, GuiLiteLoaderPanel.TOOLTIP_BACKGROUND);
524 524
525 if (annoyingTip) 525 if (annoyingTip)
@@ -537,12 +537,12 @@ public class GuiLiteLoaderPanel extends GuiScreen @@ -537,12 +537,12 @@ public class GuiLiteLoaderPanel extends GuiScreen
537 { 537 {
538 if (this.startupErrorCount > 0) 538 if (this.startupErrorCount > 0)
539 { 539 {
540 - GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, I18n.format("gui.error.tooltip", this.startupErrorCount, this.criticalErrorCount), 540 + GuiLiteLoaderPanel.drawTooltip(this.fontRenderer, I18n.format("gui.error.tooltip", this.startupErrorCount, this.criticalErrorCount),
541 left, top, this.width, this.height, GuiLiteLoaderPanel.ERROR_TOOLTIP_FOREGROUND, GuiLiteLoaderPanel.ERROR_TOOLTIP_BACKGROUND); 541 left, top, this.width, this.height, GuiLiteLoaderPanel.ERROR_TOOLTIP_FOREGROUND, GuiLiteLoaderPanel.ERROR_TOOLTIP_BACKGROUND);
542 } 542 }
543 else if (this.notification != null) 543 else if (this.notification != null)
544 { 544 {
545 - GuiLiteLoaderPanel.drawTooltip(this.fontRendererObj, this.notification, left, top, this.width, this.height, 545 + GuiLiteLoaderPanel.drawTooltip(this.fontRenderer, this.notification, left, top, this.width, this.height,
546 GuiLiteLoaderPanel.NOTIFICATION_TOOLTIP_FOREGROUND, GuiLiteLoaderPanel.NOTIFICATION_TOOLTIP_BACKGROUND); 546 GuiLiteLoaderPanel.NOTIFICATION_TOOLTIP_FOREGROUND, GuiLiteLoaderPanel.NOTIFICATION_TOOLTIP_BACKGROUND);
547 } 547 }
548 } 548 }
@@ -794,7 +794,7 @@ public class GuiLiteLoaderPanel extends GuiScreen @@ -794,7 +794,7 @@ public class GuiLiteLoaderPanel extends GuiScreen
794 glColor4f(1.0F, 1.0F, 1.0F, alpha); 794 glColor4f(1.0F, 1.0F, 1.0F, alpha);
795 795
796 Tessellator tessellator = Tessellator.getInstance(); 796 Tessellator tessellator = Tessellator.getInstance();
797 - VertexBuffer buf = tessellator.getBuffer(); 797 + BufferBuilder buf = tessellator.getBuffer();
798 buf.begin(GL_QUADS, VF_POSITION_TEX); 798 buf.begin(GL_QUADS, VF_POSITION_TEX);
799 buf.pos(x + 0, y + height, 0).tex(u , v2).endVertex(); 799 buf.pos(x + 0, y + height, 0).tex(u , v2).endVertex();
800 buf.pos(x + width, y + height, 0).tex(u2, v2).endVertex(); 800 buf.pos(x + width, y + height, 0).tex(u2, v2).endVertex();
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanel.java
  View file @f7c2ee1
@@ -106,7 +106,7 @@ public abstract class GuiPanel extends Gui @@ -106,7 +106,7 @@ public abstract class GuiPanel extends Gui
106 { 106 {
107 for (GuiButton control : this.controls) 107 for (GuiButton control : this.controls)
108 { 108 {
109 - control.drawButton(this.mc, mouseX, mouseY); 109 + control.func_191745_a(this.mc, mouseX, mouseY, partialTicks); // drawButton
110 } 110 }
111 } 111 }
112 112
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelAbout.java
  View file @f7c2ee1
@@ -58,7 +58,7 @@ class GuiPanelAbout extends GuiPanel implements ScrollPanelContent @@ -58,7 +58,7 @@ class GuiPanelAbout extends GuiPanel implements ScrollPanelContent
58 58
59 this.sortBrandingProviders(); 59 this.sortBrandingProviders();
60 60
61 - this.scrollPane.addControl(new GuiHoverLabel(-2, 38, 22 + this.brandings.size() * GuiPanelAbout.ROW_HEIGHT, this.mc.fontRendererObj, 61 + this.scrollPane.addControl(new GuiHoverLabel(-2, 38, 22 + this.brandings.size() * GuiPanelAbout.ROW_HEIGHT, this.mc.fontRenderer,
62 "\247n" + MCP_URI.toString(), this.parent.getBrandColour())); 62 "\247n" + MCP_URI.toString(), this.parent.getBrandColour()));
63 } 63 }
64 64
@@ -90,7 +90,7 @@ class GuiPanelAbout extends GuiPanel implements ScrollPanelContent @@ -90,7 +90,7 @@ class GuiPanelAbout extends GuiPanel implements ScrollPanelContent
90 if (homepage != null) 90 if (homepage != null)
91 { 91 {
92 this.scrollPane.addControl(new GuiHoverLabel(brandingIndex, 38, 22 + brandingIndex * GuiPanelAbout.ROW_HEIGHT, 92 this.scrollPane.addControl(new GuiHoverLabel(brandingIndex, 38, 22 + brandingIndex * GuiPanelAbout.ROW_HEIGHT,
93 - this.mc.fontRendererObj, "\247n" + homepage, this.parent.getBrandColour())); 93 + this.mc.fontRenderer, "\247n" + homepage, this.parent.getBrandColour()));
94 } 94 }
95 95
96 brandingIndex++; 96 brandingIndex++;
@@ -126,7 +126,7 @@ class GuiPanelAbout extends GuiPanel implements ScrollPanelContent @@ -126,7 +126,7 @@ class GuiPanelAbout extends GuiPanel implements ScrollPanelContent
126 @Override 126 @Override
127 public void drawScrollPanelContent(GuiScrollPanel source, int mouseX, int mouseY, float partialTicks, int scrollAmount, int visibleHeight) 127 public void drawScrollPanelContent(GuiScrollPanel source, int mouseX, int mouseY, float partialTicks, int scrollAmount, int visibleHeight)
128 { 128 {
129 - FontRenderer fontRenderer = this.mc.fontRendererObj; 129 + FontRenderer fontRenderer = this.mc.fontRenderer;
130 int textColour = 0xFFAAAAAA; 130 int textColour = 0xFFAAAAAA;
131 131
132 int yPos = 0; 132 int yPos = 0;
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelConfigContainer.java
  View file @f7c2ee1
@@ -165,7 +165,7 @@ class GuiPanelConfigContainer extends GuiPanel implements ConfigPanelHost @@ -165,7 +165,7 @@ class GuiPanelConfigContainer extends GuiPanel implements ConfigPanelHost
165 this.innerTop = TOP - this.scrollBar.getValue(); 165 this.innerTop = TOP - this.scrollBar.getValue();
166 166
167 // Draw panel title 167 // Draw panel title
168 - this.mc.fontRendererObj.drawString(this.getPanelTitle(), MARGIN, TOP - 14, 0xFFFFFFFF); 168 + this.mc.fontRenderer.drawString(this.getPanelTitle(), MARGIN, TOP - 14, 0xFFFFFFFF);
169 169
170 // Draw top and bottom horizontal bars 170 // Draw top and bottom horizontal bars
171 drawRect(MARGIN, TOP - 4, this.width - MARGIN, TOP - 3, 0xFF999999); 171 drawRect(MARGIN, TOP - 4, this.width - MARGIN, TOP - 3, 0xFF999999);
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelError.java
  View file @f7c2ee1
@@ -76,7 +76,7 @@ public class GuiPanelError extends GuiPanel implements ScrollPanelContent @@ -76,7 +76,7 @@ public class GuiPanelError extends GuiPanel implements ScrollPanelContent
76 boolean indented = line.startsWith(" "); 76 boolean indented = line.startsWith(" ");
77 line = line.replaceAll("\\((.+?\\.java:[0-9]+)\\)", "(\247f$1\247r)"); 77 line = line.replaceAll("\\((.+?\\.java:[0-9]+)\\)", "(\247f$1\247r)");
78 line = line.replaceAll("at ([^\\(]+)\\(", "at \2476$1\247r("); 78 line = line.replaceAll("at ([^\\(]+)\\(", "at \2476$1\247r(");
79 - this.mc.fontRendererObj.drawString(line, 2, yPos += 10, indented ? 0xFF999999 : 0xFFFF5555); 79 + this.mc.fontRenderer.drawString(line, 2, yPos += 10, indented ? 0xFF999999 : 0xFFFF5555);
80 } 80 }
81 } 81 }
82 } 82 }
@@ -103,7 +103,7 @@ public class GuiPanelError extends GuiPanel implements ScrollPanelContent @@ -103,7 +103,7 @@ public class GuiPanelError extends GuiPanel implements ScrollPanelContent
103 @Override 103 @Override
104 void draw(int mouseX, int mouseY, float partialTicks) 104 void draw(int mouseX, int mouseY, float partialTicks)
105 { 105 {
106 - this.mc.fontRendererObj.drawString(I18n.format("gui.error.title", this.mod.getDisplayName()), MARGIN, TOP - 14, 0xFFFFFFFF); 106 + this.mc.fontRenderer.drawString(I18n.format("gui.error.title", this.mod.getDisplayName()), MARGIN, TOP - 14, 0xFFFFFFFF);
107 107
108 drawRect(MARGIN, TOP - 4, this.width - MARGIN, TOP - 3, 0xFF999999); 108 drawRect(MARGIN, TOP - 4, this.width - MARGIN, TOP - 3, 0xFF999999);
109 drawRect(MARGIN, this.height - BOTTOM + 2, this.width - MARGIN, this.height - BOTTOM + 3, 0xFF999999); 109 drawRect(MARGIN, this.height - BOTTOM + 2, this.width - MARGIN, this.height - BOTTOM + 3, 0xFF999999);
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelLiteLoaderLog.java
  View file @f7c2ee1
@@ -149,8 +149,8 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent @@ -149,8 +149,8 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
149 if (this.logURL.startsWith("http:")) 149 if (this.logURL.startsWith("http:"))
150 { 150 {
151 LiteLoaderLogger.info("Log file upload succeeded, url is %s", this.logURL); 151 LiteLoaderLogger.info("Log file upload succeeded, url is %s", this.logURL);
152 - int urlWidth = this.mc.fontRendererObj.getStringWidth(this.logURL);  
153 - this.controls.add(new GuiHoverLabel(3, xMid - (urlWidth / 2), this.height / 2, this.mc.fontRendererObj, "\247n" + this.logURL, 152 + int urlWidth = this.mc.fontRenderer.getStringWidth(this.logURL);
  153 + this.controls.add(new GuiHoverLabel(3, xMid - (urlWidth / 2), this.height / 2, this.mc.fontRenderer, "\247n" + this.logURL,
154 this.parent.getBrandColour())); 154 this.parent.getBrandColour()));
155 } 155 }
156 else 156 else
@@ -193,7 +193,7 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent @@ -193,7 +193,7 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
193 void draw(int mouseX, int mouseY, float partialTicks) 193 void draw(int mouseX, int mouseY, float partialTicks)
194 { 194 {
195 // Draw panel title 195 // Draw panel title
196 - this.mc.fontRendererObj.drawString(I18n.format("gui.log.title"), MARGIN, TOP - 14, 0xFFFFFFFF); 196 + this.mc.fontRenderer.drawString(I18n.format("gui.log.title"), MARGIN, TOP - 14, 0xFFFFFFFF);
197 197
198 // Draw top and bottom horizontal bars 198 // Draw top and bottom horizontal bars
199 drawRect(MARGIN, TOP - 4, this.width - MARGIN, TOP - 3, 0xFF999999); 199 drawRect(MARGIN, TOP - 4, this.width - MARGIN, TOP - 3, 0xFF999999);
@@ -210,18 +210,18 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent @@ -210,18 +210,18 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
210 210
211 if (this.logUpload != null) 211 if (this.logUpload != null)
212 { 212 {
213 - this.drawCenteredString(this.mc.fontRendererObj, I18n.format("gui.log.uploading"), xMid, yMid - 10, 0xFFFFFFFF); 213 + this.drawCenteredString(this.mc.fontRenderer, I18n.format("gui.log.uploading"), xMid, yMid - 10, 0xFFFFFFFF);
214 this.drawThrobber(xMid - 90, yMid - 14, this.throb); 214 this.drawThrobber(xMid - 90, yMid - 14, this.throb);
215 } 215 }
216 else 216 else
217 { 217 {
218 if (this.logURL.startsWith("http:")) 218 if (this.logURL.startsWith("http:"))
219 { 219 {
220 - this.drawCenteredString(this.mc.fontRendererObj, I18n.format("gui.log.uploadsuccess"), xMid, yMid - 14, 0xFF55FF55); 220 + this.drawCenteredString(this.mc.fontRenderer, I18n.format("gui.log.uploadsuccess"), xMid, yMid - 14, 0xFF55FF55);
221 } 221 }
222 else 222 else
223 { 223 {
224 - this.drawCenteredString(this.mc.fontRendererObj, I18n.format("gui.log.uploadfailed"), xMid, yMid - 10, 0xFFFF5555); 224 + this.drawCenteredString(this.mc.fontRenderer, I18n.format("gui.log.uploadfailed"), xMid, yMid - 10, 0xFFFF5555);
225 } 225 }
226 } 226 }
227 } 227 }
@@ -249,7 +249,7 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent @@ -249,7 +249,7 @@ class GuiPanelLiteLoaderLog extends GuiPanel implements ScrollPanelContent
249 { 249 {
250 if (yPos > scrollAmount - 10 && yPos <= scrollAmount + height) 250 if (yPos > scrollAmount - 10 && yPos <= scrollAmount + height)
251 { 251 {
252 - this.mc.fontRendererObj.drawString(logLine, 0, yPos, this.getMessageColour(logLine.toLowerCase().substring(11))); 252 + this.mc.fontRenderer.drawString(logLine, 0, yPos, this.getMessageColour(logLine.toLowerCase().substring(11)));
253 } 253 }
254 yPos += 10; 254 yPos += 10;
255 } 255 }
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelSettings.java
  View file @f7c2ee1
@@ -88,7 +88,7 @@ class GuiPanelSettings extends GuiPanel @@ -88,7 +88,7 @@ class GuiPanelSettings extends GuiPanel
88 { 88 {
89 this.parentScreen.drawInfoPanel(mouseX, mouseY, partialTicks, 0, 38); 89 this.parentScreen.drawInfoPanel(mouseX, mouseY, partialTicks, 0, 38);
90 90
91 - FontRenderer fontRenderer = this.mc.fontRendererObj; 91 + FontRenderer fontRenderer = this.mc.fontRenderer;
92 int brandColour = this.parentScreen.getBrandColour(); 92 int brandColour = this.parentScreen.getBrandColour();
93 93
94 fontRenderer.drawString(this.helpText[0], 50, 104, brandColour); 94 fontRenderer.drawString(this.helpText[0], 50, 104, brandColour);
src/client/java/com/mumfrey/liteloader/client/gui/GuiPanelUpdateCheck.java
  View file @f7c2ee1
@@ -86,7 +86,7 @@ class GuiPanelUpdateCheck extends GuiPanel @@ -86,7 +86,7 @@ class GuiPanelUpdateCheck extends GuiPanel
86 @Override 86 @Override
87 void draw(int mouseX, int mouseY, float partialTicks) 87 void draw(int mouseX, int mouseY, float partialTicks)
88 { 88 {
89 - FontRenderer fontRenderer = this.mc.fontRendererObj; 89 + FontRenderer fontRenderer = this.mc.fontRenderer;
90 90
91 // Draw panel title 91 // Draw panel title
92 fontRenderer.drawString(this.panelTitle, MARGIN, TOP - 14, GuiPanelUpdateCheck.WHITE); 92 fontRenderer.drawString(this.panelTitle, MARGIN, TOP - 14, GuiPanelUpdateCheck.WHITE);
src/client/java/com/mumfrey/liteloader/client/gui/modlist/ModList.java
  View file @f7c2ee1
@@ -68,14 +68,14 @@ public class ModList @@ -68,14 +68,14 @@ public class ModList
68 // Active mods 68 // Active mods
69 for (ModInfo<LoadableMod<?>> mod : mods.getLoadedMods()) 69 for (ModInfo<LoadableMod<?>> mod : mods.getLoadedMods())
70 { 70 {
71 - ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRendererObj, brandColour, decorators, mod); 71 + ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRenderer, brandColour, decorators, mod);
72 sortedMods.put(modListEntry.getKey(), modListEntry); 72 sortedMods.put(modListEntry.getKey(), modListEntry);
73 } 73 }
74 74
75 // Disabled mods 75 // Disabled mods
76 for (ModInfo<?> disabledMod : mods.getDisabledMods()) 76 for (ModInfo<?> disabledMod : mods.getDisabledMods())
77 { 77 {
78 - ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRendererObj, brandColour, decorators, disabledMod); 78 + ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRenderer, brandColour, decorators, disabledMod);
79 sortedMods.put(modListEntry.getKey(), modListEntry); 79 sortedMods.put(modListEntry.getKey(), modListEntry);
80 } 80 }
81 81
@@ -84,7 +84,7 @@ public class ModList @@ -84,7 +84,7 @@ public class ModList
84 { 84 {
85 for (ModInfo<?> badMod : mods.getBadContainers()) 85 for (ModInfo<?> badMod : mods.getBadContainers())
86 { 86 {
87 - ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRendererObj, brandColour, decorators, badMod); 87 + ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRenderer, brandColour, decorators, badMod);
88 sortedMods.put(modListEntry.getKey(), modListEntry); 88 sortedMods.put(modListEntry.getKey(), modListEntry);
89 } 89 }
90 } 90 }
@@ -92,7 +92,7 @@ public class ModList @@ -92,7 +92,7 @@ public class ModList
92 // Injected tweaks 92 // Injected tweaks
93 for (ModInfo<Loadable<?>> injectedTweak : mods.getInjectedTweaks()) 93 for (ModInfo<Loadable<?>> injectedTweak : mods.getInjectedTweaks())
94 { 94 {
95 - ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRendererObj, brandColour, decorators, injectedTweak); 95 + ModListEntry modListEntry = new ModListEntry(this, mods, environment, minecraft.fontRenderer, brandColour, decorators, injectedTweak);
96 sortedMods.put(modListEntry.getKey(), modListEntry); 96 sortedMods.put(modListEntry.getKey(), modListEntry);
97 } 97 }
98 98
src/client/java/com/mumfrey/liteloader/client/gui/startup/LoadingBar.java
  View file @f7c2ee1
@@ -24,7 +24,7 @@ import net.minecraft.client.Minecraft; @@ -24,7 +24,7 @@ import net.minecraft.client.Minecraft;
24 import net.minecraft.client.gui.FontRenderer; 24 import net.minecraft.client.gui.FontRenderer;
25 import net.minecraft.client.gui.ScaledResolution; 25 import net.minecraft.client.gui.ScaledResolution;
26 import net.minecraft.client.renderer.Tessellator; 26 import net.minecraft.client.renderer.Tessellator;
27 -import net.minecraft.client.renderer.VertexBuffer; 27 +import net.minecraft.client.renderer.BufferBuilder;
28 import net.minecraft.client.renderer.texture.DynamicTexture; 28 import net.minecraft.client.renderer.texture.DynamicTexture;
29 import net.minecraft.client.renderer.texture.ITextureObject; 29 import net.minecraft.client.renderer.texture.ITextureObject;
30 import net.minecraft.client.renderer.texture.TextureManager; 30 import net.minecraft.client.renderer.texture.TextureManager;
@@ -260,7 +260,7 @@ public class LoadingBar extends LoadingProgress @@ -260,7 +260,7 @@ public class LoadingBar extends LoadingProgress
260 260
261 this.textureManager.bindTexture(this.textureLocation); 261 this.textureManager.bindTexture(this.textureLocation);
262 Tessellator tessellator = Tessellator.getInstance(); 262 Tessellator tessellator = Tessellator.getInstance();
263 - VertexBuffer vertexBuffer = tessellator.getBuffer(); 263 + BufferBuilder vertexBuffer = tessellator.getBuffer();
264 vertexBuffer.begin(GL_QUADS, VF_POSITION_TEX_COLOR); 264 vertexBuffer.begin(GL_QUADS, VF_POSITION_TEX_COLOR);
265 glColor4f(1.0F, 1.0F, 1.0F, 1.0F); 265 glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
266 vertexBuffer.pos(0.0D, scaledHeight, 0.0D).tex(0.0D, 0.0D).color(255, 255, 255, 255).endVertex(); 266 vertexBuffer.pos(0.0D, scaledHeight, 0.0D).tex(0.0D, 0.0D).color(255, 255, 255, 255).endVertex();
src/client/java/com/mumfrey/liteloader/client/mixin/MixinEntityRenderer.java
  View file @f7c2ee1
@@ -27,7 +27,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer @@ -27,7 +27,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
27 @Shadow @Final private static ResourceLocation[] SHADERS_TEXTURES; 27 @Shadow @Final private static ResourceLocation[] SHADERS_TEXTURES;
28 @Shadow private boolean useShader; 28 @Shadow private boolean useShader;
29 @Shadow private int shaderIndex; 29 @Shadow private int shaderIndex;
30 - @Shadow private ShaderGroup theShaderGroup; 30 + @Shadow private ShaderGroup shaderGroup;
31 31
32 @Shadow abstract void loadShader(ResourceLocation resourceLocationIn); 32 @Shadow abstract void loadShader(ResourceLocation resourceLocationIn);
33 @Shadow abstract float getFOVModifier(float partialTicks, boolean useFOVSetting); 33 @Shadow abstract float getFOVModifier(float partialTicks, boolean useFOVSetting);
@@ -168,7 +168,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer @@ -168,7 +168,7 @@ public abstract class MixinEntityRenderer implements IEntityRenderer
168 { 168 {
169 if (shader == null) 169 if (shader == null)
170 { 170 {
171 - this.theShaderGroup = null; 171 + this.shaderGroup = null;
172 this.useShader = false; 172 this.useShader = false;
173 } 173 }
174 else 174 else
src/client/java/com/mumfrey/liteloader/client/mixin/MixinGuiTextField.java
  View file @f7c2ee1
@@ -19,8 +19,8 @@ public abstract class MixinGuiTextField implements IGuiTextField @@ -19,8 +19,8 @@ public abstract class MixinGuiTextField implements IGuiTextField
19 { 19 {
20 @Shadow @Final @Mutable private int width; 20 @Shadow @Final @Mutable private int width;
21 @Shadow @Final @Mutable private int height; 21 @Shadow @Final @Mutable private int height;
22 - @Shadow public int xPosition;  
23 - @Shadow public int yPosition; 22 + @Shadow public int x;
  23 + @Shadow public int y;
24 @Shadow private int lineScrollOffset; 24 @Shadow private int lineScrollOffset;
25 @Shadow private int enabledColor; 25 @Shadow private int enabledColor;
26 @Shadow private int disabledColor; 26 @Shadow private int disabledColor;
@@ -29,25 +29,25 @@ public abstract class MixinGuiTextField implements IGuiTextField @@ -29,25 +29,25 @@ public abstract class MixinGuiTextField implements IGuiTextField
29 @Override 29 @Override
30 public int getXPosition() 30 public int getXPosition()
31 { 31 {
32 - return this.xPosition; 32 + return this.x;
33 } 33 }
34 34
35 @Override 35 @Override
36 public void setXPosition(int xPosition) 36 public void setXPosition(int xPosition)
37 { 37 {
38 - this.xPosition = xPosition; 38 + this.x = xPosition;
39 } 39 }
40 40
41 @Override 41 @Override
42 public int getYPosition() 42 public int getYPosition()
43 { 43 {
44 - return this.yPosition; 44 + return this.y;
45 } 45 }
46 46
47 @Override 47 @Override
48 public void setYPosition(int yPosition) 48 public void setYPosition(int yPosition)
49 { 49 {
50 - this.yPosition = yPosition; 50 + this.y = yPosition;
51 } 51 }
52 52
53 @Override 53 @Override
@@ -98,5 +98,4 @@ public abstract class MixinGuiTextField implements IGuiTextField @@ -98,5 +98,4 @@ public abstract class MixinGuiTextField implements IGuiTextField
98 { 98 {
99 return this.disabledColor; 99 return this.disabledColor;
100 } 100 }
101 -  
102 } 101 }
src/client/java/com/mumfrey/liteloader/modconfig/AbstractConfigPanel.java
  View file @f7c2ee1
@@ -75,7 +75,7 @@ public abstract class AbstractConfigPanel implements ConfigPanel @@ -75,7 +75,7 @@ public abstract class AbstractConfigPanel implements ConfigPanel
75 75
76 if (this.control != null) 76 if (this.control != null)
77 { 77 {
78 - this.control.drawButton(minecraft, mouseX, mouseY); 78 + this.control.func_191745_a(minecraft, mouseX, mouseY, partialTicks); // drawButton
79 } 79 }
80 } 80 }
81 81
@@ -164,7 +164,7 @@ public abstract class AbstractConfigPanel implements ConfigPanel @@ -164,7 +164,7 @@ public abstract class AbstractConfigPanel implements ConfigPanel
164 return; 164 return;
165 } 165 }
166 166
167 - GuiLabel label = new GuiLabel(this.mc.fontRendererObj, id, x, y, width, height, colour); 167 + GuiLabel label = new GuiLabel(this.mc.fontRenderer, id, x, y, width, height, colour);
168 for (String line : lines) 168 for (String line : lines)
169 { 169 {
170 label.addLine(line); 170 label.addLine(line);
@@ -184,7 +184,7 @@ public abstract class AbstractConfigPanel implements ConfigPanel @@ -184,7 +184,7 @@ public abstract class AbstractConfigPanel implements ConfigPanel
184 { 184 {
185 if (control != null) 185 if (control != null)
186 { 186 {
187 - this.contentHeight = Math.max(control.yPosition + ((IGuiButton)control).getButtonHeight(), this.contentHeight); 187 + this.contentHeight = Math.max(control.y + ((IGuiButton)control).getButtonHeight(), this.contentHeight);
188 this.options.add(new ConfigOption<T>(control, listener)); 188 this.options.add(new ConfigOption<T>(control, listener));
189 } 189 }
190 190
src/client/java/com/mumfrey/liteloader/modconfig/CloudConfig.java
  View file @f7c2ee1
@@ -615,7 +615,7 @@ public abstract class CloudConfig @@ -615,7 +615,7 @@ public abstract class CloudConfig
615 * Stub for subclasses, used to provide a prefix for all field names in this 615 * Stub for subclasses, used to provide a prefix for all field names in this
616 * class. 616 * class.
617 * 617 *
618 - * @return 618 + * @return field prefix
619 */ 619 */
620 protected String getPrefix() 620 protected String getPrefix()
621 { 621 {
src/client/java/com/mumfrey/webprefs/WebPreferencesManager.java
  View file @f7c2ee1
@@ -203,8 +203,6 @@ public final class WebPreferencesManager @@ -203,8 +203,6 @@ public final class WebPreferencesManager
203 * operations is returned instead. 203 * operations is returned instead.
204 * 204 *
205 * @param player Player to fetch preferences for 205 * @param player Player to fetch preferences for
206 - * @param privatePrefs True to fetch the player's private preferences, false  
207 - * to fetch the public preferences  
208 * @return Preference collection or <tt>null</tt> if the player's profile 206 * @return Preference collection or <tt>null</tt> if the player's profile
209 * cannot be retrieved 207 * cannot be retrieved
210 */ 208 */
src/client/java/com/mumfrey/webprefs/interfaces/IWebPreferences.java
  View file @f7c2ee1
@@ -2,6 +2,8 @@ package com.mumfrey.webprefs.interfaces; @@ -2,6 +2,8 @@ package com.mumfrey.webprefs.interfaces;
2 2
3 import java.util.Set; 3 import java.util.Set;
4 4
  5 +import com.mumfrey.webprefs.exceptions.InvalidValueException;
  6 +
5 /** 7 /**
6 * Web-based preferences, objects implementing this interface represent a remote 8 * Web-based preferences, objects implementing this interface represent a remote
7 * asychronous Key/Value store which fetches and commits values on a best-effort 9 * asychronous Key/Value store which fetches and commits values on a best-effort
@@ -111,7 +113,7 @@ public interface IWebPreferences @@ -111,7 +113,7 @@ public interface IWebPreferences
111 public abstract void poll(); 113 public abstract void poll();
112 114
113 /** 115 /**
114 - * Similar to {@link poll} except for property writes instead of property 116 + * Similar to {@link #poll} except for property writes instead of property
115 * reads. Under normal circumstances it should not be necessary to call this 117 * reads. Under normal circumstances it should not be necessary to call this
116 * method, since commits are handled asychronously by the update loop. 118 * method, since commits are handled asychronously by the update loop.
117 * However it can be used to forcibly commit even "clean" values to the 119 * However it can be used to forcibly commit even "clean" values to the
@@ -129,7 +131,7 @@ public interface IWebPreferences @@ -129,7 +131,7 @@ public interface IWebPreferences
129 * triggers asnchronous retrieval if not 131 * triggers asnchronous retrieval if not
130 * 132 *
131 * @param key Key to check for 133 * @param key Key to check for
132 - * @return 134 + * @return true if collection has specified key
133 */ 135 */
134 public abstract boolean has(String key); 136 public abstract boolean has(String key);
135 137
@@ -140,7 +142,7 @@ public interface IWebPreferences @@ -140,7 +142,7 @@ public interface IWebPreferences
140 * value is returned and the collection remains unchanged. 142 * value is returned and the collection remains unchanged.
141 * 143 *
142 * @param key 144 * @param key
143 - * @return 145 + * @return value or null
144 */ 146 */
145 public abstract String get(String key); 147 public abstract String get(String key);
146 148
@@ -152,7 +154,7 @@ public interface IWebPreferences @@ -152,7 +154,7 @@ public interface IWebPreferences
152 * 154 *
153 * @param key 155 * @param key
154 * @param defaultValue 156 * @param defaultValue
155 - * @return 157 + * @return value or default
156 */ 158 */
157 public abstract String get(String key, String defaultValue); 159 public abstract String get(String key, String defaultValue);
158 160
src/client/resources/mixins.liteloader.client.json
  View file @f7c2ee1
1 { 1 {
2 "required": true, 2 "required": true,
3 - "minVersion": "0.6", 3 + "minVersion": "0.6.8",
  4 + "compatibilityLevel": "JAVA_8",
4 "target": "@env(DEFAULT)", 5 "target": "@env(DEFAULT)",
5 "package": "com.mumfrey.liteloader.client.mixin", 6 "package": "com.mumfrey.liteloader.client.mixin",
6 "refmap": "mixins.liteloader.client.refmap.json", 7 "refmap": "mixins.liteloader.client.refmap.json",
src/client/resources/mixins.liteloader.client.optional.json
  View file @f7c2ee1
1 { 1 {
2 "required": false, 2 "required": false,
3 - "minVersion": "0.5.10", 3 + "minVersion": "0.6.8",
  4 + "compatibilityLevel": "JAVA_8",
4 "target": "@env(DEFAULT)", 5 "target": "@env(DEFAULT)",
5 "package": "com.mumfrey.liteloader.client.mixin", 6 "package": "com.mumfrey.liteloader.client.mixin",
6 "refmap": "mixins.liteloader.client.refmap.json", 7 "refmap": "mixins.liteloader.client.refmap.json",
src/main/java/com/mumfrey/liteloader/common/mixin/MixinNetHandlerPlayServer.java
  View file @f7c2ee1
@@ -33,7 +33,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler @@ -33,7 +33,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler
33 { 33 {
34 @Shadow private int teleportId; 34 @Shadow private int teleportId;
35 @Shadow private Vec3d targetPos; 35 @Shadow private Vec3d targetPos;
36 - @Shadow public EntityPlayerMP playerEntity;; 36 + @Shadow public EntityPlayerMP player;
37 37
38 LiteLoaderEventBroker<?, ?> broker = LiteLoaderEventBroker.getCommonBroker(); 38 LiteLoaderEventBroker<?, ?> broker = LiteLoaderEventBroker.getCommonBroker();
39 39
@@ -64,7 +64,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler @@ -64,7 +64,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler
64 ) 64 )
65 private void onClickedAir(CPacketAnimation packetIn, CallbackInfo ci) 65 private void onClickedAir(CPacketAnimation packetIn, CallbackInfo ci)
66 { 66 {
67 - if (!this.broker.onClickedAir(InteractType.LEFT_CLICK, ((NetHandlerPlayServer)(Object)this).playerEntity, packetIn.getHand())) 67 + if (!this.broker.onClickedAir(InteractType.LEFT_CLICK, ((NetHandlerPlayServer)(Object)this).player, packetIn.getHand()))
68 { 68 {
69 ci.cancel(); 69 ci.cancel();
70 } 70 }
@@ -86,18 +86,18 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler @@ -86,18 +86,18 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler
86 Action action = packetIn.getAction(); 86 Action action = packetIn.getAction();
87 if (action == Action.START_DESTROY_BLOCK) 87 if (action == Action.START_DESTROY_BLOCK)
88 { 88 {
89 - if (!this.broker.onPlayerDigging(InteractType.DIG_BLOCK_MAYBE, this.playerEntity, netHandler, packetIn.getPosition())) 89 + if (!this.broker.onPlayerDigging(InteractType.DIG_BLOCK_MAYBE, this.player, netHandler, packetIn.getPosition()))
90 { 90 {
91 ci.cancel(); 91 ci.cancel();
92 } 92 }
93 } 93 }
94 else if (action == Action.ABORT_DESTROY_BLOCK || action == Action.STOP_DESTROY_BLOCK) 94 else if (action == Action.ABORT_DESTROY_BLOCK || action == Action.STOP_DESTROY_BLOCK)
95 { 95 {
96 - this.broker.onPlayerDigging(InteractType.DIG_BLOCK_END, this.playerEntity, netHandler, packetIn.getPosition()); 96 + this.broker.onPlayerDigging(InteractType.DIG_BLOCK_END, this.player, netHandler, packetIn.getPosition());
97 } 97 }
98 else if (action == Action.SWAP_HELD_ITEMS) 98 else if (action == Action.SWAP_HELD_ITEMS)
99 { 99 {
100 - if (!this.broker.onPlayerSwapItems(this.playerEntity)) 100 + if (!this.broker.onPlayerSwapItems(this.player))
101 { 101 {
102 ci.cancel(); 102 ci.cancel();
103 } 103 }
@@ -117,7 +117,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler @@ -117,7 +117,7 @@ public abstract class MixinNetHandlerPlayServer implements ITeleportHandler
117 ) 117 )
118 private void onPlayerMoved(CPacketPlayer packetIn, CallbackInfo ci, WorldServer world) 118 private void onPlayerMoved(CPacketPlayer packetIn, CallbackInfo ci, WorldServer world)
119 { 119 {
120 - if (!this.broker.onPlayerMove((NetHandlerPlayServer)(Object)this, packetIn, this.playerEntity, world)) 120 + if (!this.broker.onPlayerMove((NetHandlerPlayServer)(Object)this, packetIn, this.player, world))
121 { 121 {
122 ci.cancel(); 122 ci.cancel();
123 } 123 }
src/main/java/com/mumfrey/liteloader/core/LiteLoaderBootstrap.java
  View file @f7c2ee1
@@ -17,6 +17,7 @@ import java.lang.reflect.Method; @@ -17,6 +17,7 @@ import java.lang.reflect.Method;
17 import java.util.List; 17 import java.util.List;
18 import java.util.Properties; 18 import java.util.Properties;
19 19
  20 +import org.apache.commons.io.Charsets;
20 import org.apache.logging.log4j.core.Layout; 21 import org.apache.logging.log4j.core.Layout;
21 import org.apache.logging.log4j.core.Logger; 22 import org.apache.logging.log4j.core.Logger;
22 import org.apache.logging.log4j.core.appender.FileAppender; 23 import org.apache.logging.log4j.core.appender.FileAppender;
@@ -426,10 +427,24 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP @@ -426,10 +427,24 @@ class LiteLoaderBootstrap implements LoaderBootstrap, LoaderEnvironment, LoaderP
426 LiteLoaderLogger.info("Setting up logger..."); 427 LiteLoaderLogger.info("Setting up logger...");
427 428
428 Logger logger = LiteLoaderLogger.getLogger(); 429 Logger logger = LiteLoaderLogger.getLogger();
429 - Layout<? extends Serializable> layout = PatternLayout.createLayout("[%d{HH:mm:ss}] [%t/%level]: %msg%n",  
430 - logger.getContext().getConfiguration(), null, "UTF-8", "True");  
431 - FileAppender fileAppender = FileAppender.createAppender(this.logFile.getAbsolutePath(), "False", "False",  
432 - "LiteLoader", "True", "True", "True", layout, null, "False", "", logger.getContext().getConfiguration()); 430 + Layout<? extends Serializable> layout = PatternLayout.newBuilder()
  431 + .withPattern("[%d{HH:mm:ss}] [%t/%level]: %msg%n")
  432 + .withConfiguration(logger.getContext().getConfiguration())
  433 + .withCharset(Charsets.UTF_8)
  434 + .withAlwaysWriteExceptions(true)
  435 + .build();
  436 + FileAppender fileAppender = FileAppender.newBuilder()
  437 + .withFileName(this.logFile.getAbsolutePath())
  438 + .withAppend(false)
  439 + .withLocking(false)
  440 + .withName("LiteLoader")
  441 + .withImmediateFlush(true)
  442 + .withIgnoreExceptions(true)
  443 + .withBufferedIo(true)
  444 + .withLayout(layout)
  445 + .withAdvertise(false)
  446 + .setConfiguration(logger.getContext().getConfiguration())
  447 + .build();
433 fileAppender.start(); 448 fileAppender.start();
434 logger.addAppender(fileAppender); 449 logger.addAppender(fileAppender);
435 } 450 }
src/main/java/com/mumfrey/liteloader/core/LiteLoaderEnumerator.java
  View file @f7c2ee1
@@ -24,7 +24,6 @@ import org.spongepowered.asm.mixin.MixinEnvironment; @@ -24,7 +24,6 @@ import org.spongepowered.asm.mixin.MixinEnvironment;
24 import org.spongepowered.asm.mixin.MixinEnvironment.Phase; 24 import org.spongepowered.asm.mixin.MixinEnvironment.Phase;
25 import org.spongepowered.asm.mixin.Mixins; 25 import org.spongepowered.asm.mixin.Mixins;
26 26
27 -import com.google.common.base.Throwables;  
28 import com.mumfrey.liteloader.LiteMod; 27 import com.mumfrey.liteloader.LiteMod;
29 import com.mumfrey.liteloader.api.ContainerRegistry; 28 import com.mumfrey.liteloader.api.ContainerRegistry;
30 import com.mumfrey.liteloader.api.ContainerRegistry.DisabledReason; 29 import com.mumfrey.liteloader.api.ContainerRegistry.DisabledReason;
@@ -441,7 +440,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator @@ -441,7 +440,7 @@ public class LiteLoaderEnumerator implements LoaderEnumerator
441 } 440 }
442 catch (IllegalStateException ex) // wut? 441 catch (IllegalStateException ex) // wut?
443 { 442 {
444 - Throwables.propagate(ex); 443 + throw ex;
445 } 444 }
446 catch (Throwable th) 445 catch (Throwable th)
447 { 446 {
src/main/java/com/mumfrey/liteloader/core/LiteLoaderEventBroker.java
  View file @f7c2ee1
@@ -417,7 +417,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe @@ -417,7 +417,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
417 if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, player, hand, player.getHeldItem(hand), pos, facing)) 417 if (!this.onPlayerInteract(InteractType.PLACE_BLOCK_MAYBE, player, hand, player.getHeldItem(hand), pos, facing))
418 { 418 {
419 SPacketBlockChange cancellation = new SPacketBlockChange(player.world, pos.offset(facing)); 419 SPacketBlockChange cancellation = new SPacketBlockChange(player.world, pos.offset(facing));
420 - netHandler.playerEntity.connection.sendPacket(cancellation); 420 + netHandler.player.connection.sendPacket(cancellation);
421 player.sendContainerToPlayer(player.inventoryContainer); 421 player.sendContainerToPlayer(player.inventoryContainer);
422 return false; 422 return false;
423 } 423 }
@@ -435,7 +435,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe @@ -435,7 +435,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
435 if (!this.onPlayerInteract(action, player, EnumHand.MAIN_HAND, player.getHeldItemMainhand(), pos, EnumFacing.SOUTH)) 435 if (!this.onPlayerInteract(action, player, EnumHand.MAIN_HAND, player.getHeldItemMainhand(), pos, EnumFacing.SOUTH))
436 { 436 {
437 SPacketBlockChange cancellation = new SPacketBlockChange(player.world, pos); 437 SPacketBlockChange cancellation = new SPacketBlockChange(player.world, pos);
438 - netHandler.playerEntity.connection.sendPacket(cancellation); 438 + netHandler.player.connection.sendPacket(cancellation);
439 return false; 439 return false;
440 } 440 }
441 441
@@ -498,8 +498,8 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe @@ -498,8 +498,8 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
498 if (!this.playerMoveListeners.all().onPlayerMove(player, from, to, pos)) 498 if (!this.playerMoveListeners.all().onPlayerMove(player, from, to, pos))
499 { 499 {
500 int teleportId = ((ITeleportHandler)player.connection).beginTeleport(from); 500 int teleportId = ((ITeleportHandler)player.connection).beginTeleport(from);
501 - player.setPositionAndRotation(from.xCoord, from.yCoord, from.zCoord, player.prevRotationYaw, player.prevRotationPitch);  
502 - player.connection.sendPacket(new SPacketPlayerPosLook(from.xCoord, from.yCoord, from.zCoord, 501 + player.setPositionAndRotation(from.x, from.y, from.z, player.prevRotationYaw, player.prevRotationPitch);
  502 + player.connection.sendPacket(new SPacketPlayerPosLook(from.x, from.y, from.z,
503 player.prevRotationYaw, player.prevRotationPitch, Collections.<EnumFlags>emptySet(), teleportId)); 503 player.prevRotationYaw, player.prevRotationPitch, Collections.<EnumFlags>emptySet(), teleportId));
504 return false; 504 return false;
505 } 505 }
@@ -507,7 +507,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe @@ -507,7 +507,7 @@ public abstract class LiteLoaderEventBroker&lt;TClient, TServer extends MinecraftSe
507 if (pos.isSet()) 507 if (pos.isSet())
508 { 508 {
509 Position newPos = pos.get(); 509 Position newPos = pos.get();
510 - netHandler.setPlayerLocation(newPos.xCoord, newPos.yCoord, newPos.zCoord, newPos.yaw, newPos.pitch); 510 + netHandler.setPlayerLocation(newPos.x, newPos.y, newPos.z, newPos.yaw, newPos.pitch);
511 return false; 511 return false;
512 } 512 }
513 513
src/main/java/com/mumfrey/liteloader/core/LiteLoaderVersion.java
  View file @f7c2ee1
@@ -50,12 +50,13 @@ public enum LiteLoaderVersion @@ -50,12 +50,13 @@ public enum LiteLoaderVersion
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, 1479473570, "1.10.2", "1.10.2", "1.10.2", "1.10.r1"), 51 MC_1_10_2_R0(38, 1479473570, "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 MC_1_11_0_R0(39, 0, "1.11", "1.11", "1.11", "1.11.0", "1.11.r1"),
53 - MC_1_11_2_R0(40, 0, "1.11.2", "1.11.2", "1.11.2", "1.11.r2"); 53 + MC_1_11_2_R0(40, 0, "1.11.2", "1.11.2", "1.11.2", "1.11.r2"),
  54 + MC_1_12_0_R0(41, 0, "1.12", "1.12", "1.12", "1.12.0", "1.12.r1");
54 55
55 /** 56 /**
56 * Current loader version 57 * Current loader version
57 */ 58 */
58 - public static final LiteLoaderVersion CURRENT = LiteLoaderVersion.MC_1_11_2_R0; 59 + public static final LiteLoaderVersion CURRENT = LiteLoaderVersion.MC_1_12_0_R0;
59 60
60 private static final LiteLoaderUpdateSite updateSite = new LiteLoaderUpdateSite(LiteLoaderVersion.CURRENT.getMinecraftVersion(), 61 private static final LiteLoaderUpdateSite updateSite = new LiteLoaderUpdateSite(LiteLoaderVersion.CURRENT.getMinecraftVersion(),
61 LiteLoaderVersion.CURRENT.getReleaseTimestamp()); 62 LiteLoaderVersion.CURRENT.getReleaseTimestamp());
src/main/java/com/mumfrey/liteloader/core/PacketEvents.java
  View file @f7c2ee1
@@ -264,7 +264,7 @@ public abstract class PacketEvents implements InterfaceProvider @@ -264,7 +264,7 @@ public abstract class PacketEvents implements InterfaceProvider
264 */ 264 */
265 protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, CPacketChatMessage packet) 265 protected void handlePacket(PacketEventInfo<Packet<?>> e, INetHandler netHandler, CPacketChatMessage packet)
266 { 266 {
267 - EntityPlayerMP player = netHandler instanceof NetHandlerPlayServer ? ((NetHandlerPlayServer)netHandler).playerEntity : null; 267 + EntityPlayerMP player = netHandler instanceof NetHandlerPlayServer ? ((NetHandlerPlayServer)netHandler).player : null;
268 268
269 if (!this.serverChatFilters.all().onChat(player, packet, packet.getMessage())) 269 if (!this.serverChatFilters.all().onChat(player, packet, packet.getMessage()))
270 { 270 {
@@ -316,7 +316,7 @@ public abstract class PacketEvents implements InterfaceProvider @@ -316,7 +316,7 @@ public abstract class PacketEvents implements InterfaceProvider
316 { 316 {
317 if (netHandler instanceof NetHandlerPlayServer) 317 if (netHandler instanceof NetHandlerPlayServer)
318 { 318 {
319 - LiteLoaderEventBroker.broker.onPlayerSettingsReceived(((NetHandlerPlayServer)netHandler).playerEntity, packet); 319 + LiteLoaderEventBroker.broker.onPlayerSettingsReceived(((NetHandlerPlayServer)netHandler).player, packet);
320 } 320 }
321 } 321 }
322 } 322 }
src/main/java/com/mumfrey/liteloader/core/ServerPluginChannels.java
  View file @f7c2ee1
@@ -111,7 +111,7 @@ public class ServerPluginChannels extends PluginChannels&lt;ServerPluginChannelList @@ -111,7 +111,7 @@ public class ServerPluginChannels extends PluginChannels&lt;ServerPluginChannelList
111 String channel = customPayload.getChannelName(); 111 String channel = customPayload.getChannelName();
112 PacketBuffer data = customPayload.getBufferData(); 112 PacketBuffer data = customPayload.getBufferData();
113 113
114 - EntityPlayerMP sender = ((NetHandlerPlayServer)netHandler).playerEntity; 114 + EntityPlayerMP sender = ((NetHandlerPlayServer)netHandler).player;
115 this.onPluginChannelMessage(sender, channel, data); 115 this.onPluginChannelMessage(sender, channel, data);
116 } 116 }
117 } 117 }
src/main/java/com/mumfrey/liteloader/core/event/HandlerList.java
  View file @f7c2ee1
@@ -5,7 +5,6 @@ @@ -5,7 +5,6 @@
5 */ 5 */
6 package com.mumfrey.liteloader.core.event; 6 package com.mumfrey.liteloader.core.event;
7 7
8 -import java.io.Closeable;  
9 import java.io.File; 8 import java.io.File;
10 import java.io.IOException; 9 import java.io.IOException;
11 import java.lang.reflect.Constructor; 10 import java.lang.reflect.Constructor;
@@ -21,7 +20,6 @@ import java.util.List; @@ -21,7 +20,6 @@ import java.util.List;
21 import java.util.Set; 20 import java.util.Set;
22 21
23 import org.apache.commons.io.FileUtils; 22 import org.apache.commons.io.FileUtils;
24 -import org.apache.logging.log4j.core.helpers.Booleans;  
25 import org.objectweb.asm.ClassReader; 23 import org.objectweb.asm.ClassReader;
26 import org.objectweb.asm.ClassWriter; 24 import org.objectweb.asm.ClassWriter;
27 import org.objectweb.asm.Label; 25 import org.objectweb.asm.Label;
@@ -268,14 +266,11 @@ public class HandlerList&lt;T&gt; extends LinkedList&lt;T&gt; implements FastIterableDeque&lt;T @@ -268,14 +266,11 @@ public class HandlerList&lt;T&gt; extends LinkedList&lt;T&gt; implements FastIterableDeque&lt;T
268 { 266 {
269 HandlerListClassLoader<T> classLoader = new HandlerListClassLoader<T>(this.type, this.logicOp, this.getDecorator()); 267 HandlerListClassLoader<T> classLoader = new HandlerListClassLoader<T>(this.type, this.logicOp, this.getDecorator());
270 this.bakedHandler = classLoader.newHandler(this); 268 this.bakedHandler = classLoader.newHandler(this);
271 - if (classLoader instanceof Closeable) 269 + try
272 { 270 {
273 - try  
274 - {  
275 - ((Closeable)classLoader).close();  
276 - }  
277 - catch (IOException ex) {} 271 + classLoader.close();
278 } 272 }
  273 + catch (IOException ex) {}
279 } 274 }
280 275
281 protected IHandlerListDecorator<T> getDecorator() 276 protected IHandlerListDecorator<T> getDecorator()
@@ -604,9 +599,9 @@ public class HandlerList&lt;T&gt; extends LinkedList&lt;T&gt; implements FastIterableDeque&lt;T @@ -604,9 +599,9 @@ public class HandlerList&lt;T&gt; extends LinkedList&lt;T&gt; implements FastIterableDeque&lt;T
604 { 599 {
605 private static final String HANDLER_VAR_PREFIX = "handler$"; 600 private static final String HANDLER_VAR_PREFIX = "handler$";
606 601
607 - public static final boolean DUMP = Booleans.parseBoolean(System.getProperty("liteloader.debug.dump"), false); 602 + public static final boolean DUMP = Boolean.parseBoolean(System.getProperty("liteloader.debug.dump", "false"));
608 603
609 - public static final boolean VALIDATE = Booleans.parseBoolean(System.getProperty("liteloader.debug.validate"), false); 604 + public static final boolean VALIDATE = Boolean.parseBoolean(System.getProperty("liteloader.debug.validate", "false"));
610 605
611 /** 606 /**
612 * Unique index number, just to ensure no name clashes 607 * Unique index number, just to ensure no name clashes
src/main/java/com/mumfrey/liteloader/core/runtime/Obf.java
  View file @f7c2ee1
@@ -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.11.2 17 + * TODO Obfuscation 1.12
18 */ 18 */
19 public class Obf 19 public class Obf
20 { 20 {
@@ -40,18 +40,18 @@ public class Obf @@ -40,18 +40,18 @@ public class Obf
40 40
41 // Classes 41 // Classes
42 // ----------------------------------------------------------------------------------------- 42 // -----------------------------------------------------------------------------------------
43 - public static final Obf Minecraft = new Obf("net.minecraft.client.Minecraft", "bes" );  
44 - public static final Obf EntityRenderer = new Obf("net.minecraft.client.renderer.EntityRenderer", "bqe" );  
45 - public static final Obf Blocks = new Obf("net.minecraft.init.Blocks", "alv" ); 43 + public static final Obf Minecraft = new Obf("net.minecraft.client.Minecraft", "bhz" );
  44 + public static final Obf EntityRenderer = new Obf("net.minecraft.client.renderer.EntityRenderer", "buo" );
  45 + public static final Obf Blocks = new Obf("net.minecraft.init.Blocks", "aov" );
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", "ew" );  
48 - public static final Obf Items = new Obf("net.minecraft.init.Items", "afl" );  
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", "asc" ); 47 + public static final Obf INetHandler = new Obf("net.minecraft.network.INetHandler", "hb" );
  48 + public static final Obf Items = new Obf("net.minecraft.init.Items", "aip" );
  49 + public static final Obf Profiler = new Obf("net.minecraft.profiler.Profiler", "rj" );
  50 + public static final Obf TileEntity = new Obf("net.minecraft.tileentity.TileEntity", "avh" );
51 51
52 // Methods 52 // Methods
53 // ----------------------------------------------------------------------------------------- 53 // -----------------------------------------------------------------------------------------
54 - public static final Obf startGame = new Obf(Obf.Minecraft, "func_71384_a", "an" ); 54 + public static final Obf startGame = new Obf(Obf.Minecraft, "func_71384_a", "aq" );
55 public static final Obf startSection = new Obf(Obf.Profiler, "func_76320_a", "a" ); 55 public static final Obf startSection = new Obf(Obf.Profiler, "func_76320_a", "a" );
56 public static final Obf endSection = new Obf(Obf.Profiler, "func_76319_b", "b" ); 56 public static final Obf endSection = new Obf(Obf.Profiler, "func_76319_b", "b" );
57 public static final Obf endStartSection = new Obf(Obf.Profiler, "func_76318_c", "c" ); 57 public static final Obf endStartSection = new Obf(Obf.Profiler, "func_76318_c", "c" );
src/main/java/com/mumfrey/liteloader/core/runtime/Packets.java
  View file @f7c2ee1
@@ -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.11.2 15 + * TODO Obfuscation 1.12
16 */ 16 */
17 public final class Packets extends Obf 17 public final class Packets extends Obf
18 { 18 {
@@ -37,244 +37,256 @@ public final class Packets extends Obf @@ -37,244 +37,256 @@ 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", "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); 40 + public static Packets C00Handshake = new Packets("net/minecraft/network/handshake/client/C00Handshake", "mc", Context.SERVER);
  41 + public static Packets CPacketEncryptionResponse = new Packets("net/minecraft/network/login/client/CPacketEncryptionResponse", "mm", Context.SERVER);
  42 + public static Packets CPacketLoginStart = new Packets("net/minecraft/network/login/client/CPacketLoginStart", "ml", Context.SERVER);
  43 + public static Packets SPacketDisconnectLogin = new Packets("net/minecraft/network/login/server/SPacketDisconnect", "mj", Context.CLIENT);
  44 + public static Packets SPacketEnableCompression = new Packets("net/minecraft/network/login/server/SPacketEnableCompression", "mi", Context.CLIENT);
  45 + public static Packets SPacketEncryptionRequest = new Packets("net/minecraft/network/login/server/SPacketEncryptionRequest", "mh", Context.CLIENT);
  46 + public static Packets SPacketLoginSuccess = new Packets("net/minecraft/network/login/server/SPacketLoginSuccess", "mg", Context.CLIENT);
  47 + public static Packets CPacketAnimation = new Packets("net/minecraft/network/play/client/CPacketAnimation", "lx", Context.SERVER);
  48 + public static Packets CPacketChatMessage = new Packets("net/minecraft/network/play/client/CPacketChatMessage", "la", Context.SERVER);
  49 + public static Packets CPacketClickWindow = new Packets("net/minecraft/network/play/client/CPacketClickWindow", "lf", Context.SERVER);
  50 + public static Packets CPacketClientSettings = new Packets("net/minecraft/network/play/client/CPacketClientSettings", "lc", Context.SERVER);
  51 + public static Packets CPacketClientStatus = new Packets("net/minecraft/network/play/client/CPacketClientStatus", "lb", Context.SERVER);
  52 + public static Packets CPacketCloseWindow = new Packets("net/minecraft/network/play/client/CPacketCloseWindow", "lg", Context.SERVER);
  53 + public static Packets CPacketConfirmTeleport = new Packets("net/minecraft/network/play/client/CPacketConfirmTeleport", "kx", Context.SERVER);
  54 + public static Packets CPacketConfirmTransaction = new Packets("net/minecraft/network/play/client/CPacketConfirmTransaction", "ld", Context.SERVER);
  55 + public static Packets CPacketCreativeInventoryAction = new Packets("net/minecraft/network/play/client/CPacketCreativeInventoryAction", "lv", Context.SERVER);
  56 + public static Packets CPacketCustomPayload = new Packets("net/minecraft/network/play/client/CPacketCustomPayload", "lh", Context.SERVER);
  57 + public static Packets CPacketEnchantItem = new Packets("net/minecraft/network/play/client/CPacketEnchantItem", "le", Context.SERVER);
  58 + public static Packets CPacketEntityAction = new Packets("net/minecraft/network/play/client/CPacketEntityAction", "lp", Context.SERVER);
  59 + public static Packets CPacketHeldItemChange = new Packets("net/minecraft/network/play/client/CPacketHeldItemChange", "lu", Context.SERVER);
  60 + public static Packets CPacketInput = new Packets("net/minecraft/network/play/client/CPacketInput", "lq", Context.SERVER);
  61 + public static Packets CPacketKeepAlive = new Packets("net/minecraft/network/play/client/CPacketKeepAlive", "lj", Context.SERVER);
  62 + public static Packets CPacketPlayer = new Packets("net/minecraft/network/play/client/CPacketPlayer", "lk", Context.SERVER);
  63 + public static Packets CPacketPlayerPosition = new Packets("net/minecraft/network/play/client/CPacketPlayer$Position", "lk$a", Context.SERVER);
  64 + public static Packets CPacketPlayerPositionRotation = new Packets("net/minecraft/network/play/client/CPacketPlayer$PositionRotation", "lk$b", Context.SERVER);
  65 + public static Packets CPacketPlayerRotation = new Packets("net/minecraft/network/play/client/CPacketPlayer$Rotation", "lk$c", Context.SERVER);
  66 + public static Packets CPacketPlayerAbilities = new Packets("net/minecraft/network/play/client/CPacketPlayerAbilities", "ln", Context.SERVER);
  67 + public static Packets CPacketPlayerDigging = new Packets("net/minecraft/network/play/client/CPacketPlayerDigging", "lo", Context.SERVER);
  68 + public static Packets CPacketPlayerTryUseItem = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItem", "ma", Context.SERVER);
  69 + public static Packets CPacketPlayerTryUseItemOnBlock = new Packets("net/minecraft/network/play/client/CPacketPlayerTryUseItemOnBlock", "lz", Context.SERVER);
  70 + public static Packets CPacketRecipeInfo = new Packets("net/minecraft/network/play/client/CPacketRecipeInfo", "lr", Context.SERVER);
  71 + public static Packets CPacketRecipePlacement = new Packets("net/minecraft/network/play/client/CPacketRecipePlacement", "ky", Context.SERVER);
  72 + public static Packets CPacketResourcePackStatus = new Packets("net/minecraft/network/play/client/CPacketResourcePackStatus", "ls", Context.SERVER);
  73 + public static Packets CPacketSeenAdvancements = new Packets("net/minecraft/network/play/client/CPacketSeenAdvancements", "lt", Context.SERVER);
  74 + public static Packets CPacketSpectate = new Packets("net/minecraft/network/play/client/CPacketSpectate", "ly", Context.SERVER);
  75 + public static Packets CPacketSteerBoat = new Packets("net/minecraft/network/play/client/CPacketSteerBoat", "lm", Context.SERVER);
  76 + public static Packets CPacketTabComplete = new Packets("net/minecraft/network/play/client/CPacketTabComplete", "kz", Context.SERVER);
  77 + public static Packets CPacketUpdateSign = new Packets("net/minecraft/network/play/client/CPacketUpdateSign", "lw", Context.SERVER);
  78 + public static Packets CPacketUseEntity = new Packets("net/minecraft/network/play/client/CPacketUseEntity", "li", Context.SERVER);
  79 + public static Packets CPacketVehicleMove = new Packets("net/minecraft/network/play/client/CPacketVehicleMove", "ll", Context.SERVER);
  80 + public static Packets SPacketAdvancementInfo = new Packets("net/minecraft/network/play/server/SPacketAdvancementInfo", "kt", Context.CLIENT);
  81 + public static Packets SPacketAnimation = new Packets("net/minecraft/network/play/server/SPacketAnimation", "id", Context.CLIENT);
  82 + public static Packets SPacketBlockAction = new Packets("net/minecraft/network/play/server/SPacketBlockAction", "ii", Context.CLIENT);
  83 + public static Packets SPacketBlockBreakAnim = new Packets("net/minecraft/network/play/server/SPacketBlockBreakAnim", "ig", Context.CLIENT);
  84 + public static Packets SPacketBlockChange = new Packets("net/minecraft/network/play/server/SPacketBlockChange", "ij", Context.CLIENT);
  85 + public static Packets SPacketCamera = new Packets("net/minecraft/network/play/server/SPacketCamera", "jz", Context.CLIENT);
  86 + public static Packets SPacketChangeGameState = new Packets("net/minecraft/network/play/server/SPacketChangeGameState", "jc", Context.CLIENT);
  87 + public static Packets SPacketChat = new Packets("net/minecraft/network/play/server/SPacketChat", "in", Context.CLIENT);
  88 + public static Packets SPacketChunkData = new Packets("net/minecraft/network/play/server/SPacketChunkData", "je", Context.CLIENT);
  89 + public static Packets SPacketCloseWindow = new Packets("net/minecraft/network/play/server/SPacketCloseWindow", "iq", Context.CLIENT);
  90 + public static Packets SPacketCollectItem = new Packets("net/minecraft/network/play/server/SPacketCollectItem", "kr", Context.CLIENT);
  91 + public static Packets SPacketCombatEvent = new Packets("net/minecraft/network/play/server/SPacketCombatEvent", "jn", Context.CLIENT);
  92 + public static Packets SPacketConfirmTransaction = new Packets("net/minecraft/network/play/server/SPacketConfirmTransaction", "ip", Context.CLIENT);
  93 + public static Packets SPacketCooldown = new Packets("net/minecraft/network/play/server/SPacketCooldown", "iv", Context.CLIENT);
  94 + public static Packets SPacketCustomPayload = new Packets("net/minecraft/network/play/server/SPacketCustomPayload", "iw", Context.CLIENT);
  95 + public static Packets SPacketCustomSound = new Packets("net/minecraft/network/play/server/SPacketCustomSound", "ix", Context.CLIENT);
  96 + public static Packets SPacketDestroyEntities = new Packets("net/minecraft/network/play/server/SPacketDestroyEntities", "js", Context.CLIENT);
  97 + public static Packets SPacketDisconnect = new Packets("net/minecraft/network/play/server/SPacketDisconnect", "iy", Context.CLIENT);
  98 + public static Packets SPacketDisplayObjective = new Packets("net/minecraft/network/play/server/SPacketDisplayObjective", "kb", Context.CLIENT);
  99 + public static Packets SPacketEffect = new Packets("net/minecraft/network/play/server/SPacketEffect", "jf", Context.CLIENT);
  100 + public static Packets SPacketEntity = new Packets("net/minecraft/network/play/server/SPacketEntity", "jj", Context.CLIENT);
  101 + public static Packets S15PacketEntityRelMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S15PacketEntityRelMove", "jj$a", Context.CLIENT);
  102 + public static Packets S16PacketEntityLook = new Packets("net/minecraft/network/play/server/SPacketEntity$S16PacketEntityLook", "jj$c", Context.CLIENT);
  103 + public static Packets S17PacketEntityLookMove = new Packets("net/minecraft/network/play/server/SPacketEntity$S17PacketEntityLookMove", "jj$b", Context.CLIENT);
  104 + public static Packets SPacketEntityAttach = new Packets("net/minecraft/network/play/server/SPacketEntityAttach", "kd", Context.CLIENT);
  105 + public static Packets SPacketEntityEffect = new Packets("net/minecraft/network/play/server/SPacketEntityEffect", "kv", Context.CLIENT);
  106 + public static Packets SPacketEntityEquipment = new Packets("net/minecraft/network/play/server/SPacketEntityEquipment", "kf", Context.CLIENT);
  107 + public static Packets SPacketEntityHeadLook = new Packets("net/minecraft/network/play/server/SPacketEntityHeadLook", "jw", Context.CLIENT);
  108 + public static Packets SPacketEntityMetadata = new Packets("net/minecraft/network/play/server/SPacketEntityMetadata", "kc", Context.CLIENT);
  109 + public static Packets SPacketEntityProperties = new Packets("net/minecraft/network/play/server/SPacketEntityProperties", "ku", Context.CLIENT);
  110 + public static Packets SPacketEntityStatus = new Packets("net/minecraft/network/play/server/SPacketEntityStatus", "iz", Context.CLIENT);
  111 + public static Packets SPacketEntityTeleport = new Packets("net/minecraft/network/play/server/SPacketEntityTeleport", "ks", Context.CLIENT);
  112 + public static Packets SPacketEntityVelocity = new Packets("net/minecraft/network/play/server/SPacketEntityVelocity", "ke", Context.CLIENT);
  113 + public static Packets SPacketExplosion = new Packets("net/minecraft/network/play/server/SPacketExplosion", "ja", Context.CLIENT);
  114 + public static Packets SPacketHeldItemChange = new Packets("net/minecraft/network/play/server/SPacketHeldItemChange", "ka", Context.CLIENT);
  115 + public static Packets SPacketJoinGame = new Packets("net/minecraft/network/play/server/SPacketJoinGame", "jh", Context.CLIENT);
  116 + public static Packets SPacketKeepAlive = new Packets("net/minecraft/network/play/server/SPacketKeepAlive", "jd", Context.CLIENT);
  117 + public static Packets SPacketMaps = new Packets("net/minecraft/network/play/server/SPacketMaps", "ji", Context.CLIENT);
  118 + public static Packets SPacketMoveVehicle = new Packets("net/minecraft/network/play/server/SPacketMoveVehicle", "jk", Context.CLIENT);
  119 + public static Packets SPacketMultiBlockChange = new Packets("net/minecraft/network/play/server/SPacketMultiBlockChange", "io", Context.CLIENT);
  120 + public static Packets SPacketOpenWindow = new Packets("net/minecraft/network/play/server/SPacketOpenWindow", "ir", Context.CLIENT);
  121 + public static Packets SPacketParticles = new Packets("net/minecraft/network/play/server/SPacketParticles", "jg", Context.CLIENT);
  122 + public static Packets SPacketPlayerAbilities = new Packets("net/minecraft/network/play/server/SPacketPlayerAbilities", "jm", Context.CLIENT);
  123 + public static Packets SPacketPlayerListHeaderFooter = new Packets("net/minecraft/network/play/server/SPacketPlayerListHeaderFooter", "kq", Context.CLIENT);
  124 + public static Packets SPacketPlayerListItem = new Packets("net/minecraft/network/play/server/SPacketPlayerListItem", "jo", Context.CLIENT);
  125 + public static Packets SPacketPlayerPosLook = new Packets("net/minecraft/network/play/server/SPacketPlayerPosLook", "jp", Context.CLIENT);
  126 + public static Packets SPacketRecipeBook = new Packets("net/minecraft/network/play/server/SPacketRecipeBook", "jr", Context.CLIENT);
  127 + public static Packets SPacketRemoveEntityEffect = new Packets("net/minecraft/network/play/server/SPacketRemoveEntityEffect", "jt", Context.CLIENT);
  128 + public static Packets SPacketResourcePackSend = new Packets("net/minecraft/network/play/server/SPacketResourcePackSend", "ju", Context.CLIENT);
  129 + public static Packets SPacketRespawn = new Packets("net/minecraft/network/play/server/SPacketRespawn", "jv", Context.CLIENT);
  130 + public static Packets SPacketScoreboardObjective = new Packets("net/minecraft/network/play/server/SPacketScoreboardObjective", "ki", Context.CLIENT);
  131 + public static Packets SPacketSelectAdvancementsTab = new Packets("net/minecraft/network/play/server/SPacketSelectAdvancementsTab", "jx", Context.CLIENT);
  132 + public static Packets SPacketServerDifficulty = new Packets("net/minecraft/network/play/server/SPacketServerDifficulty", "il", Context.CLIENT);
  133 + public static Packets SPacketSetExperience = new Packets("net/minecraft/network/play/server/SPacketSetExperience", "kg", Context.CLIENT);
  134 + public static Packets SPacketSetPassengers = new Packets("net/minecraft/network/play/server/SPacketSetPassengers", "kj", Context.CLIENT);
  135 + public static Packets SPacketSetSlot = new Packets("net/minecraft/network/play/server/SPacketSetSlot", "iu", Context.CLIENT);
  136 + public static Packets SPacketSignEditorOpen = new Packets("net/minecraft/network/play/server/SPacketSignEditorOpen", "jl", Context.CLIENT);
  137 + public static Packets SPacketSoundEffect = new Packets("net/minecraft/network/play/server/SPacketSoundEffect", "kp", Context.CLIENT);
  138 + public static Packets SPacketSpawnExperienceOrb = new Packets("net/minecraft/network/play/server/SPacketSpawnExperienceOrb", "hy", Context.CLIENT);
  139 + public static Packets SPacketSpawnGlobalEntity = new Packets("net/minecraft/network/play/server/SPacketSpawnGlobalEntity", "hz", Context.CLIENT);
  140 + public static Packets SPacketSpawnMob = new Packets("net/minecraft/network/play/server/SPacketSpawnMob", "ia", Context.CLIENT);
  141 + public static Packets SPacketSpawnObject = new Packets("net/minecraft/network/play/server/SPacketSpawnObject", "hx", Context.CLIENT);
  142 + public static Packets SPacketSpawnPainting = new Packets("net/minecraft/network/play/server/SPacketSpawnPainting", "ib", Context.CLIENT);
  143 + public static Packets SPacketSpawnPlayer = new Packets("net/minecraft/network/play/server/SPacketSpawnPlayer", "ic", Context.CLIENT);
  144 + public static Packets SPacketSpawnPosition = new Packets("net/minecraft/network/play/server/SPacketSpawnPosition", "km", Context.CLIENT);
  145 + public static Packets SPacketStatistics = new Packets("net/minecraft/network/play/server/SPacketStatistics", "ie", Context.CLIENT);
  146 + public static Packets SPacketTabComplete = new Packets("net/minecraft/network/play/server/SPacketTabComplete", "im", Context.CLIENT);
  147 + public static Packets SPacketTeams = new Packets("net/minecraft/network/play/server/SPacketTeams", "kk", Context.CLIENT);
  148 + public static Packets SPacketTimeUpdate = new Packets("net/minecraft/network/play/server/SPacketTimeUpdate", "kn", Context.CLIENT);
  149 + public static Packets SPacketTitle = new Packets("net/minecraft/network/play/server/SPacketTitle", "ko", Context.CLIENT);
  150 + public static Packets SPacketUnloadChunk = new Packets("net/minecraft/network/play/server/SPacketUnloadChunk", "jb", Context.CLIENT);
  151 + public static Packets SPacketUpdateBossInfo = new Packets("net/minecraft/network/play/server/SPacketUpdateBossInfo", "ik", Context.CLIENT);
  152 + public static Packets SPacketUpdateHealth = new Packets("net/minecraft/network/play/server/SPacketUpdateHealth", "kh", Context.CLIENT);
  153 + public static Packets SPacketUpdateScore = new Packets("net/minecraft/network/play/server/SPacketUpdateScore", "kl", Context.CLIENT);
  154 + public static Packets SPacketUpdateTileEntity = new Packets("net/minecraft/network/play/server/SPacketUpdateTileEntity", "ih", Context.CLIENT);
  155 + public static Packets SPacketUseBed = new Packets("net/minecraft/network/play/server/SPacketUseBed", "jq", Context.CLIENT);
  156 + public static Packets SPacketWindowItems = new Packets("net/minecraft/network/play/server/SPacketWindowItems", "is", Context.CLIENT);
  157 + public static Packets SPacketWindowProperty = new Packets("net/minecraft/network/play/server/SPacketWindowProperty", "it", Context.CLIENT);
  158 + public static Packets SPacketWorldBorder = new Packets("net/minecraft/network/play/server/SPacketWorldBorder", "jy", Context.CLIENT);
  159 + public static Packets CPacketPing = new Packets("net/minecraft/network/status/client/CPacketPing", "mu", Context.SERVER);
  160 + public static Packets CPacketServerQuery = new Packets("net/minecraft/network/status/client/CPacketServerQuery", "mv", Context.SERVER);
  161 + public static Packets SPacketPong = new Packets("net/minecraft/network/status/server/SPacketPong", "mq", Context.CLIENT);
  162 + public static Packets SPacketServerInfo = new Packets("net/minecraft/network/status/server/SPacketServerInfo", "mr", Context.CLIENT);
157 163
158 // CHECKSTYLE:ON 164 // CHECKSTYLE:ON
159 165
160 public static final Packets[] packets = new Packets[] { 166 public static final Packets[] packets = new Packets[] {
161 - CPacketEncryptionResponse,  
162 - CPacketLoginStart,  
163 - SPacketDisconnectLogin,  
164 - SPacketEnableCompression,  
165 - SPacketEncryptionRequest,  
166 - SPacketLoginSuccess,  
167 - CPacketAnimation,  
168 - CPacketChatMessage,  
169 - CPacketClickWindow,  
170 - CPacketClientSettings,  
171 - CPacketClientStatus,  
172 - CPacketCloseWindow,  
173 - CPacketConfirmTeleport,  
174 - CPacketConfirmTransaction,  
175 - CPacketCreativeInventoryAction,  
176 - CPacketCustomPayload,  
177 - CPacketEnchantItem,  
178 - CPacketEntityAction,  
179 - CPacketHeldItemChange,  
180 - CPacketInput,  
181 - C00Handshake,  
182 - CPacketKeepAlive,  
183 - CPacketPlayer,  
184 - CPacketPlayerPosition,  
185 - CPacketPlayerPositionRotation,  
186 - CPacketPlayerRotation,  
187 - CPacketPlayerAbilities,  
188 - CPacketPlayerDigging,  
189 - CPacketPlayerTryUseItem,  
190 - CPacketPlayerTryUseItemOnBlock,  
191 - CPacketResourcePackStatus,  
192 - CPacketSpectate,  
193 - CPacketSteerBoat,  
194 - CPacketTabComplete,  
195 - CPacketUpdateSign,  
196 - CPacketUseEntity,  
197 - CPacketVehicleMove,  
198 - SPacketAnimation,  
199 - SPacketBlockAction,  
200 - SPacketBlockBreakAnim,  
201 - SPacketBlockChange,  
202 - SPacketCamera,  
203 - SPacketChangeGameState,  
204 - SPacketChat,  
205 - SPacketChunkData,  
206 - SPacketCloseWindow,  
207 - SPacketCollectItem,  
208 - SPacketCombatEvent,  
209 - SPacketConfirmTransaction,  
210 - SPacketCooldown,  
211 - SPacketCustomPayload,  
212 - SPacketCustomSound,  
213 - SPacketDestroyEntities,  
214 - SPacketDisconnect,  
215 - SPacketDisplayObjective,  
216 - SPacketEffect,  
217 - SPacketEntity,  
218 - S15PacketEntityRelMove,  
219 - S16PacketEntityLook,  
220 - S17PacketEntityLookMove,  
221 - SPacketEntityAttach,  
222 - SPacketEntityEffect,  
223 - SPacketEntityEquipment,  
224 - SPacketEntityHeadLook,  
225 - SPacketEntityMetadata,  
226 - SPacketEntityProperties,  
227 - SPacketEntityStatus,  
228 - SPacketEntityTeleport,  
229 - SPacketEntityVelocity,  
230 - SPacketExplosion,  
231 - SPacketHeldItemChange,  
232 - SPacketJoinGame,  
233 - SPacketKeepAlive,  
234 - SPacketMaps,  
235 - SPacketMoveVehicle,  
236 - SPacketMultiBlockChange,  
237 - SPacketOpenWindow,  
238 - SPacketParticles,  
239 - SPacketPlayerAbilities,  
240 - SPacketPlayerListHeaderFooter,  
241 - SPacketPlayerListItem,  
242 - SPacketPlayerPosLook,  
243 - SPacketRemoveEntityEffect,  
244 - SPacketResourcePackSend,  
245 - SPacketRespawn,  
246 - SPacketScoreboardObjective,  
247 - SPacketServerDifficulty,  
248 - SPacketSetExperience,  
249 - SPacketSetPassengers,  
250 - SPacketSetSlot,  
251 - SPacketSignEditorOpen,  
252 - SPacketSoundEffect,  
253 - SPacketSpawnExperienceOrb,  
254 - SPacketSpawnGlobalEntity,  
255 - SPacketSpawnMob,  
256 - SPacketSpawnObject,  
257 - SPacketSpawnPainting,  
258 - SPacketSpawnPlayer,  
259 - SPacketSpawnPosition,  
260 - SPacketStatistics,  
261 - SPacketTabComplete,  
262 - SPacketTeams,  
263 - SPacketTimeUpdate,  
264 - SPacketTitle,  
265 - SPacketUnloadChunk,  
266 - SPacketUpdateBossInfo,  
267 - SPacketUpdateHealth,  
268 - SPacketUpdateScore,  
269 - SPacketUpdateTileEntity,  
270 - SPacketUseBed,  
271 - SPacketWindowItems,  
272 - SPacketWindowProperty,  
273 - SPacketWorldBorder,  
274 - CPacketPing,  
275 - CPacketServerQuery,  
276 - SPacketPong,  
277 - SPacketServerInfo 167 + Packets.CPacketEncryptionResponse,
  168 + Packets.CPacketLoginStart,
  169 + Packets.SPacketDisconnectLogin,
  170 + Packets.SPacketEnableCompression,
  171 + Packets.SPacketEncryptionRequest,
  172 + Packets.SPacketLoginSuccess,
  173 + Packets.CPacketAnimation,
  174 + Packets.CPacketChatMessage,
  175 + Packets.CPacketClickWindow,
  176 + Packets.CPacketClientSettings,
  177 + Packets.CPacketClientStatus,
  178 + Packets.CPacketCloseWindow,
  179 + Packets.CPacketConfirmTeleport,
  180 + Packets.CPacketConfirmTransaction,
  181 + Packets.CPacketCreativeInventoryAction,
  182 + Packets.CPacketCustomPayload,
  183 + Packets.CPacketEnchantItem,
  184 + Packets.CPacketEntityAction,
  185 + Packets.CPacketHeldItemChange,
  186 + Packets.CPacketInput,
  187 + Packets.C00Handshake,
  188 + Packets.CPacketKeepAlive,
  189 + Packets.CPacketPlayer,
  190 + Packets.CPacketPlayerPosition,
  191 + Packets.CPacketPlayerPositionRotation,
  192 + Packets.CPacketPlayerRotation,
  193 + Packets.CPacketPlayerAbilities,
  194 + Packets.CPacketPlayerDigging,
  195 + Packets.CPacketPlayerTryUseItem,
  196 + Packets.CPacketPlayerTryUseItemOnBlock,
  197 + Packets.CPacketResourcePackStatus,
  198 + Packets.CPacketSpectate,
  199 + Packets.CPacketSteerBoat,
  200 + Packets.CPacketTabComplete,
  201 + Packets.CPacketUpdateSign,
  202 + Packets.CPacketUseEntity,
  203 + Packets.CPacketVehicleMove,
  204 + Packets.SPacketAnimation,
  205 + Packets.SPacketBlockAction,
  206 + Packets.SPacketBlockBreakAnim,
  207 + Packets.SPacketBlockChange,
  208 + Packets.SPacketCamera,
  209 + Packets.SPacketChangeGameState,
  210 + Packets.SPacketChat,
  211 + Packets.SPacketChunkData,
  212 + Packets.SPacketCloseWindow,
  213 + Packets.SPacketCollectItem,
  214 + Packets.SPacketCombatEvent,
  215 + Packets.SPacketConfirmTransaction,
  216 + Packets.SPacketCooldown,
  217 + Packets.SPacketCustomPayload,
  218 + Packets.SPacketCustomSound,
  219 + Packets.SPacketDestroyEntities,
  220 + Packets.SPacketDisconnect,
  221 + Packets.SPacketDisplayObjective,
  222 + Packets.SPacketEffect,
  223 + Packets.SPacketEntity,
  224 + Packets.S15PacketEntityRelMove,
  225 + Packets.S16PacketEntityLook,
  226 + Packets.S17PacketEntityLookMove,
  227 + Packets.SPacketEntityAttach,
  228 + Packets.SPacketEntityEffect,
  229 + Packets.SPacketEntityEquipment,
  230 + Packets.SPacketEntityHeadLook,
  231 + Packets.SPacketEntityMetadata,
  232 + Packets.SPacketEntityProperties,
  233 + Packets.SPacketEntityStatus,
  234 + Packets.SPacketEntityTeleport,
  235 + Packets.SPacketEntityVelocity,
  236 + Packets.SPacketExplosion,
  237 + Packets.SPacketHeldItemChange,
  238 + Packets.SPacketJoinGame,
  239 + Packets.SPacketKeepAlive,
  240 + Packets.SPacketMaps,
  241 + Packets.SPacketMoveVehicle,
  242 + Packets.SPacketMultiBlockChange,
  243 + Packets.SPacketOpenWindow,
  244 + Packets.SPacketParticles,
  245 + Packets.SPacketPlayerAbilities,
  246 + Packets.SPacketPlayerListHeaderFooter,
  247 + Packets.SPacketPlayerListItem,
  248 + Packets.SPacketPlayerPosLook,
  249 + Packets.SPacketRemoveEntityEffect,
  250 + Packets.SPacketResourcePackSend,
  251 + Packets.SPacketRespawn,
  252 + Packets.SPacketScoreboardObjective,
  253 + Packets.SPacketServerDifficulty,
  254 + Packets.SPacketSetExperience,
  255 + Packets.SPacketSetPassengers,
  256 + Packets.SPacketSetSlot,
  257 + Packets.SPacketSignEditorOpen,
  258 + Packets.SPacketSoundEffect,
  259 + Packets.SPacketSpawnExperienceOrb,
  260 + Packets.SPacketSpawnGlobalEntity,
  261 + Packets.SPacketSpawnMob,
  262 + Packets.SPacketSpawnObject,
  263 + Packets.SPacketSpawnPainting,
  264 + Packets.SPacketSpawnPlayer,
  265 + Packets.SPacketSpawnPosition,
  266 + Packets.SPacketStatistics,
  267 + Packets.SPacketTabComplete,
  268 + Packets.SPacketTeams,
  269 + Packets.SPacketTimeUpdate,
  270 + Packets.SPacketTitle,
  271 + Packets.SPacketUnloadChunk,
  272 + Packets.SPacketUpdateBossInfo,
  273 + Packets.SPacketUpdateHealth,
  274 + Packets.SPacketUpdateScore,
  275 + Packets.SPacketUpdateTileEntity,
  276 + Packets.SPacketUseBed,
  277 + Packets.SPacketWindowItems,
  278 + Packets.SPacketWindowProperty,
  279 + Packets.SPacketWorldBorder,
  280 + Packets.CPacketPing,
  281 + Packets.CPacketServerQuery,
  282 + Packets.SPacketPong,
  283 + Packets.SPacketServerInfo,
  284 + Packets.CPacketRecipeInfo,
  285 + Packets.CPacketRecipePlacement,
  286 + Packets.CPacketSeenAdvancements,
  287 + Packets.SPacketAdvancementInfo,
  288 + Packets.SPacketRecipeBook,
  289 + Packets.SPacketSelectAdvancementsTab
278 }; 290 };
279 291
280 private static int nextPacketIndex; 292 private static int nextPacketIndex;
src/main/java/com/mumfrey/liteloader/launch/LiteLoaderTweaker.java
  View file @f7c2ee1
@@ -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.11.2  
42 - public static final String VERSION = "1.11.2"; 41 + // TODO Version - 1.12
  42 + public static final String VERSION = "1.12.0";
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/event/EventTransformer.java
  View file @f7c2ee1
@@ -17,7 +17,6 @@ import java.util.Set; @@ -17,7 +17,6 @@ import java.util.Set;
17 import java.util.TreeSet; 17 import java.util.TreeSet;
18 18
19 import org.apache.commons.io.FileUtils; 19 import org.apache.commons.io.FileUtils;
20 -import org.apache.logging.log4j.core.helpers.Booleans;  
21 import org.objectweb.asm.ClassWriter; 20 import org.objectweb.asm.ClassWriter;
22 import org.objectweb.asm.Type; 21 import org.objectweb.asm.Type;
23 import org.objectweb.asm.tree.AbstractInsnNode; 22 import org.objectweb.asm.tree.AbstractInsnNode;
@@ -73,9 +72,9 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger; @@ -73,9 +72,9 @@ import com.mumfrey.liteloader.util.log.LiteLoaderLogger;
73 */ 72 */
74 public final class EventTransformer extends ClassTransformer 73 public final class EventTransformer extends ClassTransformer
75 { 74 {
76 - public static final boolean DUMP = Booleans.parseBoolean(System.getProperty("liteloader.debug.dump"), false); 75 + public static final boolean DUMP = Boolean.parseBoolean(System.getProperty("liteloader.debug.dump", "false"));
77 76
78 - public static final boolean VALIDATE = Booleans.parseBoolean(System.getProperty("liteloader.debug.validate"), false); 77 + public static final boolean VALIDATE = Boolean.parseBoolean(System.getProperty("liteloader.debug.validate", "false"));
79 78
80 /** 79 /**
81 * Multidimensional map of class names -> target method signatures -> events 80 * Multidimensional map of class names -> target method signatures -> events
src/main/java/com/mumfrey/liteloader/util/EntityUtilities.java
  View file @f7c2ee1
@@ -74,10 +74,10 @@ public abstract class EntityUtilities @@ -74,10 +74,10 @@ public abstract class EntityUtilities
74 74
75 for (final Entity entity : EntityUtilities.getTraceEntities(source, traceDistance, lookDir, EntityUtilities.TRACEABLE)) 75 for (final Entity entity : EntityUtilities.getTraceEntities(source, traceDistance, lookDir, EntityUtilities.TRACEABLE))
76 { 76 {
77 - AxisAlignedBB entityBB = entity.getEntityBoundingBox().expandXyz(entity.getCollisionBorderSize()); 77 + AxisAlignedBB entityBB = entity.getEntityBoundingBox().grow(entity.getCollisionBorderSize());
78 RayTraceResult entityRay = entityBB.calculateIntercept(traceStart, traceEnd); 78 RayTraceResult entityRay = entityBB.calculateIntercept(traceStart, traceEnd);
79 79
80 - if (entityBB.isVecInside(traceStart)) 80 + if (entityBB.contains(traceStart))
81 { 81 {
82 if (trace.distance >= 0.0D) 82 if (trace.distance >= 0.0D)
83 { 83 {
@@ -120,7 +120,7 @@ public abstract class EntityUtilities @@ -120,7 +120,7 @@ public abstract class EntityUtilities
120 private static List<Entity> getTraceEntities(Entity source, double traceDistance, Vec3d dir, Predicate<Entity> filter) 120 private static List<Entity> getTraceEntities(Entity source, double traceDistance, Vec3d dir, Predicate<Entity> filter)
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.expand(dir.x, dir.y, dir.z);
124 List<Entity> entities = source.world.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 }
src/main/java/com/mumfrey/liteloader/util/Position.java
  View file @f7c2ee1
@@ -48,9 +48,9 @@ public class Position extends Vec3d @@ -48,9 +48,9 @@ public class Position extends Vec3d
48 48
49 public void applyTo(Entity entity) 49 public void applyTo(Entity entity)
50 { 50 {
51 - entity.posX = this.xCoord;  
52 - entity.posY = this.yCoord;  
53 - entity.posZ = this.zCoord; 51 + entity.posX = this.x;
  52 + entity.posY = this.y;
  53 + entity.posZ = this.z;
54 entity.rotationYaw = this.yaw; 54 entity.rotationYaw = this.yaw;
55 entity.rotationPitch = this.pitch; 55 entity.rotationPitch = this.pitch;
56 } 56 }
@@ -58,6 +58,6 @@ public class Position extends Vec3d @@ -58,6 +58,6 @@ public class Position extends Vec3d
58 @Override 58 @Override
59 public String toString() 59 public String toString()
60 { 60 {
61 - return "(" + this.xCoord + ", " + this.yCoord + ", " + this.zCoord + ", " + this.yaw + ", " + this.pitch + ")"; 61 + return "(" + this.x + ", " + this.y + ", " + this.z + ", " + this.yaw + ", " + this.pitch + ")";
62 } 62 }
63 } 63 }
src/main/java/com/mumfrey/liteloader/util/log/LiteLoaderLogger.java
  View file @f7c2ee1
@@ -20,7 +20,6 @@ import org.apache.logging.log4j.LogManager; @@ -20,7 +20,6 @@ import org.apache.logging.log4j.LogManager;
20 import org.apache.logging.log4j.core.LogEvent; 20 import org.apache.logging.log4j.core.LogEvent;
21 import org.apache.logging.log4j.core.Logger; 21 import org.apache.logging.log4j.core.Logger;
22 import org.apache.logging.log4j.core.appender.AbstractAppender; 22 import org.apache.logging.log4j.core.appender.AbstractAppender;
23 -import org.apache.logging.log4j.core.helpers.Booleans;  
24 23
25 /** 24 /**
26 * Gateway class for the log4j logger 25 * Gateway class for the log4j logger
@@ -29,7 +28,7 @@ import org.apache.logging.log4j.core.helpers.Booleans; @@ -29,7 +28,7 @@ import org.apache.logging.log4j.core.helpers.Booleans;
29 */ 28 */
30 public class LiteLoaderLogger extends AbstractAppender 29 public class LiteLoaderLogger extends AbstractAppender
31 { 30 {
32 - public static final boolean DEBUG = Booleans.parseBoolean(System.getProperty("liteloader.debug"), false); 31 + public static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("liteloader.debug", "false"));
33 32
34 private static final int LOG_TAIL_SIZE = 500; 33 private static final int LOG_TAIL_SIZE = 500;
35 34
@@ -84,11 +83,11 @@ public class LiteLoaderLogger extends AbstractAppender @@ -84,11 +83,11 @@ public class LiteLoaderLogger extends AbstractAppender
84 synchronized (LiteLoaderLogger.logTail) 83 synchronized (LiteLoaderLogger.logTail)
85 { 84 {
86 LiteLoaderLogger.logIndex++; 85 LiteLoaderLogger.logIndex++;
87 - this.append(event.getMillis(), event.getMessage().getFormattedMessage()); 86 + this.append(event.getTimeMillis(), event.getMessage().getFormattedMessage());
88 Throwable thrown = event.getThrown(); 87 Throwable thrown = event.getThrown();
89 if (thrown != null) 88 if (thrown != null)
90 { 89 {
91 - this.append(event.getMillis(), String.format("\2474%s: \2476%s", thrown.getClass().getSimpleName(), thrown.getMessage())); 90 + this.append(event.getTimeMillis(), String.format("\2474%s: \2476%s", thrown.getClass().getSimpleName(), thrown.getMessage()));
92 } 91 }
93 } 92 }
94 } 93 }
src/main/resources/mixins.liteloader.core.json
  View file @f7c2ee1
1 { 1 {
2 "required": true, 2 "required": true,
3 - "minVersion": "0.5.3", 3 + "minVersion": "0.6.8",
  4 + "compatibilityLevel": "JAVA_8",
4 "target": "@env(DEFAULT)", 5 "target": "@env(DEFAULT)",
5 "package": "com.mumfrey.liteloader.common.mixin", 6 "package": "com.mumfrey.liteloader.common.mixin",
6 "refmap": "mixins.liteloader.core.refmap.json", 7 "refmap": "mixins.liteloader.core.refmap.json",