diff --git a/build.gradle b/build.gradle index fbde065a9..e5fbd8c58 100644 --- a/build.gradle +++ b/build.gradle @@ -36,7 +36,7 @@ project(':clean') { patcher { parent = project(':mcp') patchedSrc = file('src/main/java') - mappings channel: 'snapshot', version: '20180813-1.12' + mappings channel: 'snapshot', version: '20180921-1.13' mcVersion = '1.13' } task runclient(type: JavaExec) { diff --git a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch index 55e0675b7..232c7c644 100644 --- a/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch +++ b/patches/minecraft/net/minecraft/client/gui/GuiMainMenu.java.patch @@ -20,6 +20,15 @@ private void func_73972_b(int p_73972_1_, int p_73972_2_) { this.func_189646_b(new GuiButton(11, this.field_146294_l / 2 - 100, p_73972_1_, I18n.func_135052_a("menu.playdemo")) { +@@ -206,7 +212,7 @@ + } + }); + this.field_73973_d = this.func_189646_b(new GuiButton(12, this.field_146294_l / 2 - 100, p_73972_1_ + p_73972_2_ * 1, I18n.func_135052_a("menu.resetdemo")) { +- public void func_194829_a(double p_194829_1_, double p_194829_3_) { ++ public void func_194829_a(double mouseX, double mouseY) { + ISaveFormat isaveformat1 = GuiMainMenu.this.field_146297_k.func_71359_d(); + WorldInfo worldinfo1 = isaveformat1.func_75803_c("Demo_World"); + if (worldinfo1 != null) { @@ -283,7 +289,10 @@ s = s + ("release".equalsIgnoreCase(this.field_146297_k.func_184123_d()) ? "" : "/" + this.field_146297_k.func_184123_d()); } diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch index 0a9757f14..cbb9c37bd 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/FaceBakery.java.patch @@ -6,8 +6,8 @@ public BakedQuad func_199332_a(Vector3f p_199332_1_, Vector3f p_199332_2_, BlockPartFace p_199332_3_, TextureAtlasSprite p_199332_4_, EnumFacing p_199332_5_, ModelRotation p_199332_6_, @Nullable BlockPartRotation p_199332_7_, boolean p_199332_8_, boolean p_199332_9_) { + return makeBakedQuad(p_199332_1_, p_199332_2_, p_199332_3_, p_199332_4_, p_199332_5_, (net.minecraftforge.common.model.ITransformation)p_199332_6_, p_199332_7_, p_199332_8_, p_199332_9_); + } -+ -+ public BakedQuad makeBakedQuad(Vector3f p_199332_1_, Vector3f p_199332_2_, BlockPartFace p_199332_3_, TextureAtlasSprite p_199332_4_, EnumFacing p_199332_5_, net.minecraftforge.common.model.ITransformation p_199332_6_, BlockPartRotation p_199332_7_, boolean p_199332_8_, boolean p_199332_9_) { ++ ++ public BakedQuad makeBakedQuad(Vector3f p_199332_1_, Vector3f p_199332_2_, BlockPartFace p_199332_3_, TextureAtlasSprite p_199332_4_, EnumFacing p_199332_5_, net.minecraftforge.common.model.ITransformation p_199332_6_, BlockPartRotation p_199332_7_, boolean p_199332_8_, boolean p_199332_9_) { BlockFaceUV blockfaceuv = p_199332_3_.field_178243_e; if (p_199332_8_) { - blockfaceuv = this.func_188010_a(p_199332_3_.field_178243_e, p_199332_5_, p_199332_6_); @@ -33,7 +33,7 @@ private int[] func_188012_a(BlockFaceUV p_188012_1_, TextureAtlasSprite p_188012_2_, EnumFacing p_188012_3_, float[] p_188012_4_, ModelRotation p_188012_5_, @Nullable BlockPartRotation p_188012_6_, boolean p_188012_7_) { + return makeQuadVertexData(p_188012_1_, p_188012_2_, p_188012_3_, p_188012_4_, (net.minecraftforge.common.model.ITransformation)p_188012_5_, p_188012_6_, p_188012_7_); + } -+ ++ + private int[] makeQuadVertexData(BlockFaceUV p_188012_1_, TextureAtlasSprite p_188012_2_, EnumFacing p_188012_3_, float[] p_188012_4_, net.minecraftforge.common.model.ITransformation p_188012_5_, BlockPartRotation p_188012_6_, boolean p_188012_7_) { int[] aint = new int[28]; @@ -50,7 +50,7 @@ - EnumFacing enumfacing = p_188015_7_.func_177523_a(p_188015_3_); + fillVertexData(p_188015_1_, p_188015_2_, p_188015_3_, p_188015_4_, p_188015_5_, p_188015_6_, (net.minecraftforge.common.model.ITransformation)p_188015_7_, p_188015_8_, p_188015_9_); + } -+ ++ + private void fillVertexData(int[] p_188015_1_, int p_188015_2_, EnumFacing p_188015_3_, BlockFaceUV p_188015_4_, float[] p_188015_5_, TextureAtlasSprite p_188015_6_, net.minecraftforge.common.model.ITransformation p_188015_7_, BlockPartRotation p_188015_8_, boolean p_188015_9_) { + EnumFacing enumfacing = p_188015_7_.rotate(p_188015_3_); int i = p_188015_9_ ? this.func_178413_a(enumfacing) : -1; @@ -79,14 +79,14 @@ public int func_199335_a(Vector3f p_199335_1_, EnumFacing p_199335_2_, int p_199335_3_, ModelRotation p_199335_4_) { + return rotateVertex(p_199335_1_, p_199335_2_, p_199335_3_, (net.minecraftforge.common.model.ITransformation)p_199335_4_); + } -+ ++ + public int rotateVertex(Vector3f p_199335_1_, EnumFacing p_199335_2_, int p_199335_3_, net.minecraftforge.common.model.ITransformation p_199335_4_) { if (p_199335_4_ == ModelRotation.X0_Y0) { return p_199335_3_; } else { - this.func_199334_a(p_199335_1_, new Vector3f(0.5F, 0.5F, 0.5F), p_199335_4_.func_195820_a(), new Vector3f(1.0F, 1.0F, 1.0F)); - return p_199335_4_.func_177520_a(p_199335_2_, p_199335_3_); -+ net.minecraftforge.client.ForgeHooksClient.transform(p_199335_1_, p_199335_4_.getMatrix()); ++ net.minecraftforge.client.ForgeHooksClient.transform(p_199335_1_, p_199335_4_.getMatrixVec()); + return p_199335_4_.rotate(p_199335_2_, p_199335_3_); } } diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.java.patch index e6e7366cd..30eff9970 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelBlock.java.patch @@ -39,19 +39,19 @@ - public IBakedModel func_209558_a(Function p_209558_1_, Function p_209558_2_, ModelRotation p_209558_3_, boolean p_209558_4_) { - return this.func_209565_a(this, p_209558_1_, p_209558_2_, p_209558_3_, p_209558_4_); + @Override -+ public IBakedModel bake(Function p_209558_1_, Function p_209558_2_, net.minecraftforge.common.model.IModelState state, boolean uvlock, VertexFormat format) { ++ public IBakedModel bake(Function p_209558_1_, Function p_209558_2_, net.minecraftforge.common.model.IModelState p_209558_3_, boolean p_209558_4_, VertexFormat format) { + if (!net.minecraftforge.client.model.Attributes.moreSpecific(format, net.minecraftforge.client.model.Attributes.DEFAULT_BAKED_FORMAT)) { + throw new IllegalArgumentException("Cannot bake vanilla model to format other than BLOCK"); } -+ return func_209565_a(this, p_209558_1_, p_209558_2_, state, uvlock); ++ return bake(this, p_209558_1_, p_209558_2_, p_209558_3_, p_209558_4_); + } - private IBakedModel func_209565_a(ModelBlock p_209565_1_, Function p_209565_2_, Function p_209565_3_, ModelRotation p_209565_4_, boolean p_209565_5_) { -+ private IBakedModel func_209565_a(ModelBlock p_209565_1_, Function p_209565_2_, Function p_209565_3_, net.minecraftforge.common.model.IModelState state, boolean uvlock) { ++ private IBakedModel bake(ModelBlock p_209565_1_, Function p_209565_2_, Function p_209565_3_, net.minecraftforge.common.model.IModelState p_209565_4_, boolean p_209565_5_) { ModelBlock modelblock = this.func_178310_f(); if (modelblock == ModelBakery.field_177606_o) { - return field_209571_g.func_209579_a(p_209565_3_, this).func_209565_a(p_209565_1_, p_209565_2_, p_209565_3_, p_209565_4_, p_209565_5_); -+ return field_209571_g.func_209579_a(p_209565_3_, this).func_209565_a(p_209565_1_, p_209565_2_, p_209565_3_, state, uvlock); ++ return field_209571_g.func_209579_a(p_209565_3_, this).bake(p_209565_1_, p_209565_2_, p_209565_3_, p_209565_4_, p_209565_5_); } else if (modelblock == ModelBakery.field_177616_r) { return new BuiltInModel(this.func_181682_g(), this.func_209568_a(p_209565_1_, p_209565_2_, p_209565_3_)); } else { @@ -60,11 +60,11 @@ TextureAtlasSprite textureatlassprite1 = p_209565_3_.apply(new ResourceLocation(this.func_178308_c(blockpartface.field_178242_d))); if (blockpartface.field_178244_b == null) { - simplebakedmodel$builder.func_177648_a(func_209567_a(blockpart, blockpartface, textureatlassprite1, enumfacing, p_209565_4_, p_209565_5_)); -+ simplebakedmodel$builder.func_177648_a(makeBakedQuad(blockpart, blockpartface, textureatlassprite1, enumfacing, state, uvlock)); ++ simplebakedmodel$builder.func_177648_a(makeBakedQuad(blockpart, blockpartface, textureatlassprite1, enumfacing, p_209565_4_, p_209565_5_)); } else { - simplebakedmodel$builder.func_177650_a(p_209565_4_.func_177523_a(blockpartface.field_178244_b), func_209567_a(blockpart, blockpartface, textureatlassprite1, enumfacing, p_209565_4_, p_209565_5_)); + -+ simplebakedmodel$builder.func_177650_a(state.apply(Optional.empty()).map(trsr -> trsr.rotate(enumfacing)).orElse(enumfacing), makeBakedQuad(blockpart, blockpartface, textureatlassprite1, enumfacing, state, uvlock)); ++ simplebakedmodel$builder.func_177650_a(p_209565_4_.apply(Optional.empty()).map(trsr -> trsr.rotate(enumfacing)).orElse(enumfacing), makeBakedQuad(blockpart, blockpartface, textureatlassprite1, enumfacing, p_209565_4_, p_209565_5_)); } } } @@ -76,8 +76,8 @@ + return makeBakedQuad(p_209567_0_, p_209567_1_, p_209567_2_, p_209567_3_, (net.minecraftforge.common.model.IModelState) p_209567_4_, p_209567_5_); } -+ public static BakedQuad makeBakedQuad(BlockPart p_209567_0_, BlockPartFace p_209567_1_, TextureAtlasSprite p_209567_2_, EnumFacing p_209567_3_, net.minecraftforge.common.model.IModelState p_209567_4_, boolean p_209567_5_) { -+ return field_209572_h.makeBakedQuad(p_209567_0_.field_178241_a, p_209567_0_.field_178239_b, p_209567_1_, p_209567_2_, p_209567_3_, p_209567_4_.apply(Optional.empty()).orElse(net.minecraftforge.common.model.TRSRTransformation.identity()), p_209567_0_.field_178237_d, p_209567_5_, p_209567_0_.field_178238_e); ++ public static BakedQuad makeBakedQuad(BlockPart p_209567_0, BlockPartFace p_209567_1_, TextureAtlasSprite p_209567_2_, EnumFacing p_209567_3_, net.minecraftforge.common.model.IModelState p_209567_4_, boolean p_209567_5_) { ++ return field_209572_h.makeBakedQuad(p_209567_0.field_178241_a, p_209567_0.field_178239_b, p_209567_1_, p_209567_2_, p_209567_3_, p_209567_4_.apply(Optional.empty()).orElse(net.minecraftforge.common.model.TRSRTransformation.identity()), p_209567_0.field_178237_d, p_209567_5_, p_209567_0.field_178238_e); + } + public boolean func_178300_b(String p_178300_1_) { diff --git a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelRotation.java.patch b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelRotation.java.patch index f882c3ce3..94a53bb4a 100644 --- a/patches/minecraft/net/minecraft/client/renderer/block/model/ModelRotation.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/block/model/ModelRotation.java.patch @@ -16,9 +16,9 @@ public static ModelRotation func_177524_a(int p_177524_0_, int p_177524_1_) { return field_177546_q.get(func_177521_b(MathHelper.func_180184_b(p_177524_0_, 360), MathHelper.func_180184_b(p_177524_1_, 360))); } -+ ++ + public java.util.Optional apply(java.util.Optional part) { return net.minecraftforge.client.ForgeHooksClient.applyTransform(this, part); } -+ public javax.vecmath.Matrix4f getMatrix() { return net.minecraftforge.common.model.TRSRTransformation.from(this).getMatrix(); } ++ public javax.vecmath.Matrix4f getMatrixVec() { return net.minecraftforge.common.model.TRSRTransformation.from(this).getMatrixVec(); } + public EnumFacing rotate(EnumFacing facing) { return func_177523_a(facing); } + public int rotate(EnumFacing facing, int vertexIndex) { return func_177520_a(facing, vertexIndex); } } diff --git a/patches/minecraft/net/minecraft/item/ItemStack.java.patch b/patches/minecraft/net/minecraft/item/ItemStack.java.patch index 247f530ec..0152cbadb 100644 --- a/patches/minecraft/net/minecraft/item/ItemStack.java.patch +++ b/patches/minecraft/net/minecraft/item/ItemStack.java.patch @@ -68,7 +68,7 @@ } public EnumActionResult func_196084_a(ItemUseContext p_196084_1_) { -+ //if (!p_196084_1_.field_196006_g.isRemote) return net.minecraftforge.common.ForgeHooks.onPlaceItemIntoWorld(p_196084_1_); ++ //if (!context.world.isRemote) return net.minecraftforge.common.ForgeHooks.onPlaceItemIntoWorld(context); EntityPlayer entityplayer = p_196084_1_.func_195999_j(); BlockPos blockpos = p_196084_1_.func_195995_a(); BlockWorldState blockworldstate = new BlockWorldState(p_196084_1_.func_195991_k(), blockpos, false); diff --git a/patches/minecraft/net/minecraft/world/lighting/BlockLightEngine.java.patch b/patches/minecraft/net/minecraft/world/lighting/BlockLightEngine.java.patch new file mode 100644 index 000000000..9734005c5 --- /dev/null +++ b/patches/minecraft/net/minecraft/world/lighting/BlockLightEngine.java.patch @@ -0,0 +1,11 @@ +--- a/net/minecraft/world/lighting/BlockLightEngine.java ++++ b/net/minecraft/world/lighting/BlockLightEngine.java +@@ -12,7 +12,7 @@ + + public void func_202677_a(WorldGenRegion p_202677_1_, IChunk p_202677_2_) { + for(BlockPos blockpos : p_202677_2_.func_201582_h()) { +- this.func_202667_a(p_202677_1_, blockpos, this.func_202670_c(p_202677_1_, blockpos)); ++ this.func_202667_a(p_202677_1_, blockpos, this.func_202670_c((net.minecraft.world.IBlockReader)p_202677_1_, blockpos)); //Forge add typecast to fix obf issue. + this.func_202659_a(p_202677_2_.func_76632_l(), blockpos, this.func_202666_a(p_202677_1_, blockpos)); + } + diff --git a/src/main/java/net/minecraftforge/client/CloudRenderer.java b/src/main/java/net/minecraftforge/client/CloudRenderer.java index 32f7c48ee..5debf3661 100644 --- a/src/main/java/net/minecraftforge/client/CloudRenderer.java +++ b/src/main/java/net/minecraftforge/client/CloudRenderer.java @@ -65,7 +65,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener private static final boolean WIREFRAME = false; // Instance fields - private final Minecraft mc = Minecraft.getMinecraft(); + private final Minecraft mc = Minecraft.getInstance(); private final ResourceLocation texture = new ResourceLocation("textures/environment/clouds.png"); private int displayList = -1; @@ -81,7 +81,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener public CloudRenderer() { // Resource manager should always be reloadable. - ((IReloadableResourceManager) mc.func_195551_G()).func_199006_a(this); + ((IReloadableResourceManager) mc.getResourceManager()).addReloadListener(this); } private int getScale() @@ -243,7 +243,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener if (OpenGlHelper.useVbo()) vbo = new VertexBuffer(FORMAT); else - GlStateManager.glNewList(displayList = GLAllocation.generateDisplayLists(1), GL11.GL_COMPILE); + GlStateManager.newList(displayList = GLAllocation.generateDisplayLists(1), GL11.GL_COMPILE); vertices(buffer); @@ -256,7 +256,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener else { tess.draw(); - GlStateManager.glEndList(); + GlStateManager.endList(); } } @@ -275,7 +275,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener boolean newEnabled = ForgeMod.forgeCloudsEnabled && mc.gameSettings.shouldRenderClouds() != 0 && mc.world != null - && mc.world.provider.isSurfaceWorld(); + && mc.world.dimension.isSurfaceWorld(); if (isBuilt() && (!newEnabled @@ -305,7 +305,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener double x = entity.prevPosX + (entity.posX - entity.prevPosX) * partialTicks + totalOffset * 0.03; - double y = mc.world.provider.getCloudHeight() + double y = mc.world.dimension.getCloudHeight() - (entity.lastTickPosY + (entity.posY - entity.lastTickPosY) * partialTicks) + 0.33; double z = entity.prevPosZ + (entity.posZ - entity.prevPosZ) * partialTicks; @@ -322,7 +322,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener GlStateManager.pushMatrix(); // Translate by the remainder after the UV offset. - GlStateManager.translate((offU * scale) - x, y, (offV * scale) - z); + GlStateManager.translated((offU * scale) - x, y, (offV * scale) - z); // Modulo to prevent texture samples becoming inaccurate at extreme offsets. offU = offU % texW; @@ -330,13 +330,13 @@ public class CloudRenderer implements ISelectiveResourceReloadListener // Translate the texture. GlStateManager.matrixMode(GL11.GL_TEXTURE); - GlStateManager.translate(offU * PX_SIZE, offV * PX_SIZE, 0); + GlStateManager.translatef(offU * PX_SIZE, offV * PX_SIZE, 0); GlStateManager.matrixMode(GL11.GL_MODELVIEW); GlStateManager.disableCull(); GlStateManager.enableBlend(); - GlStateManager.tryBlendFuncSeparate( + GlStateManager.blendFuncSeparate( GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); @@ -350,19 +350,19 @@ public class CloudRenderer implements ISelectiveResourceReloadListener COLOR_TEX = new DynamicTexture(1, 1, false); // Apply a color multiplier through a texture upload if shaders aren't supported. - COLOR_TEX.func_195414_e().func_195700_a(0, 0, 255 << 24 + COLOR_TEX.getTextureData().setPixelRGBA(0, 0, 255 << 24 | ((int) (r * 255)) << 16 | ((int) (g * 255)) << 8 | (int) (b * 255)); COLOR_TEX.updateDynamicTexture(); - GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GlStateManager.activeTexture(OpenGlHelper.GL_TEXTURE1); GlStateManager.bindTexture(COLOR_TEX.getGlTextureId()); GlStateManager.enableTexture2D(); // Bind the clouds texture last so the shader's sampler2D is correct. - GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit); - mc.renderEngine.bindTexture(texture); + GlStateManager.activeTexture(OpenGlHelper.GL_TEXTURE0); + mc.textureManager.bindTexture(texture); ByteBuffer buffer = Tessellator.getInstance().getBuffer().getByteBuffer(); @@ -372,12 +372,12 @@ public class CloudRenderer implements ISelectiveResourceReloadListener vbo.bindBuffer(); int stride = FORMAT.getSize(); - GlStateManager.glVertexPointer(3, GL11.GL_FLOAT, stride, 0); - GlStateManager.glEnableClientState(GL11.GL_VERTEX_ARRAY); - GlStateManager.glTexCoordPointer(2, GL11.GL_FLOAT, stride, 12); - GlStateManager.glEnableClientState(GL11.GL_TEXTURE_COORD_ARRAY); - GlStateManager.glColorPointer(4, GL11.GL_UNSIGNED_BYTE, stride, 20); - GlStateManager.glEnableClientState(GL11.GL_COLOR_ARRAY); + GlStateManager.vertexPointer(3, GL11.GL_FLOAT, stride, 0); + GlStateManager.enableClientState(GL11.GL_VERTEX_ARRAY); + GlStateManager.texCoordPointer(2, GL11.GL_FLOAT, stride, 12); + GlStateManager.enableClientState(GL11.GL_TEXTURE_COORD_ARRAY); + GlStateManager.colorPointer(4, GL11.GL_UNSIGNED_BYTE, stride, 20); + GlStateManager.enableClientState(GL11.GL_COLOR_ARRAY); } else { @@ -400,8 +400,8 @@ public class CloudRenderer implements ISelectiveResourceReloadListener // Wireframe for debug. if (WIREFRAME) { - GlStateManager.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE); - GlStateManager.glLineWidth(2.0F); + GlStateManager.polygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_LINE); + GlStateManager.lineWidth(2.0F); GlStateManager.disableTexture2D(); GlStateManager.depthMask(false); GlStateManager.disableFog(); @@ -409,7 +409,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener vbo.drawArrays(GL11.GL_QUADS); else GlStateManager.callList(displayList); - GlStateManager.glPolygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL); + GlStateManager.polygonMode(GL11.GL_FRONT_AND_BACK, GL11.GL_FILL); GlStateManager.depthMask(true); GlStateManager.enableTexture2D(); GlStateManager.enableFog(); @@ -431,9 +431,9 @@ public class CloudRenderer implements ISelectiveResourceReloadListener buffer.position(0); // Disable our coloring. - GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit); + GlStateManager.activeTexture(OpenGlHelper.GL_TEXTURE1); GlStateManager.disableTexture2D(); - GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit); + GlStateManager.activeTexture(OpenGlHelper.GL_TEXTURE0); // Reset texture matrix. GlStateManager.matrixMode(GL11.GL_TEXTURE); @@ -450,9 +450,9 @@ public class CloudRenderer implements ISelectiveResourceReloadListener private void reloadTextures() { - if (mc.renderEngine != null) + if (mc.textureManager != null) { - mc.renderEngine.bindTexture(texture); + mc.textureManager.bindTexture(texture); texW = GlStateManager.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_WIDTH); texH = GlStateManager.glGetTexLevelParameteri(GL11.GL_TEXTURE_2D, 0, GL11.GL_TEXTURE_HEIGHT); } @@ -482,7 +482,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener public static boolean renderClouds(int cloudTicks, float partialTicks, WorldClient world, Minecraft client) { - IRenderHandler renderer = world.provider.getCloudRenderer(); + IRenderHandler renderer = world.dimension.getCloudRenderer(); if (renderer != null) { renderer.render(partialTicks, world, client); diff --git a/src/main/java/net/minecraftforge/client/ForgeClientHandler.java b/src/main/java/net/minecraftforge/client/ForgeClientHandler.java index 655c0e117..0d7ad4069 100644 --- a/src/main/java/net/minecraftforge/client/ForgeClientHandler.java +++ b/src/main/java/net/minecraftforge/client/ForgeClientHandler.java @@ -45,7 +45,7 @@ public class ForgeClientHandler { if (FluidRegistry.isUniversalBucketEnabled()) { - event.getItemColors().func_199877_a(new FluidContainerColorer(), ForgeMod.getInstance().universalBucket); + event.getItemColors().register(new FluidContainerColorer(), ForgeMod.getInstance().universalBucket); } } } diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 8fa57f1d5..d56a05a07 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -266,7 +266,7 @@ public class ForgeHooksClient } skyInit = true; - GameSettings settings = Minecraft.getMinecraft().gameSettings; + GameSettings settings = Minecraft.getInstance().gameSettings; int[] ranges = ForgeMod.blendRanges; int distance = 0; if (settings.fancyGraphics && ranges.length > 0) @@ -360,7 +360,7 @@ public class ForgeHooksClient public static void drawScreen(GuiScreen screen, int mouseX, int mouseY, float partialTicks) { if (!MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.DrawScreenEvent.Pre(screen, mouseX, mouseY, partialTicks))) - screen.drawScreen(mouseX, mouseY, partialTicks); + screen.render(mouseX, mouseY, partialTicks); MinecraftForge.EVENT_BUS.post(new GuiScreenEvent.DrawScreenEvent.Post(screen, mouseX, mouseY, partialTicks)); } @@ -389,18 +389,18 @@ public class ForgeHooksClient m.setIdentity(); m.setTranslation(TRSRTransformation.toVecmath(transform.translation)); t.setIdentity(); - t.rotY(transform.rotation.func_195900_b()); + t.rotY(transform.rotation.getY()); m.mul(t); t.setIdentity(); - t.rotX(transform.rotation.func_195899_a()); + t.rotX(transform.rotation.getX()); m.mul(t); t.setIdentity(); - t.rotZ(transform.rotation.func_195902_c()); + t.rotZ(transform.rotation.getZ()); m.mul(t); t.setIdentity(); - t.m00 = transform.scale.func_195899_a(); - t.m11 = transform.scale.func_195900_b(); - t.m22 = transform.scale.func_195902_c(); + t.m00 = transform.scale.getX(); + t.m11 = transform.scale.getY(); + t.m22 = transform.scale.getZ(); m.mul(t); return m; } @@ -471,10 +471,10 @@ public class ForgeHooksClient glEnableClientState(GL_COLOR_ARRAY); break; case UV: - OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit + attr.getIndex()); + OpenGlHelper.glClientActiveTexture(OpenGlHelper.GL_TEXTURE0 + attr.getIndex()); glTexCoordPointer(count, constant, stride, buffer); glEnableClientState(GL_TEXTURE_COORD_ARRAY); - OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit); + OpenGlHelper.glClientActiveTexture(OpenGlHelper.GL_TEXTURE0); break; case PADDING: break; @@ -503,9 +503,9 @@ public class ForgeHooksClient GlStateManager.resetColor(); break; case UV: - OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit + attr.getIndex()); + OpenGlHelper.glClientActiveTexture(OpenGlHelper.GL_TEXTURE0 + attr.getIndex()); glDisableClientState(GL_TEXTURE_COORD_ARRAY); - OpenGlHelper.setClientActiveTexture(OpenGlHelper.defaultTexUnit); + OpenGlHelper.glClientActiveTexture(OpenGlHelper.GL_TEXTURE0); break; case PADDING: break; @@ -518,15 +518,15 @@ public class ForgeHooksClient public static void transform(net.minecraft.client.renderer.Vector3f vec, Matrix4f m) { - Vector4f tmp = new Vector4f(vec.func_195899_a(), vec.func_195900_b(), vec.func_195902_c(), 1f); + Vector4f tmp = new Vector4f(vec.getX(), vec.getY(), vec.getZ(), 1f); m.transform(tmp); if(Math.abs(tmp.w - 1f) > 1e-5) tmp.scale(1f / tmp.w); - vec.func_195905_a(tmp.x, tmp.y, tmp.z); + vec.set(tmp.x, tmp.y, tmp.z); } public static Matrix4f getMatrix(ModelRotation modelRotation) { - Matrix4f ret = new Matrix4f(TRSRTransformation.toVecmath(modelRotation.func_195820_a()), new Vector3f(), 1), tmp = new Matrix4f(); + Matrix4f ret = new Matrix4f(TRSRTransformation.toVecmath(modelRotation.getMatrix()), new Vector3f(), 1), tmp = new Matrix4f(); tmp.setIdentity(); tmp.m03 = tmp.m13 = tmp.m23 = .5f; ret.mul(tmp, ret); @@ -570,7 +570,7 @@ public class ForgeHooksClient TileEntityRenderer r = TileEntityRendererDispatcher.instance.getRenderer(tileClass); if (r != null) { - r.func_199341_a(null, 0, 0, 0, 0, -1); + r.render(null, 0, 0, 0, 0, -1); } } } @@ -646,7 +646,7 @@ public class ForgeHooksClient public static IBakedModel getDamageModel(IBakedModel ibakedmodel, TextureAtlasSprite texture, IBlockState state, IWorldReader world, BlockPos pos) { state = state.getBlock().getExtendedState(state, world, pos); - return (new SimpleBakedModel.Builder(state, ibakedmodel, texture, new Random(), 42)).makeBakedModel(); + return (new SimpleBakedModel.Builder(state, ibakedmodel, texture, new Random(), 42)).build(); } private static int slotMainHand = 0; @@ -675,8 +675,8 @@ public class ForgeHooksClient public static BlockFaceUV applyUVLock(BlockFaceUV blockFaceUV, EnumFacing originalSide, ITransformation rotation) { - TRSRTransformation global = new TRSRTransformation(rotation.getMatrix()); - Matrix4f uv = global.getUVLockTransform(originalSide).getMatrix(); + TRSRTransformation global = new TRSRTransformation(rotation.getMatrixVec()); + Matrix4f uv = global.getUVLockTransform(originalSide).getMatrixVec(); Vector4f vec = new Vector4f(0, 0, 0, 1); float u0 = blockFaceUV.getVertexU(blockFaceUV.getVertexRotatedRev(0)); float v0 = blockFaceUV.getVertexV(blockFaceUV.getVertexRotatedRev(0)); @@ -740,7 +740,7 @@ public class ForgeHooksClient { TRSRTransformation tr = TRSRTransformation.from(model.getItemCameraTransforms().getTransform(type)); Matrix4f mat = null; - if(!tr.equals(TRSRTransformation.identity())) mat = tr.getMatrix(); + if(!tr.equals(TRSRTransformation.identity())) mat = tr.getMatrixVec(); return Pair.of(model, mat); } diff --git a/src/main/java/net/minecraftforge/client/GuiIngameForge.java b/src/main/java/net/minecraftforge/client/GuiIngameForge.java index 0820155ed..858789092 100644 --- a/src/main/java/net/minecraftforge/client/GuiIngameForge.java +++ b/src/main/java/net/minecraftforge/client/GuiIngameForge.java @@ -106,9 +106,9 @@ public class GuiIngameForge extends GuiIngame @Override public void renderGameOverlay(float partialTicks) { - this.field_194811_H = this.mc.field_195558_d.func_198107_o(); - this.field_194812_I = this.mc.field_195558_d.func_198087_p(); - eventParent = new RenderGameOverlayEvent(partialTicks, this.mc.field_195558_d); + this.scaledWidth = this.mc.mainWindow.getScaledWidth(); + this.scaledHeight = this.mc.mainWindow.getScaledHeight(); + eventParent = new RenderGameOverlayEvent(partialTicks, this.mc.mainWindow); renderHealthMount = mc.player.getRidingEntity() instanceof EntityLivingBase; renderFood = mc.player.getRidingEntity() == null; renderJumpBar = mc.player.isRidingHorse(); @@ -124,71 +124,71 @@ public class GuiIngameForge extends GuiIngame if (renderVignette && Minecraft.isFancyGraphicsEnabled()) { - func_194800_d(mc.player.getBrightness()); + renderVignette(mc.player.getBrightness()); } else { - GlStateManager.enableDepth(); - GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + GlStateManager.enableDepthTest(); + GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); } if (renderHelmet) renderHelmet(partialTicks); if (renderPortal && !mc.player.isPotionActive(MobEffects.NAUSEA)) { - func_194805_e(partialTicks); + renderPortal(partialTicks); } - if (renderHotbar) func_194806_b(partialTicks); + if (renderHotbar) renderHotbar(partialTicks); if (!this.mc.gameSettings.hideGUI) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); zLevel = -90.0F; - rand.setSeed((long)(updateCounter * 312871)); + rand.setSeed((long)(ticks * 312871)); - if (renderCrosshairs) func_194798_c(partialTicks); + if (renderCrosshairs) renderAttackIndicator(partialTicks); if (renderBossHealth) renderBossHealth(); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); if (this.mc.playerController.shouldDrawHUD() && this.mc.getRenderViewEntity() instanceof EntityPlayer) { - if (renderHealth) renderHealth(this.field_194811_H, this.field_194812_I); - if (renderArmor) renderArmor(this.field_194811_H, this.field_194812_I); - if (renderFood) renderFood(this.field_194811_H, this.field_194812_I); - if (renderHealthMount) renderHealthMount(this.field_194811_H, this.field_194812_I); - if (renderAir) renderAir(this.field_194811_H, this.field_194812_I); + if (renderHealth) renderHealth(this.scaledWidth, this.scaledHeight); + if (renderArmor) renderArmor(this.scaledWidth, this.scaledHeight); + if (renderFood) renderFood(this.scaledWidth, this.scaledHeight); + if (renderHealthMount) renderHealthMount(this.scaledWidth, this.scaledHeight); + if (renderAir) renderAir(this.scaledWidth, this.scaledHeight); } if (renderJumpBar) { - func_194803_a(this.field_194811_H / 2 - 91); + renderHorseJumpBar(this.scaledWidth / 2 - 91); } else if (renderExperiance) { - renderExperience(this.field_194811_H / 2 - 91); + renderExperience(this.scaledWidth / 2 - 91); } if (this.mc.gameSettings.heldItemTooltips && this.mc.playerController.getCurrentGameType() != GameType.SPECTATOR) { - this.func_194801_c(); + this.renderSelectedItem(); } else if (this.mc.player.isSpectator()) { - this.spectatorGui.func_195623_a(); + this.spectatorGui.renderSelectedItem(); } } - renderSleepFade(this.field_194811_H, this.field_194812_I); + renderSleepFade(this.scaledWidth, this.scaledHeight); - renderHUDText(this.field_194811_H, this.field_194812_I); + renderHUDText(this.scaledWidth, this.scaledHeight); renderFPSGraph(); - func_194809_b(); + renderPotionEffects(); if (!mc.gameSettings.hideGUI) { - renderRecordOverlay(this.field_194811_H, this.field_194812_I, partialTicks); + renderRecordOverlay(this.scaledWidth, this.scaledHeight, partialTicks); renderSubtitles(); - renderTitle(this.field_194811_H, this.field_194812_I, partialTicks); + renderTitle(this.scaledWidth, this.scaledHeight, partialTicks); } Scoreboard scoreboard = this.mc.world.getScoreboard(); ScoreObjective objective = null; - ScorePlayerTeam scoreplayerteam = scoreboard.getPlayersTeam(mc.player.func_195047_I_()); + ScorePlayerTeam scoreplayerteam = scoreboard.getPlayersTeam(mc.player.getScoreboardName()); if (scoreplayerteam != null) { int slot = scoreplayerteam.getColor().getColorIndex(); @@ -197,46 +197,46 @@ public class GuiIngameForge extends GuiIngame ScoreObjective scoreobjective1 = objective != null ? objective : scoreboard.getObjectiveInDisplaySlot(1); if (renderObjective && scoreobjective1 != null) { - this.func_194802_a(scoreobjective1); + this.renderScoreboard(scoreobjective1); } GlStateManager.enableBlend(); - GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); - GlStateManager.disableAlpha(); + GlStateManager.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); + GlStateManager.disableAlphaTest(); - renderChat(this.field_194811_H, this.field_194812_I); + renderChat(this.scaledWidth, this.scaledHeight); - renderPlayerList(this.field_194811_H, this.field_194812_I); + renderPlayerList(this.scaledWidth, this.scaledHeight); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.disableLighting(); - GlStateManager.enableAlpha(); + GlStateManager.enableAlphaTest(); post(ALL); } @Override - protected void func_194798_c(float partialTicks) + protected void renderAttackIndicator(float partialTicks) { if (pre(CROSSHAIRS)) return; bind(Gui.ICONS); GlStateManager.enableBlend(); - super.func_194798_c(partialTicks); + super.renderAttackIndicator(partialTicks); post(CROSSHAIRS); } @Override - protected void func_194809_b() + protected void renderPotionEffects() { if (pre(POTION_ICONS)) return; - super.func_194809_b(); + super.renderPotionEffects(); post(POTION_ICONS); } protected void renderSubtitles() { if (pre(SUBTITLES)) return; - this.overlaySubtitle.func_195620_a(); + this.overlaySubtitle.render(); post(SUBTITLES); } @@ -245,7 +245,7 @@ public class GuiIngameForge extends GuiIngame { if (pre(BOSSHEALTH)) return; bind(Gui.ICONS); - GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); mc.profiler.startSection("bossHealth"); GlStateManager.enableBlend(); this.overlayBoss.renderBossHealth(); @@ -255,16 +255,16 @@ public class GuiIngameForge extends GuiIngame } @Override - protected void func_194800_d(float lightLevel) + protected void renderVignette(float lightLevel) { if (pre(VIGNETTE)) { // Need to put this here, since Vanilla assumes this state after the vignette was rendered. - GlStateManager.enableDepth(); - GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + GlStateManager.enableDepthTest(); + GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); return; } - super.func_194800_d(lightLevel); + super.renderVignette(lightLevel); post(VIGNETTE); } @@ -277,13 +277,13 @@ public class GuiIngameForge extends GuiIngame if (this.mc.gameSettings.thirdPersonView == 0 && !itemstack.isEmpty()) { Item item = itemstack.getItem(); - if (item == Blocks.field_196625_cS.func_199767_j()) + if (item == Blocks.CARVED_PUMPKIN.asItem()) { - func_194808_p(); + renderPumpkinOverlay(); } else { - item.renderHelmetOverlay(itemstack, mc.player, this.field_194811_H, this.field_194812_I, partialTicks); + item.renderHelmetOverlay(itemstack, mc.player, this.scaledWidth, this.scaledHeight, partialTicks); } } @@ -324,7 +324,7 @@ public class GuiIngameForge extends GuiIngame } @Override - protected void func_194805_e(float partialTicks) + protected void renderPortal(float partialTicks) { if (pre(PORTAL)) return; @@ -332,24 +332,24 @@ public class GuiIngameForge extends GuiIngame if (f1 > 0.0F) { - super.func_194805_e(f1); + super.renderPortal(f1); } post(PORTAL); } @Override - protected void func_194806_b(float partialTicks) + protected void renderHotbar(float partialTicks) { if (pre(HOTBAR)) return; if (mc.playerController.getCurrentGameType() == GameType.SPECTATOR) { - this.spectatorGui.func_195622_a(partialTicks); + this.spectatorGui.renderTooltip(partialTicks); } else { - super.func_194806_b(partialTicks); + super.renderHotbar(partialTicks); } post(HOTBAR); @@ -371,7 +371,7 @@ public class GuiIngameForge extends GuiIngame int top = height - right_height; int air = player.getAir(); - if (player.func_208600_a(FluidTags.field_206959_a) || air < 300) + if (player.areEyesInFluid(FluidTags.WATER) || air < 300) { int full = MathHelper.ceil((double)(air - 2) * 10.0D / 300.0D); int partial = MathHelper.ceil((double)air * 10.0D / 300.0D) - full; @@ -397,37 +397,37 @@ public class GuiIngameForge extends GuiIngame EntityPlayer player = (EntityPlayer)this.mc.getRenderViewEntity(); int health = MathHelper.ceil(player.getHealth()); - boolean highlight = healthUpdateCounter > (long)updateCounter && (healthUpdateCounter - (long)updateCounter) / 3L %2L == 1L; + boolean highlight = healthUpdateCounter > (long)ticks && (healthUpdateCounter - (long)ticks) / 3L %2L == 1L; if (health < this.playerHealth && player.hurtResistantTime > 0) { - this.lastSystemTime = Util.func_211177_b(); - this.healthUpdateCounter = (long)(this.updateCounter + 20); + this.lastSystemTime = Util.milliTime(); + this.healthUpdateCounter = (long)(this.ticks + 20); } else if (health > this.playerHealth && player.hurtResistantTime > 0) { - this.lastSystemTime = Util.func_211177_b(); - this.healthUpdateCounter = (long)(this.updateCounter + 10); + this.lastSystemTime = Util.milliTime(); + this.healthUpdateCounter = (long)(this.ticks + 10); } - if (Util.func_211177_b() - this.lastSystemTime > 1000L) + if (Util.milliTime() - this.lastSystemTime > 1000L) { this.playerHealth = health; this.lastPlayerHealth = health; - this.lastSystemTime = Util.func_211177_b(); + this.lastSystemTime = Util.milliTime(); } this.playerHealth = health; int healthLast = this.lastPlayerHealth; - IAttributeInstance attrMaxHealth = player.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH); - float healthMax = (float)attrMaxHealth.getAttributeValue(); + IAttributeInstance attrMaxHealth = player.getAttribute(SharedMonsterAttributes.MAX_HEALTH); + float healthMax = (float)attrMaxHealth.getValue(); float absorb = MathHelper.ceil(player.getAbsorptionAmount()); int healthRows = MathHelper.ceil((healthMax + absorb) / 2.0F / 10.0F); int rowHeight = Math.max(10 - (healthRows - 2), 3); - this.rand.setSeed((long)(updateCounter * 312871)); + this.rand.setSeed((long)(ticks * 312871)); int left = width / 2 - 91; int top = height - left_height; @@ -437,10 +437,10 @@ public class GuiIngameForge extends GuiIngame int regen = -1; if (player.isPotionActive(MobEffects.REGENERATION)) { - regen = updateCounter % 25; + regen = ticks % 25; } - final int TOP = 9 * (mc.world.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); + final int TOP = 9 * (mc.world.getWorldInfo().isHardcore() ? 5 : 0); final int BACKGROUND = (highlight ? 25 : 16); int MARGIN = 16; if (player.isPotionActive(MobEffects.POISON)) MARGIN += 36; @@ -524,7 +524,7 @@ public class GuiIngameForge extends GuiIngame } if (unused) background = 1; //Probably should be a += 1 but vanilla never uses this - if (player.getFoodStats().getSaturationLevel() <= 0.0F && updateCounter % (level * 3 + 1) == 0) + if (player.getFoodStats().getSaturationLevel() <= 0.0F && ticks % (level * 3 + 1) == 0) { y = top + (rand.nextInt(3) - 1); } @@ -546,8 +546,8 @@ public class GuiIngameForge extends GuiIngame if (mc.player.getSleepTimer() > 0) { mc.profiler.startSection("sleep"); - GlStateManager.disableDepth(); - GlStateManager.disableAlpha(); + GlStateManager.disableDepthTest(); + GlStateManager.disableAlphaTest(); int sleepTime = mc.player.getSleepTimer(); float opacity = (float)sleepTime / 100.0F; @@ -558,8 +558,8 @@ public class GuiIngameForge extends GuiIngame int color = (int)(220.0F * opacity) << 24 | 1052704; drawRect(0, 0, width, height, color); - GlStateManager.enableAlpha(); - GlStateManager.enableDepth(); + GlStateManager.enableAlphaTest(); + GlStateManager.enableDepthTest(); mc.profiler.endSection(); } } @@ -568,28 +568,28 @@ public class GuiIngameForge extends GuiIngame { bind(ICONS); if (pre(EXPERIENCE)) return; - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.disableBlend(); if (mc.playerController.gameIsSurvivalOrAdventure()) { - super.func_194804_b(x); + super.renderExpBar(x); } GlStateManager.enableBlend(); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); post(EXPERIENCE); } @Override - public void func_194803_a(int x) + public void renderHorseJumpBar(int x) { bind(ICONS); if (pre(JUMPBAR)) return; GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.disableBlend(); - super.func_194803_a(x); + super.renderHorseJumpBar(x); GlStateManager.enableBlend(); mc.profiler.endSection(); @@ -601,13 +601,13 @@ public class GuiIngameForge extends GuiIngame protected void renderHUDText(int width, int height) { mc.profiler.startSection("forgeHudText"); - OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); + OpenGlHelper.glBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); ArrayList listL = new ArrayList(); ArrayList listR = new ArrayList(); if (mc.isDemo()) { - long time = mc.world.getTotalWorldTime(); + long time = mc.world.getGameTime(); if (time >= 120500L) { listR.add(I18n.format("demo.demoExpired")); @@ -674,9 +674,9 @@ public class GuiIngameForge extends GuiIngame if (opacity > 0) { GlStateManager.pushMatrix(); - GlStateManager.translate((float)(width / 2), (float)(height - 68), 0.0F); + GlStateManager.translatef((float)(width / 2), (float)(height - 68), 0.0F); GlStateManager.enableBlend(); - GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); int color = (animateOverlayMessageColor ? Color.HSBtoRGB(hue / 50.0F, 0.7F, 0.6F) & WHITE : WHITE); fontrenderer.drawStringWithShadow(overlayMessage, -fontrenderer.getStringWidth(overlayMessage) / 2, -4, color | (opacity << 24)); GlStateManager.disableBlend(); @@ -707,16 +707,16 @@ public class GuiIngameForge extends GuiIngame if (opacity > 8) { GlStateManager.pushMatrix(); - GlStateManager.translate((float)(width / 2), (float)(height / 2), 0.0F); + GlStateManager.translatef((float)(width / 2), (float)(height / 2), 0.0F); GlStateManager.enableBlend(); - GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); GlStateManager.pushMatrix(); - GlStateManager.scale(4.0F, 4.0F, 4.0F); + GlStateManager.scalef(4.0F, 4.0F, 4.0F); int l = opacity << 24 & -16777216; this.getFontRenderer().drawStringWithShadow(this.displayedTitle, (float)(-this.getFontRenderer().getStringWidth(this.displayedTitle) / 2), -10.0F, 16777215 | l); GlStateManager.popMatrix(); GlStateManager.pushMatrix(); - GlStateManager.scale(2.0F, 2.0F, 2.0F); + GlStateManager.scalef(2.0F, 2.0F, 2.0F); this.getFontRenderer().drawStringWithShadow(this.displayedSubTitle, (float)(-this.getFontRenderer().getStringWidth(this.displayedSubTitle) / 2), 5.0F, 16777215 | l); GlStateManager.popMatrix(); GlStateManager.disableBlend(); @@ -735,8 +735,8 @@ public class GuiIngameForge extends GuiIngame if (MinecraftForge.EVENT_BUS.post(event)) return; GlStateManager.pushMatrix(); - GlStateManager.translate((float) event.getPosX(), (float) event.getPosY(), 0.0F); - persistantChatGUI.drawChat(updateCounter); + GlStateManager.translatef((float) event.getPosX(), (float) event.getPosY(), 0.0F); + persistantChatGUI.drawChat(ticks); GlStateManager.popMatrix(); post(CHAT); @@ -751,14 +751,14 @@ public class GuiIngameForge extends GuiIngame if (mc.gameSettings.keyBindPlayerList.isKeyDown() && (!mc.isIntegratedServerRunning() || handler.getPlayerInfoMap().size() > 1 || scoreobjective != null)) { - this.overlayPlayerList.updatePlayerList(true); + this.overlayPlayerList.setVisible(true); if (pre(PLAYER_LIST)) return; this.overlayPlayerList.renderPlayerlist(width, this.mc.world.getScoreboard(), scoreobjective); post(PLAYER_LIST); } else { - this.overlayPlayerList.updatePlayerList(false); + this.overlayPlayerList.setVisible(false); } } @@ -836,10 +836,10 @@ public class GuiIngameForge extends GuiIngame this.mc = mc; } @Override protected void renderDebugInfoLeft(){} - @Override protected void func_194819_c(){} + @Override protected void renderDebugInfoRight(){} private List getLeft() { - List ret = this.func_209011_c(); + List ret = this.call(); ret.add(""); ret.add("Debug: Pie [shift]: " + (this.mc.gameSettings.showDebugProfilerChart ? "visible" : "hidden") + " FPS [alt]: " + (this.mc.gameSettings.showLagometer ? "visible" : "hidden")); ret.add("For help: press F3 + Q"); diff --git a/src/main/java/net/minecraftforge/client/ItemModelMesherForge.java b/src/main/java/net/minecraftforge/client/ItemModelMesherForge.java index 06a9dc7ed..27e3edbed 100644 --- a/src/main/java/net/minecraftforge/client/ItemModelMesherForge.java +++ b/src/main/java/net/minecraftforge/client/ItemModelMesherForge.java @@ -50,13 +50,13 @@ public class ItemModelMesherForge extends ItemModelMesher @Override @Nullable - public IBakedModel func_199312_b(Item item) + public IBakedModel getItemModel(Item item) { return models.get(item.delegate); } @Override - public void func_199311_a(Item item, ModelResourceLocation location) + public void register(Item item, ModelResourceLocation location) { IRegistryDelegate key = item.delegate; locations.put(key, location); diff --git a/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java b/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java index 7cdc1693e..65ee3f9dc 100644 --- a/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java +++ b/src/main/java/net/minecraftforge/client/MinecraftForgeClient.java @@ -53,7 +53,7 @@ public class MinecraftForgeClient */ public static Locale getLocale() { - return Minecraft.getMinecraft().getLanguageManager().getCurrentLanguage().getJavaLocale(); + return Minecraft.getInstance().getLanguageManager().getCurrentLanguage().getJavaLocale(); } private static BitSet stencilBits = new BitSet(8); diff --git a/src/main/java/net/minecraftforge/client/event/EntityViewRenderEvent.java b/src/main/java/net/minecraftforge/client/event/EntityViewRenderEvent.java index 4a1d2faa2..fb2a2b829 100644 --- a/src/main/java/net/minecraftforge/client/event/EntityViewRenderEvent.java +++ b/src/main/java/net/minecraftforge/client/event/EntityViewRenderEvent.java @@ -25,6 +25,8 @@ import net.minecraft.entity.Entity; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.eventbus.api.Event.HasResult; + /** * Event that hooks into EntityRenderer, allowing any feature to customize visual attributes * the player sees. diff --git a/src/main/java/net/minecraftforge/client/event/PlayerSPPushOutOfBlocksEvent.java b/src/main/java/net/minecraftforge/client/event/PlayerSPPushOutOfBlocksEvent.java index 4c42d135c..51d98c368 100644 --- a/src/main/java/net/minecraftforge/client/event/PlayerSPPushOutOfBlocksEvent.java +++ b/src/main/java/net/minecraftforge/client/event/PlayerSPPushOutOfBlocksEvent.java @@ -44,4 +44,4 @@ public class PlayerSPPushOutOfBlocksEvent extends PlayerEvent public AxisAlignedBB getEntityBoundingBox() { return entityBoundingBox; } public void setEntityBoundingBox(@Nonnull AxisAlignedBB entityBoundingBox) { this.entityBoundingBox = entityBoundingBox; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/client/event/RenderPlayerEvent.java b/src/main/java/net/minecraftforge/client/event/RenderPlayerEvent.java index e571c3895..abf1e4cef 100644 --- a/src/main/java/net/minecraftforge/client/event/RenderPlayerEvent.java +++ b/src/main/java/net/minecraftforge/client/event/RenderPlayerEvent.java @@ -135,4 +135,4 @@ public abstract class RenderPlayerEvent extends PlayerEvent return stack; } } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java b/src/main/java/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java index a68824907..0ab3b5219 100644 --- a/src/main/java/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java +++ b/src/main/java/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java @@ -29,4 +29,4 @@ public class PlaySoundSourceEvent extends SoundSourceEvent { super(manager, sound, uuid); } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java b/src/main/java/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java index bab96ed32..028e844e1 100644 --- a/src/main/java/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java +++ b/src/main/java/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java @@ -29,4 +29,4 @@ public class PlayStreamingSourceEvent extends SoundSourceEvent { super(manager, sound, uuid); } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/client/extensions/IForgeKeybinding.java b/src/main/java/net/minecraftforge/client/extensions/IForgeKeybinding.java index 23fa52651..0167b7985 100644 --- a/src/main/java/net/minecraftforge/client/extensions/IForgeKeybinding.java +++ b/src/main/java/net/minecraftforge/client/extensions/IForgeKeybinding.java @@ -18,12 +18,12 @@ public interface IForgeKeybinding */ default boolean isActiveAndMatches(InputMappings.Input keyCode) { - return keyCode.func_197937_c() != 0 && keyCode.equals(getKey()) && getKeyConflictContext().isActive() && getKeyModifier().isActive(getKeyConflictContext()); + return keyCode.getKeyCode() != 0 && keyCode.equals(getKey()) && getKeyConflictContext().isActive() && getKeyModifier().isActive(getKeyConflictContext()); } default void setToDefault() { - setKeyModifierAndCode(getKeyModifierDefault(), getKeyBinding().func_197977_i()); + setKeyModifierAndCode(getKeyModifierDefault(), getKeyBinding().getDefault()); } void setKeyConflictContext(IKeyConflictContext keyConflictContext); diff --git a/src/main/java/net/minecraftforge/client/gui/NotificationModUpdateScreen.java b/src/main/java/net/minecraftforge/client/gui/NotificationModUpdateScreen.java index d92a80abb..ce9a6a545 100644 --- a/src/main/java/net/minecraftforge/client/gui/NotificationModUpdateScreen.java +++ b/src/main/java/net/minecraftforge/client/gui/NotificationModUpdateScreen.java @@ -61,15 +61,15 @@ public class NotificationModUpdateScreen extends GuiScreen } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) + public void render(int mouseX, int mouseY, float partialTicks) { if (showNotification == null || !showNotification.shouldDraw() || ForgeMod.disableVersionCheck) { return; } - Minecraft.getMinecraft().getTextureManager().bindTexture(VERSION_CHECK_ICONS); - GlStateManager.color(1, 1, 1, 1); + Minecraft.getInstance().getTextureManager().bindTexture(VERSION_CHECK_ICONS); + GlStateManager.color4f(1, 1, 1, 1); GlStateManager.pushMatrix(); int x = modButton.x; diff --git a/src/main/java/net/minecraftforge/client/model/BakedItemModel.java b/src/main/java/net/minecraftforge/client/model/BakedItemModel.java index 1fda67cdb..1f8a6c3de 100644 --- a/src/main/java/net/minecraftforge/client/model/BakedItemModel.java +++ b/src/main/java/net/minecraftforge/client/model/BakedItemModel.java @@ -67,7 +67,7 @@ public class BakedItemModel implements IBakedModel @Override public ItemOverrideList getOverrides() { return overrides; } @Override - public List func_200117_a(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { if (side == null) { @@ -105,7 +105,7 @@ public class BakedItemModel implements IBakedModel } @Override - public List func_200117_a (@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) + public List getQuads (@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { if(side == null) { diff --git a/src/main/java/net/minecraftforge/client/model/BakedModelWrapper.java b/src/main/java/net/minecraftforge/client/model/BakedModelWrapper.java index f8b9b6808..adc276c61 100644 --- a/src/main/java/net/minecraftforge/client/model/BakedModelWrapper.java +++ b/src/main/java/net/minecraftforge/client/model/BakedModelWrapper.java @@ -43,9 +43,9 @@ public abstract class BakedModelWrapper implements IBaked } @Override - public List func_200117_a(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { - return originalModel.func_200117_a(state, side, rand); + return originalModel.getQuads(state, side, rand); } @Override diff --git a/src/main/java/net/minecraftforge/client/model/FancyMissingModel.java b/src/main/java/net/minecraftforge/client/model/FancyMissingModel.java index b33509e55..ae6a0a657 100644 --- a/src/main/java/net/minecraftforge/client/model/FancyMissingModel.java +++ b/src/main/java/net/minecraftforge/client/model/FancyMissingModel.java @@ -68,9 +68,9 @@ final class FancyMissingModel implements IUnbakedModel m.m33 = 1; m.setTranslation(new Vector3f(1, 1 + 1f / 0x100, 0)); return new SimpleModelFontRenderer( - Minecraft.getMinecraft().gameSettings, + Minecraft.getInstance().gameSettings, font, - Minecraft.getMinecraft().getTextureManager(), + Minecraft.getInstance().getTextureManager(), false, m, format @@ -92,15 +92,15 @@ final class FancyMissingModel implements IUnbakedModel this.missingModel = missingModel; this.message = message; } - + @Override - public Collection func_209559_a(Function p_209559_1_, Set p_209559_2_) + public Collection getTextures(Function modelGetter, Set missingTextureErrors) { return ImmutableList.of(font2); } - + @Override - public Collection getOverrideLocations() + public Collection getOverrideLocations() { return Collections.emptyList(); } @@ -145,7 +145,7 @@ final class FancyMissingModel implements IUnbakedModel } @Override - public List func_200117_a(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { if (side == null) { @@ -161,16 +161,16 @@ final class FancyMissingModel implements IUnbakedModel } for (int y = 0; y < splitLines.size(); y++) { - fontRenderer.func_211126_b(splitLines.get(y), 0, ((y - splitLines.size() / 2f) * fontRenderer.FONT_HEIGHT) + 0x40, 0xFF00FFFF); + fontRenderer.drawString(splitLines.get(y), 0, ((y - splitLines.size() / 2f) * fontRenderer.FONT_HEIGHT) + 0x40, 0xFF00FFFF); } ImmutableList.Builder builder = ImmutableList.builder(); - builder.addAll(missingModel.func_200117_a (state, side, rand)); + builder.addAll(missingModel.getQuads (state, side, rand)); builder.addAll(fontRenderer.build()); quads = builder.build(); } return quads; } - return missingModel.func_200117_a (state, side, rand); + return missingModel.getQuads (state, side, rand); } @Override @@ -186,7 +186,7 @@ final class FancyMissingModel implements IUnbakedModel public TextureAtlasSprite getParticleTexture() { return fontTexture; } @Override - public ItemOverrideList getOverrides() { return ItemOverrideList.NONE; } + public ItemOverrideList getOverrides() { return ItemOverrideList.EMPTY; } @Override public Pair handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) @@ -230,9 +230,9 @@ final class FancyMissingModel implements IUnbakedModel } if (big != this.big) { - return Pair.of(otherModel, transform.getMatrix()); + return Pair.of(otherModel, transform.getMatrixVec()); } - return Pair.of(this, transform.getMatrix()); + return Pair.of(this, transform.getMatrixVec()); } } } diff --git a/src/main/java/net/minecraftforge/client/model/ICustomModelLoader.java b/src/main/java/net/minecraftforge/client/model/ICustomModelLoader.java index a6d4cd3f4..c68704b19 100644 --- a/src/main/java/net/minecraftforge/client/model/ICustomModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/ICustomModelLoader.java @@ -31,14 +31,14 @@ import net.minecraft.util.ResourceLocation; public interface ICustomModelLoader extends ISelectiveResourceReloadListener { @Override - void func_195410_a(IResourceManager resourceManager); + void onResourceManagerReload(IResourceManager resourceManager); @Override default void onResourceManagerReload(IResourceManager resourceManager, Predicate resourcePredicate) { if (resourcePredicate.test(VanillaResourceType.MODELS)) { - func_195410_a(resourceManager); + onResourceManagerReload(resourceManager); } } diff --git a/src/main/java/net/minecraftforge/client/model/IModel.java b/src/main/java/net/minecraftforge/client/model/IModel.java index d5f07c62c..a14aa541f 100644 --- a/src/main/java/net/minecraftforge/client/model/IModel.java +++ b/src/main/java/net/minecraftforge/client/model/IModel.java @@ -43,7 +43,7 @@ import net.minecraftforge.common.model.animation.IClip; public interface IModel> { @Nullable - IBakedModel bake(Function p_209558_1_, Function p_209558_2_, IModelState state, boolean uvlock, VertexFormat format); + IBakedModel bake(Function modelGetter, Function spriteGetter, IModelState state, boolean uvlock, VertexFormat format); /* * Default state this model will be baked with. diff --git a/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java b/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java index 38df66e7e..ca68b87fc 100644 --- a/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java +++ b/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java @@ -64,7 +64,7 @@ public final class ItemLayerModel implements IUnbakedModel public ItemLayerModel(ImmutableList textures) { - this(textures, ItemOverrideList.NONE); + this(textures, ItemOverrideList.EMPTY); } public ItemLayerModel(ImmutableList textures, ItemOverrideList overrides) @@ -75,7 +75,7 @@ public final class ItemLayerModel implements IUnbakedModel public ItemLayerModel(ModelBlock model) { - this(getTextures(model), model.func_209568_a(model, ModelLoader.defaultModelGetter(), ModelLoader.defaultTextureGetter())); + this(getTextures(model), model.getOverrides(model, ModelLoader.defaultModelGetter(), ModelLoader.defaultTextureGetter())); } private static ImmutableList getTextures(ModelBlock model) @@ -87,17 +87,17 @@ public final class ItemLayerModel implements IUnbakedModel } return builder.build(); } - + @Override - public Collection func_209559_a(Function p_209559_1_, Set p_209559_2_) + public Collection getTextures(Function modelGetter, Set missingTextureErrors) { return textures; } - + @Override - public Collection getOverrideLocations() + public Collection getOverrideLocations() { - return Collections.emptyList(); + return Collections.emptyList(); } @Override @@ -117,9 +117,9 @@ public final class ItemLayerModel implements IUnbakedModel } return new ItemLayerModel(builder.build(), overrides); } - + @Override - public IBakedModel bake(Function p_209558_1_, Function bakedTextureGetter, IModelState state, boolean p_209558_4_, VertexFormat format) { + public IBakedModel bake(Function modelGetter, Function bakedTextureGetter, IModelState state, boolean uvlock, VertexFormat format) { ImmutableList.Builder builder = ImmutableList.builder(); Optional transform = state.apply(Optional.empty()); for(int i = 0; i < textures.size(); i++) @@ -136,8 +136,8 @@ public final class ItemLayerModel implements IUnbakedModel { ImmutableList.Builder builder = ImmutableList.builder(); - int uMax = sprite.getIconWidth(); - int vMax = sprite.getIconHeight(); + int uMax = sprite.getWidth(); + int vMax = sprite.getHeight(); FaceData faceData = new FaceData(uMax, vMax); boolean translucent = false; @@ -343,8 +343,8 @@ public final class ItemLayerModel implements IUnbakedModel { final float eps = 1e-2f; - int width = sprite.getIconWidth(); - int height = sprite.getIconHeight(); + int width = sprite.getWidth(); + int height = sprite.getHeight(); float x0 = (float) u / width; float y0 = (float) v / height; @@ -424,7 +424,7 @@ public final class ItemLayerModel implements IUnbakedModel vec.y = y; vec.z = z; vec.w = 1; - transform.get().getMatrix().transform(vec); + transform.get().getMatrixVec().transform(vec); builder.put(e, vec.x, vec.y, vec.z, vec.w); } else @@ -455,7 +455,7 @@ public final class ItemLayerModel implements IUnbakedModel INSTANCE; @Override - public void func_195410_a(IResourceManager resourceManager) {} + public void onResourceManagerReload(IResourceManager resourceManager) {} @Override public boolean accepts(ResourceLocation modelLocation) diff --git a/src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java b/src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java index f5840b86e..604abf122 100644 --- a/src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java +++ b/src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java @@ -80,8 +80,8 @@ public final class ItemTextureQuadConverter */ public static List convertTextureHorizontal(VertexFormat format, TRSRTransformation transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, EnumFacing facing, int color, int tint) { - int w = template.getIconWidth(); - int h = template.getIconHeight(); + int w = template.getWidth(); + int h = template.getHeight(); float wScale = 16f / (float)w; float hScale = 16f / (float)h; List quads = Lists.newArrayList(); @@ -93,7 +93,7 @@ public final class ItemTextureQuadConverter for (int x = 0; x < w; x++) { // current pixel - boolean isVisible = !template.func_195662_a(0, x, y); + boolean isVisible = !template.isPixelTransparent(0, x, y); // no current quad but found a new one if (start < 0 && isVisible) @@ -111,7 +111,7 @@ public final class ItemTextureQuadConverter { for (int i = 0; i < w; i++) { - if (template.func_195662_a(0, i, y) != template.func_195662_a(0, i, endY)) + if (template.isPixelTransparent(0, i, y) != template.isPixelTransparent(0, i, endY)) { sameRow = false; break; @@ -158,8 +158,8 @@ public final class ItemTextureQuadConverter */ public static List convertTextureVertical(VertexFormat format, TRSRTransformation transform, TextureAtlasSprite template, TextureAtlasSprite sprite, float z, EnumFacing facing, int color, int tint) { - int w = template.getIconWidth(); - int h = template.getIconHeight(); + int w = template.getWidth(); + int h = template.getHeight(); float wScale = 16f / (float)w; float hScale = 16f / (float)h; List quads = Lists.newArrayList(); @@ -171,7 +171,7 @@ public final class ItemTextureQuadConverter for (int y = 0; y < h; y++) { // current pixel - boolean isVisible = !sprite.func_195662_a(0, x, y); + boolean isVisible = !sprite.isPixelTransparent(0, x, y); // no current quad but found a new one if (start < 0 && isVisible) @@ -189,7 +189,7 @@ public final class ItemTextureQuadConverter { for (int i = 0; i < h; i++) { - if (sprite.func_195662_a(0, x, i) != sprite.func_195662_a(0, endX, i)) + if (sprite.isPixelTransparent(0, x, i) != sprite.isPixelTransparent(0, endX, i)) { sameColumn = false; break; @@ -305,7 +305,7 @@ public final class ItemTextureQuadConverter vec.y = y; vec.z = z; vec.w = 1; - transform.getMatrix().transform(vec); + transform.getMatrixVec().transform(vec); builder.put(e, vec.x, vec.y, vec.z, vec.w); } break; diff --git a/src/main/java/net/minecraftforge/client/model/ModelDynBucket.java b/src/main/java/net/minecraftforge/client/model/ModelDynBucket.java index 189e25648..fab677d37 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelDynBucket.java +++ b/src/main/java/net/minecraftforge/client/model/ModelDynBucket.java @@ -111,7 +111,7 @@ public final class ModelDynBucket implements IUnbakedModel } @Override - public Collection func_209559_a(Function p_209559_1_, Set p_209559_2_) + public Collection getTextures(Function modelGetter, Set missingTextureErrors) { ImmutableSet.Builder builder = ImmutableSet.builder(); @@ -160,7 +160,7 @@ public final class ModelDynBucket implements IUnbakedModel // build base (insidest) IBakedModel model = (new ItemLayerModel(ImmutableList.of(baseLocation))).bake(modelGetter, bakedTextureGetter, state, uvlock, format); random.setSeed(42); - builder.addAll(model.func_200117_a(null, null, random)); + builder.addAll(model.getQuads(null, null, random)); particleSprite = model.getParticleTexture(); } if (liquidLocation != null && fluidSprite != null) @@ -260,7 +260,7 @@ public final class ModelDynBucket implements IUnbakedModel { try { - return Minecraft.getMinecraft().func_195551_G().func_199002_a(resourceLocation); + return Minecraft.getInstance().getResourceManager().getResource(resourceLocation); } catch (IOException ignored) { @@ -298,7 +298,7 @@ public final class ModelDynBucket implements IUnbakedModel } @Override - public void func_195410_a(IResourceManager resourceManager) + public void onResourceManagerReload(IResourceManager resourceManager) { // no need to clear cache since we create a new model instance } @@ -331,7 +331,7 @@ public final class ModelDynBucket implements IUnbakedModel private BucketBaseSprite(IResource resource) { - super(resource.func_199029_a(), getSizeInfo(resource), resource.func_199028_a(AnimationMetadataSection.field_195817_a)); + super(resource.getLocation(), getSizeInfo(resource), resource.getMetadata(AnimationMetadataSection.SERIALIZER)); } /* TODO Custom TAS @@ -373,7 +373,7 @@ public final class ModelDynBucket implements IUnbakedModel private BucketCoverSprite(IResource resource) { - super(resource.func_199029_a(), getSizeInfo(resource), resource.func_199028_a(AnimationMetadataSection.field_195817_a)); + super(resource.getLocation(), getSizeInfo(resource), resource.getMetadata(AnimationMetadataSection.SERIALIZER)); } /* TODO Custom TAS @@ -404,7 +404,7 @@ public final class ModelDynBucket implements IUnbakedModel IResource mask = getResource(new ResourceLocation(ForgeVersion.MOD_ID, "textures/items/vanilla_bucket_cover_mask.png")) ) { // use the alpha mask if it fits, otherwise leave the cover texture blank - if (empty != null && mask != null && Objects.equals(empty.func_199026_d(), mask.func_199026_d()) && + if (empty != null && mask != null && Objects.equals(empty.getPackName(), mask.getPackName()) && alphaMask.getIconWidth() == width && alphaMask.getIconHeight() == height) { final int[][] oldPixels = sprite.getFrameTextureData(0); @@ -437,7 +437,7 @@ public final class ModelDynBucket implements IUnbakedModel private BakedDynBucketOverrideHandler() {} @Override - public IBakedModel func_209581_a(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity) + public IBakedModel getModelWithOverrides(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity) { return FluidUtil.getFluidContained(stack) .map(fluidStack -> { @@ -450,7 +450,7 @@ public final class ModelDynBucket implements IUnbakedModel { IUnbakedModel parent = model.parent.process(ImmutableMap.of("fluid", name)); Function textureGetter; - textureGetter = location -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); + textureGetter = location -> Minecraft.getInstance().getTextureMap().getAtlasSprite(location.toString()); IBakedModel bakedModel = parent.bake(ModelLoader.defaultModelGetter(), textureGetter, new SimpleModelState(model.transforms), false, model.format); model.cache.put(name, bakedModel); diff --git a/src/main/java/net/minecraftforge/client/model/ModelFluid.java b/src/main/java/net/minecraftforge/client/model/ModelFluid.java index c598b1589..c6716d9fa 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelFluid.java +++ b/src/main/java/net/minecraftforge/client/model/ModelFluid.java @@ -79,13 +79,13 @@ public final class ModelFluid implements IUnbakedModel } @Override - public Collection func_209559_a(Function modelGetter, Set p_209559_2_) + public Collection getTextures(Function modelGetter, Set missingTextureErrors) { return fluid.getOverlay() != null ? ImmutableSet.of(fluid.getStill(), fluid.getFlowing(), fluid.getOverlay()) : ImmutableSet.of(fluid.getStill(), fluid.getFlowing()); } - + @Override public Collection getOverrideLocations() { return Collections.emptyList(); @@ -112,7 +112,7 @@ public final class ModelFluid implements IUnbakedModel INSTANCE; @Override - public void func_195410_a(IResourceManager resourceManager) {} + public void onResourceManagerReload(IResourceManager resourceManager) {} @Override public boolean accepts(ResourceLocation modelLocation) @@ -229,7 +229,7 @@ public final class ModelFluid implements IUnbakedModel } @Override - public List func_200117_a(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { if (side != null && state instanceof IExtendedBlockState) { @@ -255,10 +255,10 @@ public final class ModelFluid implements IUnbakedModel key <<= 1; key |= 1; - return modelCache.getUnchecked(key).func_200117_a(state, side, rand); + return modelCache.getUnchecked(key).getQuads(state, side, rand); } - return super.func_200117_a(state, side, rand); + return super.getQuads(state, side, rand); } } @@ -432,7 +432,7 @@ public final class ModelFluid implements IUnbakedModel if(transformation.isPresent() && !transformation.get().isIdentity()) { Vector4f vec = new Vector4f(data); - transformation.get().getMatrix().transform(vec); + transformation.get().getMatrixVec().transform(vec); vec.get(data); } builder.put(e, data); @@ -484,7 +484,7 @@ public final class ModelFluid implements IUnbakedModel } @Override - public List func_200117_a(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { return side == null ? ImmutableList.of() : faceQuads.get(side); } @@ -492,7 +492,7 @@ public final class ModelFluid implements IUnbakedModel @Override public ItemOverrideList getOverrides() { - return ItemOverrideList.NONE; + return ItemOverrideList.EMPTY; } @Override diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java index 734ae12e8..6605d74fe 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java @@ -162,45 +162,45 @@ public final class ModelLoader extends ModelBakery return bakedRegistry; isLoading = true; - + missingModel = ModelLoaderRegistry.getMissingModel(); stateModels.put(MODEL_MISSING, missingModel); final Set textures = Sets.newHashSet(ModelLoaderRegistry.getTextures()); - textures.remove(MissingTextureSprite.func_195675_b()); + textures.remove(MissingTextureSprite.getLocation()); textures.addAll(LOCATIONS_BUILTIN_TEXTURES); - textureMap.func_195426_a(resourceManager, textures); - + textureMap.stitch(resourceManager, textures); + field_209607_C.forEach((p_209602_2_, p_209602_3_) -> { p_209602_3_.getValidStates().forEach((p_209601_3_) -> { - this.func_209594_a(map, BlockModelShapes.func_209553_a(p_209602_2_, p_209601_3_)); + this.getUnbakedModel(map, BlockModelShapes.getModelLocation(p_209602_2_, p_209601_3_)); }); }); for(ResourceLocation resourcelocation : Item.REGISTRY.getKeys()) { - this.func_209594_a(map, new ModelResourceLocation(resourcelocation, "inventory")); + this.getUnbakedModel(map, new ModelResourceLocation(resourcelocation, "inventory")); } - this.func_209594_a(map, new ModelResourceLocation("minecraft:trident_in_hand#inventory")); + this.getUnbakedModel(map, new ModelResourceLocation("minecraft:trident_in_hand#inventory")); Set set = Sets.newLinkedHashSet(); Set set1 = (Set)map.values().stream().flatMap((p_209595_2_) -> { - return p_209595_2_.func_209559_a(this::func_209597_a, set).stream(); + return p_209595_2_.getTextures(this::getUnbakedModel, set).stream(); }).collect(Collectors.toSet()); set1.addAll(LOCATIONS_BUILTIN_TEXTURES); set.forEach((p_209588_0_) -> { LOGGER.warn("Unable to resolve texture reference: {}", (Object)p_209588_0_); }); - this.textureMap.func_195426_a(this.resourceManager, set1); + this.textureMap.stitch(this.resourceManager, set1); map.forEach((p_209599_1_, p_209599_2_) -> { - IBakedModel ibakedmodel = p_209599_2_.func_209558_a(this::func_209597_a, this.textureMap::func_195424_a, ModelRotation.X0_Y0, false); + IBakedModel ibakedmodel = p_209599_2_.bake(this::getUnbakedModel, this.textureMap::getSprite, ModelRotation.X0_Y0, false); if (ibakedmodel != null) { this.bakedRegistry.putObject(p_209599_1_, ibakedmodel); } }); return this.bakedRegistry; - + IBakedModel missingBaked = missingModel.bake(defaultModelGetter(), defaultTextureGetter(), missingModel.getDefaultState(), false, DefaultVertexFormats.ITEM); Map bakedModels = Maps.newHashMap(); HashMultimap models = HashMultimap.create(); @@ -356,8 +356,8 @@ public final class ModelLoader extends ModelBakery private final class VanillaModelWrapper implements IUnbakedModel { - private final FaceBakery faceBakery = new FaceBakery(); - + private final FaceBakery faceBakery = new FaceBakery(); + private final ResourceLocation location; private final ModelBlock model; private final boolean uvlock; @@ -390,9 +390,9 @@ public final class ModelLoader extends ModelBakery } return ImmutableSet.copyOf(set); } - + @Override - public Collection func_209559_a(Function p_209559_1_, Set p_209559_2_) + public Collection getTextures(Function modelGetter, Set missingTextureErrors) { // setting parent here to make textures resolve properly if(model.getParentLocation() != null) @@ -471,7 +471,7 @@ public final class ModelLoader extends ModelBakery { return new ItemLayerModel(model).bake(modelGetter, bakedTextureGetter, perState, uvlock, format); } - if(model == ModelBakery.MODEL_ENTITY) return new BuiltInModel(transforms, model.func_209568_a(model, modelGetter, bakedTextureGetter)); + if(model == ModelBakery.MODEL_ENTITY) return new BuiltInModel(transforms, model.getOverrides(model, modelGetter, bakedTextureGetter)); return bakeNormal(model, perState, state, newTransforms, format, modelGetter, bakedTextureGetter, uvlock); } @@ -479,7 +479,7 @@ public final class ModelLoader extends ModelBakery { final TRSRTransformation baseState = modelState.apply(Optional.empty()).orElse(TRSRTransformation.identity()); TextureAtlasSprite particle = bakedTextureGetter.apply(new ResourceLocation(model.resolveTextureName("particle"))); - SimpleBakedModel.Builder builder = (new SimpleBakedModel.Builder(model, model.func_209568_a(model, modelGetter, bakedTextureGetter))).setTexture(particle); + SimpleBakedModel.Builder builder = (new SimpleBakedModel.Builder(model, model.getOverrides(model, modelGetter, bakedTextureGetter))).setTexture(particle); for(int i = 0; i < model.getElements().size(); i++) { if(modelState.apply(Optional.of(Models.getHiddenModelPart(ImmutableList.of(Integer.toString(i))))).isPresent()) @@ -499,7 +499,7 @@ public final class ModelLoader extends ModelBakery { TextureAtlasSprite textureatlassprite1 = bakedTextureGetter.apply(new ResourceLocation(model.resolveTextureName(e.getValue().texture))); - if (e.getValue().cullFace == null || !TRSRTransformation.isInteger(transformation.getMatrix())) + if (e.getValue().cullFace == null || !TRSRTransformation.isInteger(transformation.getMatrixVec())) { builder.addGeneralQuad(ModelBlock.makeBakedQuad(part, e.getValue(), textureatlassprite1, e.getKey(), transformation, uvLocked)); } @@ -510,12 +510,12 @@ public final class ModelLoader extends ModelBakery } } - return new PerspectiveMapWrapper(builder.makeBakedModel(), perState) + return new PerspectiveMapWrapper(builder.build(), perState) { private final ItemOverrideList overrides = new AnimationItemOverrideList(VanillaModelWrapper.this, modelState, format, bakedTextureGetter, super.getOverrides()); @Override - public List func_200117_a(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { if(state instanceof IExtendedBlockState) { @@ -526,11 +526,11 @@ public final class ModelLoader extends ModelBakery IExtendedBlockState newExState = (IExtendedBlockState) exState.withProperty(Properties.AnimationProperty, null); if(newState != null) { - return VanillaModelWrapper.this.bake(modelGetter, bakedTextureGetter, new ModelStateComposition(modelState, newState), uvlock, format).func_200117_a(newExState, side, rand); + return VanillaModelWrapper.this.bake(modelGetter, bakedTextureGetter, new ModelStateComposition(modelState, newState), uvlock, format).getQuads(newExState, side, rand); } } } - return super.func_200117_a(state, side, rand); + return super.getQuads(state, side, rand); } @Override @@ -675,7 +675,7 @@ public final class ModelLoader extends ModelBakery ModelLoaderRegistry.getModelOrMissing(location); } //FMLLog.getLogger().error("Exception resolving indirect dependencies for model" + loc, e); - textures.addAll(model.func_209559_a(ModelLoader.defaultModelGetter(), new HashSet<>())); // Kick this, just in case. + textures.addAll(model.getTextures(ModelLoader.defaultModelGetter(), new HashSet<>())); // Kick this, just in case. models.add(model); @@ -703,15 +703,15 @@ public final class ModelLoader extends ModelBakery this.models = models; this.defaultState = defaultState; } - + @Override - public Collection getOverrideLocations() + public Collection getOverrideLocations() { return ImmutableList.copyOf(locations); } - + @Override - public Collection func_209559_a(Function p_209559_1_, Set p_209559_2_) + public Collection getTextures(Function modelGetter, Set missingTextureErrors) { return ImmutableSet.copyOf(textures); } @@ -734,7 +734,7 @@ public final class ModelLoader extends ModelBakery IUnbakedModel model = models.get(i); builder.add(model.bake(modelGetter, bakedTextureGetter, MultiModelState.getPartState(state, model, i), uvlock, format), variants.get(i).getWeight()); } - return builder.func_209614_a(); + return builder.build(); } @Override @@ -757,7 +757,7 @@ public final class ModelLoader extends ModelBakery for(int i = 0; i < this.variants.size(); i++) { IUnbakedModel retextured = this.models.get(i).retexture(textures); - modelTextures.addAll(retextured.func_209559_a(ModelLoader.defaultModelGetter(), new HashSet<>())); + modelTextures.addAll(retextured.getTextures(ModelLoader.defaultModelGetter(), new HashSet<>())); retexturedModels.add(retextured); builder.add(Pair.of(retextured, this.variants.get(i).getState())); } @@ -850,7 +850,7 @@ public final class ModelLoader extends ModelBakery // NOOP, handled in loader @Override - public void func_195410_a(IResourceManager resourceManager) {} + public void onResourceManagerReload(IResourceManager resourceManager) {} @Override public boolean accepts(ResourceLocation modelLocation) @@ -887,17 +887,17 @@ public final class ModelLoader extends ModelBakery return "VanillaLoader.INSTANCE"; } } - + // Temporary to compile things public static final class White { - public static final ResourceLocation LOCATION = new ResourceLocation("white"); - public static final TextureAtlasSprite INSTANCE = MissingTextureSprite.func_195677_a(); + public static final ResourceLocation LOCATION = new ResourceLocation("white"); + public static final TextureAtlasSprite INSTANCE = MissingTextureSprite.getSprite(); } /** * 16x16 pure white sprite. */ - /*/ TODO Custom TAS + /*/ TODO Custom TAS public static final class White extends TextureAtlasSprite { public static final ResourceLocation LOCATION = new ResourceLocation("white"); @@ -955,7 +955,7 @@ public final class ModelLoader extends ModelBakery */ public void onPostBakeEvent(IRegistry modelRegistry) { - IBakedModel missingModel = modelRegistry.getObject(MODEL_MISSING); + IBakedModel missingModel = modelRegistry.get(MODEL_MISSING); for(Map.Entry entry : loadingExceptions.entrySet()) { // ignoring pure ResourceLocation arguments, all things we care about pass ModelResourceLocation @@ -963,23 +963,23 @@ public final class ModelLoader extends ModelBakery { LOGGER.debug(MODELLOADING, ()-> new ModelLoaderErrorMessage((ModelResourceLocation)entry.getKey(), entry.getValue())); final ModelResourceLocation location = (ModelResourceLocation)entry.getKey(); - final IBakedModel model = modelRegistry.getObject(location); + final IBakedModel model = modelRegistry.get(location); if(model == null) { - modelRegistry.putObject(location, missingModel); + modelRegistry.put(location, missingModel); } } } for(ModelResourceLocation missing : missingVariants) { - IBakedModel model = modelRegistry.getObject(missing); + IBakedModel model = modelRegistry.get(missing); if(model == null || model == missingModel) { LOGGER.debug(MODELLOADING, ()-> new ModelLoaderErrorMessage(missing, null)); } if(model == null) { - modelRegistry.putObject(missing, missingModel); + modelRegistry.put(missing, missingModel); } } loadingExceptions.clear(); @@ -1047,7 +1047,7 @@ public final class ModelLoader extends ModelBakery { for (Entry, Integer>, ModelResourceLocation> e : customModels.entrySet()) { - mesher.func_199311_a(e.getKey().getLeft().get(), e.getValue()); + mesher.register(e.getKey().getLeft().get(), e.getValue()); } } */ @@ -1058,10 +1058,10 @@ public final class ModelLoader extends ModelBakery @Override public TextureAtlasSprite apply(ResourceLocation location) { - return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString()); + return Minecraft.getInstance().getTextureMap().getAtlasSprite(location.toString()); } } - + private static final Function DEFAULT_MODEL_GETTER = ModelLoaderRegistry::getModelOrMissing; /** @@ -1071,10 +1071,10 @@ public final class ModelLoader extends ModelBakery { return DefaultTextureGetter.INSTANCE; } - + public static Function defaultModelGetter() { - return DEFAULT_MODEL_GETTER; + return DEFAULT_MODEL_GETTER; } protected static enum VariantLoader implements ICustomModelLoader @@ -1090,7 +1090,7 @@ public final class ModelLoader extends ModelBakery // NOOP, handled in loader @Override - public void func_195410_a(IResourceManager resourceManager) {} + public void onResourceManagerReload(IResourceManager resourceManager) {} @Override public boolean accepts(ResourceLocation modelLocation) @@ -1101,7 +1101,7 @@ public final class ModelLoader extends ModelBakery @Override public IUnbakedModel loadModel(ResourceLocation modelLocation) throws Exception { - return loader.func_209597_a(modelLocation); + return loader.getUnbakedModel(modelLocation); } @Override diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoaderRegistry.java b/src/main/java/net/minecraftforge/client/model/ModelLoaderRegistry.java index 5cde6a68a..860fe278f 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoaderRegistry.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoaderRegistry.java @@ -79,7 +79,7 @@ public class ModelLoaderRegistry public static void registerLoader(ICustomModelLoader loader) { loaders.add(loader); - ((IReloadableResourceManager) Minecraft.getMinecraft().func_195551_G()).func_199006_a(loader); + ((IReloadableResourceManager) Minecraft.getInstance().getResourceManager()).addReloadListener(loader); } public static boolean loaded(ResourceLocation location) @@ -174,7 +174,7 @@ public class ModelLoaderRegistry { throw new LoaderException(String.format("Loader %s returned null while loading model %s", accepted, location)); } - textures.addAll(model.func_209559_a(ModelLoader.defaultModelGetter(), new HashSet<>())); + textures.addAll(model.getTextures(ModelLoader.defaultModelGetter(), new HashSet<>())); } finally { @@ -237,7 +237,7 @@ public class ModelLoaderRegistry { //IModel model = new FancyMissingModel(ExceptionUtils.getStackTrace(cause).replaceAll("\\t", " ")); IUnbakedModel model = new FancyMissingModel(getMissingModel(), location.toString()); - textures.addAll(model.func_209559_a(null, null)); + textures.addAll(model.getTextures(null, null)); return model; } diff --git a/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java b/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java index 87b1d65e3..7b2f31e3c 100644 --- a/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java +++ b/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java @@ -77,7 +77,7 @@ public final class MultiLayerModel implements IUnbakedModel } @Override - public Collection func_209559_a(Function p_209559_1_, Set p_209559_2_) + public Collection getTextures(Function modelGetter, Set missingTextureErrors) { return Collections.emptyList(); } @@ -154,7 +154,7 @@ public final class MultiLayerModel implements IUnbakedModel } @Override - public List func_200117_a(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { BlockRenderLayer layer = MinecraftForgeClient.getRenderLayer(); if (layer == null) @@ -162,12 +162,12 @@ public final class MultiLayerModel implements IUnbakedModel ImmutableList.Builder builder = ImmutableList.builder(); for (IBakedModel model : models.values()) { - builder.addAll(model.func_200117_a(state, side, rand)); + builder.addAll(model.getQuads(state, side, rand)); } return builder.build(); } // assumes that child model will handle this state properly. FIXME? - return models.getOrDefault(Optional.of(layer), missing).func_200117_a(state, side, rand); + return models.getOrDefault(Optional.of(layer), missing).getQuads(state, side, rand); } @Override @@ -209,7 +209,7 @@ public final class MultiLayerModel implements IUnbakedModel @Override public ItemOverrideList getOverrides() { - return ItemOverrideList.NONE; + return ItemOverrideList.EMPTY; } } @@ -218,7 +218,7 @@ public final class MultiLayerModel implements IUnbakedModel INSTANCE; @Override - public void func_195410_a(IResourceManager resourceManager) {} + public void onResourceManagerReload(IResourceManager resourceManager) {} @Override public boolean accepts(ResourceLocation modelLocation) diff --git a/src/main/java/net/minecraftforge/client/model/MultiModel.java b/src/main/java/net/minecraftforge/client/model/MultiModel.java index 13aaaf76b..88e0e9d75 100644 --- a/src/main/java/net/minecraftforge/client/model/MultiModel.java +++ b/src/main/java/net/minecraftforge/client/model/MultiModel.java @@ -63,7 +63,7 @@ import com.google.common.collect.Sets; public final class MultiModel implements IUnbakedModel { private static final Logger LOGGER = LogManager.getLogger(); - + private static final class Baked implements IBakedModel { private final ResourceLocation location; @@ -76,7 +76,7 @@ public final class MultiModel implements IUnbakedModel private final ItemOverrideList overrides = new ItemOverrideList() { @Override - public IBakedModel func_209581_a(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity) + public IBakedModel getModelWithOverrides(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity) { if(originalModel != Baked.this) { @@ -87,7 +87,7 @@ public final class MultiModel implements IUnbakedModel if(base != null) { - newBase = base.getOverrides().func_209581_a(base, stack, world, entity); + newBase = base.getOverrides().getModelWithOverrides(base, stack, world, entity); if(base != newBase) { dirty = true; @@ -96,7 +96,7 @@ public final class MultiModel implements IUnbakedModel ImmutableMap.Builder builder = ImmutableMap.builder(); for(Map.Entry entry : parts.entrySet()) { - IBakedModel newPart = entry.getValue().getOverrides().func_209581_a(entry.getValue(), stack, world, entity); + IBakedModel newPart = entry.getValue().getOverrides().getModelWithOverrides(entry.getValue(), stack, world, entity); builder.put(entry.getKey(), newPart); if(entry.getValue() != newPart) { @@ -188,16 +188,16 @@ public final class MultiModel implements IUnbakedModel } @Override - public List func_200117_a(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { ImmutableList.Builder quads = ImmutableList.builder(); if (base != null) { - quads.addAll(base.func_200117_a(state, side, rand)); + quads.addAll(base.getQuads(state, side, rand)); } for (IBakedModel bakedPart : parts.values()) { - quads.addAll(bakedPart.func_200117_a(state, side, rand)); + quads.addAll(bakedPart.getQuads(state, side, rand)); } return quads.build(); } @@ -207,7 +207,7 @@ public final class MultiModel implements IUnbakedModel { Pair p = transforms.get(cameraTransformType); if (p == null) return Pair.of(this, null); - return Pair.of(p.getLeft(), p.getRight().getMatrix()); + return Pair.of(p.getLeft(), p.getRight().getMatrixVec()); } @Override @@ -247,9 +247,9 @@ public final class MultiModel implements IUnbakedModel { this(location, base, ImmutableMap.copyOf(parts)); } - + @Override - public Collection getOverrideLocations() + public Collection getOverrideLocations() { Set deps = Sets.newHashSet(); @@ -261,17 +261,17 @@ public final class MultiModel implements IUnbakedModel return deps; } - + @Override - public Collection func_209559_a(Function modelGetter, Set missingTextures) + public Collection getTextures(Function modelGetter, Set missingTextures) { Set deps = Sets.newHashSet(); if (base != null) - deps.addAll(base.func_209559_a(modelGetter, missingTextures)); + deps.addAll(base.getTextures(modelGetter, missingTextures)); for (Pair pair : parts.values()) - deps.addAll(pair.getLeft().func_209559_a(modelGetter, missingTextures)); + deps.addAll(pair.getLeft().getTextures(modelGetter, missingTextures)); return deps; } diff --git a/src/main/java/net/minecraftforge/client/model/PerspectiveMapWrapper.java b/src/main/java/net/minecraftforge/client/model/PerspectiveMapWrapper.java index 91571526a..7a18233a3 100644 --- a/src/main/java/net/minecraftforge/client/model/PerspectiveMapWrapper.java +++ b/src/main/java/net/minecraftforge/client/model/PerspectiveMapWrapper.java @@ -88,7 +88,7 @@ public class PerspectiveMapWrapper implements IBakedModel TRSRTransformation tr = transforms.getOrDefault(cameraTransformType, TRSRTransformation.identity()); if (!tr.isIdentity()) { - return Pair.of(model, TRSRTransformation.blockCornerToCenter(tr).getMatrix()); + return Pair.of(model, TRSRTransformation.blockCornerToCenter(tr).getMatrixVec()); } return Pair.of(model, null); } @@ -98,7 +98,7 @@ public class PerspectiveMapWrapper implements IBakedModel TRSRTransformation tr = state.apply(Optional.of(cameraTransformType)).orElse(TRSRTransformation.identity()); if (!tr.isIdentity()) { - return Pair.of(model, TRSRTransformation.blockCornerToCenter(tr).getMatrix()); + return Pair.of(model, TRSRTransformation.blockCornerToCenter(tr).getMatrixVec()); } return Pair.of(model, null); } @@ -110,7 +110,7 @@ public class PerspectiveMapWrapper implements IBakedModel @Override public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); } @SuppressWarnings("deprecation") @Override public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); } - @Override public List func_200117_a(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { return parent.func_200117_a(state, side, rand); } + @Override public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { return parent.getQuads(state, side, rand); } @Override public ItemOverrideList getOverrides() { return parent.getOverrides(); } @Override diff --git a/src/main/java/net/minecraftforge/client/model/animation/Animation.java b/src/main/java/net/minecraftforge/client/model/animation/Animation.java index 148ef735b..7be147e37 100644 --- a/src/main/java/net/minecraftforge/client/model/animation/Animation.java +++ b/src/main/java/net/minecraftforge/client/model/animation/Animation.java @@ -47,10 +47,10 @@ public enum Animation { if (worldRef == null || worldRef.get() != world) { - epochTime = world.getTotalWorldTime(); + epochTime = world.getGameTime(); worldRef = new WeakReference<>(world); } - return (world.getTotalWorldTime() - epochTime + tickProgress) / 20; + return (world.getGameTime() - epochTime + tickProgress) / 20; } /** diff --git a/src/main/java/net/minecraftforge/client/model/animation/AnimationItemOverrideList.java b/src/main/java/net/minecraftforge/client/model/animation/AnimationItemOverrideList.java index d83670948..821482a3d 100644 --- a/src/main/java/net/minecraftforge/client/model/animation/AnimationItemOverrideList.java +++ b/src/main/java/net/minecraftforge/client/model/animation/AnimationItemOverrideList.java @@ -65,7 +65,7 @@ public final class AnimationItemOverrideList extends ItemOverrideList } @Override - public IBakedModel func_209581_a(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity) + public IBakedModel getModelWithOverrides(IBakedModel originalModel, ItemStack stack, @Nullable World world, @Nullable EntityLivingBase entity) { return stack.getCapability(CapabilityAnimation.ANIMATION_CAPABILITY, null) .map(asm -> @@ -78,12 +78,12 @@ public final class AnimationItemOverrideList extends ItemOverrideList } if(world == null) { - w = Minecraft.getMinecraft().world; + w = Minecraft.getInstance().world; } return asm.apply(Animation.getWorldTime(world, Animation.getPartialTickTime())).getLeft(); }) // TODO where should uvlock data come from? .map(state -> model.bake(ModelLoader.defaultModelGetter(), bakedTextureGetter, new ModelStateComposition(state, this.state), false, format)) - .orElseGet(() -> super.func_209581_a(originalModel, stack, world, entity)); + .orElseGet(() -> super.getModelWithOverrides(originalModel, stack, world, entity)); } } diff --git a/src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java b/src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java index de3a511bf..e7d79c152 100644 --- a/src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java +++ b/src/main/java/net/minecraftforge/client/model/animation/AnimationModelBase.java @@ -82,7 +82,7 @@ public class AnimationModelBase extends ModelBase implements I RenderHelper.disableStandardItemLighting(); GlStateManager.pushMatrix(); - GlStateManager.rotate(180, 0, 0, 1); + GlStateManager.rotatef(180, 0, 0, 1); Tessellator tessellator = Tessellator.getInstance(); BufferBuilder builder = tessellator.getBuffer(); builder.begin(GL11.GL_QUADS, DefaultVertexFormats.BLOCK); @@ -95,7 +95,7 @@ public class AnimationModelBase extends ModelBase implements I boolean empty = true; Random random = new Random(); random.setSeed(42); - List quads = bakedModel.func_200117_a(null, null, random); + List quads = bakedModel.getQuads(null, null, random); if(!quads.isEmpty()) { lighter.updateBlockInfo(); @@ -108,7 +108,7 @@ public class AnimationModelBase extends ModelBase implements I for(EnumFacing side : EnumFacing.values()) { random.setSeed(42); - quads = bakedModel.func_200117_a(null, side, random); + quads = bakedModel.getQuads(null, side, random); if(!quads.isEmpty()) { if(empty) lighter.updateBlockInfo(); diff --git a/src/main/java/net/minecraftforge/client/model/animation/AnimationTESR.java b/src/main/java/net/minecraftforge/client/model/animation/AnimationTESR.java index 65cb8bed6..152886fde 100644 --- a/src/main/java/net/minecraftforge/client/model/animation/AnimationTESR.java +++ b/src/main/java/net/minecraftforge/client/model/animation/AnimationTESR.java @@ -56,13 +56,13 @@ public class AnimationTESR extends FastTESR implements { return; } - if(blockRenderer == null) blockRenderer = Minecraft.getMinecraft().getBlockRendererDispatcher(); + if(blockRenderer == null) blockRenderer = Minecraft.getInstance().getBlockRendererDispatcher(); BlockPos pos = te.getPos(); IWorldReader world = MinecraftForgeClient.getRegionRenderCache(te.getWorld(), pos); IBlockState state = world.getBlockState(pos); - if(state.getBlock().getBlockState().getProperties().contains(Properties.StaticProperty)) + if(state.getBlock().getStateContainer().getProperties().contains(Properties.StaticProperty)) { - state = state.func_206870_a(Properties.StaticProperty, false); + state = state.with(Properties.StaticProperty, false); } if(state instanceof IExtendedBlockState) { @@ -76,12 +76,12 @@ public class AnimationTESR extends FastTESR implements handleEvents(te, time, pair.getRight()); // TODO: caching? - IBakedModel model = blockRenderer.getBlockModelShapes().getModelForState(exState.getClean()); + IBakedModel model = blockRenderer.getBlockModelShapes().getModel(exState.getClean()); IExtendedBlockState animState = (IExtendedBlockState) exState.withProperty(Properties.AnimationProperty, pair.getLeft()); renderer.setTranslation(x - pos.getX(), y - pos.getY(), z - pos.getZ()); - blockRenderer.getBlockModelRenderer().func_199324_a(world, model, animState, pos, renderer, false, new Random(), 42); + blockRenderer.getBlockModelRenderer().renderModel(world, model, animState, pos, renderer, false, new Random(), 42); }); } } diff --git a/src/main/java/net/minecraftforge/client/model/animation/FastTESR.java b/src/main/java/net/minecraftforge/client/model/animation/FastTESR.java index 371f6d829..be1b054f3 100644 --- a/src/main/java/net/minecraftforge/client/model/animation/FastTESR.java +++ b/src/main/java/net/minecraftforge/client/model/animation/FastTESR.java @@ -34,7 +34,7 @@ import net.minecraft.tileentity.TileEntity; public abstract class FastTESR extends TileEntityRenderer { @Override - public final void func_199341_a(T te, double x, double y, double z, float partialTicks, int destroyStage) + public final void render(T te, double x, double y, double z, float partialTicks, int destroyStage) { Tessellator tessellator = Tessellator.getInstance(); BufferBuilder buffer = tessellator.getBuffer(); diff --git a/src/main/java/net/minecraftforge/client/model/animation/ModelBlockAnimation.java b/src/main/java/net/minecraftforge/client/model/animation/ModelBlockAnimation.java index 6d76497f7..c5af59c27 100644 --- a/src/main/java/net/minecraftforge/client/model/animation/ModelBlockAnimation.java +++ b/src/main/java/net/minecraftforge/client/model/animation/ModelBlockAnimation.java @@ -71,8 +71,8 @@ import com.google.gson.annotations.SerializedName; public class ModelBlockAnimation { - private static final Logger LOGGER = LogManager.getLogger(); - + private static final Logger LOGGER = LogManager.getLogger(); + private final ImmutableMap> joints; private final ImmutableMap clips; private transient ImmutableMultimap jointIndexMap; @@ -534,7 +534,7 @@ public class ModelBlockAnimation if(trOp.isPresent() && !trOp.get().isIdentity()) { float w = info.getWeights().get(i)[0]; - tmp = trOp.get().getMatrix(); + tmp = trOp.get().getMatrixVec(); tmp.mul(w); m.add(tmp); weight += w; @@ -557,9 +557,9 @@ public class ModelBlockAnimation { try { - try (IResource resource = manager.func_199002_a(armatureLocation)) + try (IResource resource = manager.getResource(armatureLocation)) { - ModelBlockAnimation mba = mbaGson.fromJson(new InputStreamReader(resource.func_199027_b(), StandardCharsets.UTF_8), ModelBlockAnimation.class); + ModelBlockAnimation mba = mbaGson.fromJson(new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8), ModelBlockAnimation.class); //String json = mbaGson.toJson(mba); return mba; } diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java index 09623d542..f404a3ef9 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java @@ -98,8 +98,8 @@ import com.google.gson.JsonParser; public enum B3DLoader implements ICustomModelLoader { INSTANCE; - - private static final Logger LOGGER = LogManager.getLogger(); + + private static final Logger LOGGER = LogManager.getLogger(); private IResourceManager manager; @@ -112,7 +112,7 @@ public enum B3DLoader implements ICustomModelLoader } @Override - public void func_195410_a(IResourceManager manager) + public void onResourceManagerReload(IResourceManager manager) { this.manager = manager; cache.clear(); @@ -136,17 +136,17 @@ public enum B3DLoader implements ICustomModelLoader { try { - resource = manager.func_199002_a(file); + resource = manager.getResource(file); } catch(FileNotFoundException e) { if(modelLocation.getPath().startsWith("models/block/")) - resource = manager.func_199002_a(new ResourceLocation(file.getNamespace(), "models/item/" + file.getPath().substring("models/block/".length()))); + resource = manager.getResource(new ResourceLocation(file.getNamespace(), "models/item/" + file.getPath().substring("models/block/".length()))); else if(modelLocation.getPath().startsWith("models/item/")) - resource = manager.func_199002_a(new ResourceLocation(file.getNamespace(), "models/block/" + file.getPath().substring("models/item/".length()))); + resource = manager.getResource(new ResourceLocation(file.getNamespace(), "models/block/" + file.getPath().substring("models/item/".length()))); else throw e; } - B3DModel.Parser parser = new B3DModel.Parser(resource.func_199027_b()); + B3DModel.Parser parser = new B3DModel.Parser(resource.getInputStream()); B3DModel model = parser.parse(); cache.put(file, model); } @@ -365,7 +365,7 @@ public enum B3DLoader implements ICustomModelLoader @Override public TRSRTransformation getInvBindPose() { - Matrix4f m = new TRSRTransformation(node.getPos(), node.getRot(), node.getScale(), null).getMatrix(); + Matrix4f m = new TRSRTransformation(node.getPos(), node.getRot(), node.getScale(), null).getMatrixVec(); m.invert(); TRSRTransformation pose = new TRSRTransformation(m); @@ -452,17 +452,17 @@ public enum B3DLoader implements ICustomModelLoader if(path.endsWith(".png")) path = path.substring(0, path.length() - ".png".length()); return path; } - + @Override - public Collection func_209559_a(Function p_209559_1_, Set p_209559_2_) + public Collection getTextures(Function modelGetter, Set missingTextureErrors) { return Collections2.filter(textures.values(), loc -> !loc.getPath().startsWith("#")); } - + @Override - public Collection getOverrideLocations() + public Collection getOverrideLocations() { - return Collections.emptyList(); + return Collections.emptyList(); } @Override @@ -647,7 +647,7 @@ public enum B3DLoader implements ICustomModelLoader } @Override - public List func_200117_a(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) + public List getQuads(@Nullable IBlockState state, @Nullable EnumFacing side, Random rand) { if(side != null) return ImmutableList.of(); IModelState modelState = this.state; @@ -723,7 +723,7 @@ public enum B3DLoader implements ICustomModelLoader @Override public Matrix4f apply(Node node) { - return global.compose(localCache.getUnchecked(node)).getMatrix(); + return global.compose(localCache.getUnchecked(node)).getMatrixVec(); } }); for(Face f : faces) @@ -834,7 +834,7 @@ public enum B3DLoader implements ICustomModelLoader public ItemOverrideList getOverrides() { // TODO handle items - return ItemOverrideList.NONE; + return ItemOverrideList.EMPTY; } } } diff --git a/src/main/java/net/minecraftforge/client/model/obj/OBJLoader.java b/src/main/java/net/minecraftforge/client/model/obj/OBJLoader.java index 1d6ba9f66..03e1e257d 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/OBJLoader.java +++ b/src/main/java/net/minecraftforge/client/model/obj/OBJLoader.java @@ -58,7 +58,7 @@ public enum OBJLoader implements ICustomModelLoader { } @Override - public void func_195410_a(IResourceManager resourceManager) + public void onResourceManagerReload(IResourceManager resourceManager) { this.manager = resourceManager; cache.clear(); @@ -82,14 +82,14 @@ public enum OBJLoader implements ICustomModelLoader { { try { - resource = manager.func_199002_a(file); + resource = manager.getResource(file); } catch (FileNotFoundException e) { if (modelLocation.getPath().startsWith("models/block/")) - resource = manager.func_199002_a(new ResourceLocation(file.getNamespace(), "models/item/" + file.getPath().substring("models/block/".length()))); + resource = manager.getResource(new ResourceLocation(file.getNamespace(), "models/item/" + file.getPath().substring("models/block/".length()))); else if (modelLocation.getPath().startsWith("models/item/")) - resource = manager.func_199002_a(new ResourceLocation(file.getNamespace(), "models/block/" + file.getPath().substring("models/item/".length()))); + resource = manager.getResource(new ResourceLocation(file.getNamespace(), "models/block/" + file.getPath().substring("models/item/".length()))); else throw e; } OBJModel.Parser parser = new OBJModel.Parser(resource, manager); diff --git a/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java b/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java index b7ed0ae5c..ed8243e47 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java +++ b/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java @@ -83,8 +83,8 @@ import com.google.common.collect.Maps; public class OBJModel implements IUnbakedModel { - private static final Logger LOGGER = LogManager.getLogger(); - + private static final Logger LOGGER = LogManager.getLogger(); + //private Gson GSON = new GsonBuilder().create(); private MaterialLibrary matLib; private final ResourceLocation modelLocation; @@ -103,7 +103,7 @@ public class OBJModel implements IUnbakedModel } @Override - public Collection func_209559_a(Function p_209559_1_, Set p_209559_2_) + public Collection getTextures(Function modelGetter, Set missingTextureErrors) { Iterator materialIterator = this.matLib.materials.values().iterator(); List textures = Lists.newArrayList(); @@ -116,11 +116,11 @@ public class OBJModel implements IUnbakedModel } return textures; } - + @Override - public Collection getOverrideLocations() + public Collection getOverrideLocations() { - return Collections.emptyList(); + return Collections.emptyList(); } @Override @@ -216,8 +216,8 @@ public class OBJModel implements IUnbakedModel public Parser(IResource from, IResourceManager manager) throws IOException { this.manager = manager; - this.objFrom = from.func_199029_a(); - this.objStream = new InputStreamReader(from.func_199027_b(), StandardCharsets.UTF_8); + this.objFrom = from.getLocation(); + this.objStream = new InputStreamReader(from.getInputStream(), StandardCharsets.UTF_8); this.objReader = new BufferedReader(objStream); } @@ -517,7 +517,7 @@ public class OBJModel implements IUnbakedModel String domain = from.getNamespace(); if (!path.contains("/")) path = from.getPath().substring(0, from.getPath().lastIndexOf("/") + 1) + path; - mtlStream = new InputStreamReader(manager.func_199002_a(new ResourceLocation(domain, path)).func_199027_b(), StandardCharsets.UTF_8); + mtlStream = new InputStreamReader(manager.getResource(new ResourceLocation(domain, path)).getInputStream(), StandardCharsets.UTF_8); mtlReader = new BufferedReader(mtlStream); String currentLine = ""; @@ -857,7 +857,7 @@ public class OBJModel implements IUnbakedModel public Face bake(TRSRTransformation transform) { - Matrix4f m = transform.getMatrix(); + Matrix4f m = transform.getMatrixVec(); Matrix3f mn = null; Vertex[] vertices = new Vertex[verts.length]; // Normal[] normals = norms != null ? new Normal[norms.length] : null; @@ -1318,7 +1318,7 @@ public class OBJModel implements IUnbakedModel // FIXME: merge with getQuads @Override - public List func_200117_a(IBlockState blockState, EnumFacing side, Random rand) + public List getQuads(IBlockState blockState, EnumFacing side, Random rand) { if (side != null) return ImmutableList.of(); if (quads == null) @@ -1598,7 +1598,7 @@ public class OBJModel implements IUnbakedModel @Override public ItemOverrideList getOverrides() { - return ItemOverrideList.NONE; + return ItemOverrideList.EMPTY; } } diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/BlockInfo.java b/src/main/java/net/minecraftforge/client/model/pipeline/BlockInfo.java index 296179073..eaa0c73d7 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/BlockInfo.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/BlockInfo.java @@ -60,7 +60,7 @@ public class BlockInfo { if(cachedTint == tint) return cachedMultiplier; cachedTint = tint; - cachedMultiplier = colors.colorMultiplier(state, world, blockPos, tint); + cachedMultiplier = colors.getColor(state, world, blockPos, tint); return cachedMultiplier; } diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java b/src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java index 7fef442b3..96b5e812a 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/ForgeBlockModelRenderer.java @@ -52,7 +52,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer } @Override - public boolean func_199325_c(IWorldReader world, IBakedModel model, IBlockState state, BlockPos pos, BufferBuilder buffer, boolean checkSides, Random rand, long seed) + public boolean renderModelFlat(IWorldReader world, IBakedModel model, IBlockState state, BlockPos pos, BufferBuilder buffer, boolean checkSides, Random rand, long seed) { if(ForgeMod.forgeLightPipelineEnabled) { @@ -68,12 +68,12 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer } else { - return super.func_199325_c(world, model, state, pos, buffer, checkSides, rand, seed); + return super.renderModelFlat(world, model, state, pos, buffer, checkSides, rand, seed); } } @Override - public boolean func_199326_b(IWorldReader world, IBakedModel model, IBlockState state, BlockPos pos, BufferBuilder buffer, boolean checkSides, Random rand, long seed) + public boolean renderModelSmooth(IWorldReader world, IBakedModel model, IBlockState state, BlockPos pos, BufferBuilder buffer, boolean checkSides, Random rand, long seed) { if(ForgeMod.forgeLightPipelineEnabled) { @@ -89,7 +89,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer } else { - return super.func_199326_b(world, model, state, pos, buffer, checkSides, rand, seed); + return super.renderModelSmooth(world, model, state, pos, buffer, checkSides, rand, seed); } } @@ -99,7 +99,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer lighter.setState(state); lighter.setBlockPos(pos); boolean empty = true; - List quads = model.func_200117_a(state, null, rand); + List quads = model.getQuads(state, null, rand); if(!quads.isEmpty()) { lighter.updateBlockInfo(); @@ -111,7 +111,7 @@ public class ForgeBlockModelRenderer extends BlockModelRenderer } for(EnumFacing side : EnumFacing.values()) { - quads = model.func_200117_a(state, side, rand); + quads = model.getQuads(state, side, rand); if(!quads.isEmpty()) { if(!checkSides || Block.shouldSideBeRendered(state, world, pos, side)) diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/TransformerConsumer.java b/src/main/java/net/minecraftforge/client/model/pipeline/TransformerConsumer.java index 4cedf2dd6..334f11b43 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/TransformerConsumer.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/TransformerConsumer.java @@ -43,4 +43,4 @@ public abstract class TransformerConsumer implements IVertexConsumer { } protected abstract float[] transform(int element, float... data); -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java b/src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java index f0979babe..9f9aa6980 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/UnpackedBakedQuad.java @@ -180,8 +180,8 @@ public class UnpackedBakedQuad extends BakedQuad } if(contractUVs) { - float tX = texture.getIconWidth() / (texture.getMaxU() - texture.getMinU()); - float tY = texture.getIconHeight() / (texture.getMaxV() - texture.getMinV()); + float tX = texture.getWidth() / (texture.getMaxU() - texture.getMinU()); + float tY = texture.getHeight() / (texture.getMaxV() - texture.getMinV()); float tS = tX > tY ? tX : tY; float ep = 1f / (tS * 0x100); int uve = 0; @@ -235,4 +235,4 @@ public class UnpackedBakedQuad extends BakedQuad return new UnpackedBakedQuad(unpackedData, tint, orientation, texture, applyDiffuseLighting, format); } } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java index 9cf09c478..7f219345c 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java @@ -109,7 +109,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer private static VertexFormat withNormal(VertexFormat format) { - if (format == null || format.func_207751_b()) return format; + if (format == null || format.hasNormal()) return format; return new VertexFormat(format).addElement(NORMAL_4F); } diff --git a/src/main/java/net/minecraftforge/client/resource/ISelectiveResourceReloadListener.java b/src/main/java/net/minecraftforge/client/resource/ISelectiveResourceReloadListener.java index dbfb83c90..7b5c00f40 100644 --- a/src/main/java/net/minecraftforge/client/resource/ISelectiveResourceReloadListener.java +++ b/src/main/java/net/minecraftforge/client/resource/ISelectiveResourceReloadListener.java @@ -27,7 +27,7 @@ import net.minecraft.resources.IResourceManagerReloadListener; public interface ISelectiveResourceReloadListener extends IResourceManagerReloadListener { @Override - default void func_195410_a(IResourceManager resourceManager) + default void onResourceManagerReload(IResourceManager resourceManager) { // For compatibility, call the selective version from the non-selective function onResourceManagerReload(resourceManager, SelectiveReloadStateHandler.INSTANCE.get()); diff --git a/src/main/java/net/minecraftforge/client/settings/KeyConflictContext.java b/src/main/java/net/minecraftforge/client/settings/KeyConflictContext.java index fedaf7ff0..f70682969 100644 --- a/src/main/java/net/minecraftforge/client/settings/KeyConflictContext.java +++ b/src/main/java/net/minecraftforge/client/settings/KeyConflictContext.java @@ -49,7 +49,7 @@ public enum KeyConflictContext implements IKeyConflictContext @Override public boolean isActive() { - return Minecraft.getMinecraft().currentScreen != null; + return Minecraft.getInstance().currentScreen != null; } @Override diff --git a/src/main/java/net/minecraftforge/client/settings/KeyModifier.java b/src/main/java/net/minecraftforge/client/settings/KeyModifier.java index cb94fe118..5c5027ad6 100644 --- a/src/main/java/net/minecraftforge/client/settings/KeyModifier.java +++ b/src/main/java/net/minecraftforge/client/settings/KeyModifier.java @@ -33,7 +33,7 @@ public enum KeyModifier { @Override public boolean matches(InputMappings.Input key) { - int keyCode = key.func_197937_c(); + int keyCode = key.getKeyCode(); if (Minecraft.IS_RUNNING_ON_MAC) { return keyCode == GLFW.GLFW_KEY_LEFT_ALT || keyCode == GLFW.GLFW_KEY_RIGHT_ALT; @@ -59,7 +59,7 @@ public enum KeyModifier { @Override public String getLocalizedComboName(InputMappings.Input key) { - String keyName = key.func_197936_a(); + String keyName = key.getName(); String localizationFormatKey = Minecraft.IS_RUNNING_ON_MAC ? "forge.controlsgui.control.mac" : "forge.controlsgui.control"; return I18n.format(localizationFormatKey, keyName); } @@ -68,7 +68,7 @@ public enum KeyModifier { @Override public boolean matches(InputMappings.Input key) { - return key.func_197937_c() == GLFW.GLFW_KEY_LEFT_SHIFT || key.func_197937_c() == GLFW.GLFW_KEY_RIGHT_SHIFT; + return key.getKeyCode() == GLFW.GLFW_KEY_LEFT_SHIFT || key.getKeyCode() == GLFW.GLFW_KEY_RIGHT_SHIFT; } @Override @@ -86,14 +86,14 @@ public enum KeyModifier { @Override public String getLocalizedComboName(InputMappings.Input key) { - return I18n.format("forge.controlsgui.shift", key.func_197936_a()); + return I18n.format("forge.controlsgui.shift", key.getName()); } }, ALT { @Override public boolean matches(InputMappings.Input key) { - return key.func_197937_c() == GLFW.GLFW_KEY_LEFT_ALT || key.func_197937_c() == GLFW.GLFW_KEY_RIGHT_ALT; + return key.getKeyCode() == GLFW.GLFW_KEY_LEFT_ALT || key.getKeyCode() == GLFW.GLFW_KEY_RIGHT_ALT; } @Override @@ -111,7 +111,7 @@ public enum KeyModifier { @Override public String getLocalizedComboName(InputMappings.Input keyCode) { - return I18n.format("forge.controlsgui.alt", keyCode.func_197936_a()); + return I18n.format("forge.controlsgui.alt", keyCode.getName()); } }, NONE { @@ -146,7 +146,7 @@ public enum KeyModifier { @Override public String getLocalizedComboName(InputMappings.Input key) { - return key.func_197936_a(); + return key.getName(); } }; diff --git a/src/main/java/net/minecraftforge/common/BiomeDictionary.java b/src/main/java/net/minecraftforge/common/BiomeDictionary.java index c79c79203..d93681af3 100644 --- a/src/main/java/net/minecraftforge/common/BiomeDictionary.java +++ b/src/main/java/net/minecraftforge/common/BiomeDictionary.java @@ -270,18 +270,18 @@ public class BiomeDictionary */ public static void makeBestGuess(Biome biome) { - Type type = Type.fromVanilla(biome.func_201856_r()); + Type type = Type.fromVanilla(biome.getCategory()); if (type != null) { BiomeDictionary.addTypes(biome, type); } - if (biome.getRainfall() > 0.85f) + if (biome.getDownfall() > 0.85f) { BiomeDictionary.addTypes(biome, WET); } - if (biome.getRainfall() < 0.15f) + if (biome.getDownfall() < 0.15f) { BiomeDictionary.addTypes(biome, DRY); } @@ -296,14 +296,14 @@ public class BiomeDictionary BiomeDictionary.addTypes(biome, COLD); } - if (biome.isHighHumidity() && biome.getBaseHeight() < 0.0F && (biome.getHeightVariation() <= 0.3F && biome.getHeightVariation() >= 0.0F)) + if (biome.isHighHumidity() && biome.getDepth() < 0.0F && (biome.getScale() <= 0.3F && biome.getScale() >= 0.0F)) { BiomeDictionary.addTypes(biome, SWAMP); } - if (biome.getBaseHeight() <= -0.5F) + if (biome.getDepth() <= -0.5F) { - if (biome.getHeightVariation() == 0.0F) + if (biome.getScale() == 0.0F) { BiomeDictionary.addTypes(biome, RIVER); } @@ -313,12 +313,12 @@ public class BiomeDictionary } } - if (biome.getHeightVariation() >= 0.4F && biome.getHeightVariation() < 1.5F) + if (biome.getScale() >= 0.4F && biome.getScale() < 1.5F) { BiomeDictionary.addTypes(biome, HILLS); } - if (biome.getHeightVariation() >= 1.5F) + if (biome.getScale() >= 1.5F) { BiomeDictionary.addTypes(biome, MOUNTAIN); } @@ -367,76 +367,76 @@ public class BiomeDictionary addTypes(Biomes.OCEAN, OCEAN ); addTypes(Biomes.PLAINS, PLAINS ); addTypes(Biomes.DESERT, HOT, DRY, SANDY ); - addTypes(Biomes.EXTREME_HILLS, MOUNTAIN, HILLS ); + addTypes(Biomes.MOUNTAINS, MOUNTAIN, HILLS ); addTypes(Biomes.FOREST, FOREST ); addTypes(Biomes.TAIGA, COLD, CONIFEROUS, FOREST ); - addTypes(Biomes.SWAMPLAND, WET, SWAMP ); + addTypes(Biomes.SWAMP, WET, SWAMP ); addTypes(Biomes.RIVER, RIVER ); - addTypes(Biomes.HELL, HOT, DRY, NETHER ); - addTypes(Biomes.SKY, COLD, DRY, END ); + addTypes(Biomes.NETHER, HOT, DRY, NETHER ); + addTypes(Biomes.THE_END, COLD, DRY, END ); addTypes(Biomes.FROZEN_OCEAN, COLD, OCEAN, SNOWY ); addTypes(Biomes.FROZEN_RIVER, COLD, RIVER, SNOWY ); - addTypes(Biomes.ICE_PLAINS, COLD, SNOWY, WASTELAND ); - addTypes(Biomes.ICE_MOUNTAINS, COLD, SNOWY, MOUNTAIN ); - addTypes(Biomes.MUSHROOM_ISLAND, MUSHROOM, RARE ); - addTypes(Biomes.MUSHROOM_ISLAND_SHORE, MUSHROOM, BEACH, RARE ); + addTypes(Biomes.SNOWY_TUNDRA, COLD, SNOWY, WASTELAND ); + addTypes(Biomes.SNOWY_MOUNTAINS, COLD, SNOWY, MOUNTAIN ); + addTypes(Biomes.MUSHROOM_FIELDS, MUSHROOM, RARE ); + addTypes(Biomes.MUSHROOM_FIELD_SHORE, MUSHROOM, BEACH, RARE ); addTypes(Biomes.BEACH, BEACH ); addTypes(Biomes.DESERT_HILLS, HOT, DRY, SANDY, HILLS ); - addTypes(Biomes.FOREST_HILLS, FOREST, HILLS ); + addTypes(Biomes.WOODED_HILLS, FOREST, HILLS ); addTypes(Biomes.TAIGA_HILLS, COLD, CONIFEROUS, FOREST, HILLS ); - addTypes(Biomes.EXTREME_HILLS_EDGE, MOUNTAIN ); + addTypes(Biomes.MOUNTAIN_EDGE, MOUNTAIN ); addTypes(Biomes.JUNGLE, HOT, WET, DENSE, JUNGLE ); addTypes(Biomes.JUNGLE_HILLS, HOT, WET, DENSE, JUNGLE, HILLS ); addTypes(Biomes.JUNGLE_EDGE, HOT, WET, JUNGLE, FOREST, RARE ); addTypes(Biomes.DEEP_OCEAN, OCEAN ); - addTypes(Biomes.STONE_BEACH, BEACH ); - addTypes(Biomes.COLD_BEACH, COLD, BEACH, SNOWY ); + addTypes(Biomes.STONE_SHORE, BEACH ); + addTypes(Biomes.SNOWY_BEACH, COLD, BEACH, SNOWY ); addTypes(Biomes.BIRCH_FOREST, FOREST ); addTypes(Biomes.BIRCH_FOREST_HILLS, FOREST, HILLS ); - addTypes(Biomes.ROOFED_FOREST, SPOOKY, DENSE, FOREST ); - addTypes(Biomes.COLD_TAIGA, COLD, CONIFEROUS, FOREST, SNOWY ); - addTypes(Biomes.COLD_TAIGA_HILLS, COLD, CONIFEROUS, FOREST, SNOWY, HILLS ); - addTypes(Biomes.REDWOOD_TAIGA, COLD, CONIFEROUS, FOREST ); - addTypes(Biomes.REDWOOD_TAIGA_HILLS, COLD, CONIFEROUS, FOREST, HILLS ); - addTypes(Biomes.EXTREME_HILLS_WITH_TREES, MOUNTAIN, FOREST, SPARSE ); + addTypes(Biomes.DARK_FOREST, SPOOKY, DENSE, FOREST ); + addTypes(Biomes.SNOWY_TAIGA, COLD, CONIFEROUS, FOREST, SNOWY ); + addTypes(Biomes.SNOWY_TAIGA_HILLS, COLD, CONIFEROUS, FOREST, SNOWY, HILLS ); + addTypes(Biomes.GIANT_TREE_TAIGA, COLD, CONIFEROUS, FOREST ); + addTypes(Biomes.GIANT_TREE_TAIGA_HILLS, COLD, CONIFEROUS, FOREST, HILLS ); + addTypes(Biomes.WOODED_MOUNTAINS, MOUNTAIN, FOREST, SPARSE ); addTypes(Biomes.SAVANNA, HOT, SAVANNA, PLAINS, SPARSE ); addTypes(Biomes.SAVANNA_PLATEAU, HOT, SAVANNA, PLAINS, SPARSE, RARE ); - addTypes(Biomes.MESA, MESA, SANDY ); - addTypes(Biomes.MESA_ROCK, MESA, SPARSE, SANDY ); - addTypes(Biomes.MESA_CLEAR_ROCK, MESA, SANDY ); - addTypes(Biomes.field_201936_P, END ); - addTypes(Biomes.field_201937_Q, END ); - addTypes(Biomes.field_201938_R, END ); - addTypes(Biomes.field_201939_S, END ); - addTypes(Biomes.field_203614_T, OCEAN, HOT ); - addTypes(Biomes.field_203615_U, OCEAN ); - addTypes(Biomes.field_203616_V, OCEAN, COLD ); - addTypes(Biomes.field_203617_W, OCEAN, HOT ); - addTypes(Biomes.field_203618_X, OCEAN ); - addTypes(Biomes.field_203619_Y, OCEAN, COLD ); - addTypes(Biomes.field_203620_Z, OCEAN, COLD ); - addTypes(Biomes.VOID, VOID ); - addTypes(Biomes.MUTATED_PLAINS, PLAINS, RARE ); - addTypes(Biomes.MUTATED_DESERT, HOT, DRY, SANDY, RARE ); - addTypes(Biomes.MUTATED_EXTREME_HILLS, MOUNTAIN, SPARSE, RARE ); - addTypes(Biomes.MUTATED_FOREST, FOREST, HILLS, RARE ); - addTypes(Biomes.MUTATED_TAIGA, COLD, CONIFEROUS, FOREST, MOUNTAIN, RARE ); - addTypes(Biomes.MUTATED_SWAMPLAND, WET, SWAMP, HILLS, RARE ); - addTypes(Biomes.MUTATED_ICE_FLATS, COLD, SNOWY, HILLS, RARE ); - addTypes(Biomes.MUTATED_JUNGLE, HOT, WET, DENSE, JUNGLE, MOUNTAIN, RARE); - addTypes(Biomes.MUTATED_JUNGLE_EDGE, HOT, SPARSE, JUNGLE, HILLS, RARE ); - addTypes(Biomes.MUTATED_BIRCH_FOREST, FOREST, DENSE, HILLS, RARE ); - addTypes(Biomes.MUTATED_BIRCH_FOREST_HILLS, FOREST, DENSE, MOUNTAIN, RARE ); - addTypes(Biomes.MUTATED_ROOFED_FOREST, SPOOKY, DENSE, FOREST, MOUNTAIN, RARE ); - addTypes(Biomes.MUTATED_TAIGA_COLD, COLD, CONIFEROUS, FOREST, SNOWY, MOUNTAIN, RARE); - addTypes(Biomes.MUTATED_REDWOOD_TAIGA, DENSE, FOREST, RARE ); - addTypes(Biomes.MUTATED_REDWOOD_TAIGA_HILLS, DENSE, FOREST, HILLS, RARE ); - addTypes(Biomes.MUTATED_EXTREME_HILLS_WITH_TREES, MOUNTAIN, SPARSE, RARE ); - addTypes(Biomes.MUTATED_SAVANNA, HOT, DRY, SPARSE, SAVANNA, MOUNTAIN, RARE); - addTypes(Biomes.MUTATED_SAVANNA_ROCK, HOT, DRY, SPARSE, SAVANNA, HILLS, RARE); - addTypes(Biomes.MUTATED_MESA, HOT, DRY, SPARSE, SAVANNA, MOUNTAIN, RARE); - addTypes(Biomes.MUTATED_MESA_ROCK, HOT, DRY, SPARSE, HILLS, RARE ); - addTypes(Biomes.MUTATED_MESA_CLEAR_ROCK, HOT, DRY, SPARSE, SAVANNA, MOUNTAIN, RARE); + addTypes(Biomes.BADLANDS, MESA, SANDY ); + addTypes(Biomes.WOODED_BADLANDS_PLATEAU, MESA, SPARSE, SANDY ); + addTypes(Biomes.BADLANDS_PLATEAU, MESA, SANDY ); + addTypes(Biomes.SMALL_END_ISLANDS, END ); + addTypes(Biomes.END_MIDLANDS, END ); + addTypes(Biomes.END_HIGHLANDS, END ); + addTypes(Biomes.END_BARRENS, END ); + addTypes(Biomes.WARM_OCEAN, OCEAN, HOT ); + addTypes(Biomes.LUKEWARM_OCEAN, OCEAN ); + addTypes(Biomes.COLD_OCEAN, OCEAN, COLD ); + addTypes(Biomes.DEEP_WARM_OCEAN, OCEAN, HOT ); + addTypes(Biomes.DEEP_LUKEWARM_OCEAN, OCEAN ); + addTypes(Biomes.DEEP_COLD_OCEAN, OCEAN, COLD ); + addTypes(Biomes.DEEP_FROZEN_OCEAN, OCEAN, COLD ); + addTypes(Biomes.THE_VOID, VOID ); + addTypes(Biomes.SUNFLOWER_PLAINS, PLAINS, RARE ); + addTypes(Biomes.DESERT_LAKES, HOT, DRY, SANDY, RARE ); + addTypes(Biomes.GRAVELLY_MOUNTAINS, MOUNTAIN, SPARSE, RARE ); + addTypes(Biomes.FLOWER_FOREST, FOREST, HILLS, RARE ); + addTypes(Biomes.TAIGA_MOUNTAINS, COLD, CONIFEROUS, FOREST, MOUNTAIN, RARE ); + addTypes(Biomes.SWAMP_HILLS, WET, SWAMP, HILLS, RARE ); + addTypes(Biomes.ICE_SPIKES, COLD, SNOWY, HILLS, RARE ); + addTypes(Biomes.MODIFIED_JUNGLE, HOT, WET, DENSE, JUNGLE, MOUNTAIN, RARE); + addTypes(Biomes.MODIFIED_JUNGLE_EDGE, HOT, SPARSE, JUNGLE, HILLS, RARE ); + addTypes(Biomes.TALL_BIRCH_FOREST, FOREST, DENSE, HILLS, RARE ); + addTypes(Biomes.TALL_BIRCH_HILLS, FOREST, DENSE, MOUNTAIN, RARE ); + addTypes(Biomes.DARK_FOREST_HILLS, SPOOKY, DENSE, FOREST, MOUNTAIN, RARE ); + addTypes(Biomes.SNOWY_TAIGA_MOUNTAINS, COLD, CONIFEROUS, FOREST, SNOWY, MOUNTAIN, RARE); + addTypes(Biomes.GIANT_SPRUCE_TAIGA, DENSE, FOREST, RARE ); + addTypes(Biomes.GIANT_SPRUCE_TAIGA_HILLS, DENSE, FOREST, HILLS, RARE ); + addTypes(Biomes.MODIFIED_GRAVELLY_MOUNTAINS, MOUNTAIN, SPARSE, RARE ); + addTypes(Biomes.SHATTERED_SAVANNA, HOT, DRY, SPARSE, SAVANNA, MOUNTAIN, RARE); + addTypes(Biomes.SHATTERED_SAVANNA_PLATEAU, HOT, DRY, SPARSE, SAVANNA, HILLS, RARE); + addTypes(Biomes.ERODED_BADLANDS, HOT, DRY, SPARSE, SAVANNA, MOUNTAIN, RARE); + addTypes(Biomes.MODIFIED_WOODED_BADLANDS_PLATEAU, HOT, DRY, SPARSE, HILLS, RARE ); + addTypes(Biomes.MODIFIED_BADLANDS_PLATEAU, HOT, DRY, SPARSE, SAVANNA, MOUNTAIN, RARE); if (DEBUG) diff --git a/src/main/java/net/minecraftforge/common/BiomeManager.java b/src/main/java/net/minecraftforge/common/BiomeManager.java index d1b0d2607..4597781ee 100644 --- a/src/main/java/net/minecraftforge/common/BiomeManager.java +++ b/src/main/java/net/minecraftforge/common/BiomeManager.java @@ -52,25 +52,25 @@ public class BiomeManager List list = new ArrayList(); list.add(new BiomeEntry(Biomes.FOREST, 10)); - list.add(new BiomeEntry(Biomes.ROOFED_FOREST, 10)); - list.add(new BiomeEntry(Biomes.EXTREME_HILLS, 10)); + list.add(new BiomeEntry(Biomes.DARK_FOREST, 10)); + list.add(new BiomeEntry(Biomes.MOUNTAINS, 10)); list.add(new BiomeEntry(Biomes.PLAINS, 10)); list.add(new BiomeEntry(Biomes.BIRCH_FOREST, 10)); - list.add(new BiomeEntry(Biomes.SWAMPLAND, 10)); + list.add(new BiomeEntry(Biomes.SWAMP, 10)); currentBiomes[BiomeType.WARM.ordinal()] = new TrackedList(list); list.clear(); list.add(new BiomeEntry(Biomes.FOREST, 10)); - list.add(new BiomeEntry(Biomes.EXTREME_HILLS, 10)); + list.add(new BiomeEntry(Biomes.MOUNTAINS, 10)); list.add(new BiomeEntry(Biomes.TAIGA, 10)); list.add(new BiomeEntry(Biomes.PLAINS, 10)); currentBiomes[BiomeType.COOL.ordinal()] = new TrackedList(list); list.clear(); - list.add(new BiomeEntry(Biomes.ICE_PLAINS, 30)); - list.add(new BiomeEntry(Biomes.COLD_TAIGA, 10)); + list.add(new BiomeEntry(Biomes.SNOWY_TUNDRA, 30)); + list.add(new BiomeEntry(Biomes.SNOWY_TAIGA, 10)); currentBiomes[BiomeType.ICY.ordinal()] = new TrackedList(list); list.clear(); @@ -82,17 +82,17 @@ public class BiomeManager public static void addSpawnBiome(Biome biome) { - if (!BiomeProvider.field_201540_a.contains(biome)) + if (!BiomeProvider.BIOMES_TO_SPAWN_IN.contains(biome)) { - BiomeProvider.field_201540_a.add(biome); + BiomeProvider.BIOMES_TO_SPAWN_IN.add(biome); } } public static void removeSpawnBiome(Biome biome) { - if (BiomeProvider.field_201540_a.contains(biome)) + if (BiomeProvider.BIOMES_TO_SPAWN_IN.contains(biome)) { - BiomeProvider.field_201540_a.remove(biome); + BiomeProvider.BIOMES_TO_SPAWN_IN.remove(biome); } } diff --git a/src/main/java/net/minecraftforge/common/DimensionManager.java b/src/main/java/net/minecraftforge/common/DimensionManager.java index 1b02c7916..870f419aa 100644 --- a/src/main/java/net/minecraftforge/common/DimensionManager.java +++ b/src/main/java/net/minecraftforge/common/DimensionManager.java @@ -173,7 +173,7 @@ public class DimensionManager public static Dimension getProvider(int dim) { - return getWorld(dim).provider; + return getWorld(dim).dimension; } public static Integer[] getIDs(boolean check) @@ -219,7 +219,7 @@ public class DimensionManager { worlds.put(id, world); weakWorldMap.put(world, world); - LOGGER.info(DIMMGR,"Loading dimension {} ({}) ({})", id, world.getWorldInfo().getWorldName(), world.getMinecraftServer()); + LOGGER.info(DIMMGR,"Loading dimension {} ({}) ({})", id, world.getWorldInfo().getWorldName(), world.getServer()); } else { @@ -264,7 +264,7 @@ public class DimensionManager LOGGER.error(DIMMGR,"Cannot Hotload Dim: {}", dim, e); return; // If a provider hasn't been registered then we can't hotload the dim } - MinecraftServer mcServer = overworld.getMinecraftServer(); + MinecraftServer mcServer = overworld.getServer(); ISaveHandler savehandler = overworld.getSaveHandler(); //WorldSettings worldSettings = new WorldSettings(overworld.getWorldInfo()); @@ -329,7 +329,7 @@ public class DimensionManager { if (dimensions.containsKey(dim)) { - Dimension ret = getProviderType(dim).createDimension(); + Dimension ret = getProviderType(dim).create(); ret.setId(dim); return ret; } @@ -361,8 +361,8 @@ public class DimensionManager { return ForgeChunkManager.getPersistentChunksFor(world).isEmpty() && world.playerEntities.isEmpty() - && !world.provider.getDimensionType().shouldLoadSpawn() - && !keepLoaded.contains(world.provider.getId()); + && !world.dimension.getType().shouldLoadSpawn() + && !keepLoaded.contains(world.dimension.getId()); } /** @@ -421,7 +421,7 @@ public class DimensionManager { MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(w)); w.close(); - setWorld(id, null, w.getMinecraftServer()); + setWorld(id, null, w.getServer()); } } } diff --git a/src/main/java/net/minecraftforge/common/ForgeChunkManager.java b/src/main/java/net/minecraftforge/common/ForgeChunkManager.java index eac730a8b..62cf44f43 100644 --- a/src/main/java/net/minecraftforge/common/ForgeChunkManager.java +++ b/src/main/java/net/minecraftforge/common/ForgeChunkManager.java @@ -456,7 +456,7 @@ public class ForgeChunkManager try { NBTTagCompound forcedChunkData = CompressedStreamTools.read(chunkLoaderData); - return forcedChunkData.getTagList("TicketList", Constants.NBT.TAG_COMPOUND).size() > 0; + return forcedChunkData.getList("TicketList", Constants.NBT.TAG_COMPOUND).size() > 0; } catch (IOException e) { @@ -499,10 +499,10 @@ public class ForgeChunkManager LOGGER.warn(CHUNK_MANAGER, "Unable to read forced chunk data at {} - it will be ignored", chunkLoaderData.getAbsolutePath(), e); return; } - NBTTagList ticketList = forcedChunkData.getTagList("TicketList", Constants.NBT.TAG_COMPOUND); + NBTTagList ticketList = forcedChunkData.getList("TicketList", Constants.NBT.TAG_COMPOUND); for (int i = 0; i < ticketList.size(); i++) { - NBTTagCompound ticketHolder = ticketList.getCompoundTagAt(i); + NBTTagCompound ticketHolder = ticketList.getCompound(i); String modId = ticketHolder.getString("Owner"); boolean isPlayer = ForgeVersion.MOD_ID.equals(modId); @@ -518,17 +518,17 @@ public class ForgeChunkManager continue; } - NBTTagList tickets = ticketHolder.getTagList("Tickets", Constants.NBT.TAG_COMPOUND); + NBTTagList tickets = ticketHolder.getList("Tickets", Constants.NBT.TAG_COMPOUND); for (int j = 0; j < tickets.size(); j++) { - NBTTagCompound ticket = tickets.getCompoundTagAt(j); + NBTTagCompound ticket = tickets.getCompound(j); modId = ticket.hasKey("ModId") ? ticket.getString("ModId") : modId; Type type = Type.values()[ticket.getByte("Type")]; //byte ticketChunkDepth = ticket.getByte("ChunkListDepth"); Ticket tick = new Ticket(modId, type, world); if (ticket.hasKey("ModData")) { - tick.modData = ticket.getCompoundTag("ModData"); + tick.modData = ticket.getCompound("ModData"); } if (ticket.hasKey("Player")) { @@ -545,8 +545,8 @@ public class ForgeChunkManager } if (type == Type.ENTITY) { - tick.entityChunkX = ticket.getInteger("chunkX"); - tick.entityChunkZ = ticket.getInteger("chunkZ"); + tick.entityChunkX = ticket.getInt("chunkX"); + tick.entityChunkZ = ticket.getInt("chunkZ"); UUID uuid = new UUID(ticket.getLong("PersistentIDMSB"), ticket.getLong("PersistentIDLSB")); // add the ticket to the "pending entity" list pendingEntities.put(uuid, tick); @@ -936,10 +936,10 @@ public class ForgeChunkManager { ticket.setTag("ModData", tick.modData); } - if (tick.ticketType == Type.ENTITY && tick.entity != null && tick.entity.writeToNBTOptional(new NBTTagCompound())) + if (tick.ticketType == Type.ENTITY && tick.entity != null && tick.entity.writeUnlessPassenger(new NBTTagCompound())) { - ticket.setInteger("chunkX", MathHelper.floor(tick.entity.chunkCoordX)); - ticket.setInteger("chunkZ", MathHelper.floor(tick.entity.chunkCoordZ)); + ticket.setInt("chunkX", MathHelper.floor(tick.entity.chunkCoordX)); + ticket.setInt("chunkZ", MathHelper.floor(tick.entity.chunkCoordZ)); ticket.setLong("PersistentIDMSB", tick.entity.getUniqueID().getMostSignificantBits()); ticket.setLong("PersistentIDLSB", tick.entity.getUniqueID().getLeastSignificantBits()); tickets.add(ticket); @@ -996,8 +996,8 @@ public class ForgeChunkManager ChunkEntry entry = cache.getIfPresent(ChunkPos.asLong(chunk.x, chunk.z)); if (entry != null) { - entry.nbt.setTag("Entities", nbt.getTagList("Entities", Constants.NBT.TAG_COMPOUND)); - entry.nbt.setTag("TileEntities", nbt.getTagList("TileEntities", Constants.NBT.TAG_COMPOUND)); + entry.nbt.setTag("Entities", nbt.getList("Entities", Constants.NBT.TAG_COMPOUND)); + entry.nbt.setTag("TileEntities", nbt.getList("TileEntities", Constants.NBT.TAG_COMPOUND)); ClassInheritanceMultiMap[] entityLists = chunk.getEntityLists(); for (int i = 0; i < entityLists.length; ++i) @@ -1027,17 +1027,17 @@ public class ForgeChunkManager private static void loadChunkEntities(Chunk chunk, NBTTagCompound nbt, World world) { - NBTTagList entities = nbt.getTagList("Entities", Constants.NBT.TAG_COMPOUND); + NBTTagList entities = nbt.getList("Entities", Constants.NBT.TAG_COMPOUND); for (int i = 0; i < entities.size(); ++i) { - AnvilChunkLoader.readChunkEntity(entities.getCompoundTagAt(i), world, chunk); + AnvilChunkLoader.readChunkEntity(entities.getCompound(i), world, chunk); chunk.setHasEntities(true); } - NBTTagList tileEntities = nbt.getTagList("TileEntities", Constants.NBT.TAG_COMPOUND); + NBTTagList tileEntities = nbt.getList("TileEntities", Constants.NBT.TAG_COMPOUND); for (int i = 0; i < tileEntities.size(); ++i) { - TileEntity tileEntity = TileEntity.func_203403_c(tileEntities.getCompoundTagAt(i)); + TileEntity tileEntity = TileEntity.create(tileEntities.getCompound(i)); if (tileEntity != null) chunk.addTileEntity(tileEntity); } } diff --git a/src/main/java/net/minecraftforge/common/ForgeHooks.java b/src/main/java/net/minecraftforge/common/ForgeHooks.java index 1dacef263..98a25c7b5 100644 --- a/src/main/java/net/minecraftforge/common/ForgeHooks.java +++ b/src/main/java/net/minecraftforge/common/ForgeHooks.java @@ -456,10 +456,10 @@ public class ForgeHooks } */ ItemStack result; - boolean isCreative = player.capabilities.isCreativeMode; + boolean isCreative = player.abilities.isCreativeMode; TileEntity te = null; - if (target.typeOfHit == RayTraceResult.Type.BLOCK) + if (target.type == RayTraceResult.Type.BLOCK) { IBlockState state = world.getBlockState(target.getBlockPos()); @@ -475,12 +475,12 @@ public class ForgeHooks } else { - if (target.typeOfHit != RayTraceResult.Type.ENTITY || target.entityHit == null || !isCreative) + if (target.type != RayTraceResult.Type.ENTITY || target.entity == null || !isCreative) { return false; } - result = target.entityHit.getPickedResult(target); + result = target.entity.getPickedResult(target); } if (result.isEmpty()) @@ -490,13 +490,13 @@ public class ForgeHooks if (te != null) { - Minecraft.getMinecraft().storeTEInStack(result, te); + Minecraft.getInstance().storeTEInStack(result, te); } if (isCreative) { player.inventory.setPickedItemStack(result); - Minecraft.getMinecraft().playerController.sendSlotPacket(player.getHeldItem(EnumHand.MAIN_HAND), 36 + player.inventory.currentItem); + Minecraft.getInstance().playerController.sendSlotPacket(player.getHeldItem(EnumHand.MAIN_HAND), 36 + player.inventory.currentItem); return true; } int slot = player.inventory.getSlotFor(result); @@ -505,7 +505,7 @@ public class ForgeHooks if (InventoryPlayer.isHotbar(slot)) player.inventory.currentItem = slot; else - Minecraft.getMinecraft().playerController.pickItem(slot); + Minecraft.getInstance().playerController.pickItem(slot); return true; } return false; @@ -610,7 +610,7 @@ public class ForgeHooks } else { - AxisAlignedBB bb = entity.getEntityBoundingBox(); + AxisAlignedBB bb = entity.getBoundingBox(); int mX = MathHelper.floor(bb.minX); int mY = MathHelper.floor(bb.minY); int mZ = MathHelper.floor(bb.minZ); @@ -769,7 +769,7 @@ public class ForgeHooks if (!entityPlayer.isAllowEdit()) { - if (itemstack.isEmpty() || !itemstack.func_206848_a(world.func_205772_D(), new BlockWorldState(world, pos, false))) + if (itemstack.isEmpty() || !itemstack.canDestroy(world.getTags(), new BlockWorldState(world, pos, false))) preCancelEvent = true; } } @@ -809,8 +809,8 @@ public class ForgeHooks /* TODO: Talk to Sponge folk about World rollbacks. public static EnumActionResult onPlaceItemIntoWorld(@Nonnull ItemUseContext context) { - ItemStack itemstack = context.func_195996_i(); - World world = context.func_195991_k(); + ItemStack itemstack = context.getItem(); + World world = context.getWorld(); // handle all placement events here int meta = itemstack.getItemDamage(); @@ -826,7 +826,7 @@ public class ForgeHooks world.captureBlockSnapshots = true; } - EnumActionResult ret = itemstack.getItem().func_195939_a(context); + EnumActionResult ret = itemstack.getItem().onItemUse(context); world.captureBlockSnapshots = false; if (ret == EnumActionResult.SUCCESS) @@ -845,15 +845,15 @@ public class ForgeHooks world.capturedBlockSnapshots.clear(); // make sure to set pre-placement item data for event - itemstack.func_196085_b(meta); + itemstack.setDamage(meta); itemstack.setCount(size); if (nbt != null) { itemstack.setTagCompound(nbt); } - EntityPlayer player = context.func_195999_j(); - EnumFacing side = context.func_196000_l(); + EntityPlayer player = context.getPlayer(); + EnumFacing side = context.getFace(); if (blockSnapshots.size() > 1) { @@ -878,7 +878,7 @@ public class ForgeHooks else { // Change the stack to its new content - itemstack.func_196085_b(newMeta); + itemstack.setDamage(newMeta); itemstack.setCount(newSize); if (nbt != null) { @@ -940,7 +940,7 @@ public class ForgeHooks if (stack.getItem().hasContainerItem(stack)) { stack = stack.getItem().getContainerItem(stack); - if (!stack.isEmpty() && stack.isItemStackDamageable() && stack.getItemDamage() > stack.getMaxDamage()) + if (!stack.isEmpty() && stack.isDamageable() && stack.getDamage() > stack.getMaxDamage()) { ForgeEventFactory.onPlayerDestroyItem(craftingPlayer.get(), stack, null); return ItemStack.EMPTY; @@ -1232,7 +1232,7 @@ public class ForgeHooks NBTTagList enchantmentsNbt = ItemEnchantedBook.getEnchantments(itemStack); if (enchantmentsNbt.size() == 1) { - NBTTagCompound nbttagcompound = enchantmentsNbt.getCompoundTagAt(0); + NBTTagCompound nbttagcompound = enchantmentsNbt.getCompound(0); Enchantment enchantment = Enchantment.getEnchantmentByID(nbttagcompound.getShort("id")); if (enchantment != null) { @@ -1255,7 +1255,7 @@ public class ForgeHooks } else if (item instanceof ItemSpawnEgg) { - ResourceLocation resourceLocation = ((ItemSpawnEgg)item).func_208076_b(null).getRegistryName(); + ResourceLocation resourceLocation = ((ItemSpawnEgg)item).getType(null).getRegistryName(); if (resourceLocation != null) { return resourceLocation.getNamespace(); @@ -1319,8 +1319,8 @@ public class ForgeHooks } @Override - public IFluidState func_204610_c(BlockPos p_204610_1_) { - return Fluids.field_204541_a.func_207188_f(); + public IFluidState getFluidState(BlockPos pos) { + return Fluids.EMPTY.getDefaultState(); } } diff --git a/src/main/java/net/minecraftforge/common/ForgeMod.java b/src/main/java/net/minecraftforge/common/ForgeMod.java index 816660476..922487a29 100644 --- a/src/main/java/net/minecraftforge/common/ForgeMod.java +++ b/src/main/java/net/minecraftforge/common/ForgeMod.java @@ -323,7 +323,7 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook if (event.isWorldRunning() && tmpStairs != disableStairSlabCulling) { - DistExecutor.runWhenOn(Dist.CLIENT,()->()-> Minecraft.getMinecraft().renderGlobal.loadRenderers()); + DistExecutor.runWhenOn(Dist.CLIENT,()->()-> Minecraft.getInstance().renderGlobal.loadRenderers()); } } @@ -435,7 +435,7 @@ public class ForgeMod implements WorldPersistenceHooks.WorldPersistenceHook @Override public void readData(SaveHandler handler, WorldInfo info, NBTTagCompound tag) { - DimensionManager.loadDimensionDataMap(tag.hasKey("DimensionData") ? tag.getCompoundTag("DimensionData") : null); + DimensionManager.loadDimensionDataMap(tag.hasKey("DimensionData") ? tag.getCompound("DimensionData") : null); // TODO fluids FluidRegistry.loadFluidDefaults(tag); } diff --git a/src/main/java/net/minecraftforge/common/IPlantable.java b/src/main/java/net/minecraftforge/common/IPlantable.java index 8f5b54533..ee8db043f 100644 --- a/src/main/java/net/minecraftforge/common/IPlantable.java +++ b/src/main/java/net/minecraftforge/common/IPlantable.java @@ -27,4 +27,4 @@ public interface IPlantable { EnumPlantType getPlantType(IWorldReader world, BlockPos pos); IBlockState getPlant(IWorldReader world, BlockPos pos); -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/common/ISpecialArmor.java b/src/main/java/net/minecraftforge/common/ISpecialArmor.java index d3657eddb..e45cbc639 100644 --- a/src/main/java/net/minecraftforge/common/ISpecialArmor.java +++ b/src/main/java/net/minecraftforge/common/ISpecialArmor.java @@ -137,7 +137,7 @@ public interface ISpecialArmor } double totalArmor = entity.getTotalArmorValue(); - double totalToughness = entity.getEntityAttribute(SharedMonsterAttributes.ARMOR_TOUGHNESS).getAttributeValue(); + double totalToughness = entity.getAttribute(SharedMonsterAttributes.ARMOR_TOUGHNESS).getValue(); if (source.isUnblockable()) { @@ -169,7 +169,7 @@ public interface ISpecialArmor { ItemArmor armor = (ItemArmor)stack.getItem(); prop = new ArmorProperties(0, 0, Integer.MAX_VALUE); - prop.Armor = armor.func_200881_e(); + prop.Armor = armor.getDamageReduceAmount(); prop.Toughness = armor.getToughness(); } if (prop != null) diff --git a/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java b/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java index 5dd939300..72cea9961 100644 --- a/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java +++ b/src/main/java/net/minecraftforge/common/WorldSpecificSaveHandler.java @@ -63,7 +63,7 @@ public class WorldSpecificSaveHandler implements ISaveHandler @Override public IPlayerFileData getPlayerNBTManager() { return parent.getPlayerNBTManager(); } @Override public void flush() { parent.flush(); } @Override public File getWorldDirectory() { return parent.getWorldDirectory(); } - @Override public DataFixer func_197718_i() { return parent.func_197718_i(); } + @Override public DataFixer getFixer() { return parent.getFixer(); } @Override public File getMapFileFromName(String name) @@ -76,7 +76,7 @@ public class WorldSpecificSaveHandler implements ISaveHandler File file = new File(dataDir, name + ".dat"); if (!file.exists()) { - switch (world.provider.getId()) + switch (world.dimension.getId()) { case -1: if (name.equalsIgnoreCase("FORTRESS")) copyFile(name, file); diff --git a/src/main/java/net/minecraftforge/common/brewing/VanillaBrewingRecipe.java b/src/main/java/net/minecraftforge/common/brewing/VanillaBrewingRecipe.java index 948d93056..4bdb5593a 100644 --- a/src/main/java/net/minecraftforge/common/brewing/VanillaBrewingRecipe.java +++ b/src/main/java/net/minecraftforge/common/brewing/VanillaBrewingRecipe.java @@ -40,7 +40,7 @@ public class VanillaBrewingRecipe implements IBrewingRecipe { public boolean isInput(ItemStack stack) { Item item = stack.getItem(); - return item == Items.POTIONITEM || item == Items.SPLASH_POTION || item == Items.LINGERING_POTION || item == Items.GLASS_BOTTLE; + return item == Items.POTION || item == Items.SPLASH_POTION || item == Items.LINGERING_POTION || item == Items.GLASS_BOTTLE; } /** diff --git a/src/main/java/net/minecraftforge/common/chunkio/ChunkIOExecutor.java b/src/main/java/net/minecraftforge/common/chunkio/ChunkIOExecutor.java index 30f108d15..dced9ee8d 100644 --- a/src/main/java/net/minecraftforge/common/chunkio/ChunkIOExecutor.java +++ b/src/main/java/net/minecraftforge/common/chunkio/ChunkIOExecutor.java @@ -124,7 +124,7 @@ public class ChunkIOExecutor ChunkIOProvider task = tasks.get(key); if (task == null) { - LOGGER.warn("Attempted to dequeue chunk that wasn't queued? {} @ ({}, {})", world.provider.getId(), x, z); + LOGGER.warn("Attempted to dequeue chunk that wasn't queued? {} @ ({}, {})", world.dimension.getId(), x, z); return; } diff --git a/src/main/java/net/minecraftforge/common/chunkio/QueuedChunk.java b/src/main/java/net/minecraftforge/common/chunkio/QueuedChunk.java index 1b0c30ddb..1801cff45 100644 --- a/src/main/java/net/minecraftforge/common/chunkio/QueuedChunk.java +++ b/src/main/java/net/minecraftforge/common/chunkio/QueuedChunk.java @@ -57,8 +57,8 @@ class QueuedChunk { result.append(" x: " + x + NEW_LINE); result.append(" z: " + z + NEW_LINE); result.append(" world: " + world.getWorldInfo().getWorldName() + NEW_LINE); - result.append(" dimension: " + world.provider.getId() + NEW_LINE); - result.append(" provider: " + world.provider.getClass().getName() + NEW_LINE); + result.append(" dimension: " + world.dimension.getId() + NEW_LINE); + result.append(" provider: " + world.dimension.getClass().getName() + NEW_LINE); result.append("}"); return result.toString(); diff --git a/src/main/java/net/minecraftforge/common/config/ConfigCategory.java b/src/main/java/net/minecraftforge/common/config/ConfigCategory.java index 702b1ac81..f90ef4467 100644 --- a/src/main/java/net/minecraftforge/common/config/ConfigCategory.java +++ b/src/main/java/net/minecraftforge/common/config/ConfigCategory.java @@ -439,4 +439,4 @@ public class ConfigCategory implements Map changed = true; } } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/common/crafting/CompoundIngredient.java b/src/main/java/net/minecraftforge/common/crafting/CompoundIngredient.java index 6f76ff095..d1c6ef0d3 100644 --- a/src/main/java/net/minecraftforge/common/crafting/CompoundIngredient.java +++ b/src/main/java/net/minecraftforge/common/crafting/CompoundIngredient.java @@ -118,7 +118,7 @@ public class CompoundIngredient extends Ingredient @Override public CompoundIngredient parse(PacketBuffer buffer) { - return new CompoundIngredient(Stream.generate(() -> Ingredient.func_199566_b(buffer)).limit(buffer.readVarInt()).collect(Collectors.toList())); + return new CompoundIngredient(Stream.generate(() -> Ingredient.fromBuffer(buffer)).limit(buffer.readVarInt()).collect(Collectors.toList())); } @Override @@ -131,7 +131,7 @@ public class CompoundIngredient extends Ingredient public void write(PacketBuffer buffer, CompoundIngredient ingredient) { buffer.writeVarInt(ingredient.children.size()); - ingredient.children.forEach(c -> c.func_199564_a(buffer)); + ingredient.children.forEach(c -> c.writeToBuffer(buffer)); } } diff --git a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java index 66e072318..69038d0ad 100644 --- a/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java +++ b/src/main/java/net/minecraftforge/common/crafting/CraftingHelper.java @@ -111,11 +111,11 @@ public class CraftingHelper public static final IIngredientSerializer INGREDIENT_COMPOUND = register(new ResourceLocation("forge", "compound"), new CompoundIngredient.Serializer()); public static final IIngredientSerializer INGREDIENT_VANILLA = register(new ResourceLocation("minecraft", "item"), new IIngredientSerializer() { public Ingredient parse(PacketBuffer buffer) { - return Ingredient.func_209357_a(Stream.generate(() -> new Ingredient.SingleItemList(buffer.readItemStack())).limit(buffer.readVarInt())); + return Ingredient.fromItemListStream(Stream.generate(() -> new Ingredient.SingleItemList(buffer.readItemStack())).limit(buffer.readVarInt())); } public Ingredient parse(JsonObject json) { - return Ingredient.func_209357_a(Stream.of(Ingredient.func_199803_a(json))); + return Ingredient.fromItemListStream(Stream.of(Ingredient.deserializeItemList(json))); } public void write(PacketBuffer buffer, Ingredient ingredient) { @@ -248,9 +248,9 @@ public class CraftingHelper tmp.setTag("tag", nbt); tmp.setString("id", itemName); - tmp.setInteger("Count", JsonUtils.getInt(json, "count", 1)); + tmp.setInt("Count", JsonUtils.getInt(json, "count", 1)); - return ItemStack.func_199557_a(tmp); + return ItemStack.read(tmp); } catch (CommandSyntaxException e) { @@ -292,15 +292,15 @@ public class CraftingHelper public static void reloadConstants(IResourceManager manager) { Map ret = new HashMap<>(); - for(ResourceLocation key : manager.func_199003_a("recipes", filename -> filename.equals("_constants.json"))) + for(ResourceLocation key : manager.getAllResourceLocations("recipes", filename -> filename.equals("_constants.json"))) { String path = key.getPath(); if (!path.equals("recipes/_constants.json")) //Top level only continue; - try (IResource iresource = manager.func_199002_a(key)) + try (IResource iresource = manager.getResource(key)) { - JsonObject[] elements = JsonUtils.gsonDeserialize(GSON, IOUtils.toString(iresource.func_199027_b(), StandardCharsets.UTF_8), JsonObject[].class); + JsonObject[] elements = JsonUtils.fromJson(GSON, IOUtils.toString(iresource.getInputStream(), StandardCharsets.UTF_8), JsonObject[].class); for (int x = 0; x < elements.length; x++) { JsonObject json = elements[x]; @@ -328,7 +328,7 @@ public class CraftingHelper constants.put(new ResourceLocation(JsonUtils.getString(json, "name")), new StackList(items)); } else if (json.has("tag")) - constants.put(new ResourceLocation(JsonUtils.getString(json, "name")), Ingredient.func_199803_a(json)); + constants.put(new ResourceLocation(JsonUtils.getString(json, "name")), Ingredient.deserializeItemList(json)); else if (json.has("item")) constants.put(new ResourceLocation(JsonUtils.getString(json, "name")), new StackList(Lists.newArrayList(getItemStack(JsonUtils.getJsonObject(json, "item"), true)))); else diff --git a/src/main/java/net/minecraftforge/common/crafting/IngredientNBT.java b/src/main/java/net/minecraftforge/common/crafting/IngredientNBT.java index c51d784f9..d6e23f0e8 100644 --- a/src/main/java/net/minecraftforge/common/crafting/IngredientNBT.java +++ b/src/main/java/net/minecraftforge/common/crafting/IngredientNBT.java @@ -44,7 +44,7 @@ public class IngredientNBT extends Ingredient if (input == null) return false; //Can't use areItemStacksEqualUsingNBTShareTag because it compares stack size as well - return this.stack.getItem() == input.getItem() && this.stack.getItemDamage() == input.getItemDamage() && ItemStack.areItemStackShareTagsEqual(this.stack, input); + return this.stack.getItem() == input.getItem() && this.stack.getDamage() == input.getDamage() && ItemStack.areItemStackShareTagsEqual(this.stack, input); } @Override diff --git a/src/main/java/net/minecraftforge/common/crafting/StackList.java b/src/main/java/net/minecraftforge/common/crafting/StackList.java index 10b2f93e1..16e88831e 100644 --- a/src/main/java/net/minecraftforge/common/crafting/StackList.java +++ b/src/main/java/net/minecraftforge/common/crafting/StackList.java @@ -37,13 +37,13 @@ public class StackList implements IItemList } @Override - public Collection func_199799_a() + public Collection getStacks() { return items; } @Override - public JsonObject func_200303_b() + public JsonObject toJson() { if (items.size() == 1) return toJson(items.iterator().next()); @@ -61,8 +61,8 @@ public class StackList implements IItemList ret.addProperty("item", stack.getItem().getRegistryName().toString()); if (stack.getCount() != 1) ret.addProperty("count", stack.getCount()); - if (stack.getTagCompound() != null) - ret.addProperty("nbt", stack.getTagCompound().toString()); //TODO: Better serialization? + if (stack.getTag() != null) + ret.addProperty("nbt", stack.getTag().toString()); //TODO: Better serialization? return ret; } diff --git a/src/main/java/net/minecraftforge/common/crafting/package-info.java b/src/main/java/net/minecraftforge/common/crafting/package-info.java index 950a7b310..05f23cdfa 100644 --- a/src/main/java/net/minecraftforge/common/crafting/package-info.java +++ b/src/main/java/net/minecraftforge/common/crafting/package-info.java @@ -23,4 +23,4 @@ package net.minecraftforge.common.crafting; import mcp.MethodsReturnNonnullByDefault; -import javax.annotation.ParametersAreNonnullByDefault; \ No newline at end of file +import javax.annotation.ParametersAreNonnullByDefault; diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java b/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java index 8da283e4f..0f664e7e2 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java @@ -139,7 +139,7 @@ public interface IForgeBlock */ default boolean doesSideBlockRendering(IBlockState state, IWorldReader world, BlockPos pos, EnumFacing face) { - return state.func_200015_d(world, pos); + return state.isOpaqueCube(world, pos); } /** @@ -237,7 +237,7 @@ public interface IForgeBlock { if (world instanceof IWorldWriter) { - ((IWorldWriter)world).setBlockState(pos, state.func_206870_a(BlockBed.OCCUPIED,occupied), 4); + ((IWorldWriter)world).setBlockState(pos, state.with(BlockBed.OCCUPIED,occupied), 4); } } @@ -252,7 +252,7 @@ public interface IForgeBlock */ default EnumFacing getBedDirection(IBlockState state, IWorldReader world, BlockPos pos) { - return state.getValue(BlockHorizontal.FACING); + return state.get(BlockHorizontal.HORIZONTAL_FACING); } /** @@ -264,7 +264,7 @@ public interface IForgeBlock */ default boolean isBedFoot(IBlockState state, IWorldReader world, BlockPos pos) { - return state.getValue(BlockBed.PART) == BedPart.FOOT; + return state.get(BlockBed.PART) == BedPart.FOOT; } /** @@ -408,7 +408,7 @@ public interface IForgeBlock default boolean canPlaceTorchOnTop(IBlockState state, IWorldReader world, BlockPos pos) { if (state.isTopSolid() || state.getBlockFaceShape(world, pos, EnumFacing.UP) == BlockFaceShape.SOLID) - return this.getBlock() != Blocks.END_GATEWAY && this.getBlock() != Blocks.field_196628_cT; + return this.getBlock() != Blocks.END_GATEWAY && this.getBlock() != Blocks.JACK_O_LANTERN; else return this.getBlock() instanceof BlockFence || this.getBlock() == Blocks.COBBLESTONE_WALL || this.getBlock() instanceof BlockGlass; } @@ -514,19 +514,19 @@ public interface IForgeBlock return this.getBlock() == Blocks.CACTUS && this.getBlock() == Blocks.SAND; } - if (plant.getBlock() == Blocks.field_196608_cF) + if (plant.getBlock() == Blocks.SUGAR_CANE) { return true; } - if (plantable instanceof BlockBush && ((BlockBush)plantable).func_196260_a(state, world, pos)) + if (plantable instanceof BlockBush && ((BlockBush)plantable).isValidPosition(state, world, pos)) { return true; } switch (type) { - case Desert: return this.getBlock() == Blocks.SAND || this.getBlock() == Blocks.HARDENED_CLAY || + case Desert: return this.getBlock() == Blocks.SAND || this.getBlock() == Blocks.TERRACOTTA || this.getBlock() instanceof BlockGlazedTerracotta; case Nether: return this.getBlock() == Blocks.SOUL_SAND; case Crop: return this.getBlock() == Blocks.FARMLAND; @@ -578,7 +578,7 @@ public interface IForgeBlock default boolean isFertile(IBlockState state, IWorldReader world, BlockPos pos) { if (this.getBlock() == Blocks.FARMLAND) - return state.getValue(BlockFarmland.MOISTURE) > 0; + return state.get(BlockFarmland.MOISTURE) > 0; return false; } @@ -598,7 +598,7 @@ public interface IForgeBlock */ default int getLightOpacity(IBlockState state, IWorldReader world, BlockPos pos) { - return state.func_200016_a(world, pos); + return state.getOpacity(world, pos); } /** @@ -630,7 +630,7 @@ public interface IForgeBlock default boolean rotateBlock(IBlockState state, IWorld world, BlockPos pos, EnumFacing axis) { - state.func_206871_b().keySet().forEach(prop -> + state.getValues().keySet().forEach(prop -> { if (prop.getName().equals("facing") || prop.getName().equals("rotation") && prop.getValueClass() == EnumFacing.class) { @@ -640,13 +640,13 @@ public interface IForgeBlock IBlockState newState; @SuppressWarnings("unchecked") IProperty facingIProperty = (IProperty) prop; - EnumFacing facing = state.getValue(facingIProperty); + EnumFacing facing = state.get(facingIProperty); Collection validFacing = facingIProperty.getAllowedValues(); // rotate horizontal facings clockwise if (validFacing.size() == 4 && !validFacing.contains(EnumFacing.UP) && !validFacing.contains(EnumFacing.DOWN)) { - newState = state.func_206870_a(facingIProperty, facing.rotateY()); + newState = state.with(facingIProperty, facing.rotateY()); } else { @@ -654,11 +654,11 @@ public interface IForgeBlock EnumFacing rotatedFacing = facing.rotateAround(axis.getAxis()); if (validFacing.contains(rotatedFacing)) { - newState = state.func_206870_a(facingIProperty, rotatedFacing); + newState = state.with(facingIProperty, rotatedFacing); } else // abnormal facing property, just cycle it { - newState = state.cycleProperty(facingIProperty); + newState = state.cycle(facingIProperty); } } @@ -879,7 +879,7 @@ public interface IForgeBlock @SuppressWarnings("deprecation") default IBlockState getStateForPlacement(IBlockState state, EnumFacing facing, IBlockState state2, IWorld world, BlockPos pos1, BlockPos pos2, EnumHand hand) { - return this.getBlock().func_196271_a(state, facing, state2, world, pos1, pos2); + return this.getBlock().updatePostPlacement(state, facing, state2, world, pos1, pos2); } diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java b/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java index c54890ad6..8af182c6a 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeEntity.java @@ -52,7 +52,7 @@ public interface IForgeEntity extends ICapabilitySerializable default void deserializeNBT(NBTTagCompound nbt) { - getEntity().readFromNBT(nbt); + getEntity().read(nbt); } default NBTTagCompound serializeNBT() @@ -63,7 +63,7 @@ public interface IForgeEntity extends ICapabilitySerializable { ret.setString("id", getEntity().getEntityString()); } - return getEntity().writeToNBT(ret); + return getEntity().writeWithoutTypeId(ret); } boolean canUpdate(); @@ -125,7 +125,7 @@ public interface IForgeEntity extends ICapabilitySerializable } else { - ItemSpawnEgg egg = ItemSpawnEgg.func_200889_b(getEntity().func_200600_R()); + ItemSpawnEgg egg = ItemSpawnEgg.getEgg(getEntity().getType()); if (egg != null) return new ItemStack(egg); } return ItemStack.EMPTY; diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeFluid.java b/src/main/java/net/minecraftforge/common/extensions/IForgeFluid.java index e85163f9c..123af98cb 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeFluid.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeFluid.java @@ -52,7 +52,7 @@ public interface IForgeFluid */ default boolean isEntityInside(IFluidState state, IWorldReader world, BlockPos pos, Entity entity, double yToTest, Tag tag, boolean testingHead) { - return state.func_206884_a(tag) && yToTest - pos.getY() < state.func_206885_f() + 0.1F; + return state.isTagged(tag) && yToTest - pos.getY() < state.getHeight() + 0.1F; } /** @@ -96,6 +96,6 @@ public interface IForgeFluid */ default float getExplosionResistance(IFluidState state, IWorldReader world, BlockPos pos, @Nullable Entity exploder, Explosion explosion) { - return state.func_210200_l(); + return state.getExplosionResistance(); } } diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeFluidState.java b/src/main/java/net/minecraftforge/common/extensions/IForgeFluidState.java index 5c4a68ae0..a7965a8d5 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeFluidState.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeFluidState.java @@ -49,7 +49,7 @@ public interface IForgeFluidState */ default boolean isEntityInside(IWorldReader world, BlockPos pos, Entity entity, double yToTest, Tag tag, boolean testingHead) { - return getFluidState().func_206886_c().isEntityInside(getFluidState(), world, pos, entity, yToTest, tag, testingHead); + return getFluidState().getFluid().isEntityInside(getFluidState(), world, pos, entity, yToTest, tag, testingHead); } @@ -65,6 +65,6 @@ public interface IForgeFluidState */ default float getExplosionResistance(IWorldReader world, BlockPos pos, @Nullable Entity exploder, Explosion explosion) { - return getFluidState().func_206886_c().getExplosionResistance(getFluidState(), world, pos, exploder, explosion); + return getFluidState().getFluid().getExplosionResistance(getFluidState(), world, pos, exploder, explosion); } } diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java b/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java index 903b73a3a..33a1ca112 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeItem.java @@ -70,7 +70,7 @@ public interface IForgeItem @SuppressWarnings("deprecation") default Multimap getAttributeModifiers(EntityEquipmentSlot slot, ItemStack stack) { - return getItem().getItemAttributeModifiers(slot); + return getItem().getAttributeModifiers(slot); } /** @@ -133,7 +133,7 @@ public interface IForgeItem @Nullable default NBTTagCompound getNBTShareTag(ItemStack stack) { - return stack.getTagCompound(); + return stack.getTag(); } /** @@ -145,7 +145,7 @@ public interface IForgeItem */ default void readNBTShareTag(ItemStack stack, @Nullable NBTTagCompound nbt) { - stack.setTagCompound(nbt); + stack.setTag(nbt); } /** @@ -286,7 +286,7 @@ public interface IForgeItem */ default java.util.Collection getCreativeTabs() { - return java.util.Collections.singletonList(getItem().getCreativeTab()); + return java.util.Collections.singletonList(getItem().getGroup()); } /** @@ -454,7 +454,7 @@ public interface IForgeItem */ default int getDamage(ItemStack stack) { - return !stack.hasTagCompound() ? 0 : stack.getTagCompound().getInteger("Damage"); + return !stack.hasTag() ? 0 : stack.getTag().getInt("Damage"); } /** @@ -467,7 +467,7 @@ public interface IForgeItem */ default boolean showDurabilityBar(ItemStack stack) { - return stack.isItemDamaged(); + return stack.isDamaged(); } /** @@ -479,7 +479,7 @@ public interface IForgeItem */ default double getDurabilityForDisplay(ItemStack stack) { - return (double) stack.getItemDamage() / (double) stack.getMaxDamage(); + return (double) stack.getDamage() / (double) stack.getMaxDamage(); } /** @@ -517,7 +517,7 @@ public interface IForgeItem */ default boolean isDamaged(ItemStack stack) { - return stack.getItemDamage() > 0; + return stack.getDamage() > 0; } /** @@ -529,7 +529,7 @@ public interface IForgeItem */ default void setDamage(ItemStack stack, int damage) { - stack.func_196082_o().setInteger("Damage", Math.max(0, damage)); + stack.getOrCreateTag().setInt("Damage", Math.max(0, damage)); } /** @@ -570,7 +570,7 @@ public interface IForgeItem @SuppressWarnings("deprecation") default int getItemStackLimit(ItemStack stack) { - return getItem().getItemStackLimit(); + return getItem().getMaxStackSize(); } Set getToolTypes(ItemStack stack); @@ -654,7 +654,7 @@ public interface IForgeItem default boolean shouldCauseBlockBreakReset(ItemStack oldStack, ItemStack newStack) { return !(newStack.getItem() == oldStack.getItem() && ItemStack.areItemStackTagsEqual(newStack, oldStack) - && (newStack.isItemStackDamageable() || newStack.getItemDamage() == oldStack.getItemDamage())); + && (newStack.isDamageable() || newStack.getDamage() == oldStack.getDamage())); } /** @@ -704,7 +704,7 @@ public interface IForgeItem .builder(); for (ResourceLocation location : ((RegistrySimple) getItem().properties).getKeys()) { - final IItemPropertyGetter parameter = getItem().properties.getObject(location); + final IItemPropertyGetter parameter = getItem().properties.get(location); builder.put(location.toString(), input -> parameter.call(stack, world, entity)); } return builder.build(); diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java b/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java index b6d6bf568..3bac827b0 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeItemStack.java @@ -101,16 +101,16 @@ public interface IForgeItemStack extends ICapabilitySerializable default EnumActionResult onItemUseFirst(ItemUseContext context) { - EntityPlayer entityplayer = context.func_195999_j(); - BlockPos blockpos = context.func_195995_a(); - BlockWorldState blockworldstate = new BlockWorldState(context.func_195991_k(), blockpos, false); - if (entityplayer != null && !entityplayer.capabilities.allowEdit && !getStack().func_206847_b(context.func_195991_k().func_205772_D(), blockworldstate)) { + EntityPlayer entityplayer = context.getPlayer(); + BlockPos blockpos = context.getPos(); + BlockWorldState blockworldstate = new BlockWorldState(context.getWorld(), blockpos, false); + if (entityplayer != null && !entityplayer.abilities.allowEdit && !getStack().canPlaceOn(context.getWorld().getTags(), blockworldstate)) { return EnumActionResult.PASS; } else { Item item = getStack().getItem(); EnumActionResult enumactionresult = item.onItemUseFirst(getStack(), context); if (entityplayer != null && enumactionresult == EnumActionResult.SUCCESS) { - entityplayer.addStat(StatList.OBJECT_USE_STATS.func_199076_b(item)); + entityplayer.addStat(StatList.ITEM_USED.get(item)); } return enumactionresult; @@ -120,7 +120,7 @@ public interface IForgeItemStack extends ICapabilitySerializable default NBTTagCompound serializeNBT() { NBTTagCompound ret = new NBTTagCompound(); - getStack().writeToNBT(ret); + getStack().write(ret); return ret; } diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeTileEntity.java b/src/main/java/net/minecraftforge/common/extensions/IForgeTileEntity.java index 778f9e1e5..25bf1f750 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeTileEntity.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeTileEntity.java @@ -30,14 +30,14 @@ public interface IForgeTileEntity extends ICapabilitySerializable apply(Optional part); -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/common/model/ITransformation.java b/src/main/java/net/minecraftforge/common/model/ITransformation.java index 54d8f89c7..c58dde4c6 100644 --- a/src/main/java/net/minecraftforge/common/model/ITransformation.java +++ b/src/main/java/net/minecraftforge/common/model/ITransformation.java @@ -29,7 +29,7 @@ import net.minecraft.util.EnumFacing; */ public interface ITransformation { - Matrix4f getMatrix(); + Matrix4f getMatrixVec(); EnumFacing rotate(EnumFacing facing); diff --git a/src/main/java/net/minecraftforge/common/model/TRSRTransformation.java b/src/main/java/net/minecraftforge/common/model/TRSRTransformation.java index bdc9dc7ca..cbf9fa396 100644 --- a/src/main/java/net/minecraftforge/common/model/TRSRTransformation.java +++ b/src/main/java/net/minecraftforge/common/model/TRSRTransformation.java @@ -116,7 +116,7 @@ public final class TRSRTransformation implements IModelState, ITransformation @OnlyIn(Dist.CLIENT) public static Matrix4f getMatrix(EnumFacing facing) { - return getRotation(facing).getMatrix(); + return getRotation(facing).getMatrixVec(); } @OnlyIn(Dist.CLIENT) @@ -153,15 +153,15 @@ public final class TRSRTransformation implements IModelState, ITransformation { if (this.isIdentity()) return b; if (b.isIdentity()) return this; - Matrix4f m = getMatrix(); - m.mul(b.getMatrix()); + Matrix4f m = getMatrixVec(); + m.mul(b.getMatrixVec()); return new TRSRTransformation(m); } public TRSRTransformation inverse() { if (this.isIdentity()) return this; - Matrix4f m = getMatrix(); + Matrix4f m = getMatrixVec(); m.invert(); return new TRSRTransformation(m); } @@ -547,7 +547,7 @@ public final class TRSRTransformation implements IModelState, ITransformation } @Override - public Matrix4f getMatrix() + public Matrix4f getMatrixVec() { return (Matrix4f)matrix.clone(); } @@ -645,7 +645,7 @@ public final class TRSRTransformation implements IModelState, ITransformation { if (transform.isIdentity()) return transform; - Matrix4f ret = new Matrix4f(transform.getMatrix()), tmp = new Matrix4f(); + Matrix4f ret = new Matrix4f(transform.getMatrixVec()), tmp = new Matrix4f(); tmp.setIdentity(); tmp.m03 = tmp.m13 = tmp.m23 = .5f; ret.mul(tmp, ret); @@ -661,7 +661,7 @@ public final class TRSRTransformation implements IModelState, ITransformation { if (transform.isIdentity()) return transform; - Matrix4f ret = new Matrix4f(transform.getMatrix()), tmp = new Matrix4f(); + Matrix4f ret = new Matrix4f(transform.getMatrixVec()), tmp = new Matrix4f(); tmp.setIdentity(); tmp.m03 = tmp.m13 = tmp.m23 = -.5f; ret.mul(tmp, ret); @@ -692,28 +692,28 @@ public final class TRSRTransformation implements IModelState, ITransformation @OnlyIn(Dist.CLIENT) public static Vector3f toVecmath(net.minecraft.client.renderer.Vector3f vec) { - return new Vector3f(vec.func_195899_a(), vec.func_195900_b(), vec.func_195902_c()); + return new Vector3f(vec.getX(), vec.getY(), vec.getZ()); } @OnlyIn(Dist.CLIENT) public static Vector4f toVecmath(net.minecraft.client.renderer.Vector4f vec) { - return new Vector4f(vec.func_195910_a(), vec.func_195913_b(), vec.func_195914_c(), vec.func_195915_d()); + return new Vector4f(vec.getX(), vec.getY(), vec.getZ(), vec.getW()); } @OnlyIn(Dist.CLIENT) public static Matrix4f toVecmath(net.minecraft.client.renderer.Matrix4f m) { return new Matrix4f( - m.func_195885_a(0, 0), m.func_195885_a(1, 0), m.func_195885_a(2, 0), m.func_195885_a(3, 0), - m.func_195885_a(0, 1), m.func_195885_a(1, 1), m.func_195885_a(2, 1), m.func_195885_a(3, 1), - m.func_195885_a(0, 2), m.func_195885_a(1, 2), m.func_195885_a(2, 2), m.func_195885_a(3, 2), - m.func_195885_a(0, 3), m.func_195885_a(1, 3), m.func_195885_a(2, 3), m.func_195885_a(3, 3)); + m.get(0, 0), m.get(1, 0), m.get(2, 0), m.get(3, 0), + m.get(0, 1), m.get(1, 1), m.get(2, 1), m.get(3, 1), + m.get(0, 2), m.get(1, 2), m.get(2, 2), m.get(3, 2), + m.get(0, 3), m.get(1, 3), m.get(2, 3), m.get(3, 3)); } public static Quat4f toVecmath(net.minecraft.client.renderer.Quaternion q) { - return new Quat4f(q.func_195889_a(), q.func_195891_b(), q.func_195893_c(), q.func_195894_d()); + return new Quat4f(q.getX(), q.getY(), q.getZ(), q.getW()); } @OnlyIn(Dist.CLIENT) @@ -738,7 +738,7 @@ public final class TRSRTransformation implements IModelState, ITransformation m.getRow(x, row); for (int y = 0; y < 4; y++) { - r.func_195878_a(x, y, row[y]); + r.set(x, y, row[y]); } } return r; diff --git a/src/main/java/net/minecraftforge/common/model/animation/AnimationStateMachine.java b/src/main/java/net/minecraftforge/common/model/animation/AnimationStateMachine.java index 279e53741..177ad5d8c 100644 --- a/src/main/java/net/minecraftforge/common/model/animation/AnimationStateMachine.java +++ b/src/main/java/net/minecraftforge/common/model/animation/AnimationStateMachine.java @@ -218,13 +218,13 @@ public final class AnimationStateMachine implements IAnimationStateMachine @OnlyIn(Dist.CLIENT) public static IAnimationStateMachine load(IResourceManager manager, ResourceLocation location, ImmutableMap customParameters) { - try (IResource resource = manager.func_199002_a(location)) + try (IResource resource = manager.getResource(location)) { ClipResolver clipResolver = new ClipResolver(); ParameterResolver parameterResolver = new ParameterResolver(customParameters); Clips.CommonClipTypeAdapterFactory.INSTANCE.setClipResolver(clipResolver); TimeValues.CommonTimeValueTypeAdapterFactory.INSTANCE.setValueResolver(parameterResolver); - AnimationStateMachine asm = asmGson.fromJson(new InputStreamReader(resource.func_199027_b(), StandardCharsets.UTF_8), AnimationStateMachine.class); + AnimationStateMachine asm = asmGson.fromJson(new InputStreamReader(resource.getInputStream(), StandardCharsets.UTF_8), AnimationStateMachine.class); clipResolver.asm = asm; parameterResolver.asm = asm; asm.initialize(); diff --git a/src/main/java/net/minecraftforge/common/model/animation/Clips.java b/src/main/java/net/minecraftforge/common/model/animation/Clips.java index 75d9a99e9..6902d20df 100644 --- a/src/main/java/net/minecraftforge/common/model/animation/Clips.java +++ b/src/main/java/net/minecraftforge/common/model/animation/Clips.java @@ -580,4 +580,4 @@ public final class Clips }; } } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/common/network/FluidIdRegistryMessageHandler.java b/src/main/java/net/minecraftforge/common/network/FluidIdRegistryMessageHandler.java index 26660ae5d..00f7ab061 100644 --- a/src/main/java/net/minecraftforge/common/network/FluidIdRegistryMessageHandler.java +++ b/src/main/java/net/minecraftforge/common/network/FluidIdRegistryMessageHandler.java @@ -44,4 +44,4 @@ public class FluidIdRegistryMessageHandler extends SimpleChannelInboundHandler> extends Stat @Override @Nonnull - public , V extends T> S func_206870_a(@Nonnull IProperty property, @Nonnull V value) + public , V extends T> S with(@Nonnull IProperty property, @Nonnull V value) { - S clean = super.func_206870_a(property, value); + S clean = super.with(property, value); if (clean == this.cleanState) { return (S) this; } @@ -111,7 +111,7 @@ public class ExtendedStateContainer> extends Stat return clean; } - return (S) new ExtendedStateHolder(field_206876_a, ((IStateHolder)clean).func_206871_b(), unlistedProperties, this.cleanState); + return (S) new ExtendedStateHolder(object, ((IStateHolder)clean).getValues(), unlistedProperties, this.cleanState); } @Override @@ -128,7 +128,7 @@ public class ExtendedStateContainer> extends Stat } if (!property.isValid(value)) { - throw new IllegalArgumentException("Cannot set unlisted property " + property + " to " + value + " on object " + field_206876_a + ", it is not an allowed value"); + throw new IllegalArgumentException("Cannot set unlisted property " + property + " to " + value + " on object " + object + ", it is not an allowed value"); } boolean clean = true; ImmutableMap.Builder, Optional> builder = ImmutableMap.builder(); @@ -143,7 +143,7 @@ public class ExtendedStateContainer> extends Stat { // no dynamic properties, lookup normal state return (S) cleanState; } - return (S) new ExtendedStateHolder(field_206876_a, func_206871_b(), builder.build(), this.cleanState); + return (S) new ExtendedStateHolder(object, getValues(), builder.build(), this.cleanState); } @Override diff --git a/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java b/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java index d165f31bb..0d22f9686 100644 --- a/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java +++ b/src/main/java/net/minecraftforge/common/util/BlockSnapshot.java @@ -63,7 +63,7 @@ public class BlockSnapshot public BlockSnapshot(World world, BlockPos pos, IBlockState state, @Nullable NBTTagCompound nbt) { this.setWorld(world); - this.dimId = world.provider.getId(); + this.dimId = world.dimension.getId(); this.pos = pos.toImmutable(); this.setReplacedBlock(state); this.registryName = state.getBlock().getRegistryName(); @@ -113,12 +113,12 @@ public class BlockSnapshot public static BlockSnapshot readFromNBT(NBTTagCompound tag) { return new BlockSnapshot( - tag.getInteger("dimension"), - new BlockPos(tag.getInteger("posX"), tag.getInteger("posY"), tag.getInteger("posZ")), + tag.getInt("dimension"), + new BlockPos(tag.getInt("posX"), tag.getInt("posY"), tag.getInt("posZ")), new ResourceLocation(tag.getString("blockMod"), tag.getString("blockName")), - tag.getInteger("metadata"), - tag.getInteger("flag"), - tag.getBoolean("hasTE") ? tag.getCompoundTag("tileEntity") : null); + tag.getInt("metadata"), + tag.getInt("flag"), + tag.getBoolean("hasTE") ? tag.getCompound("tileEntity") : null); } @Nullable @@ -126,7 +126,7 @@ public class BlockSnapshot { if (te == null) return null; NBTTagCompound nbt = new NBTTagCompound(); - te.writeToNBT(nbt); + te.write(nbt); return nbt; } @@ -150,7 +150,7 @@ public class BlockSnapshot { if (this.replacedBlock == null) { - this.replacedBlock = ForgeRegistries.BLOCKS.getValue(getRegistryName()).func_196257_b(getMeta()); + this.replacedBlock = ForgeRegistries.BLOCKS.getValue(getRegistryName()).getStateById(getMeta()); } return this.replacedBlock; } @@ -158,7 +158,7 @@ public class BlockSnapshot @Nullable public TileEntity getTileEntity() { - return getNbt() != null ? TileEntity.func_203403_c(getNbt()) : null; + return getNbt() != null ? TileEntity.create(getNbt()) : null; } public boolean restore() @@ -202,7 +202,7 @@ public class BlockSnapshot te = world.getTileEntity(pos); if (te != null) { - te.readFromNBT(getNbt()); + te.read(getNbt()); te.markDirty(); } } @@ -218,12 +218,12 @@ public class BlockSnapshot { compound.setString("blockMod", getRegistryName().getNamespace()); compound.setString("blockName", getRegistryName().getPath()); - compound.setInteger("posX", getPos().getX()); - compound.setInteger("posY", getPos().getY()); - compound.setInteger("posZ", getPos().getZ()); - compound.setInteger("flag", getFlag()); - compound.setInteger("dimension", getDimId()); - compound.setInteger("metadata", getMeta()); + compound.setInt("posX", getPos().getX()); + compound.setInt("posY", getPos().getY()); + compound.setInt("posZ", getPos().getZ()); + compound.setInt("flag", getFlag()); + compound.setInt("dimension", getDimId()); + compound.setInt("metadata", getMeta()); compound.setBoolean("hasTE", getNbt() != null); diff --git a/src/main/java/net/minecraftforge/common/util/ChunkCoordComparator.java b/src/main/java/net/minecraftforge/common/util/ChunkCoordComparator.java index d02922211..01b9befa8 100644 --- a/src/main/java/net/minecraftforge/common/util/ChunkCoordComparator.java +++ b/src/main/java/net/minecraftforge/common/util/ChunkCoordComparator.java @@ -77,4 +77,4 @@ public class ChunkCoordComparator implements java.util.Comparator } } } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/common/util/Constants.java b/src/main/java/net/minecraftforge/common/util/Constants.java index f9317da82..f43359653 100644 --- a/src/main/java/net/minecraftforge/common/util/Constants.java +++ b/src/main/java/net/minecraftforge/common/util/Constants.java @@ -29,7 +29,7 @@ public class Constants * NBT Tag type IDS, used when storing the nbt to disc, Should align with NBTBase.getId, * table used in NBTBase.func_150283_g * - * Main use is checking tag type in NBTTagCompound.func_150297_b(String, int) + * Main use is checking tag type in NBTTagCompound.contains(String, int) * */ public static class NBT diff --git a/src/main/java/net/minecraftforge/common/util/FakePlayer.java b/src/main/java/net/minecraftforge/common/util/FakePlayer.java index c530e51d8..1080d554c 100644 --- a/src/main/java/net/minecraftforge/common/util/FakePlayer.java +++ b/src/main/java/net/minecraftforge/common/util/FakePlayer.java @@ -38,7 +38,7 @@ public class FakePlayer extends EntityPlayerMP { public FakePlayer(WorldServer world, GameProfile name) { - super(world.getMinecraftServer(), world, name, new PlayerInteractionManager(world)); + super(world.getServer(), world, name, new PlayerInteractionManager(world)); } @Override public Vec3d getPositionVector(){ return new Vec3d(0, 0, 0); } @@ -46,10 +46,10 @@ public class FakePlayer extends EntityPlayerMP @Override public void sendMessage(ITextComponent component) {} @Override public void addStat(StatBase par1StatBase, int par2){} //@Override public void openGui(Object mod, int modGuiId, World world, int x, int y, int z){} - @Override public boolean isEntityInvulnerable(DamageSource source){ return true; } + @Override public boolean isInvulnerableTo(DamageSource source){ return true; } @Override public boolean canAttackPlayer(EntityPlayer player){ return false; } @Override public void onDeath(DamageSource source){ return; } - @Override public void onUpdate(){ return; } + @Override public void tick(){ return; } @Override public Entity changeDimension(int dim, ITeleporter teleporter){ return this; } @Override public void handleClientSettings(CPacketClientSettings pkt){ return; } } diff --git a/src/main/java/net/minecraftforge/common/util/PacketUtil.java b/src/main/java/net/minecraftforge/common/util/PacketUtil.java index e489d9faf..11978b7fe 100644 --- a/src/main/java/net/minecraftforge/common/util/PacketUtil.java +++ b/src/main/java/net/minecraftforge/common/util/PacketUtil.java @@ -49,7 +49,7 @@ public class PacketUtil if (stack.getItem().isDamageable() || stack.getItem().getShareTag()) { - nbttagcompound = stack.getTagCompound(); + nbttagcompound = stack.getTag(); } buffer.writeCompoundTag(nbttagcompound); diff --git a/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java b/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java index 43b21de11..e3e92f652 100644 --- a/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java +++ b/src/main/java/net/minecraftforge/common/util/WorldCapabilityData.java @@ -44,7 +44,7 @@ public class WorldCapabilityData extends WorldSavedData } @Override - public void readFromNBT(NBTTagCompound nbt) + public void read(NBTTagCompound nbt) { this.capNBT = nbt; if (serializable != null) @@ -55,7 +55,7 @@ public class WorldCapabilityData extends WorldSavedData } @Override - public NBTTagCompound writeToNBT(NBTTagCompound nbt) + public NBTTagCompound write(NBTTagCompound nbt) { if (serializable != null) nbt = serializable.serializeNBT(); diff --git a/src/main/java/net/minecraftforge/event/DifficultyChangeEvent.java b/src/main/java/net/minecraftforge/event/DifficultyChangeEvent.java index ab2158e30..bee186020 100644 --- a/src/main/java/net/minecraftforge/event/DifficultyChangeEvent.java +++ b/src/main/java/net/minecraftforge/event/DifficultyChangeEvent.java @@ -57,4 +57,4 @@ public class DifficultyChangeEvent extends net.minecraftforge.eventbus.api.Event { return oldDifficulty; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java index c669b89c0..e8935a2a7 100644 --- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java +++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java @@ -384,7 +384,7 @@ public class ForgeEventFactory if (event.getResult() == Result.ALLOW) { - if (player.capabilities.isCreativeMode) + if (player.abilities.isCreativeMode) return new ActionResult(EnumActionResult.SUCCESS, stack); stack.shrink(1); @@ -499,7 +499,7 @@ public class ForgeEventFactory { Entity e = itr.next(); double dist = e.getDistance(p.xCoord, p.yCoord, p.zCoord) / diameter; - if (e.func_180427_aV() || dist > 1.0F) itr.remove(); + if (e.isImmuneToExplosions() || dist > 1.0F) itr.remove(); } */ MinecraftForge.EVENT_BUS.post(new ExplosionEvent.Detonate(world, explosion, list)); diff --git a/src/main/java/net/minecraftforge/event/entity/EntityTravelToDimensionEvent.java b/src/main/java/net/minecraftforge/event/entity/EntityTravelToDimensionEvent.java index 9919d61ec..9b31220e6 100644 --- a/src/main/java/net/minecraftforge/event/entity/EntityTravelToDimensionEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/EntityTravelToDimensionEvent.java @@ -51,4 +51,4 @@ public class EntityTravelToDimensionEvent extends EntityEvent { return dimension; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/event/entity/item/ItemEvent.java b/src/main/java/net/minecraftforge/event/entity/item/ItemEvent.java index c707317da..6633f2174 100644 --- a/src/main/java/net/minecraftforge/event/entity/item/ItemEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/item/ItemEvent.java @@ -50,4 +50,4 @@ public class ItemEvent extends EntityEvent { return entityItem; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/event/entity/item/ItemExpireEvent.java b/src/main/java/net/minecraftforge/event/entity/item/ItemExpireEvent.java index 8937028e4..d6c6c8665 100644 --- a/src/main/java/net/minecraftforge/event/entity/item/ItemExpireEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/item/ItemExpireEvent.java @@ -55,4 +55,4 @@ public class ItemExpireEvent extends ItemEvent { this.extraLife = extraLife; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/event/entity/item/ItemTossEvent.java b/src/main/java/net/minecraftforge/event/entity/item/ItemTossEvent.java index d7737dde5..35c11d200 100644 --- a/src/main/java/net/minecraftforge/event/entity/item/ItemTossEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/item/ItemTossEvent.java @@ -54,4 +54,4 @@ public class ItemTossEvent extends ItemEvent { return player; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/event/entity/living/LivingHealEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingHealEvent.java index 6548317f3..3a055c875 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/LivingHealEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/LivingHealEvent.java @@ -58,4 +58,4 @@ public class LivingHealEvent extends LivingEvent { this.amount = amount; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/event/entity/living/LivingKnockBackEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingKnockBackEvent.java index 9ba79f283..1685e6ecc 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/LivingKnockBackEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/LivingKnockBackEvent.java @@ -92,4 +92,4 @@ public class LivingKnockBackEvent extends LivingEvent public void setRatioX(double ratioX) {this.ratioX = ratioX;} public void setRatioZ(double ratioZ) {this.ratioZ = ratioZ;} -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java b/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java index 7ed85e92d..8804c796f 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java @@ -27,6 +27,8 @@ import net.minecraftforge.eventbus.api.Event; import net.minecraft.entity.EntityLiving; import net.minecraft.world.World; +import net.minecraftforge.eventbus.api.Event.HasResult; + /** * LivingSpawnEvent is fired for any events associated with Living Entities spawn status.
* If a method utilizes this {@link Event} as its parameter, the method will diff --git a/src/main/java/net/minecraftforge/event/entity/living/PotionColorCalculationEvent.java b/src/main/java/net/minecraftforge/event/entity/living/PotionColorCalculationEvent.java index 59675a5f4..c87639882 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/PotionColorCalculationEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/PotionColorCalculationEvent.java @@ -75,4 +75,4 @@ public class PotionColorCalculationEvent extends LivingEvent { return Collections.unmodifiableCollection(effectList); } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/event/entity/living/ZombieEvent.java b/src/main/java/net/minecraftforge/event/entity/living/ZombieEvent.java index ce9e4d056..e42b0af34 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/ZombieEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/ZombieEvent.java @@ -29,6 +29,8 @@ import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.eventbus.api.Event.HasResult; + /** * ZombieEvent is fired whenever a zombie is spawned for aid. * If a method utilizes this {@link Event} as its parameter, the method will diff --git a/src/main/java/net/minecraftforge/event/entity/player/CriticalHitEvent.java b/src/main/java/net/minecraftforge/event/entity/player/CriticalHitEvent.java index 852539ef8..6c09dfb61 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/CriticalHitEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/CriticalHitEvent.java @@ -97,4 +97,4 @@ public class CriticalHitEvent extends PlayerEvent { return vanillaCritical; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/event/entity/player/PlayerDropsEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerDropsEvent.java index c99bcb00f..524b7ccfa 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerDropsEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/PlayerDropsEvent.java @@ -57,4 +57,4 @@ public class PlayerDropsEvent extends LivingDropsEvent { return entityPlayer; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java b/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java index 71f03a1a2..aaa3fd542 100644 --- a/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/player/PlayerInteractEvent.java @@ -39,6 +39,8 @@ import javax.annotation.Nullable; import static net.minecraftforge.eventbus.api.Event.Result.DEFAULT; import static net.minecraftforge.eventbus.api.Event.Result.DENY; +import net.minecraftforge.eventbus.api.Event.Result; + /** * PlayerInteractEvent is fired when a player interacts in some way. * All subclasses are fired on {@link MinecraftForge#EVENT_BUS}. diff --git a/src/main/java/net/minecraftforge/event/terraingen/BiomeEvent.java b/src/main/java/net/minecraftforge/event/terraingen/BiomeEvent.java index 8ea9dc697..8c49d3055 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/BiomeEvent.java +++ b/src/main/java/net/minecraftforge/event/terraingen/BiomeEvent.java @@ -24,6 +24,8 @@ import net.minecraftforge.eventbus.api.Event; import net.minecraft.block.state.IBlockState; import net.minecraft.world.biome.Biome; +import net.minecraftforge.eventbus.api.Event.HasResult; + /** * BiomeEvent is fired whenever an event involving biomes occurs.
* If a method utilizes this {@link Event} as its parameter, the method will diff --git a/src/main/java/net/minecraftforge/event/terraingen/ChunkGeneratorEvent.java b/src/main/java/net/minecraftforge/event/terraingen/ChunkGeneratorEvent.java index aef2313a3..d8b887a57 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/ChunkGeneratorEvent.java +++ b/src/main/java/net/minecraftforge/event/terraingen/ChunkGeneratorEvent.java @@ -24,6 +24,8 @@ import net.minecraft.world.chunk.ChunkPrimer; import net.minecraft.world.gen.IChunkGenSettings; import net.minecraft.world.gen.IChunkGenerator; +import net.minecraftforge.eventbus.api.Event.HasResult; + public class ChunkGeneratorEvent extends net.minecraftforge.eventbus.api.Event { private final IChunkGenerator gen; diff --git a/src/main/java/net/minecraftforge/event/terraingen/InitNoiseGensEvent.java b/src/main/java/net/minecraftforge/event/terraingen/InitNoiseGensEvent.java index 4881deb74..c93f0ffd6 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/InitNoiseGensEvent.java +++ b/src/main/java/net/minecraftforge/event/terraingen/InitNoiseGensEvent.java @@ -132,4 +132,4 @@ public class InitNoiseGensEvent extends Wo public void getPerlin2 (NoiseGeneratorOctaves value) { this.perlin2 = value; } public void getPerlin3 (NoiseGeneratorOctaves value) { this.perlin3 = value; } } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/event/terraingen/OreGenEvent.java b/src/main/java/net/minecraftforge/event/terraingen/OreGenEvent.java index 587398500..cac0e264c 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/OreGenEvent.java +++ b/src/main/java/net/minecraftforge/event/terraingen/OreGenEvent.java @@ -21,6 +21,10 @@ package net.minecraftforge.event.terraingen; import java.util.Random; +import net.minecraft.util.math.BlockPos; +import net.minecraft.world.World; +import net.minecraftforge.eventbus.api.Event; + //import net.minecraft.world.biome.BiomeDecorator; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.Cancelable; diff --git a/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java b/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java index b6c0d7742..2253ab4ba 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java +++ b/src/main/java/net/minecraftforge/event/terraingen/PopulateChunkEvent.java @@ -27,6 +27,8 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.Cancelable; import net.minecraftforge.eventbus.api.Event; +import net.minecraftforge.eventbus.api.Event.HasResult; + /** * PopulateChunkEvent is fired when an event involving chunk terrain feature population occurs.
* If a method utilizes this {@link net.minecraftforge.eventbus.api.Event} as its parameter, the method will diff --git a/src/main/java/net/minecraftforge/event/terraingen/TerrainGen.java b/src/main/java/net/minecraftforge/event/terraingen/TerrainGen.java index b99d414c4..02cdb280e 100644 --- a/src/main/java/net/minecraftforge/event/terraingen/TerrainGen.java +++ b/src/main/java/net/minecraftforge/event/terraingen/TerrainGen.java @@ -27,6 +27,9 @@ import net.minecraft.world.World; import net.minecraft.world.gen.IChunkGenerator; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.terraingen.DecorateBiomeEvent.Decorate; +import net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate; +import net.minecraftforge.eventbus.api.Event.Result; + //import net.minecraftforge.event.terraingen.OreGenEvent.GenerateMinable; import net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate; import net.minecraftforge.eventbus.api.Event.Result; diff --git a/src/main/java/net/minecraftforge/event/world/BlockEvent.java b/src/main/java/net/minecraftforge/event/world/BlockEvent.java index 41ec2a21c..7e34b524f 100644 --- a/src/main/java/net/minecraftforge/event/world/BlockEvent.java +++ b/src/main/java/net/minecraftforge/event/world/BlockEvent.java @@ -45,6 +45,8 @@ import com.google.common.collect.ImmutableList; import javax.annotation.Nonnull; +import net.minecraftforge.eventbus.api.Event.HasResult; + public class BlockEvent extends Event { private static final boolean DEBUG = Boolean.parseBoolean(System.getProperty("forge.debugBlockEvent", "false")); diff --git a/src/main/java/net/minecraftforge/event/world/ExplosionEvent.java b/src/main/java/net/minecraftforge/event/world/ExplosionEvent.java index 0f426c102..62453c01c 100644 --- a/src/main/java/net/minecraftforge/event/world/ExplosionEvent.java +++ b/src/main/java/net/minecraftforge/event/world/ExplosionEvent.java @@ -103,4 +103,4 @@ public class ExplosionEvent extends Event return entityList; } } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/event/world/NoteBlockEvent.java b/src/main/java/net/minecraftforge/event/world/NoteBlockEvent.java index 97162e396..b23fbb97f 100644 --- a/src/main/java/net/minecraftforge/event/world/NoteBlockEvent.java +++ b/src/main/java/net/minecraftforge/event/world/NoteBlockEvent.java @@ -204,4 +204,4 @@ public class NoteBlockEvent extends BlockEvent } } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java b/src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java index 4a89a4c94..b84fc95d0 100644 --- a/src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java +++ b/src/main/java/net/minecraftforge/fluids/DispenseFluidContainer.java @@ -67,8 +67,8 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem @Nonnull private ItemStack fillContainer(@Nonnull IBlockSource source, @Nonnull ItemStack stack) { - World world = source.func_197524_h(); - EnumFacing dispenserFacing = source.getBlockState().getValue(BlockDispenser.FACING); + World world = source.getWorld(); + EnumFacing dispenserFacing = source.getBlockState().get(BlockDispenser.FACING); BlockPos blockpos = source.getBlockPos().offset(dispenserFacing); FluidActionResult actionResult = FluidUtil.tryPickUpFluid(stack, null, world, blockpos, dispenserFacing.getOpposite()); @@ -108,9 +108,9 @@ public class DispenseFluidContainer extends BehaviorDefaultDispenseItem } FluidStack fluidStack = fluidHandler.drain(Fluid.BUCKET_VOLUME, false); - EnumFacing dispenserFacing = source.getBlockState().getValue(BlockDispenser.FACING); + EnumFacing dispenserFacing = source.getBlockState().get(BlockDispenser.FACING); BlockPos blockpos = source.getBlockPos().offset(dispenserFacing); - FluidActionResult result = fluidStack != null ? FluidUtil.tryPlaceFluid(null, source.func_197524_h(), blockpos, stack, fluidStack) : FluidActionResult.FAILURE; + FluidActionResult result = fluidStack != null ? FluidUtil.tryPlaceFluid(null, source.getWorld(), blockpos, stack, fluidStack) : FluidActionResult.FAILURE; if (result.isSuccess()) { diff --git a/src/main/java/net/minecraftforge/fluids/Fluid.java b/src/main/java/net/minecraftforge/fluids/Fluid.java index 22f1e29c6..2c3107d96 100644 --- a/src/main/java/net/minecraftforge/fluids/Fluid.java +++ b/src/main/java/net/minecraftforge/fluids/Fluid.java @@ -310,7 +310,7 @@ public class Fluid for (int l = 0; l < 8; ++l) { - worldIn.func_195589_b(Particles.field_197594_E, (double) pos.getX() + Math.random(), (double) pos.getY() + Math.random(), (double) pos.getZ() + Math.random(), 0.0D, 0.0D, 0.0D); + worldIn.addOptionalParticle(Particles.LARGE_SMOKE, (double) pos.getX() + Math.random(), (double) pos.getY() + Math.random(), (double) pos.getZ() + Math.random(), 0.0D, 0.0D, 0.0D); } } diff --git a/src/main/java/net/minecraftforge/fluids/FluidStack.java b/src/main/java/net/minecraftforge/fluids/FluidStack.java index f41d17d5b..b4bad3076 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidStack.java +++ b/src/main/java/net/minecraftforge/fluids/FluidStack.java @@ -87,7 +87,7 @@ public class FluidStack { return null; } - if (!nbt.hasKey("FluidName", Constants.NBT.TAG_STRING)) + if (!nbt.contains("FluidName", Constants.NBT.TAG_STRING)) { return null; } @@ -109,7 +109,7 @@ public class FluidStack public NBTTagCompound writeToNBT(NBTTagCompound nbt) { // TODO fluids bt.setString("FluidName", FluidRegistry.getFluidName(getFluid())); - nbt.setInteger("Amount", amount); + nbt.setInt("Amount", amount); if (tag != null) { diff --git a/src/main/java/net/minecraftforge/fluids/FluidUtil.java b/src/main/java/net/minecraftforge/fluids/FluidUtil.java index 9d7f54834..593c1e70d 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidUtil.java +++ b/src/main/java/net/minecraftforge/fluids/FluidUtil.java @@ -258,7 +258,7 @@ public class FluidUtil return FluidActionResult.FAILURE; } - if (player != null && player.capabilities.isCreativeMode) + if (player != null && player.abilities.isCreativeMode) { FluidActionResult filledReal = tryFillContainer(container, fluidSource, maxAmount, player, doFill); if (filledReal.isSuccess()) @@ -349,7 +349,7 @@ public class FluidUtil return FluidActionResult.FAILURE; } - if (player != null && player.capabilities.isCreativeMode) + if (player != null && player.abilities.isCreativeMode) { FluidActionResult emptiedReal = tryEmptyContainer(container, fluidDestination, maxAmount, player, doDrain); if (emptiedReal.isSuccess()) @@ -622,13 +622,13 @@ public class FluidUtil IBlockState destBlockState = world.getBlockState(pos); Material destMaterial = destBlockState.getMaterial(); boolean isDestNonSolid = !destMaterial.isSolid(); - boolean isDestReplaceable = destBlockState.func_196953_a(context); + boolean isDestReplaceable = destBlockState.isReplaceable(context); if (!world.isAirBlock(pos) && !isDestNonSolid && !isDestReplaceable) { return false; // Non-air, solid, unreplacable block. We can't put fluid here. } - if (world.provider.doesWaterVaporize() && fluid.doesVaporize(resource)) + if (world.dimension.doesWaterVaporize() && fluid.doesVaporize(resource)) { FluidStack result = fluidSource.drain(resource, true); if (result != null) diff --git a/src/main/java/net/minecraftforge/fluids/UniversalBucket.java b/src/main/java/net/minecraftforge/fluids/UniversalBucket.java index 8d4c88d2f..61ebf6d68 100644 --- a/src/main/java/net/minecraftforge/fluids/UniversalBucket.java +++ b/src/main/java/net/minecraftforge/fluids/UniversalBucket.java @@ -50,6 +50,8 @@ import net.minecraftforge.items.ItemHandlerHelper; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import net.minecraft.item.Item.Builder; + /** * A universal bucket that can hold any liquid */ @@ -83,7 +85,7 @@ public class UniversalBucket extends Item this.setCreativeTab(CreativeTabs.MISC); */ - BlockDispenser.func_199774_a(this, DispenseFluidContainer.getInstance()); + BlockDispenser.registerDispenseBehavior(this, DispenseFluidContainer.getInstance()); } @Override @@ -105,9 +107,9 @@ public class UniversalBucket extends Item } @Override - public void getSubItems(@Nullable ItemGroup tab, @Nonnull NonNullList subItems) + public void fillItemGroup(@Nullable ItemGroup tab, @Nonnull NonNullList subItems) { - if (!this.isInCreativeTab(tab)) + if (!this.isInGroup(tab)) return;/* TODO fluids for (Fluid fluid : FluidRegistry.getRegisteredFluids().values()) { @@ -128,22 +130,22 @@ public class UniversalBucket extends Item @Override @Nonnull - public ITextComponent func_200295_i(@Nonnull ItemStack stack) + public ITextComponent getDisplayName(@Nonnull ItemStack stack) { FluidStack fluidStack = getFluid(stack); if (fluidStack == null) { if(!getEmpty().isEmpty()) { - return getEmpty().func_200301_q(); + return getEmpty().getDisplayName(); } - return super.func_200295_i(stack); + return super.getDisplayName(stack); } String unloc = this.getTranslationKey(); // TODO this is not reliable on the server - if (LanguageMap.getInstance().func_210813_b(unloc + "." + fluidStack.getFluid().getName())) + if (LanguageMap.getInstance().exists(unloc + "." + fluidStack.getFluid().getName())) { return new TextComponentTranslation(unloc + "." + fluidStack.getFluid().getName()); } @@ -169,7 +171,7 @@ public class UniversalBucket extends Item ActionResult ret = ForgeEventFactory.onBucketUse(player, world, itemstack, mop); if (ret != null) return ret; - if(mop == null || mop.typeOfHit != RayTraceResult.Type.BLOCK) + if(mop == null || mop.type != RayTraceResult.Type.BLOCK) { return new ActionResult(EnumActionResult.PASS, itemstack); } @@ -186,10 +188,10 @@ public class UniversalBucket extends Item { // try placing liquid FluidActionResult result = FluidUtil.tryPlaceFluid(player, world, targetPos, itemstack, fluidStack); - if (result.isSuccess() && !player.capabilities.isCreativeMode) + if (result.isSuccess() && !player.abilities.isCreativeMode) { // success! - player.addStat(StatList.OBJECT_USE_STATS.func_199076_b(this)); + player.addStat(StatList.ITEM_USED.get(this)); itemstack.shrink(1); ItemStack drained = result.getResult(); @@ -234,7 +236,7 @@ public class UniversalBucket extends Item // needs to target a block RayTraceResult target = event.getTarget(); - if (target == null || target.typeOfHit != RayTraceResult.Type.BLOCK) + if (target == null || target.type != RayTraceResult.Type.BLOCK) { return; } @@ -272,7 +274,7 @@ public class UniversalBucket extends Item @Nullable public FluidStack getFluid(@Nonnull ItemStack container) { - return FluidStack.loadFluidStackFromNBT(container.getTagCompound()); + return FluidStack.loadFluidStackFromNBT(container.getTag()); } public int getCapacity() diff --git a/src/main/java/net/minecraftforge/fluids/capability/CapabilityFluidHandler.java b/src/main/java/net/minecraftforge/fluids/capability/CapabilityFluidHandler.java index 68d708906..41a62d470 100644 --- a/src/main/java/net/minecraftforge/fluids/capability/CapabilityFluidHandler.java +++ b/src/main/java/net/minecraftforge/fluids/capability/CapabilityFluidHandler.java @@ -64,7 +64,7 @@ public class CapabilityFluidHandler { nbt.setString("Empty", ""); } - nbt.setInteger("Capacity", tank.getCapacity()); + nbt.setInt("Capacity", tank.getCapacity()); return nbt; } @@ -75,7 +75,7 @@ public class CapabilityFluidHandler throw new RuntimeException("IFluidHandler instance is not instance of FluidTank"); NBTTagCompound tags = (NBTTagCompound) nbt; FluidTank tank = (FluidTank) instance; - tank.setCapacity(tags.getInteger("Capacity")); + tank.setCapacity(tags.getInt("Capacity")); tank.readFromNBT(tags); } } diff --git a/src/main/java/net/minecraftforge/fluids/capability/TileFluidHandler.java b/src/main/java/net/minecraftforge/fluids/capability/TileFluidHandler.java index 023ebbc9a..3c14b6b32 100644 --- a/src/main/java/net/minecraftforge/fluids/capability/TileFluidHandler.java +++ b/src/main/java/net/minecraftforge/fluids/capability/TileFluidHandler.java @@ -37,22 +37,22 @@ public class TileFluidHandler extends TileEntity private final OptionalCapabilityInstance holder = OptionalCapabilityInstance.of(() -> tank); - public TileFluidHandler(@Nonnull TileEntityType p_i48289_1_) + public TileFluidHandler(@Nonnull TileEntityType tileEntityTypeIn) { - super(p_i48289_1_); + super(tileEntityTypeIn); } @Override - public void readFromNBT(NBTTagCompound tag) + public void read(NBTTagCompound tag) { - super.readFromNBT(tag); + super.read(tag); tank.readFromNBT(tag); } @Override - public NBTTagCompound writeToNBT(NBTTagCompound tag) + public NBTTagCompound write(NBTTagCompound tag) { - tag = super.writeToNBT(tag); + tag = super.write(tag); tank.writeToNBT(tag); return tag; } diff --git a/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStack.java b/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStack.java index 9589b21cd..e8b49425d 100644 --- a/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStack.java +++ b/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStack.java @@ -73,24 +73,24 @@ public class FluidHandlerItemStack implements IFluidHandlerItem, ICapabilityProv @Nullable public FluidStack getFluid() { - NBTTagCompound tagCompound = container.getTagCompound(); + NBTTagCompound tagCompound = container.getTag(); if (tagCompound == null || !tagCompound.hasKey(FLUID_NBT_KEY)) { return null; } - return FluidStack.loadFluidStackFromNBT(tagCompound.getCompoundTag(FLUID_NBT_KEY)); + return FluidStack.loadFluidStackFromNBT(tagCompound.getCompound(FLUID_NBT_KEY)); } protected void setFluid(FluidStack fluid) { - if (!container.hasTagCompound()) + if (!container.hasTag()) { - container.setTagCompound(new NBTTagCompound()); + container.setTag(new NBTTagCompound()); } NBTTagCompound fluidTag = new NBTTagCompound(); fluid.writeToNBT(fluidTag); - container.getTagCompound().setTag(FLUID_NBT_KEY, fluidTag); + container.getTag().setTag(FLUID_NBT_KEY, fluidTag); } @Override @@ -200,7 +200,7 @@ public class FluidHandlerItemStack implements IFluidHandlerItem, ICapabilityProv */ protected void setContainerToEmpty() { - container.getTagCompound().removeTag(FLUID_NBT_KEY); + container.getTag().removeTag(FLUID_NBT_KEY); } @Override diff --git a/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStackSimple.java b/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStackSimple.java index 82840d697..1f618907c 100644 --- a/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStackSimple.java +++ b/src/main/java/net/minecraftforge/fluids/capability/templates/FluidHandlerItemStackSimple.java @@ -70,24 +70,24 @@ public class FluidHandlerItemStackSimple implements IFluidHandlerItem, ICapabili @Nullable public FluidStack getFluid() { - NBTTagCompound tagCompound = container.getTagCompound(); + NBTTagCompound tagCompound = container.getTag(); if (tagCompound == null || !tagCompound.hasKey(FLUID_NBT_KEY)) { return null; } - return FluidStack.loadFluidStackFromNBT(tagCompound.getCompoundTag(FLUID_NBT_KEY)); + return FluidStack.loadFluidStackFromNBT(tagCompound.getCompound(FLUID_NBT_KEY)); } protected void setFluid(FluidStack fluid) { - if (!container.hasTagCompound()) + if (!container.hasTag()) { - container.setTagCompound(new NBTTagCompound()); + container.setTag(new NBTTagCompound()); } NBTTagCompound fluidTag = new NBTTagCompound(); fluid.writeToNBT(fluidTag); - container.getTagCompound().setTag(FLUID_NBT_KEY, fluidTag); + container.getTag().setTag(FLUID_NBT_KEY, fluidTag); } @Override @@ -177,7 +177,7 @@ public class FluidHandlerItemStackSimple implements IFluidHandlerItem, ICapabili */ protected void setContainerToEmpty() { - container.getTagCompound().removeTag(FLUID_NBT_KEY); + container.getTag().removeTag(FLUID_NBT_KEY); } @Override diff --git a/src/main/java/net/minecraftforge/fluids/capability/wrappers/BlockLiquidWrapper.java b/src/main/java/net/minecraftforge/fluids/capability/wrappers/BlockLiquidWrapper.java index 9e851bd51..b220d2e16 100644 --- a/src/main/java/net/minecraftforge/fluids/capability/wrappers/BlockLiquidWrapper.java +++ b/src/main/java/net/minecraftforge/fluids/capability/wrappers/BlockLiquidWrapper.java @@ -155,4 +155,4 @@ public class BlockLiquidWrapper implements IFluidHandler } } } -*/ \ No newline at end of file +*/ diff --git a/src/main/java/net/minecraftforge/fluids/capability/wrappers/BlockWrapper.java b/src/main/java/net/minecraftforge/fluids/capability/wrappers/BlockWrapper.java index e18c08b58..c0856bcb3 100644 --- a/src/main/java/net/minecraftforge/fluids/capability/wrappers/BlockWrapper.java +++ b/src/main/java/net/minecraftforge/fluids/capability/wrappers/BlockWrapper.java @@ -60,4 +60,4 @@ public class BlockWrapper extends VoidFluidHandler } return Fluid.BUCKET_VOLUME; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/fml/FMLWorldPersistenceHook.java b/src/main/java/net/minecraftforge/fml/FMLWorldPersistenceHook.java index 712e834ab..37da82591 100644 --- a/src/main/java/net/minecraftforge/fml/FMLWorldPersistenceHook.java +++ b/src/main/java/net/minecraftforge/fml/FMLWorldPersistenceHook.java @@ -86,10 +86,10 @@ public final class FMLWorldPersistenceHook implements WorldPersistenceHooks.Worl { if (tag.hasKey("LoadingModList")) { - NBTTagList modList = tag.getTagList("LoadingModList", (byte)10); + NBTTagList modList = tag.getList("LoadingModList", (byte)10); for (int i = 0; i < modList.size(); i++) { - NBTTagCompound mod = modList.getCompoundTagAt(i); + NBTTagCompound mod = modList.getCompound(i); String modId = mod.getString("ModId"); String modVersion = mod.getString("ModVersion"); Optional container = ModList.get().getModContainerById(modId); @@ -115,10 +115,10 @@ public final class FMLWorldPersistenceHook implements WorldPersistenceHooks.Worl else if (tag.hasKey("Registries")) // 1.8, genericed out the 'registries' list { Map snapshot = new HashMap<>(); - NBTTagCompound regs = tag.getCompoundTag("Registries"); - for (String key : regs.getKeySet()) + NBTTagCompound regs = tag.getCompound("Registries"); + for (String key : regs.keySet()) { - snapshot.put(new ResourceLocation(key), ForgeRegistry.Snapshot.read(regs.getCompoundTag(key))); + snapshot.put(new ResourceLocation(key), ForgeRegistry.Snapshot.read(regs.getCompound(key))); } failedElements = GameData.injectSnapshot(snapshot, true, true); } diff --git a/src/main/java/net/minecraftforge/fml/SidedProvider.java b/src/main/java/net/minecraftforge/fml/SidedProvider.java index 9a90892fa..51953309d 100644 --- a/src/main/java/net/minecraftforge/fml/SidedProvider.java +++ b/src/main/java/net/minecraftforge/fml/SidedProvider.java @@ -34,7 +34,7 @@ import java.util.function.Supplier; public enum SidedProvider { // All of these need to be careful not to directly dereference the client and server elements in their signatures - DATAFIXER(c->c.get().getDataFixer(), s->s.get().func_195563_aC()), + DATAFIXER(c->c.get().getDataFixer(), s->s.get().getDataFixer()), SIDEDINIT((Function, Function>)c-> mc->new FMLClientInitEvent(c, mc), (Function, Function>)s-> mc->new FMLServerInitEvent(s, mc)), STRIPCHARS((Function, Function>)c-> ClientHooks::stripSpecialChars, @@ -76,4 +76,4 @@ public enum SidedProvider throw new IllegalArgumentException("THREE SIDES? WUT?"); } } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/fml/WorldPersistenceHooks.java b/src/main/java/net/minecraftforge/fml/WorldPersistenceHooks.java index a4cf3ff8b..a51398037 100644 --- a/src/main/java/net/minecraftforge/fml/WorldPersistenceHooks.java +++ b/src/main/java/net/minecraftforge/fml/WorldPersistenceHooks.java @@ -44,7 +44,7 @@ public class WorldPersistenceHooks { if (EffectiveSide.get() == LogicalSide.SERVER) { - worldPersistenceHooks.forEach(wac->wac.readData(handler, worldInfo, tagCompound.getCompoundTag(wac.getModId()))); + worldPersistenceHooks.forEach(wac->wac.readData(handler, worldInfo, tagCompound.getCompound(wac.getModId()))); } } diff --git a/src/main/java/net/minecraftforge/fml/client/ClientHooks.java b/src/main/java/net/minecraftforge/fml/client/ClientHooks.java index 74ff8c582..68eabb0a9 100644 --- a/src/main/java/net/minecraftforge/fml/client/ClientHooks.java +++ b/src/main/java/net/minecraftforge/fml/client/ClientHooks.java @@ -155,7 +155,7 @@ public class ClientHooks { return null; } - Minecraft.getMinecraft().getTextureManager().bindTexture(iconSheet); + Minecraft.getInstance().getTextureManager().bindTexture(iconSheet); Gui.drawModalRectWithCustomSizedTexture(x + width - 18, y + 10, 0, (float)idx, 16, 16, 256.0f, 256.0f); if (blocked) { @@ -172,14 +172,14 @@ public class ClientHooks static File getSavesDir() { - return new File(Minecraft.getMinecraft().gameDir, "saves"); + return new File(Minecraft.getInstance().gameDir, "saves"); } public static void tryLoadExistingWorld(GuiWorldSelection selectWorldGUI, WorldSummary comparator) { try { - Minecraft.getMinecraft().launchIntegratedServer(comparator.getFileName(), comparator.getDisplayName(), null); + Minecraft.getInstance().launchIntegratedServer(comparator.getFileName(), comparator.getDisplayName(), null); } catch (StartupQuery.AbortedException e) { @@ -189,7 +189,7 @@ public class ClientHooks private static NetworkManager getClientToServerNetworkManager() { - return Minecraft.getMinecraft().getConnection()!=null ? Minecraft.getMinecraft().getConnection().getNetworkManager() : null; + return Minecraft.getInstance().getConnection()!=null ? Minecraft.getInstance().getConnection().getNetworkManager() : null; } public static void handleClientWorldClosing(WorldClient world) @@ -207,11 +207,11 @@ public class ClientHooks ExtendedServerListData extendedData = serverDataTag.get(serverEntry); if (extendedData != null && extendedData.isBlocked) { - Minecraft.getMinecraft().displayGuiScreen(new GuiAccessDenied(guiMultiplayer, serverEntry)); + Minecraft.getInstance().displayGuiScreen(new GuiAccessDenied(guiMultiplayer, serverEntry)); } else { - Minecraft.getMinecraft().displayGuiScreen(new GuiConnecting(guiMultiplayer, Minecraft.getMinecraft(), serverEntry)); + Minecraft.getInstance().displayGuiScreen(new GuiConnecting(guiMultiplayer, Minecraft.getInstance(), serverEntry)); } } diff --git a/src/main/java/net/minecraftforge/fml/client/ModFileResourcePack.java b/src/main/java/net/minecraftforge/fml/client/ModFileResourcePack.java index 925833afc..d90e6b711 100644 --- a/src/main/java/net/minecraftforge/fml/client/ModFileResourcePack.java +++ b/src/main/java/net/minecraftforge/fml/client/ModFileResourcePack.java @@ -49,34 +49,34 @@ public class ModFileResourcePack extends AbstractResourcePack } @Override - public String func_195762_a() + public String getName() { return modFile.getFileName(); } @Override - protected InputStream func_195766_a(String name) throws IOException + protected InputStream getInputStream(String name) throws IOException { return Files.newInputStream(modFile.getLocator().findPath(modFile, name)); } @Override - protected boolean func_195768_c(String name) + protected boolean resourceExists(String name) { return Files.exists(modFile.getLocator().findPath(modFile, name)); } @Override - public Collection func_195758_a(ResourcePackType p_195758_1_, String p_195758_2_, int p_195758_3_, Predicate p_195758_4_) + public Collection getAllResourceLocations(ResourcePackType type, String pathIn, int maxDepth, Predicate filter) { try { - return Files.walk(modFile.getLocator().findPath(modFile, p_195758_1_.func_198956_a())). + return Files.walk(modFile.getLocator().findPath(modFile, type.getDirectoryName())). filter(path -> !path.toString().endsWith(".mcmeta")). - filter(path -> path.getNameCount() > 2 && p_195758_2_.equals(path.getName(2).toString())). - filter(path -> p_195758_4_.test(path.subpath(3, Math.min(p_195758_3_+3, path.getNameCount())).toString())). - map(path -> new ResourceLocation(path.getName(1).toString(),path.subpath(3,Math.min(p_195758_3_+3, path.getNameCount())).toString())). + filter(path -> path.getNameCount() > 2 && pathIn.equals(path.getName(2).toString())). + filter(path -> filter.test(path.subpath(3, Math.min(maxDepth+3, path.getNameCount())).toString())). + map(path -> new ResourceLocation(path.getName(1).toString(),path.subpath(3,Math.min(maxDepth+3, path.getNameCount())).toString())). collect(Collectors.toList()); } catch (IOException e) @@ -86,10 +86,10 @@ public class ModFileResourcePack extends AbstractResourcePack } @Override - public Set func_195759_a(ResourcePackType p_195759_1_) + public Set getResourceNamespaces(ResourcePackType type) { try { - return Files.walk(modFile.getLocator().findPath(modFile, p_195759_1_.func_198956_a()),1).map(p->p.getFileName().toString()).collect(Collectors.toSet()); + return Files.walk(modFile.getLocator().findPath(modFile, type.getDirectoryName()),1).map(p->p.getFileName().toString()).collect(Collectors.toSet()); } catch (IOException e) { diff --git a/src/main/java/net/minecraftforge/fml/client/ResourcePackLoader.java b/src/main/java/net/minecraftforge/fml/client/ResourcePackLoader.java index 41f38d3a6..25d04f815 100644 --- a/src/main/java/net/minecraftforge/fml/client/ResourcePackLoader.java +++ b/src/main/java/net/minecraftforge/fml/client/ResourcePackLoader.java @@ -52,7 +52,7 @@ public class ResourcePackLoader @SuppressWarnings("unchecked") public static T getResourcePackInfo(String modId) { - return (T)resourcePackList.func_198981_a(modId); + return (T)resourcePackList.getPackInfo(modId); } public static void loadResourcePacks(ResourcePackList resourcePacks) { @@ -63,13 +63,13 @@ public class ResourcePackLoader forgePack = Files.isDirectory(FMLLoader.getForgePath()) ? new FolderPack(FMLLoader.getForgePath().toFile()) : new FilePack(FMLLoader.getForgePath().toFile()); - resourcePacks.func_198982_a(new ModPackFinder()); + resourcePacks.addPackFinder(new ModPackFinder()); } private static class ModPackFinder implements net.minecraft.resources.IPackFinder { @Override - public void func_195730_a(Map packList, ResourcePackInfo.IFactory factory) + public void addPackInfosToMap(Map packList, ResourcePackInfo.IFactory factory) { packList.put("forge", ResourcePackInfo.func_195793_a("forge", true, ()->forgePack, factory, ResourcePackInfo.Priority.BOTTOM)); } diff --git a/src/main/java/net/minecraftforge/fml/client/SplashProgress.java b/src/main/java/net/minecraftforge/fml/client/SplashProgress.java index e81670517..1771af788 100644 --- a/src/main/java/net/minecraftforge/fml/client/SplashProgress.java +++ b/src/main/java/net/minecraftforge/fml/client/SplashProgress.java @@ -982,4 +982,4 @@ public class SplashProgress return (int) (bytes / 1024L / 1024L); } */ -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiButtonExt.java b/src/main/java/net/minecraftforge/fml/client/config/GuiButtonExt.java index 690d1be4e..cd0cebbcf 100644 --- a/src/main/java/net/minecraftforge/fml/client/config/GuiButtonExt.java +++ b/src/main/java/net/minecraftforge/fml/client/config/GuiButtonExt.java @@ -48,15 +48,15 @@ public class GuiButtonExt extends GuiButton * Draws this button to the screen. */ @Override - public void func_194828_a(int mouseX, int mouseY, float partial) + public void render(int mouseX, int mouseY, float partial) { if (this.visible) { - Minecraft mc = Minecraft.getMinecraft(); + Minecraft mc = Minecraft.getInstance(); this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height; int k = this.getHoverState(this.hovered); GuiUtils.drawContinuousTexturedBox(BUTTON_TEXTURES, this.x, this.y, 0, 46 + k * 20, this.width, this.height, 200, 20, 2, 3, 2, 2, this.zLevel); - this.mouseDragged(mc, mouseX, mouseY); + this.renderBg(mc, mouseX, mouseY); int color = 14737632; if (packedFGColor != 0) diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java b/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java index 8ec57b828..596a42e45 100644 --- a/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java +++ b/src/main/java/net/minecraftforge/fml/client/config/GuiCheckBox.java @@ -38,18 +38,18 @@ public class GuiCheckBox extends GuiButton this.isChecked = isChecked; this.boxWidth = 11; this.height = 11; - this.width = this.boxWidth + 2 + Minecraft.getMinecraft().fontRenderer.getStringWidth(displayString); + this.width = this.boxWidth + 2 + Minecraft.getInstance().fontRenderer.getStringWidth(displayString); } @Override - public void func_194828_a(int mouseX, int mouseY, float partial) + public void render(int mouseX, int mouseY, float partial) { if (this.visible) { - Minecraft mc = Minecraft.getMinecraft(); + Minecraft mc = Minecraft.getInstance(); this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.boxWidth && mouseY < this.y + this.height; GuiUtils.drawContinuousTexturedBox(BUTTON_TEXTURES, this.x, this.y, 0, 46, this.boxWidth, this.height, 200, 20, 2, 3, 2, 2, this.zLevel); - this.mouseDragged(mc, mouseX, mouseY); + this.renderBg(mc, mouseX, mouseY); int color = 14737632; if (packedFGColor != 0) @@ -69,7 +69,7 @@ public class GuiCheckBox extends GuiButton } @Override - public void func_194829_a(double mouseX, double mouseY) + public void onClick(double mouseX, double mouseY) { this.isChecked = !this.isChecked; } diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiMessageDialog.java b/src/main/java/net/minecraftforge/fml/client/config/GuiMessageDialog.java index 0c531f91b..0a3d0d7f3 100644 --- a/src/main/java/net/minecraftforge/fml/client/config/GuiMessageDialog.java +++ b/src/main/java/net/minecraftforge/fml/client/config/GuiMessageDialog.java @@ -40,6 +40,6 @@ public class GuiMessageDialog extends GuiDisconnected public void initGui() { super.initGui(); - buttonList.get(0).displayString = I18n.format(buttonText); + buttons.get(0).displayString = I18n.format(buttonText); } } diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiSlider.java b/src/main/java/net/minecraftforge/fml/client/config/GuiSlider.java index dfe7c4c15..b90e8abfc 100644 --- a/src/main/java/net/minecraftforge/fml/client/config/GuiSlider.java +++ b/src/main/java/net/minecraftforge/fml/client/config/GuiSlider.java @@ -107,7 +107,7 @@ public class GuiSlider extends GuiButtonExt * Fired when the mouse button is dragged. Equivalent of MouseListener.mouseDragged(MouseEvent e). */ @Override - protected void mouseDragged(Minecraft par1Minecraft, int par2, int par3) + protected void renderBg(Minecraft par1Minecraft, int par2, int par3) { if (this.visible) { @@ -117,7 +117,7 @@ public class GuiSlider extends GuiButtonExt updateSlider(); } - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); this.drawTexturedModalRect(this.x + (int)(this.sliderValue * (float)(this.width - 8)), this.y, 0, 66, 4, 20); this.drawTexturedModalRect(this.x + (int)(this.sliderValue * (float)(this.width - 8)) + 4, this.y, 196, 66, 4, 20); } @@ -128,7 +128,7 @@ public class GuiSlider extends GuiButtonExt * e). */ @Override - public void func_194829_a(double mouseX, double mouseY) + public void onClick(double mouseX, double mouseY) { this.sliderValue = (mouseX - (this.x + 4)) / (this.width - 8); updateSlider(); @@ -190,7 +190,7 @@ public class GuiSlider extends GuiButtonExt * Fired when the mouse button is released. Equivalent of MouseListener.mouseReleased(MouseEvent e). */ @Override - public void func_194831_b(double mouseX, double mouseY) + public void onRelease(double mouseX, double mouseY) { this.dragging = false; } diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiUnicodeGlyphButton.java b/src/main/java/net/minecraftforge/fml/client/config/GuiUnicodeGlyphButton.java index 5faa773c2..5148a9806 100644 --- a/src/main/java/net/minecraftforge/fml/client/config/GuiUnicodeGlyphButton.java +++ b/src/main/java/net/minecraftforge/fml/client/config/GuiUnicodeGlyphButton.java @@ -41,15 +41,15 @@ public class GuiUnicodeGlyphButton extends GuiButtonExt } @Override - public void func_194828_a(int mouseX, int mouseY, float partial) + public void render(int mouseX, int mouseY, float partial) { if (this.visible) { - Minecraft mc = Minecraft.getMinecraft(); + Minecraft mc = Minecraft.getInstance(); this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height; int k = this.getHoverState(this.hovered); GuiUtils.drawContinuousTexturedBox(GuiButton.BUTTON_TEXTURES, this.x, this.y, 0, 46 + k * 20, this.width, this.height, 200, 20, 2, 3, 2, 2, this.zLevel); - this.mouseDragged(mc, mouseX, mouseY); + this.renderBg(mc, mouseX, mouseY); int color = 14737632; if (packedFGColor != 0) @@ -78,7 +78,7 @@ public class GuiUnicodeGlyphButton extends GuiButtonExt totalWidth = glyphWidth + strWidth; GlStateManager.pushMatrix(); - GlStateManager.scale(glyphScale, glyphScale, 1.0F); + GlStateManager.scalef(glyphScale, glyphScale, 1.0F); this.drawCenteredString(mc.fontRenderer, glyph, (int) (((this.x + (this.width / 2) - (strWidth / 2)) / glyphScale) - (glyphWidth / (2 * glyphScale)) + 2), (int) (((this.y + ((this.height - 8) / glyphScale) / 2) - 1) / glyphScale), color); diff --git a/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java b/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java index 8248be5a7..20591d348 100644 --- a/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java +++ b/src/main/java/net/minecraftforge/fml/client/config/GuiUtils.java @@ -125,7 +125,7 @@ public class GuiUtils public static void drawContinuousTexturedBox(ResourceLocation res, int x, int y, int u, int v, int width, int height, int textureWidth, int textureHeight, int topBorder, int bottomBorder, int leftBorder, int rightBorder, float zLevel) { - Minecraft.getMinecraft().getTextureManager().bindTexture(res); + Minecraft.getInstance().getTextureManager().bindTexture(res); drawContinuousTexturedBox(x, y, u, v, width, height, textureWidth, textureHeight, topBorder, bottomBorder, leftBorder, rightBorder, zLevel); } @@ -151,9 +151,9 @@ public class GuiUtils public static void drawContinuousTexturedBox(int x, int y, int u, int v, int width, int height, int textureWidth, int textureHeight, int topBorder, int bottomBorder, int leftBorder, int rightBorder, float zLevel) { - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.enableBlend(); - GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); + GlStateManager.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); int fillerWidth = textureWidth - leftBorder - rightBorder; int fillerHeight = textureHeight - topBorder - bottomBorder; @@ -275,7 +275,7 @@ public class GuiUtils GlStateManager.disableRescaleNormal(); RenderHelper.disableStandardItemLighting(); GlStateManager.disableLighting(); - GlStateManager.disableDepth(); + GlStateManager.disableDepthTest(); int tooltipTextWidth = 0; for (String textLine : textLines) @@ -409,7 +409,7 @@ public class GuiUtils MinecraftForge.EVENT_BUS.post(new RenderTooltipEvent.PostText(stack, textLines, tooltipX, tooltipTop, font, tooltipTextWidth, tooltipHeight)); GlStateManager.enableLighting(); - GlStateManager.enableDepth(); + GlStateManager.enableDepthTest(); RenderHelper.enableStandardItemLighting(); GlStateManager.enableRescaleNormal(); } @@ -428,8 +428,8 @@ public class GuiUtils GlStateManager.disableTexture2D(); GlStateManager.enableBlend(); - GlStateManager.disableAlpha(); - GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); + GlStateManager.disableAlphaTest(); + GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO); GlStateManager.shadeModel(GL11.GL_SMOOTH); Tessellator tessellator = Tessellator.getInstance(); @@ -443,7 +443,7 @@ public class GuiUtils GlStateManager.shadeModel(GL11.GL_FLAT); GlStateManager.disableBlend(); - GlStateManager.enableAlpha(); + GlStateManager.enableAlphaTest(); GlStateManager.enableTexture2D(); } } diff --git a/src/main/java/net/minecraftforge/fml/client/config/IArrayEntry.java b/src/main/java/net/minecraftforge/fml/client/config/IArrayEntry.java index ca2f0baa3..0ec36ccce 100644 --- a/src/main/java/net/minecraftforge/fml/client/config/IArrayEntry.java +++ b/src/main/java/net/minecraftforge/fml/client/config/IArrayEntry.java @@ -32,4 +32,4 @@ public interface IArrayEntry boolean isValueSavable(); Object getValue(); -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/fml/client/config/IConfigEntry.java b/src/main/java/net/minecraftforge/fml/client/config/IConfigEntry.java index 336b8a187..a02bc40f1 100644 --- a/src/main/java/net/minecraftforge/fml/client/config/IConfigEntry.java +++ b/src/main/java/net/minecraftforge/fml/client/config/IConfigEntry.java @@ -121,4 +121,4 @@ public interface IConfigEntry * This method is called when the parent GUI is closed. Most handlers won't need this; it is provided for special cases. */ void onGuiClosed(); -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiAccessDenied.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiAccessDenied.java index d8051e5ba..3c7bf4425 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiAccessDenied.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiAccessDenied.java @@ -37,9 +37,9 @@ public class GuiAccessDenied extends GuiScreen @Override public void initGui() { - this.buttonList.add(new GuiButton(1, this.width / 2 - 75, this.height - 38, I18n.format("gui.done")) + this.buttons.add(new GuiButton(1, this.width / 2 - 75, this.height - 38, I18n.format("gui.done")) { - public void func_194829_a(double p_194829_1_, double p_194829_3_) + public void onClick(double mouseX, double mouseY) { GuiAccessDenied.this.mc.displayGuiScreen(parent); } @@ -47,13 +47,13 @@ public class GuiAccessDenied extends GuiScreen } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) + public void render(int mouseX, int mouseY, float partialTicks) { this.drawDefaultBackground(); int offset = Math.max(85 - 2 * 10, 10); this.drawCenteredString(this.fontRenderer, "Forge Mod Loader could not connect to this server", this.width / 2, offset, 0xFFFFFF); offset += 10; this.drawCenteredString(this.fontRenderer, String.format("The server %s has forbidden modded access", data.serverName), this.width / 2, offset, 0xFFFFFF); - super.drawScreen(mouseX, mouseY, partialTicks); + super.render(mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiBackupFailed.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiBackupFailed.java index d824477ac..27e244ed0 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiBackupFailed.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiBackupFailed.java @@ -38,9 +38,9 @@ public class GuiBackupFailed extends GuiScreen @Override public void initGui() { - this.buttonList.add(new GuiButton(1, this.width / 2 - 75, this.height - 38, I18n.format("gui.done")) + this.buttons.add(new GuiButton(1, this.width / 2 - 75, this.height - 38, I18n.format("gui.done")) { - public void func_194829_a(double p_194829_1_, double p_194829_3_) + public void onClick(double mouseX, double mouseY) { GuiBackupFailed.this.mc.displayGuiScreen(parent); } @@ -48,13 +48,13 @@ public class GuiBackupFailed extends GuiScreen } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) + public void render(int mouseX, int mouseY, float partialTicks) { this.drawDefaultBackground(); int offset = Math.max(85 - 2 * 10, 10); this.drawCenteredString(this.fontRenderer, String.format("There was an error saving the archive %s", zipName.getName()), this.width / 2, offset, 0xFFFFFF); offset += 10; this.drawCenteredString(this.fontRenderer, String.format("Please fix the problem and try again"), this.width / 2, offset, 0xFFFFFF); - super.drawScreen(mouseX, mouseY, partialTicks); + super.render(mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiConfirmation.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiConfirmation.java index 13f2e8c18..da1e1ca22 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiConfirmation.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiConfirmation.java @@ -32,18 +32,18 @@ public class GuiConfirmation extends GuiNotification @Override public void initGui() { - this.buttonList.add(new GuiOptionButton(0, this.width / 2 - 155, this.height - 38, I18n.format("gui.yes")) + this.buttons.add(new GuiOptionButton(0, this.width / 2 - 155, this.height - 38, I18n.format("gui.yes")) { - public void func_194829_a(double p_194829_1_, double p_194829_3_) + public void onClick(double mouseX, double mouseY) { GuiConfirmation.this.mc.displayGuiScreen(null); query.setResult(true); query.finish(); } }); - this.buttonList.add(new GuiOptionButton(1, this.width / 2 - 155 + 160, this.height - 38, I18n.format("gui.no")) + this.buttons.add(new GuiOptionButton(1, this.width / 2 - 155 + 160, this.height - 38, I18n.format("gui.no")) { - public void func_194829_a(double p_194829_1_, double p_194829_3_) + public void onClick(double mouseX, double mouseY) { GuiConfirmation.this.mc.displayGuiScreen(null); query.setResult(false); diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiCustomModLoadingErrorScreen.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiCustomModLoadingErrorScreen.java index 974874b38..cd119f7cc 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiCustomModLoadingErrorScreen.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiCustomModLoadingErrorScreen.java @@ -40,10 +40,10 @@ public class GuiCustomModLoadingErrorScreen extends GuiErrorBase } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) + public void render(int mouseX, int mouseY, float partialTicks) { this.drawDefaultBackground(); - super.drawScreen(mouseX, mouseY, partialTicks); + super.render(mouseX, mouseY, partialTicks); this.customException.drawScreen(this, fontRenderer, mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiDupesFound.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiDupesFound.java index ec2840835..62a45f3ff 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiDupesFound.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiDupesFound.java @@ -38,7 +38,7 @@ public class GuiDupesFound extends GuiErrorBase } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) + public void render(int mouseX, int mouseY, float partialTicks) { this.drawDefaultBackground(); int offset = Math.max(85 - dupes.dupes.size() * 10, 10); @@ -53,6 +53,6 @@ public class GuiDupesFound extends GuiErrorBase offset += 10; this.drawCenteredString(this.fontRenderer, String.format("%s : %s", mc.getKey().getModId(), mc.getValue().getName()), this.width / 2, offset, 0xEEEEEE); } - super.drawScreen(mouseX, mouseY, partialTicks); + super.render(mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiErrorBase.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiErrorBase.java index 9ede95b28..b749f7ede 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiErrorBase.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiErrorBase.java @@ -52,10 +52,10 @@ public class GuiErrorBase extends GuiErrorScreen public void initGui() { super.initGui(); - this.buttonList.clear(); - this.buttonList.add(new GuiButton(10, 50, this.height - 38, this.width / 2 - 55, 20, translateOrDefault("fml.button.open.mods.folder", "Open Mods Folder")) + this.buttons.clear(); + this.buttons.add(new GuiButton(10, 50, this.height - 38, this.width / 2 - 55, 20, translateOrDefault("fml.button.open.mods.folder", "Open Mods Folder")) { - public void func_194829_a(double p_194829_1_, double p_194829_3_) + public void onClick(double mouseX, double mouseY) { try { @@ -69,9 +69,9 @@ public class GuiErrorBase extends GuiErrorScreen } }); String openFileText = translateOrDefault("fml.button.open.file", "Open %s", logFile.getName()); - this.buttonList.add(new GuiButton(11, this.width / 2 + 5, this.height - 38, this.width / 2 - 55, 20, openFileText) + this.buttons.add(new GuiButton(11, this.width / 2 + 5, this.height - 38, this.width / 2 - 55, 20, openFileText) { - public void func_194829_a(double p_194829_1_, double p_194829_3_) + public void onClick(double mouseX, double mouseY) { try { @@ -86,11 +86,11 @@ public class GuiErrorBase extends GuiErrorScreen } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) + public void render(int mouseX, int mouseY, float partialTicks) { - for (GuiButton button : buttonList) + for (GuiButton button : buttons) { - button.func_194828_a(mouseX, mouseY, partialTicks); + button.render(mouseX, mouseY, partialTicks); } } } diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiModList.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiModList.java index b32a4743e..18cd7509e 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiModList.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiModList.java @@ -116,7 +116,7 @@ public class GuiModList extends GuiScreen } @Override - public void func_194829_a(double p_194829_1_, double p_194829_3_) + public void onClick(double mouseX, double mouseY) { GuiModList.this.sortType = this.type; resortMods(); @@ -166,13 +166,13 @@ public class GuiModList extends GuiScreen void setInfo(Info info) { - this.func_195086_c(); - this.func_195085_a(info); + this.clearEntries(); + this.addEntry(info); } public void clear() { - this.func_195086_c(); + this.clearEntries(); } } @Override @@ -191,22 +191,22 @@ public class GuiModList extends GuiScreen this.addButton(new GuiButton(6, ((modList.right + this.width) / 2) - 100, this.height - 38, I18n.format("gui.done")){ @Override - public void func_194829_a(double p_194829_1_, double p_194829_3_) + public void onClick(double mouseX, double mouseY) { GuiModList.this.mc.displayGuiScreen(GuiModList.this.mainMenu); } }); this.addButton(this.configButton = new GuiButton(20, 10, this.height - 49, this.listWidth, 20, I18n.format("fml.menu.mods.config")){ @Override - public void func_194829_a(double p_194829_1_, double p_194829_3_) + public void onClick(double mouseX, double mouseY) { GuiModList.this.displayModConfig(); } }); search = new GuiTextField(0, getFontRenderer(), 12, modList.bottom + 17, modList.width - 4, 14); - field_195124_j.add(search); - field_195124_j.add(modList); + children.add(search); + children.add(modList); search.setFocused(true); search.setCanLoseFocus(true); @@ -235,9 +235,9 @@ public class GuiModList extends GuiScreen } @Override - public void updateScreen() + public void tick() { - search.updateCursorCounter(); + search.tick(); if (!search.getText().equals(lastFilterText)) { @@ -269,7 +269,7 @@ public class GuiModList extends GuiScreen private void resortMods() { - for (GuiButton b : buttonList) + for (GuiButton b : buttons) { if (b instanceof SortButton) { b.enabled = sortType.button != b; @@ -279,18 +279,18 @@ public class GuiModList extends GuiScreen } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) + public void render(int mouseX, int mouseY, float partialTicks) { this.modList.drawScreen(mouseX, mouseY, partialTicks); this.modInfo.drawScreen(mouseX, mouseY, partialTicks); int left = ((this.width - this.listWidth - 38) / 2) + this.listWidth + 30; - super.drawScreen(mouseX, mouseY, partialTicks); + super.render(mouseX, mouseY, partialTicks); String text = I18n.format("fml.menu.mods.search"); int x = ((10 + modList.right) / 2) - (getFontRenderer().getStringWidth(text) / 2); - getFontRenderer().func_211126_b(text, x, modList.bottom + 5, 0xFFFFFF); - this.search.func_195608_a(mouseX, mouseY, partialTicks); + getFontRenderer().drawString(text, x, modList.bottom + 5, 0xFFFFFF); + this.search.drawTextField(mouseX, mouseY, partialTicks); } Minecraft getMinecraftInstance() @@ -341,10 +341,10 @@ public class GuiModList extends GuiScreen NativeImage logo = null; InputStream logoResource = getClass().getResourceAsStream(logoFile); if (logoResource != null) - logo = NativeImage.func_195713_a(logoResource); + logo = NativeImage.read(logoResource); if (logo != null) { - return Pair.of(tm.getDynamicTextureLocation("modlogo", new DynamicTexture(logo)), new Dimension(logo.func_195702_a(), logo.func_195714_b())); + return Pair.of(tm.getDynamicTextureLocation("modlogo", new DynamicTexture(logo)), new Dimension(logo.getWidth(), logo.getHeight())); } } catch (IOException e) { } @@ -396,7 +396,7 @@ public class GuiModList extends GuiScreen public Info(GuiListExtended parent, List lines, @Nullable ResourceLocation logoPath, Dimension logoDims) { - this.field_195004_a = parent; + this.list = parent; this.lines = resizeContent(lines); this.logoPath = logoPath; this.logoDims = logoDims; @@ -415,7 +415,7 @@ public class GuiModList extends GuiScreen // ITextComponent chat = ForgeHooks.newChatWithLinks(line, false); ITextComponent chat = new TextComponentString(line); - int maxTextLength = this.func_195002_d() - 8; + int maxTextLength = this.getX() - 8; if (maxTextLength >= 0) { ret.addAll(GuiUtilRenderComponents.splitText(chat, maxTextLength, GuiModList.this.fontRenderer, false, true)); @@ -426,10 +426,10 @@ public class GuiModList extends GuiScreen @Override - public void func_194999_a(int p_194999_1_, int p_194999_2_, int p_194999_3_, int p_194999_4_, boolean p_194999_5_, float p_194999_6_) + public void drawEntry(int entryWidth, int entryHeight, int mouseX, int mouseY, boolean p_194999_5_, float partialTicks) { - int top = this.func_195001_c(); - int left = this.func_195002_d(); + int top = this.getY(); + int left = this.getX(); /* int top = this. @@ -457,7 +457,7 @@ public class GuiModList extends GuiScreen { GlStateManager.enableBlend(); GuiModList.this.fontRenderer.drawStringWithShadow(line.getFormattedText(), left + 4, top, 0xFFFFFF); - GlStateManager.disableAlpha(); + GlStateManager.disableAlphaTest(); GlStateManager.disableBlend(); } top += fontRenderer.FONT_HEIGHT + 1; diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiModsMissing.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiModsMissing.java index 83cb02605..34cf8d3dd 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiModsMissing.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiModsMissing.java @@ -43,7 +43,7 @@ public class GuiModsMissing extends GuiErrorBase } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) + public void render(int mouseX, int mouseY, float partialTicks) { this.drawDefaultBackground(); List missingModsVersions = modsMissing.getMissingModInfos(); @@ -89,6 +89,6 @@ public class GuiModsMissing extends GuiErrorBase offset += 10; this.drawCenteredString(this.fontRenderer, message, this.width / 2, offset, 0xEEEEEE); } - super.drawScreen(mouseX, mouseY, partialTicks); + super.render(mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiModsMissingForServer.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiModsMissingForServer.java index 9ce3da7ed..bbc1b5083 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiModsMissingForServer.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiModsMissingForServer.java @@ -39,9 +39,9 @@ public class GuiModsMissingForServer extends GuiScreen @Override public void initGui() { - this.buttonList.add(new GuiButton(1, this.width / 2 - 75, this.height - 38, I18n.format("gui.done")) + this.buttons.add(new GuiButton(1, this.width / 2 - 75, this.height - 38, I18n.format("gui.done")) { - public void func_194829_a(double p_194829_1_, double p_194829_3_) + public void onClick(double mouseX, double mouseY) { GuiModsMissingForServer.this.mc.displayGuiScreen(null); } @@ -49,7 +49,7 @@ public class GuiModsMissingForServer extends GuiScreen } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) + public void render(int mouseX, int mouseY, float partialTicks) { this.drawDefaultBackground(); List missingModsVersions = modsMissing.getMissingModInfos(); @@ -66,6 +66,6 @@ public class GuiModsMissingForServer extends GuiScreen offset += 10; this.drawCenteredString(this.fontRenderer, String.format("%s : %s", v.getLabel(), v.getRangeString()), this.width / 2, offset, 0xEEEEEE); } - super.drawScreen(mouseX, mouseY, partialTicks); + super.render(mouseX, mouseY, partialTicks); } } diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiMultipleModsErrored.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiMultipleModsErrored.java index 9d2aabd2b..6fec893a8 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiMultipleModsErrored.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiMultipleModsErrored.java @@ -59,13 +59,13 @@ public class GuiMultipleModsErrored extends GuiErrorBase } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) + public void render(int mouseX, int mouseY, float partialTicks) { this.drawDefaultBackground(); this.list.drawScreen(mouseX, mouseY, partialTicks); String missingMultipleModsText = I18n.format("fml.messages.mod.missing.multiple", missingModsExceptions.size()); this.drawCenteredString(this.fontRenderer, missingMultipleModsText, this.width / 2, 10, 0xFFFFFF); - super.drawScreen(mouseX, mouseY, partialTicks); + super.render(mouseX, mouseY, partialTicks); } @Override @@ -118,11 +118,11 @@ public class GuiMultipleModsErrored extends GuiErrorBase FontRenderer renderer = GuiMultipleModsErrored.this.fontRenderer; if (!missingModsExceptions.isEmpty()) { - renderer.func_211126_b(I18n.format("fml.messages.mod.missing.dependencies.multiple.issues"), this.left, offset, 0xFFFFFF); + renderer.drawString(I18n.format("fml.messages.mod.missing.dependencies.multiple.issues"), this.left, offset, 0xFFFFFF); offset += 15; for (MissingModsException exception : missingModsExceptions) { - renderer.func_211126_b(exception.getModName() + ":", this.left, offset, 0xFFFFFF); + renderer.drawString(exception.getModName() + ":", this.left, offset, 0xFFFFFF); for (MissingModsException.MissingModInfo versionInfo : exception.getMissingModInfos()) { ArtifactVersion acceptedVersion = versionInfo.getAcceptedVersion(); @@ -159,7 +159,7 @@ public class GuiMultipleModsErrored extends GuiErrorBase message = I18n.format("fml.messages.mod.missing.dependencies.compatible.with", versionInfoText); } offset += 10; - renderer.func_211126_b(message, this.left, offset, 0xEEEEEE); + renderer.drawString(message, this.left, offset, 0xEEEEEE); } offset += 15; diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiNotification.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiNotification.java index a713192af..c462b994e 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiNotification.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiNotification.java @@ -34,9 +34,9 @@ public class GuiNotification extends GuiScreen @Override public void initGui() { - this.buttonList.add(new GuiButton(0, this.width / 2 - 100, this.height - 38, I18n.format("gui.done")) + this.buttons.add(new GuiButton(0, this.width / 2 - 100, this.height - 38, I18n.format("gui.done")) { - public void func_194829_a(double p_194829_1_, double p_194829_3_) + public void onClick(double mouseX, double mouseY) { GuiNotification.this.mc.displayGuiScreen(null); query.finish(); @@ -45,7 +45,7 @@ public class GuiNotification extends GuiScreen } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) + public void render(int mouseX, int mouseY, float partialTicks) { this.drawDefaultBackground(); @@ -70,7 +70,7 @@ public class GuiNotification extends GuiScreen } } - super.drawScreen(mouseX, mouseY, partialTicks); + super.render(mouseX, mouseY, partialTicks); } protected final StartupQuery query; diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiScrollingList.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiScrollingList.java index aed652d84..7841c017f 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiScrollingList.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiScrollingList.java @@ -198,8 +198,8 @@ public abstract class GuiScrollingList int viewHeight = this.bottom - this.top; int border = 4; - Minecraft minecraft = Minecraft.getMinecraft(); - if (minecraft.mouseHelper.func_198030_b()) + Minecraft minecraft = Minecraft.getInstance(); + if (minecraft.mouseHelper.isLeftDown()) { if (this.initialMouseClickY == -1.0F) { @@ -261,11 +261,11 @@ public abstract class GuiScrollingList Tessellator tess = Tessellator.getInstance(); BufferBuilder worldr = tess.getBuffer(); - MainWindow window = client.field_195558_d; - double scaleW = window.func_198107_o(); - double scaleH = window.func_198087_p(); + MainWindow window = client.mainWindow; + double scaleW = window.getScaledWidth(); + double scaleH = window.getScaledHeight(); GL11.glEnable(GL11.GL_SCISSOR_TEST); - GL11.glScissor((int) (left * scaleW), (int) (window.func_198107_o() - (bottom * scaleH)), + GL11.glScissor((int) (left * scaleW), (int) (window.getScaledWidth() - (bottom * scaleH)), (int) (listWidth * scaleW), (int) (viewHeight * scaleH)); if (this.client.world != null) @@ -276,8 +276,8 @@ public abstract class GuiScrollingList { GlStateManager.disableLighting(); GlStateManager.disableFog(); - this.client.renderEngine.bindTexture(Gui.OPTIONS_BACKGROUND); - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + this.client.textureManager.bindTexture(Gui.OPTIONS_BACKGROUND); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); final float scale = 32.0F; worldr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldr.pos(this.left, this.bottom, 0.0D).tex(this.left / scale, (this.bottom + (int) this.scrollDistance) / scale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); @@ -305,7 +305,7 @@ public abstract class GuiScrollingList { int min = this.left; int max = entryRight; - GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); GlStateManager.disableTexture2D(); worldr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); worldr.pos(min, slotTop + slotBuffer + 2, 0).tex(0, 1).color(0x80, 0x80, 0x80, 0xFF).endVertex(); @@ -324,7 +324,7 @@ public abstract class GuiScrollingList } } - GlStateManager.disableDepth(); + GlStateManager.disableDepthTest(); int extraHeight = (this.getContentHeight() + border) - viewHeight; if (extraHeight > 0) @@ -366,7 +366,7 @@ public abstract class GuiScrollingList this.drawScreen(mouseX, mouseY); GlStateManager.enableTexture2D(); GlStateManager.shadeModel(GL11.GL_FLAT); - GlStateManager.enableAlpha(); + GlStateManager.enableAlphaTest(); GlStateManager.disableBlend(); GL11.glDisable(GL11.GL_SCISSOR_TEST); } diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiSlotModList.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiSlotModList.java index 4736f1b07..f1b620747 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiSlotModList.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiSlotModList.java @@ -66,8 +66,8 @@ public class GuiSlotModList extends GuiListExtended } void refreshList() { - this.func_195086_c(); - parent.buildModList(this::func_195085_a, mod->new ModEntry(mod, this.parent)); + this.clearEntries(); + parent.buildModList(this::addEntry, mod->new ModEntry(mod, this.parent)); } @Override @@ -92,21 +92,21 @@ public class GuiSlotModList extends GuiListExtended } @Override - public void func_194999_a(int p_194999_1_, int p_194999_2_, int p_194999_3_, int p_194999_4_, boolean p_194999_5_, float p_194999_6_) + public void drawEntry(int entryWidth, int entryHeight, int mouseX, int mouseY, boolean p_194999_5_, float partialTicks) { - int top = this.func_195001_c(); - int left = this.func_195002_d(); + int top = this.getY(); + int left = this.getX(); String name = stripControlCodes(modInfo.getDisplayName()); String version = stripControlCodes(modInfo.getVersion().getVersionString()); VersionChecker.CheckResult vercheck = VersionChecker.getResult(modInfo); FontRenderer font = this.parent.getFontRenderer(); - font.func_211126_b(font.trimStringToWidth(name, listWidth),left + 3, top + 2, 0xFFFFFF); - font.func_211126_b(font.trimStringToWidth(version, listWidth), left + 3 , top + 2 + font.FONT_HEIGHT, 0xCCCCCC); + font.drawString(font.trimStringToWidth(name, listWidth),left + 3, top + 2, 0xFFFFFF); + font.drawString(font.trimStringToWidth(version, listWidth), left + 3 , top + 2 + font.FONT_HEIGHT, 0xCCCCCC); if (vercheck.status.shouldDraw()) { //TODO: Consider adding more icons for visualization - Minecraft.getMinecraft().getTextureManager().bindTexture(VERSION_CHECK_ICONS); - GlStateManager.color(1, 1, 1, 1); + Minecraft.getInstance().getTextureManager().bindTexture(VERSION_CHECK_ICONS); + GlStateManager.color4f(1, 1, 1, 1); GlStateManager.pushMatrix(); Gui.drawModalRectWithCustomSizedTexture(right - (height / 2 + 4), GuiSlotModList.this.top + (height / 2 - 4), vercheck.status.getSheetOffset() * 8, (vercheck.status.isAnimated() && ((System.currentTimeMillis() / 800 & 1)) == 1) ? 8 : 0, 8, 8, 64, 16); GlStateManager.popMatrix(); @@ -116,7 +116,7 @@ public class GuiSlotModList extends GuiListExtended @Override public boolean mouseClicked(double p_mouseClicked_1_, double p_mouseClicked_3_, int p_mouseClicked_5_) { - parent.selectModIndex(this.func_195003_b()); + parent.selectModIndex(this.getIndex()); return false; } } diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiSortingProblem.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiSortingProblem.java index 5caf1def0..5b553e951 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiSortingProblem.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiSortingProblem.java @@ -39,7 +39,7 @@ public class GuiSortingProblem extends GuiScreen { } @Override - public void drawScreen(int mouseX, int mouseY, float partialTicks) + public void render(int mouseX, int mouseY, float partialTicks) { this.drawDefaultBackground(); int offset = Math.max(85 - (failedList.getVisitedNodes().size() + 3) * 10, 10); diff --git a/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java b/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java index abd64cecf..b3a25d627 100644 --- a/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java +++ b/src/main/java/net/minecraftforge/fml/client/registry/ClientRegistry.java @@ -59,7 +59,7 @@ public class ClientRegistry public static void registerKeyBinding(KeyBinding key) { - Minecraft.getMinecraft().gameSettings.keyBindings = ArrayUtils.add(Minecraft.getMinecraft().gameSettings.keyBindings, key); + Minecraft.getInstance().gameSettings.keyBindings = ArrayUtils.add(Minecraft.getInstance().gameSettings.keyBindings, key); } /** diff --git a/src/main/java/net/minecraftforge/fml/common/LoaderException.java b/src/main/java/net/minecraftforge/fml/common/LoaderException.java index 616be09ca..cbc869758 100644 --- a/src/main/java/net/minecraftforge/fml/common/LoaderException.java +++ b/src/main/java/net/minecraftforge/fml/common/LoaderException.java @@ -18,6 +18,8 @@ */ package net.minecraftforge.fml.common; +import net.minecraftforge.fml.common.EnhancedRuntimeException.WrappedPrintStream; + public class LoaderException extends EnhancedRuntimeException { diff --git a/src/main/java/net/minecraftforge/fml/common/MissingModsException.java b/src/main/java/net/minecraftforge/fml/common/MissingModsException.java index 8680955da..e78186b01 100644 --- a/src/main/java/net/minecraftforge/fml/common/MissingModsException.java +++ b/src/main/java/net/minecraftforge/fml/common/MissingModsException.java @@ -34,6 +34,8 @@ import net.minecraftforge.fml.client.gui.GuiModsMissing; import net.minecraftforge.fml.client.IDisplayableError; import net.minecraftforge.fml.common.versioning.ArtifactVersion; +import net.minecraftforge.fml.common.EnhancedRuntimeException.WrappedPrintStream; + public class MissingModsException extends EnhancedRuntimeException implements IDisplayableError { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/minecraftforge/fml/common/MultipleModsErrored.java b/src/main/java/net/minecraftforge/fml/common/MultipleModsErrored.java index 6811ac16d..b39ff2a4f 100644 --- a/src/main/java/net/minecraftforge/fml/common/MultipleModsErrored.java +++ b/src/main/java/net/minecraftforge/fml/common/MultipleModsErrored.java @@ -27,6 +27,8 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.fml.client.IDisplayableError; import net.minecraftforge.fml.client.gui.GuiMultipleModsErrored; +import net.minecraftforge.fml.common.EnhancedRuntimeException.WrappedPrintStream; + public class MultipleModsErrored extends EnhancedRuntimeException implements IDisplayableError { public final List missingModsExceptions; diff --git a/src/main/java/net/minecraftforge/fml/common/ProgressManager.java b/src/main/java/net/minecraftforge/fml/common/ProgressManager.java index 26f394f03..b463b1447 100644 --- a/src/main/java/net/minecraftforge/fml/common/ProgressManager.java +++ b/src/main/java/net/minecraftforge/fml/common/ProgressManager.java @@ -159,4 +159,4 @@ public class ProgressManager this.timeEachStep = true; } } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/fml/common/asm/transformers/SoundEngineFixTransformer.java b/src/main/java/net/minecraftforge/fml/common/asm/transformers/SoundEngineFixTransformer.java index 57f687b39..5ab5b6c64 100644 --- a/src/main/java/net/minecraftforge/fml/common/asm/transformers/SoundEngineFixTransformer.java +++ b/src/main/java/net/minecraftforge/fml/common/asm/transformers/SoundEngineFixTransformer.java @@ -167,4 +167,4 @@ public class SoundEngineFixTransformer implements IClassTransformer } } -*/ \ No newline at end of file +*/ diff --git a/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartingEvent.java b/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartingEvent.java index 95d35dddf..3beb847cf 100644 --- a/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartingEvent.java +++ b/src/main/java/net/minecraftforge/fml/common/event/FMLServerStartingEvent.java @@ -38,6 +38,6 @@ public class FMLServerStartingEvent extends ServerLifecycleEvent } public CommandDispatcher getCommandDispatcher() { - return server.func_195571_aL().func_197054_a(); + return server.getCommandManager().getDispatcher(); } } diff --git a/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java b/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java index f417075fd..d25c3dc63 100644 --- a/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java +++ b/src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java @@ -320,7 +320,7 @@ public class VillagerRegistry public static void setRandomProfession(EntityVillager entity, Random rand) { - entity.setProfession(INSTANCE.REGISTRY.getRandomObject(rand)); + entity.setProfession(INSTANCE.REGISTRY.getRandom(rand)); } @@ -333,8 +333,8 @@ public class VillagerRegistry //Below this is INTERNAL USE ONLY DO NOT USE MODDERS public static void onSetProfession(EntityVillager entity, int network) { - VillagerProfession prof = INSTANCE.REGISTRY.getObjectById(network); - if (prof == null || INSTANCE.REGISTRY.getIDForObject(prof) != network) + VillagerProfession prof = INSTANCE.REGISTRY.get(network); + if (prof == null || INSTANCE.REGISTRY.getId(prof) != network) { throw new RuntimeException("Attempted to set villager profession to unregistered profession: " + network + " " + prof); } @@ -345,8 +345,8 @@ public class VillagerRegistry public static void onSetProfession(EntityZombieVillager entity, int network) { - VillagerProfession prof = INSTANCE.REGISTRY.getObjectById(network); - if (prof == null && network != -1 || INSTANCE.REGISTRY.getIDForObject(prof) != network) + VillagerProfession prof = INSTANCE.REGISTRY.get(network); + if (prof == null && network != -1 || INSTANCE.REGISTRY.getId(prof) != network) { throw new RuntimeException("Attempted to set villager profession to unregistered profession: " + network + " " + prof); } @@ -355,8 +355,8 @@ public class VillagerRegistry entity.setForgeProfession(prof); } - @Deprecated public static VillagerProfession getById(int network){ return INSTANCE.REGISTRY.getObjectById(network); } - @Deprecated public static int getId(@Nullable VillagerProfession prof){ return INSTANCE.REGISTRY.getIDForObject(prof); } + @Deprecated public static VillagerProfession getById(int network){ return INSTANCE.REGISTRY.get(network); } + @Deprecated public static int getId(@Nullable VillagerProfession prof){ return INSTANCE.REGISTRY.getId(prof); } //TODO: Figure out a good generic system for this. Put on hold for Patches. diff --git a/src/main/java/net/minecraftforge/fml/common/toposort/ModSortingException.java b/src/main/java/net/minecraftforge/fml/common/toposort/ModSortingException.java index 41f9d3278..ac0b19e68 100644 --- a/src/main/java/net/minecraftforge/fml/common/toposort/ModSortingException.java +++ b/src/main/java/net/minecraftforge/fml/common/toposort/ModSortingException.java @@ -29,6 +29,8 @@ import net.minecraftforge.fml.client.IDisplayableError; import net.minecraftforge.fml.client.gui.GuiSortingProblem; import net.minecraftforge.fml.common.EnhancedRuntimeException; +import net.minecraftforge.fml.common.EnhancedRuntimeException.WrappedPrintStream; + public class ModSortingException extends EnhancedRuntimeException implements IDisplayableError { private static final long serialVersionUID = 1L; diff --git a/src/main/java/net/minecraftforge/fml/common/versioning/VersionRange.java b/src/main/java/net/minecraftforge/fml/common/versioning/VersionRange.java index 3100bebcf..7c0189a20 100644 --- a/src/main/java/net/minecraftforge/fml/common/versioning/VersionRange.java +++ b/src/main/java/net/minecraftforge/fml/common/versioning/VersionRange.java @@ -33,6 +33,8 @@ import net.minecraftforge.api.distmarker.OnlyIn; import javax.annotation.Nullable; +import com.google.common.base.Joiner; + /** * Construct a version range from a specification. * diff --git a/src/main/java/net/minecraftforge/fml/loading/DefaultModInfos.java b/src/main/java/net/minecraftforge/fml/loading/DefaultModInfos.java index 98c11264b..72827d31b 100644 --- a/src/main/java/net/minecraftforge/fml/loading/DefaultModInfos.java +++ b/src/main/java/net/minecraftforge/fml/loading/DefaultModInfos.java @@ -61,4 +61,4 @@ public class DefaultModInfos } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java b/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java index ab56019a3..a389d432a 100644 --- a/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java +++ b/src/main/java/net/minecraftforge/fml/loading/FMLServiceProvider.java @@ -37,6 +37,8 @@ import java.util.function.BiFunction; import static net.minecraftforge.fml.Logging.CORE; +import cpw.mods.modlauncher.api.ITransformationService.OptionResult; + public class FMLServiceProvider implements ITransformationService { diff --git a/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileParser.java b/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileParser.java index 5466acadc..df180fe38 100644 --- a/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileParser.java +++ b/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFileParser.java @@ -79,4 +79,4 @@ public class ModFileParser { map(e -> new CoreModFile(e.getKey(), modFile.getLocator().findPath(modFile, e.getValue()),modFile)). collect(Collectors.toList()); } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java b/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java index 725aa6782..403c6c33d 100644 --- a/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java +++ b/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModInfo.java @@ -32,6 +32,8 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; +import net.minecraftforge.fml.language.IModInfo.ModVersion; + public class ModInfo implements IModInfo { private static final DefaultArtifactVersion DEFAULT_VERSION = new DefaultArtifactVersion("1"); diff --git a/src/main/java/net/minecraftforge/fml/network/FMLHandshakeHandler.java b/src/main/java/net/minecraftforge/fml/network/FMLHandshakeHandler.java index 27b7606f2..396d7ade4 100644 --- a/src/main/java/net/minecraftforge/fml/network/FMLHandshakeHandler.java +++ b/src/main/java/net/minecraftforge/fml/network/FMLHandshakeHandler.java @@ -59,7 +59,7 @@ import java.util.function.Supplier; * *

The collected {@link net.minecraftforge.fml.network.NetworkRegistry.LoginPayload} are sent, one per tick, via * the {@link FMLLoginWrapper#wrapPacket(ResourceLocation, PacketBuffer)} mechanism to the incoming client connection. Each - * packet is indexed via {@link net.minecraft.network.login.client.CPacketCustomPayloadLogin#field_209922_a}, which is + * packet is indexed via {@link net.minecraft.network.login.client.CPacketCustomPayloadLogin#transaction}, which is * the only mechanism available for tracking request/response pairs. * *

Each packet sent from the server should be replied by the client, though not necessarily in sent order. The reply diff --git a/src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java b/src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java index 12b81aba2..7425c55d3 100644 --- a/src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java +++ b/src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java @@ -60,8 +60,8 @@ public class FMLHandshakeMessages S2CModList(NBTTagCompound nbtTagCompound) { - this.modList = nbtTagCompound.getTagList("modlist", 8).stream().map(INBTBase::getString).collect(Collectors.toList()); - this.channels = nbtTagCompound.getTagList("channels", 10); + this.modList = nbtTagCompound.getList("modlist", 8).stream().map(INBTBase::getString).collect(Collectors.toList()); + this.channels = nbtTagCompound.getList("channels", 10); } public static S2CModList decode(PacketBuffer packetBuffer) diff --git a/src/main/java/net/minecraftforge/fml/network/event/EventNetworkChannel.java b/src/main/java/net/minecraftforge/fml/network/event/EventNetworkChannel.java index 64d7816a5..7fd3f293b 100644 --- a/src/main/java/net/minecraftforge/fml/network/event/EventNetworkChannel.java +++ b/src/main/java/net/minecraftforge/fml/network/event/EventNetworkChannel.java @@ -47,4 +47,4 @@ public class EventNetworkChannel { instance.unregisterObject(object); } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/fml/network/simple/SimpleChannel.java b/src/main/java/net/minecraftforge/fml/network/simple/SimpleChannel.java index b2c7903bf..ab0dfa1a4 100644 --- a/src/main/java/net/minecraftforge/fml/network/simple/SimpleChannel.java +++ b/src/main/java/net/minecraftforge/fml/network/simple/SimpleChannel.java @@ -78,7 +78,7 @@ public class SimpleChannel public void sendToServer(MSG message) { - sendTo(message, Minecraft.getMinecraft().getConnection().getNetworkManager(), NetworkDirection.PLAY_TO_SERVER); + sendTo(message, Minecraft.getInstance().getConnection().getNetworkManager(), NetworkDirection.PLAY_TO_SERVER); } public void sendTo(MSG message, NetworkManager manager, NetworkDirection direction) diff --git a/src/main/java/net/minecraftforge/items/CapabilityItemHandler.java b/src/main/java/net/minecraftforge/items/CapabilityItemHandler.java index f957d466c..c292e55e9 100644 --- a/src/main/java/net/minecraftforge/items/CapabilityItemHandler.java +++ b/src/main/java/net/minecraftforge/items/CapabilityItemHandler.java @@ -50,8 +50,8 @@ public class CapabilityItemHandler if (!stack.isEmpty()) { NBTTagCompound itemTag = new NBTTagCompound(); - itemTag.setInteger("Slot", i); - stack.writeToNBT(itemTag); + itemTag.setInt("Slot", i); + stack.write(itemTag); nbtTagList.add(itemTag); } } @@ -67,12 +67,12 @@ public class CapabilityItemHandler NBTTagList tagList = (NBTTagList) base; for (int i = 0; i < tagList.size(); i++) { - NBTTagCompound itemTags = tagList.getCompoundTagAt(i); - int j = itemTags.getInteger("Slot"); + NBTTagCompound itemTags = tagList.getCompound(i); + int j = itemTags.getInt("Slot"); if (j >= 0 && j < instance.getSlots()) { - itemHandlerModifiable.setStackInSlot(j, ItemStack.func_199557_a(itemTags)); + itemHandlerModifiable.setStackInSlot(j, ItemStack.read(itemTags)); } } } diff --git a/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java b/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java index 5220600e6..c398188e7 100644 --- a/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java +++ b/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java @@ -54,10 +54,10 @@ public class ItemHandlerHelper public static boolean canItemStacksStack(@Nonnull ItemStack a, @Nonnull ItemStack b) { - if (a.isEmpty() || !a.isItemEqual(b) || a.hasTagCompound() != b.hasTagCompound()) + if (a.isEmpty() || !a.isItemEqual(b) || a.hasTag() != b.hasTag()) return false; - return (!a.hasTagCompound() || a.getTagCompound().equals(b.getTagCompound())) && a.areCapsCompatible(b); + return (!a.hasTag() || a.getTag().equals(b.getTag())) && a.areCapsCompatible(b); } /** @@ -79,10 +79,10 @@ public class ItemHandlerHelper if (a.getHasSubtypes() && a.getMetadata() != b.getMetadata()) return false; */ - if (a.hasTagCompound() != b.hasTagCompound()) + if (a.hasTag() != b.hasTag()) return false; - return (!a.hasTagCompound() || a.getTagCompound().equals(b.getTagCompound())) && a.areCapsCompatible(b); + return (!a.hasTag() || a.getTag().equals(b.getTag())) && a.areCapsCompatible(b); } @Nonnull diff --git a/src/main/java/net/minecraftforge/items/ItemStackHandler.java b/src/main/java/net/minecraftforge/items/ItemStackHandler.java index eb07f42a5..59afa1508 100644 --- a/src/main/java/net/minecraftforge/items/ItemStackHandler.java +++ b/src/main/java/net/minecraftforge/items/ItemStackHandler.java @@ -179,30 +179,30 @@ public class ItemStackHandler implements IItemHandler, IItemHandlerModifiable, I if (!stacks.get(i).isEmpty()) { NBTTagCompound itemTag = new NBTTagCompound(); - itemTag.setInteger("Slot", i); - stacks.get(i).writeToNBT(itemTag); + itemTag.setInt("Slot", i); + stacks.get(i).write(itemTag); nbtTagList.add(itemTag); } } NBTTagCompound nbt = new NBTTagCompound(); nbt.setTag("Items", nbtTagList); - nbt.setInteger("Size", stacks.size()); + nbt.setInt("Size", stacks.size()); return nbt; } @Override public void deserializeNBT(NBTTagCompound nbt) { - setSize(nbt.hasKey("Size", Constants.NBT.TAG_INT) ? nbt.getInteger("Size") : stacks.size()); - NBTTagList tagList = nbt.getTagList("Items", Constants.NBT.TAG_COMPOUND); + setSize(nbt.contains("Size", Constants.NBT.TAG_INT) ? nbt.getInt("Size") : stacks.size()); + NBTTagList tagList = nbt.getList("Items", Constants.NBT.TAG_COMPOUND); for (int i = 0; i < tagList.size(); i++) { - NBTTagCompound itemTags = tagList.getCompoundTagAt(i); - int slot = itemTags.getInteger("Slot"); + NBTTagCompound itemTags = tagList.getCompound(i); + int slot = itemTags.getInt("Slot"); if (slot >= 0 && slot < stacks.size()) { - stacks.set(slot, ItemStack.func_199557_a(itemTags)); + stacks.set(slot, ItemStack.read(itemTags)); } } onLoad(); diff --git a/src/main/java/net/minecraftforge/items/VanillaDoubleChestItemHandler.java b/src/main/java/net/minecraftforge/items/VanillaDoubleChestItemHandler.java index 6a5ee58c1..39ead7611 100644 --- a/src/main/java/net/minecraftforge/items/VanillaDoubleChestItemHandler.java +++ b/src/main/java/net/minecraftforge/items/VanillaDoubleChestItemHandler.java @@ -59,9 +59,9 @@ public class VanillaDoubleChestItemHandler extends WeakReference= 0; i--) // Use reverse order so we can return early { EnumFacing enumfacing = horizontals[i]; @@ -99,7 +99,7 @@ public class VanillaDoubleChestItemHandler extends WeakReference { IItemHandler itemHandler = destinationResult.getKey(); Object destination = destinationResult.getValue(); - ItemStack dispensedStack = stack.copy().splitStack(1); + ItemStack dispensedStack = stack.copy().split(1); ItemStack remainder = putStackInInventoryAllSlots(dropper, destination, itemHandler, dispensedStack); if (remainder.isEmpty()) @@ -117,7 +117,7 @@ public class VanillaInventoryCodeHooks */ public static boolean insertHook(TileEntityHopper hopper) { - EnumFacing hopperFacing = hopper.func_195044_w().getValue(BlockHopper.FACING); + EnumFacing hopperFacing = hopper.getBlockState().get(BlockHopper.FACING); return getItemHandler(hopper, hopperFacing) .map(destinationResult -> { IItemHandler itemHandler = destinationResult.getKey(); diff --git a/src/main/java/net/minecraftforge/items/wrapper/InvWrapper.java b/src/main/java/net/minecraftforge/items/wrapper/InvWrapper.java index 89b3e69ad..37c5ea492 100644 --- a/src/main/java/net/minecraftforge/items/wrapper/InvWrapper.java +++ b/src/main/java/net/minecraftforge/items/wrapper/InvWrapper.java @@ -109,7 +109,7 @@ public class InvWrapper implements IItemHandlerModifiable stack = stack.copy(); if (!simulate) { - ItemStack copy = stack.splitStack(m); + ItemStack copy = stack.split(m); copy.grow(stackInSlot.getCount()); getInv().setInventorySlotContents(slot, copy); getInv().markDirty(); @@ -134,7 +134,7 @@ public class InvWrapper implements IItemHandlerModifiable stack = stack.copy(); if (!simulate) { - getInv().setInventorySlotContents(slot, stack.splitStack(m)); + getInv().setInventorySlotContents(slot, stack.split(m)); getInv().markDirty(); return stack; } diff --git a/src/main/java/net/minecraftforge/items/wrapper/SidedInvWrapper.java b/src/main/java/net/minecraftforge/items/wrapper/SidedInvWrapper.java index 159832bd8..4208b6286 100644 --- a/src/main/java/net/minecraftforge/items/wrapper/SidedInvWrapper.java +++ b/src/main/java/net/minecraftforge/items/wrapper/SidedInvWrapper.java @@ -137,7 +137,7 @@ public class SidedInvWrapper implements IItemHandlerModifiable stack = stack.copy(); if (!simulate) { - ItemStack copy = stack.splitStack(m); + ItemStack copy = stack.split(m); copy.grow(stackInSlot.getCount()); setInventorySlotContents(slot1, copy); return stack; @@ -161,7 +161,7 @@ public class SidedInvWrapper implements IItemHandlerModifiable stack = stack.copy(); if (!simulate) { - setInventorySlotContents(slot1, stack.splitStack(m)); + setInventorySlotContents(slot1, stack.split(m)); return stack; } else diff --git a/src/main/java/net/minecraftforge/logging/ModelLoaderErrorMessage.java b/src/main/java/net/minecraftforge/logging/ModelLoaderErrorMessage.java index 473b206f9..1741de2ff 100644 --- a/src/main/java/net/minecraftforge/logging/ModelLoaderErrorMessage.java +++ b/src/main/java/net/minecraftforge/logging/ModelLoaderErrorMessage.java @@ -48,8 +48,8 @@ public class ModelLoaderErrorMessage extends SimpleMessage if (!reverseBlockMap.isEmpty()) return; ForgeRegistries.BLOCKS.getValues().stream() - .flatMap(block -> block.getBlockState().getValidStates().stream()) - .forEach(state -> reverseBlockMap.put(BlockModelShapes.func_209554_c(state), state)); + .flatMap(block -> block.getStateContainer().getValidStates().stream()) + .forEach(state -> reverseBlockMap.put(BlockModelShapes.getModelLocation(state), state)); ForgeRegistries.ITEMS.forEach(item -> { diff --git a/src/main/java/net/minecraftforge/registries/ForgeRegistry.java b/src/main/java/net/minecraftforge/registries/ForgeRegistry.java index adf15987d..dd87edb58 100644 --- a/src/main/java/net/minecraftforge/registries/ForgeRegistry.java +++ b/src/main/java/net/minecraftforge/registries/ForgeRegistry.java @@ -56,6 +56,13 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; +import net.minecraftforge.registries.IForgeRegistry.AddCallback; +import net.minecraftforge.registries.IForgeRegistry.ClearCallback; +import net.minecraftforge.registries.IForgeRegistry.CreateCallback; +import net.minecraftforge.registries.IForgeRegistry.DummyFactory; +import net.minecraftforge.registries.IForgeRegistry.MissingFactory; +import net.minecraftforge.registries.IForgeRegistry.ValidateCallback; + public class ForgeRegistry> implements IForgeRegistryInternal, IForgeRegistryModifiable { public static Marker REGISTRIES = MarkerManager.getMarker("REGISTRIES"); @@ -782,7 +789,7 @@ public class ForgeRegistry> implements IForgeRe { NBTTagCompound tag = new NBTTagCompound(); tag.setString("K", e.getKey().toString()); - tag.setInteger("V", e.getValue()); + tag.setInt("V", e.getValue()); ids.add(tag); }); data.setTag("ids", ids); @@ -825,21 +832,21 @@ public class ForgeRegistry> implements IForgeRe return ret; } - NBTTagList list = nbt.getTagList("ids", 10); + NBTTagList list = nbt.getList("ids", 10); list.forEach(e -> { NBTTagCompound comp = (NBTTagCompound)e; - ret.ids.put(new ResourceLocation(comp.getString("K")), comp.getInteger("V")); + ret.ids.put(new ResourceLocation(comp.getString("K")), comp.getInt("V")); }); - list = nbt.getTagList("aliases", 10); + list = nbt.getList("aliases", 10); list.forEach(e -> { NBTTagCompound comp = (NBTTagCompound)e; ret.overrides.put(new ResourceLocation(comp.getString("K")), comp.getString("V")); }); - list = nbt.getTagList("overrides", 10); + list = nbt.getList("overrides", 10); list.forEach(e -> { NBTTagCompound comp = (NBTTagCompound)e; @@ -852,10 +859,10 @@ public class ForgeRegistry> implements IForgeRe ret.blocked.add(i); } - list = nbt.getTagList("dummied", 10); //10 - NBTTagCompound, Old format. New format is String list. For now we will just merge the old and new. TODO: Remove in 1.13 + list = nbt.getList("dummied", 10); //10 - NBTTagCompound, Old format. New format is String list. For now we will just merge the old and new. TODO: Remove in 1.13 list.forEach(e -> ret.dummied.add(new ResourceLocation(((NBTTagCompound)e).getString("K")))); - list = nbt.getTagList("dummied", 8); //8 - NBTTagString, New format, less redundant/verbose + list = nbt.getList("dummied", 8); //8 - NBTTagString, New format, less redundant/verbose list.forEach(e -> ret.dummied.add(new ResourceLocation(((NBTTagString)e).getString()))); return ret; diff --git a/src/main/java/net/minecraftforge/registries/GameData.java b/src/main/java/net/minecraftforge/registries/GameData.java index 8f52a9890..551cebd33 100644 --- a/src/main/java/net/minecraftforge/registries/GameData.java +++ b/src/main/java/net/minecraftforge/registries/GameData.java @@ -71,6 +71,8 @@ import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Marker; import org.apache.logging.log4j.MarkerManager; +import net.minecraftforge.fml.common.EnhancedRuntimeException.WrappedPrintStream; + /** * INTERNAL ONLY * MODDERS SHOULD HAVE NO REASON TO USE THIS CLASS @@ -356,7 +358,7 @@ public class GameData @Override public Block createDummy(ResourceLocation key) { - Block ret = new BlockDummyAir(Block.Builder.func_200945_a(Material.AIR)); + Block ret = new BlockDummyAir(Block.Builder.create(Material.AIR)); GameData.forceRegistryName(ret, key); return ret; } @@ -386,7 +388,7 @@ public class GameData { @SuppressWarnings("unchecked") Map blockToItem = owner.getSlaveMap(BLOCK_TO_ITEM, Map.class); - ((ItemBlock)item).func_195946_a(blockToItem, item); + ((ItemBlock)item).addToBlockToItemMap(blockToItem, item); } } diff --git a/src/main/java/net/minecraftforge/registries/NamespacedDefaultedWrapper.java b/src/main/java/net/minecraftforge/registries/NamespacedDefaultedWrapper.java index b827d903a..14e5c493a 100644 --- a/src/main/java/net/minecraftforge/registries/NamespacedDefaultedWrapper.java +++ b/src/main/java/net/minecraftforge/registries/NamespacedDefaultedWrapper.java @@ -61,7 +61,7 @@ class NamespacedDefaultedWrapper> extends Regis } @Override - public void putObject(ResourceLocation key, V value) + public void put(ResourceLocation key, V value) { register(-1, key, value); } @@ -75,14 +75,14 @@ class NamespacedDefaultedWrapper> extends Regis // Reading Functions @Override @Nullable - public V getObject(@Nullable ResourceLocation name) + public V get(@Nullable ResourceLocation name) { return this.delegate.getValue(name); } @Override @Nullable - public ResourceLocation getNameForObject(V value) + public ResourceLocation getKey(V value) { return this.delegate.getKey(value); } @@ -94,14 +94,14 @@ class NamespacedDefaultedWrapper> extends Regis } @Override - public int getIDForObject(@Nullable V value) + public int getId(@Nullable V value) { return this.delegate.getID(value); } @Override @Nullable - public V getObjectById(int id) + public V get(int id) { return this.delegate.getValue(id); } @@ -120,7 +120,7 @@ class NamespacedDefaultedWrapper> extends Regis @Override @Nullable - public V getRandomObject(Random random) + public V getRandom(Random random) { Collection values = this.delegate.getValues(); return values.stream().skip(random.nextInt(values.size())).findFirst().orElse(null); diff --git a/src/main/java/net/minecraftforge/registries/NamespacedWrapper.java b/src/main/java/net/minecraftforge/registries/NamespacedWrapper.java index 71192abfb..64a3fe94d 100644 --- a/src/main/java/net/minecraftforge/registries/NamespacedWrapper.java +++ b/src/main/java/net/minecraftforge/registries/NamespacedWrapper.java @@ -61,7 +61,7 @@ class NamespacedWrapper> extends RegistryNamesp } @Override - public void putObject(ResourceLocation key, V value) + public void put(ResourceLocation key, V value) { register(-1, key, value); } @@ -70,14 +70,14 @@ class NamespacedWrapper> extends RegistryNamesp // Reading Functions @Override @Nullable - public V getObject(@Nullable ResourceLocation name) + public V get(@Nullable ResourceLocation name) { return this.delegate.getValue(name); } @Override @Nullable - public ResourceLocation getNameForObject(V value) + public ResourceLocation getKey(V value) { return this.delegate.getKey(value); } @@ -89,14 +89,14 @@ class NamespacedWrapper> extends RegistryNamesp } @Override - public int getIDForObject(@Nullable V value) + public int getId(@Nullable V value) { return this.delegate.getID(value); } @Override @Nullable - public V getObjectById(int id) + public V get(int id) { return this.delegate.getValue(id); } @@ -115,7 +115,7 @@ class NamespacedWrapper> extends RegistryNamesp @Override @Nullable - public V getRandomObject(Random random) + public V getRandom(Random random) { Collection values = this.delegate.getValues(); return values.stream().skip(random.nextInt(values.size())).findFirst().orElse(null); diff --git a/src/main/java/net/minecraftforge/server/command/ChunkGenWorker.java b/src/main/java/net/minecraftforge/server/command/ChunkGenWorker.java index d15913f32..019b1efbe 100644 --- a/src/main/java/net/minecraftforge/server/command/ChunkGenWorker.java +++ b/src/main/java/net/minecraftforge/server/command/ChunkGenWorker.java @@ -106,7 +106,7 @@ public class ChunkGenWorker implements IWorker world = DimensionManager.getWorld(dim); if (world == null) { - listener.func_197030_a(new TextComponentTranslation("commands.forge.gen.dim_fail", dim), true); + listener.sendFeedback(new TextComponentTranslation("commands.forge.gen.dim_fail", dim), true); queue.clear(); return false; } @@ -118,7 +118,7 @@ public class ChunkGenWorker implements IWorker if (lastNotifcationTime < System.currentTimeMillis() - 10*1000) { - listener.func_197030_a(new TextComponentTranslation("commands.forge.gen.progress", total - queue.size(), total), true); + listener.sendFeedback(new TextComponentTranslation("commands.forge.gen.progress", total - queue.size(), total), true); lastNotifcationTime = System.currentTimeMillis(); } return false; @@ -136,7 +136,7 @@ public class ChunkGenWorker implements IWorker if (++lastNotification >= notificationFrequency || lastNotifcationTime < System.currentTimeMillis() - 60*1000) { - listener.func_197030_a(new TextComponentTranslation("commands.forge.gen.progress", total - queue.size(), total), true); + listener.sendFeedback(new TextComponentTranslation("commands.forge.gen.progress", total - queue.size(), total), true); lastNotification = 0; lastNotifcationTime = System.currentTimeMillis(); } @@ -164,7 +164,7 @@ public class ChunkGenWorker implements IWorker } catch (IOException | SessionLockException e) { - listener.func_197030_a(new TextComponentTranslation("commands.forge.gen.saveerror", e.getMessage()), true); + listener.sendFeedback(new TextComponentTranslation("commands.forge.gen.saveerror", e.getMessage()), true); } genned++; } @@ -179,7 +179,7 @@ public class ChunkGenWorker implements IWorker if (queue.size() == 0) { - listener.func_197030_a(new TextComponentTranslation("commands.forge.gen.complete", genned, total, dim), true); + listener.sendFeedback(new TextComponentTranslation("commands.forge.gen.complete", genned, total, dim), true); if (keepingLoaded != null && keepingLoaded) { DimensionManager.keepDimensionLoaded(dim, false); diff --git a/src/main/java/net/minecraftforge/server/command/CommandDimensions.java b/src/main/java/net/minecraftforge/server/command/CommandDimensions.java index 084843455..033ae7a09 100644 --- a/src/main/java/net/minecraftforge/server/command/CommandDimensions.java +++ b/src/main/java/net/minecraftforge/server/command/CommandDimensions.java @@ -35,13 +35,13 @@ public class CommandDimensions { static ArgumentBuilder register() { - return Commands.func_197057_a("dimensions") - .requires(cs->cs.func_197034_c(0)) //permission + return Commands.literal("dimensions") + .requires(cs->cs.hasPermissionLevel(0)) //permission .executes(ctx -> { - ctx.getSource().func_197030_a(new TextComponentTranslation("commands.forge.dimensions.list"), true); + ctx.getSource().sendFeedback(new TextComponentTranslation("commands.forge.dimensions.list"), true); for (Map.Entry entry : DimensionManager.getRegisteredDimensions().entrySet()) { - ctx.getSource().func_197030_a(new TextComponentString(entry.getKey().getName() + ": " + entry.getValue()), true); + ctx.getSource().sendFeedback(new TextComponentString(entry.getKey().getName() + ": " + entry.getValue()), true); } return 0; }); diff --git a/src/main/java/net/minecraftforge/server/command/CommandEntity.java b/src/main/java/net/minecraftforge/server/command/CommandEntity.java index b2385da6b..45c3690c8 100644 --- a/src/main/java/net/minecraftforge/server/command/CommandEntity.java +++ b/src/main/java/net/minecraftforge/server/command/CommandEntity.java @@ -60,7 +60,7 @@ class CommandEntity { static ArgumentBuilder register() { - return Commands.func_197057_a("entity") + return Commands.literal("entity") .then(EntityListCommand.register()); //TODO: //Kill, spawn, etc.. } @@ -71,17 +71,17 @@ class CommandEntity private static final SimpleCommandExceptionType NO_ENTITIES = new SimpleCommandExceptionType(new TextComponentTranslation("commands.forge.entity.list.none")); static ArgumentBuilder register() { - return Commands.func_197057_a("list") - .requires(cs->cs.func_197034_c(2)) //permission - .then(Commands.func_197056_a("filter", StringArgumentType.string()) - .suggests((ctx, builder) -> ISuggestionProvider.func_197013_a(ForgeRegistries.ENTITIES.getKeys().stream().map(id -> id.toString()), builder)) - .then(Commands.func_197056_a("dim", IntegerArgumentType.integer()) - .suggests((ctx, builder) -> ISuggestionProvider.func_197013_a(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder)) + return Commands.literal("list") + .requires(cs->cs.hasPermissionLevel(2)) //permission + .then(Commands.argument("filter", StringArgumentType.string()) + .suggests((ctx, builder) -> ISuggestionProvider.suggest(ForgeRegistries.ENTITIES.getKeys().stream().map(id -> id.toString()), builder)) + .then(Commands.argument("dim", IntegerArgumentType.integer()) + .suggests((ctx, builder) -> ISuggestionProvider.suggest(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder)) .executes(ctx -> execute(ctx.getSource(), StringArgumentType.getString(ctx, "filter"), IntegerArgumentType.getInteger(ctx, "dim"))) ) - .executes(ctx -> execute(ctx.getSource(), StringArgumentType.getString(ctx, "filter"), ctx.getSource().func_197023_e().provider.getId())) + .executes(ctx -> execute(ctx.getSource(), StringArgumentType.getString(ctx, "filter"), ctx.getSource().getWorld().dimension.getId())) ) - .executes(ctx -> execute(ctx.getSource(), "*", ctx.getSource().func_197023_e().provider.getId())); + .executes(ctx -> execute(ctx.getSource(), "*", ctx.getSource().getWorld().dimension.getId())); } private static int execute(CommandSource sender, String filter, int dim) throws CommandSyntaxException @@ -100,7 +100,7 @@ class CommandEntity Map>> list = Maps.newHashMap(); List entities = world.loadedEntityList; entities.forEach(e -> { - MutablePair> info = list.computeIfAbsent(e.func_200600_R().getRegistryName(), k -> MutablePair.of(0, Maps.newHashMap())); + MutablePair> info = list.computeIfAbsent(e.getType().getRegistryName(), k -> MutablePair.of(0, Maps.newHashMap())); ChunkPos chunk = new ChunkPos(e.getPosition()); info.left++; info.right.put(chunk, info.right.getOrDefault(chunk, 0) + 1); @@ -113,7 +113,7 @@ class CommandEntity if (info == null) throw NO_ENTITIES.create(); - sender.func_197030_a(new TextComponentTranslation("commands.forge.entity.list.single.header", name, info.getLeft()), true); + sender.sendFeedback(new TextComponentTranslation("commands.forge.entity.list.single.header", name, info.getLeft()), true); List> toSort = new ArrayList<>(); toSort.addAll(info.getRight().entrySet()); toSort.sort((a, b) -> { @@ -127,7 +127,7 @@ class CommandEntity for (Map.Entry e : toSort) { if (limit-- == 0) break; - sender.func_197030_a(new TextComponentString(" " + e.getValue() + ": " + e.getKey().x + ", " + e.getKey().z), true); + sender.sendFeedback(new TextComponentString(" " + e.getValue() + ": " + e.getKey().x + ", " + e.getKey().z), true); } return toSort.size(); } @@ -153,8 +153,8 @@ class CommandEntity throw NO_ENTITIES.create(); int count = info.stream().mapToInt(Pair::getRight).sum(); - sender.func_197030_a(new TextComponentTranslation("commands.forge.entity.list.multiple.header", count), true); - info.forEach(e -> sender.func_197030_a(new TextComponentString(" " + e.getValue() + ": " + e.getKey()), true)); + sender.sendFeedback(new TextComponentTranslation("commands.forge.entity.list.multiple.header", count), true); + info.forEach(e -> sender.sendFeedback(new TextComponentString(" " + e.getValue() + ": " + e.getKey()), true)); return info.size(); } } diff --git a/src/main/java/net/minecraftforge/server/command/CommandGenerate.java b/src/main/java/net/minecraftforge/server/command/CommandGenerate.java index 399a466ab..c44f9088e 100644 --- a/src/main/java/net/minecraftforge/server/command/CommandGenerate.java +++ b/src/main/java/net/minecraftforge/server/command/CommandGenerate.java @@ -48,18 +48,18 @@ class CommandGenerate { static ArgumentBuilder register() { - return Commands.func_197057_a("generate") - .requires(cs->cs.func_197034_c(4)) //permission - .then(Commands.func_197056_a("pos", BlockPosArgument.func_197276_a()) - .then(Commands.func_197056_a("count", IntegerArgumentType.integer(1)) - .then(Commands.func_197056_a("dim", IntegerArgumentType.integer()) - .suggests((ctx, builder) -> ISuggestionProvider.func_197013_a(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder)) - .then(Commands.func_197056_a("interval", IntegerArgumentType.integer()) - .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.func_197274_b(ctx, "pos"), getInt(ctx, "count"), getInt(ctx, "dim"), getInt(ctx, "interval"))) + return Commands.literal("generate") + .requires(cs->cs.hasPermissionLevel(4)) //permission + .then(Commands.argument("pos", BlockPosArgument.blockPos()) + .then(Commands.argument("count", IntegerArgumentType.integer(1)) + .then(Commands.argument("dim", IntegerArgumentType.integer()) + .suggests((ctx, builder) -> ISuggestionProvider.suggest(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder)) + .then(Commands.argument("interval", IntegerArgumentType.integer()) + .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), getInt(ctx, "dim"), getInt(ctx, "interval"))) ) - .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.func_197274_b(ctx, "pos"), getInt(ctx, "count"), getInt(ctx, "dim"), -1)) + .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), getInt(ctx, "dim"), -1)) ) - .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.func_197274_b(ctx, "pos"), getInt(ctx, "count"), ctx.getSource().func_197023_e().provider.getId(), -1)) + .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), ctx.getSource().getWorld().dimension.getId(), -1)) ) ); } @@ -74,7 +74,7 @@ class CommandGenerate BlockPos chunkpos = new BlockPos(pos.getX() >> 4, 0, pos.getZ() >> 4); ChunkGenWorker worker = new ChunkGenWorker(source, chunkpos, count, dim, interval); - source.func_197030_a(worker.getStartMessage(source), true); + source.sendFeedback(worker.getStartMessage(source), true); WorldWorkerManager.addWorker(worker); return 0; diff --git a/src/main/java/net/minecraftforge/server/command/CommandSetDimension.java b/src/main/java/net/minecraftforge/server/command/CommandSetDimension.java index 694d3dcbb..ac5f14901 100644 --- a/src/main/java/net/minecraftforge/server/command/CommandSetDimension.java +++ b/src/main/java/net/minecraftforge/server/command/CommandSetDimension.java @@ -56,15 +56,15 @@ public class CommandSetDimension private static final DynamicCommandExceptionType INVALID_DIMENSION = new DynamicCommandExceptionType(dim -> new TextComponentTranslation("commands.forge.setdim.invalid.dim", dim)); static ArgumentBuilder register() { - return Commands.func_197057_a("setdimension") - .requires(cs->cs.func_197034_c(2)) //permission - .then(Commands.func_197056_a("targets", EntityArgument.func_197093_b()) - .then(Commands.func_197056_a("dim", IntegerArgumentType.integer()) - .suggests((ctx, builder) -> ISuggestionProvider.func_197013_a(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder)) - .then(Commands.func_197056_a("pos", BlockPosArgument.func_197276_a()) - .executes(ctx -> execute(ctx.getSource(), EntityArgument.func_197087_c(ctx, "targets"), IntegerArgumentType.getInteger(ctx, "dim"), BlockPosArgument.func_197274_b(ctx, "pos"))) + return Commands.literal("setdimension") + .requires(cs->cs.hasPermissionLevel(2)) //permission + .then(Commands.argument("targets", EntityArgument.multipleEntities()) + .then(Commands.argument("dim", IntegerArgumentType.integer()) + .suggests((ctx, builder) -> ISuggestionProvider.suggest(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder)) + .then(Commands.argument("pos", BlockPosArgument.blockPos()) + .executes(ctx -> execute(ctx.getSource(), EntityArgument.getEntitiesAllowingNone(ctx, "targets"), IntegerArgumentType.getInteger(ctx, "dim"), BlockPosArgument.getBlockPos(ctx, "pos"))) ) - .executes(ctx -> execute(ctx.getSource(), EntityArgument.func_197087_c(ctx, "targets"), IntegerArgumentType.getInteger(ctx, "dim"), new BlockPos(ctx.getSource().func_197036_d()))) + .executes(ctx -> execute(ctx.getSource(), EntityArgument.getEntitiesAllowingNone(ctx, "targets"), IntegerArgumentType.getInteger(ctx, "dim"), new BlockPos(ctx.getSource().getPos()))) ) ); } @@ -79,7 +79,7 @@ public class CommandSetDimension throw INVALID_DIMENSION.create(dim); final ITeleporter teleporter = new CommandTeleporter(pos); - entities.stream().filter(e -> e.dimension == dim).forEach(e -> sender.func_197030_a(new TextComponentTranslation("commands.forge.setdim.invalid.nochange", e.getDisplayName(), dim), true)); + entities.stream().filter(e -> e.dimension == dim).forEach(e -> sender.sendFeedback(new TextComponentTranslation("commands.forge.setdim.invalid.nochange", e.getDisplayName(), dim), true)); entities.stream().filter(e -> e.dimension != dim).forEach(e -> e.changeDimension(dim, teleporter)); return 0; @@ -88,7 +88,7 @@ public class CommandSetDimension private static boolean checkEntity(Entity entity) { // use vanilla portal logic, try to avoid doing anything too silly - return entity.isRiding() || entity.isBeingRidden() || entity.isNonBoss(); + return entity.isPassenger() || entity.isBeingRidden() || entity.isNonBoss(); } private static class CommandTeleporter implements ITeleporter diff --git a/src/main/java/net/minecraftforge/server/command/CommandTps.java b/src/main/java/net/minecraftforge/server/command/CommandTps.java index 97a67bf9f..b27a84a15 100644 --- a/src/main/java/net/minecraftforge/server/command/CommandTps.java +++ b/src/main/java/net/minecraftforge/server/command/CommandTps.java @@ -40,19 +40,19 @@ class CommandTps static ArgumentBuilder register() { - return Commands.func_197057_a("tps") - .requires(cs->cs.func_197034_c(0)) //permission - .then(Commands.func_197056_a("dim", IntegerArgumentType.integer()) - .suggests((ctx, builder) -> ISuggestionProvider.func_197013_a(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder)) + return Commands.literal("tps") + .requires(cs->cs.hasPermissionLevel(0)) //permission + .then(Commands.argument("dim", IntegerArgumentType.integer()) + .suggests((ctx, builder) -> ISuggestionProvider.suggest(DimensionManager.getIDStream().sorted().map(id -> id.toString()), builder)) .executes(ctx -> sendTime(ctx.getSource(), IntegerArgumentType.getInteger(ctx, "dim"))) ) .executes(ctx -> { for (Integer dim : (Iterable)DimensionManager.getIDStream().sorted()::iterator) sendTime(ctx.getSource(), dim); - double meanTickTime = mean(ctx.getSource().func_197028_i().tickTimeArray) * 1.0E-6D; + double meanTickTime = mean(ctx.getSource().getServer().tickTimeArray) * 1.0E-6D; double meanTPS = Math.min(1000.0/meanTickTime, 20); - ctx.getSource().func_197030_a(new TextComponentTranslation("commands.forge.tps.summary.all", TIME_FORMATTER.format(meanTickTime), TIME_FORMATTER.format(meanTPS)), true); + ctx.getSource().sendFeedback(new TextComponentTranslation("commands.forge.tps.summary.all", TIME_FORMATTER.format(meanTickTime), TIME_FORMATTER.format(meanTPS)), true); return 0; } @@ -76,9 +76,9 @@ class CommandTps double worldTPS = Math.min(1000.0 / worldTickTime, 20); DimensionType type = DimensionManager.getProviderType(dim); if (type == null) - cs.func_197030_a(new TextComponentTranslation("commands.forge.tps.summary.basic", dim, TIME_FORMATTER.format(worldTickTime), TIME_FORMATTER.format(worldTPS)), true); + cs.sendFeedback(new TextComponentTranslation("commands.forge.tps.summary.basic", dim, TIME_FORMATTER.format(worldTickTime), TIME_FORMATTER.format(worldTPS)), true); else - cs.func_197030_a(new TextComponentTranslation("commands.forge.tps.summary.named", dim, type.getName(), TIME_FORMATTER.format(worldTickTime), TIME_FORMATTER.format(worldTPS)), true); + cs.sendFeedback(new TextComponentTranslation("commands.forge.tps.summary.named", dim, type.getName(), TIME_FORMATTER.format(worldTickTime), TIME_FORMATTER.format(worldTPS)), true); return 1; } diff --git a/src/main/java/net/minecraftforge/server/command/CommandTrack.java b/src/main/java/net/minecraftforge/server/command/CommandTrack.java index 5bf5bba1e..d4a518007 100644 --- a/src/main/java/net/minecraftforge/server/command/CommandTrack.java +++ b/src/main/java/net/minecraftforge/server/command/CommandTrack.java @@ -58,7 +58,7 @@ class CommandTrack static ArgumentBuilder register() { - return Commands.func_197057_a("track") + return Commands.literal("track") .then(StartTrackingCommand.register()) .then(ResetTrackingCommand.register()) .then(TrackResultsEntity.register()) @@ -70,26 +70,26 @@ class CommandTrack { static ArgumentBuilder register() { - return Commands.func_197057_a("start") - .requires(cs->cs.func_197034_c(2)) //permission - .then(Commands.func_197057_a("te") - .then(Commands.func_197056_a("duration", IntegerArgumentType.integer(1)) + return Commands.literal("start") + .requires(cs->cs.hasPermissionLevel(2)) //permission + .then(Commands.literal("te") + .then(Commands.argument("duration", IntegerArgumentType.integer(1)) .executes(ctx -> { int duration = IntegerArgumentType.getInteger(ctx, "duration"); TimeTracker.TILE_ENTITY_UPDATE.reset(); TimeTracker.TILE_ENTITY_UPDATE.enable(duration); - ctx.getSource().func_197030_a(new TextComponentTranslation("commands.forge.tracking.te.enabled", duration), true); + ctx.getSource().sendFeedback(new TextComponentTranslation("commands.forge.tracking.te.enabled", duration), true); return 0; }) ) ) - .then(Commands.func_197057_a("entity") - .then(Commands.func_197056_a("duration", IntegerArgumentType.integer(1)) + .then(Commands.literal("entity") + .then(Commands.argument("duration", IntegerArgumentType.integer(1)) .executes(ctx -> { int duration = IntegerArgumentType.getInteger(ctx, "duration"); TimeTracker.ENTITY_UPDATE.reset(); TimeTracker.ENTITY_UPDATE.enable(duration); - ctx.getSource().func_197030_a(new TextComponentTranslation("commands.forge.tracking.entity.enabled", duration), true); + ctx.getSource().sendFeedback(new TextComponentTranslation("commands.forge.tracking.entity.enabled", duration), true); return 0; }) ) @@ -101,19 +101,19 @@ class CommandTrack { static ArgumentBuilder register() { - return Commands.func_197057_a("reset") - .requires(cs->cs.func_197034_c(2)) //permission - .then(Commands.func_197057_a("te") + return Commands.literal("reset") + .requires(cs->cs.hasPermissionLevel(2)) //permission + .then(Commands.literal("te") .executes(ctx -> { TimeTracker.TILE_ENTITY_UPDATE.reset(); - ctx.getSource().func_197030_a(new TextComponentTranslation("commands.forge.tracking.te.reset"), true); + ctx.getSource().sendFeedback(new TextComponentTranslation("commands.forge.tracking.te.reset"), true); return 0; }) ) - .then(Commands.func_197057_a("entity") + .then(Commands.literal("entity") .executes(ctx -> { TimeTracker.ENTITY_UPDATE.reset(); - ctx.getSource().func_197030_a(new TextComponentTranslation("commands.forge.tracking.entity.reset"), true); + ctx.getSource().sendFeedback(new TextComponentTranslation("commands.forge.tracking.entity.reset"), true); return 0; }) ); @@ -143,14 +143,14 @@ class CommandTrack List> timingsList = getSortedTimings(tracker); if (timingsList.isEmpty()) { - source.func_197030_a(new TextComponentTranslation("commands.forge.tracking.no_data"), true); + source.sendFeedback(new TextComponentTranslation("commands.forge.tracking.no_data"), true); } else { timingsList.stream() .filter(timings -> timings.getObject().get() != null) .limit(10) - .forEach(timings -> source.func_197030_a(toString.apply(timings), true)); + .forEach(timings -> source.sendFeedback(toString.apply(timings), true)); } return 0; } @@ -175,7 +175,7 @@ class CommandTrack { static ArgumentBuilder register() { - return Commands.func_197057_a("entity").executes(ctx -> TrackResults.execute(ctx.getSource(), TimeTracker.ENTITY_UPDATE, data -> + return Commands.literal("entity").executes(ctx -> TrackResults.execute(ctx.getSource(), TimeTracker.ENTITY_UPDATE, data -> { Entity entity = data.getObject().get(); if (entity == null) @@ -183,9 +183,9 @@ class CommandTrack BlockPos pos = entity.getPosition(); double averageTimings = data.getAverageTimings(); - String tickTime = (averageTimings > 1000 ? TIME_FORMAT.format(averageTimings / 1000) : TIME_FORMAT.format(averageTimings)) + (averageTimings < 1000 ? "µs" : "ms"); + String tickTime = (averageTimings > 1000 ? TIME_FORMAT.format(averageTimings / 1000) : TIME_FORMAT.format(averageTimings)) + (averageTimings < 1000 ? "�s" : "ms"); - return new TextComponentTranslation("commands.forge.tracking.timing_entry", entity.func_200600_R().getRegistryName(), TrackResults.getWorldName(entity.world.provider.getId()), pos.getX(), pos.getY(), pos.getZ(), tickTime); + return new TextComponentTranslation("commands.forge.tracking.timing_entry", entity.getType().getRegistryName(), TrackResults.getWorldName(entity.world.dimension.getId()), pos.getX(), pos.getY(), pos.getZ(), tickTime); }) ); } @@ -195,7 +195,7 @@ class CommandTrack { static ArgumentBuilder register() { - return Commands.func_197057_a("te").executes(ctx -> TrackResults.execute(ctx.getSource(), TimeTracker.TILE_ENTITY_UPDATE, data -> + return Commands.literal("te").executes(ctx -> TrackResults.execute(ctx.getSource(), TimeTracker.TILE_ENTITY_UPDATE, data -> { TileEntity te = data.getObject().get(); if (te == null) @@ -204,8 +204,8 @@ class CommandTrack BlockPos pos = te.getPos(); double averageTimings = data.getAverageTimings(); - String tickTime = (averageTimings > 1000 ? TIME_FORMAT.format(averageTimings / 1000) : TIME_FORMAT.format(averageTimings)) + (averageTimings < 1000 ? "µs" : "ms"); - return new TextComponentTranslation("commands.forge.tracking.timing_entry", te.func_200662_C().getRegistryName(), TrackResults.getWorldName(te.getWorld().provider.getId()), pos.getX(), pos.getY(), pos.getZ(), tickTime); + String tickTime = (averageTimings > 1000 ? TIME_FORMAT.format(averageTimings / 1000) : TIME_FORMAT.format(averageTimings)) + (averageTimings < 1000 ? "�s" : "ms"); + return new TextComponentTranslation("commands.forge.tracking.timing_entry", te.getType().getRegistryName(), TrackResults.getWorldName(te.getWorld().dimension.getId()), pos.getX(), pos.getY(), pos.getZ(), tickTime); }) ); } diff --git a/src/main/java/net/minecraftforge/server/permission/DefaultPermissionHandler.java b/src/main/java/net/minecraftforge/server/permission/DefaultPermissionHandler.java index e58bdad4e..52375e0d4 100644 --- a/src/main/java/net/minecraftforge/server/permission/DefaultPermissionHandler.java +++ b/src/main/java/net/minecraftforge/server/permission/DefaultPermissionHandler.java @@ -90,4 +90,4 @@ public enum DefaultPermissionHandler implements IPermissionHandler DefaultPermissionLevel level = PERMISSION_LEVEL_MAP.get(node); return level == null ? DefaultPermissionLevel.NONE : level; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/DefaultPermissionLevel.java b/src/main/java/net/minecraftforge/server/permission/DefaultPermissionLevel.java index 38d5eb77d..df44d12ca 100644 --- a/src/main/java/net/minecraftforge/server/permission/DefaultPermissionLevel.java +++ b/src/main/java/net/minecraftforge/server/permission/DefaultPermissionLevel.java @@ -32,4 +32,4 @@ public enum DefaultPermissionLevel ALL, OP, NONE -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/IPermissionHandler.java b/src/main/java/net/minecraftforge/server/permission/IPermissionHandler.java index 5473450aa..5eb2fd667 100644 --- a/src/main/java/net/minecraftforge/server/permission/IPermissionHandler.java +++ b/src/main/java/net/minecraftforge/server/permission/IPermissionHandler.java @@ -48,4 +48,4 @@ public interface IPermissionHandler * @see #registerNode(String, DefaultPermissionLevel, String) */ String getNodeDescription(String node); -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/PermissionAPI.java b/src/main/java/net/minecraftforge/server/permission/PermissionAPI.java index e89b66194..3d99355dd 100644 --- a/src/main/java/net/minecraftforge/server/permission/PermissionAPI.java +++ b/src/main/java/net/minecraftforge/server/permission/PermissionAPI.java @@ -95,4 +95,4 @@ public class PermissionAPI Preconditions.checkNotNull(player, "Player can't be null!"); return hasPermission(player.getGameProfile(), node, new PlayerContext(player)); } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/context/AreaContext.java b/src/main/java/net/minecraftforge/server/permission/context/AreaContext.java index bb7fe72b3..a76f2bea6 100644 --- a/src/main/java/net/minecraftforge/server/permission/context/AreaContext.java +++ b/src/main/java/net/minecraftforge/server/permission/context/AreaContext.java @@ -47,4 +47,4 @@ public class AreaContext extends PlayerContext { return key.equals(ContextKeys.AREA); } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/context/BlockPosContext.java b/src/main/java/net/minecraftforge/server/permission/context/BlockPosContext.java index d542e13cd..d721fe9b3 100644 --- a/src/main/java/net/minecraftforge/server/permission/context/BlockPosContext.java +++ b/src/main/java/net/minecraftforge/server/permission/context/BlockPosContext.java @@ -77,4 +77,4 @@ public class BlockPosContext extends PlayerContext { return key.equals(ContextKeys.POS) || key.equals(ContextKeys.BLOCK_STATE) || (facing != null && key.equals(ContextKeys.FACING)); } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/context/Context.java b/src/main/java/net/minecraftforge/server/permission/context/Context.java index 97bb06714..33d62aca1 100644 --- a/src/main/java/net/minecraftforge/server/permission/context/Context.java +++ b/src/main/java/net/minecraftforge/server/permission/context/Context.java @@ -84,4 +84,4 @@ public class Context implements IContext { return false; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/context/ContextKey.java b/src/main/java/net/minecraftforge/server/permission/context/ContextKey.java index 32f517fb3..69d9a80bf 100644 --- a/src/main/java/net/minecraftforge/server/permission/context/ContextKey.java +++ b/src/main/java/net/minecraftforge/server/permission/context/ContextKey.java @@ -64,4 +64,4 @@ public final class ContextKey { return typeClass; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/context/ContextKeys.java b/src/main/java/net/minecraftforge/server/permission/context/ContextKeys.java index 1fb1147ac..82b40944b 100644 --- a/src/main/java/net/minecraftforge/server/permission/context/ContextKeys.java +++ b/src/main/java/net/minecraftforge/server/permission/context/ContextKeys.java @@ -43,4 +43,4 @@ public class ContextKeys public static final ContextKey FACING = ContextKey.create("facing", EnumFacing.class); public static final ContextKey AREA = ContextKey.create("area", AxisAlignedBB.class); public static final ContextKey BLOCK_STATE = ContextKey.create("blockstate", IBlockState.class); -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/context/IContext.java b/src/main/java/net/minecraftforge/server/permission/context/IContext.java index c7adb759f..337f2ffbc 100644 --- a/src/main/java/net/minecraftforge/server/permission/context/IContext.java +++ b/src/main/java/net/minecraftforge/server/permission/context/IContext.java @@ -53,4 +53,4 @@ public interface IContext * @return true if context contains this key */ boolean has(ContextKey key); -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/context/PlayerContext.java b/src/main/java/net/minecraftforge/server/permission/context/PlayerContext.java index 886971092..1df989e7f 100644 --- a/src/main/java/net/minecraftforge/server/permission/context/PlayerContext.java +++ b/src/main/java/net/minecraftforge/server/permission/context/PlayerContext.java @@ -43,4 +43,4 @@ public class PlayerContext extends Context { return player; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/context/TargetContext.java b/src/main/java/net/minecraftforge/server/permission/context/TargetContext.java index d182f3408..9ca75be91 100644 --- a/src/main/java/net/minecraftforge/server/permission/context/TargetContext.java +++ b/src/main/java/net/minecraftforge/server/permission/context/TargetContext.java @@ -46,4 +46,4 @@ public class TargetContext extends PlayerContext { return target != null && key.equals(ContextKeys.TARGET); } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/context/WorldContext.java b/src/main/java/net/minecraftforge/server/permission/context/WorldContext.java index b711e979a..1d8c1fdb8 100644 --- a/src/main/java/net/minecraftforge/server/permission/context/WorldContext.java +++ b/src/main/java/net/minecraftforge/server/permission/context/WorldContext.java @@ -46,4 +46,4 @@ public class WorldContext extends Context { return null; } -} \ No newline at end of file +} diff --git a/src/main/java/net/minecraftforge/server/permission/context/package-info.java b/src/main/java/net/minecraftforge/server/permission/context/package-info.java index 0bc93e8c0..ceaa30ceb 100644 --- a/src/main/java/net/minecraftforge/server/permission/context/package-info.java +++ b/src/main/java/net/minecraftforge/server/permission/context/package-info.java @@ -19,4 +19,4 @@ @javax.annotation.ParametersAreNonnullByDefault @mcp.MethodsReturnNonnullByDefault -package net.minecraftforge.server.permission.context; \ No newline at end of file +package net.minecraftforge.server.permission.context; diff --git a/src/main/java/net/minecraftforge/server/permission/package-info.java b/src/main/java/net/minecraftforge/server/permission/package-info.java index 55e0146ed..d9b7995e7 100644 --- a/src/main/java/net/minecraftforge/server/permission/package-info.java +++ b/src/main/java/net/minecraftforge/server/permission/package-info.java @@ -19,4 +19,4 @@ @javax.annotation.ParametersAreNonnullByDefault @mcp.MethodsReturnNonnullByDefault -package net.minecraftforge.server.permission; \ No newline at end of file +package net.minecraftforge.server.permission; diff --git a/src/main/java/net/minecraftforge/server/terminalconsole/package-info.java b/src/main/java/net/minecraftforge/server/terminalconsole/package-info.java index fabc845d6..66f0e35f1 100644 --- a/src/main/java/net/minecraftforge/server/terminalconsole/package-info.java +++ b/src/main/java/net/minecraftforge/server/terminalconsole/package-info.java @@ -4,4 +4,4 @@ package net.minecraftforge.server.terminalconsole; import javax.annotation.ParametersAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file +import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/java/net/minecraftforge/server/terminalconsole/util/package-info.java b/src/main/java/net/minecraftforge/server/terminalconsole/util/package-info.java index 583a294b0..448eef878 100644 --- a/src/main/java/net/minecraftforge/server/terminalconsole/util/package-info.java +++ b/src/main/java/net/minecraftforge/server/terminalconsole/util/package-info.java @@ -4,4 +4,4 @@ package net.minecraftforge.server.terminalconsole.util; import javax.annotation.ParametersAreNonnullByDefault; -import mcp.MethodsReturnNonnullByDefault; \ No newline at end of file +import mcp.MethodsReturnNonnullByDefault; diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index 3c9750cd2..a32e241f8 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -46,10 +46,16 @@ net/minecraft/world/WorldServer.canMineBlockBody(Lnet/minecraft/entity/player/En #net/minecraft/client/renderer/entity/RenderItem.applyVanillaTransform(Lnet/minecraft/client/renderer/block/model/ItemTransformVec3f;)V=|p_175034_1_ #net/minecraft/client/renderer/block/model/ModelBakery.bakeModel(Lnet/minecraft/client/renderer/block/model/ModelBlock;Lnet/minecraftforge/common/model/ITransformation;Z)Lnet/minecraft/client/renderer/block/model/IBakedModel;=|p_177578_1_,p_177578_2_,p_177578_3_ #net/minecraft/client/renderer/block/model/ModelBakery.makeBakedQuad(Lnet/minecraft/client/renderer/block/model/BlockPart;Lnet/minecraft/client/renderer/block/model/BlockPartFace;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/util/EnumFacing;Lnet/minecraftforge/common/model/ITransformation;Z)Lnet/minecraft/client/renderer/block/model/BakedQuad;=|p_177589_1_,p_177589_2_,p_177589_3_,p_177589_4_,p_177589_5_,p_177589_6_ -#net/minecraft/client/renderer/block/model/FaceBakery.makeBakedQuad(Lorg/lwjgl/util/vector/Vector3f;Lorg/lwjgl/util/vector/Vector3f;Lnet/minecraft/client/renderer/block/model/BlockPartFace;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/util/EnumFacing;Lnet/minecraftforge/common/model/ITransformation;Lnet/minecraft/client/renderer/block/model/BlockPartRotation;ZZ)Lnet/minecraft/client/renderer/block/model/BakedQuad;=|p_178414_1_,p_178414_2_,p_178414_3_,p_178414_4_,p_178414_5_,p_178414_6_,p_178414_7_,p_178414_8_,p_178414_9_ +net/minecraft/client/renderer/block/model/FaceBakery.makeBakedQuad(Lnet/minecraft/client/renderer/Vector3f;Lnet/minecraft/client/renderer/Vector3f;Lnet/minecraft/client/renderer/block/model/BlockPartFace;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/util/EnumFacing;Lnet/minecraftforge/common/model/ITransformation;Lnet/minecraft/client/renderer/block/model/BlockPartRotation;ZZ)Lnet/minecraft/client/renderer/block/model/BakedQuad;=|p_199332_1_,p_199332_2_,p_199332_3_,p_199332_4_,p_199332_5_,p_199332_6_,p_199332_7_,p_199332_8_,p_199332_9_ net/minecraft/client/renderer/block/model/FaceBakery.makeQuadVertexData(Lnet/minecraft/client/renderer/block/model/BlockFaceUV;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/util/EnumFacing;[FLnet/minecraftforge/common/model/ITransformation;Lnet/minecraft/client/renderer/block/model/BlockPartRotation;Z)[I=|p_188012_1_,p_188012_2_,p_188012_3_,p_188012_4_,p_188012_5_,p_188012_6_,p_188012_7_ -#net/minecraft/client/renderer/block/model/FaceBakery.fillVertexData([IILnet/minecraft/util/EnumFacing;Lnet/minecraft/client/renderer/block/model/BlockFaceUV;[FLnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraftforge/common/model/ITransformation;Lnet/minecraft/client/renderer/block/model/BlockPartRotation;Z)V=|p_188015_1_,p_188015_2_,p_188015_3_,p_188015_4_,p_188015_5_,p_188015_6_,p_188015_7_,p_188015_8_,p_188015_9_ +net/minecraft/client/renderer/block/model/FaceBakery.fillVertexData([IILnet/minecraft/util/EnumFacing;Lnet/minecraft/client/renderer/block/model/BlockFaceUV;[FLnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraftforge/common/model/ITransformation;Lnet/minecraft/client/renderer/block/model/BlockPartRotation;Z)V=|p_188015_1_,p_188015_2_,p_188015_3_,p_188015_4_,p_188015_5_,p_188015_6_,p_188015_7_,p_188015_8_,p_188015_9_ #net/minecraft/client/renderer/block/model/FaceBakery.rotateVertex(Lorg/lwjgl/util/vector/Vector3f;Lnet/minecraft/util/EnumFacing;ILnet/minecraftforge/common/model/ITransformation)I=|p_188011_1_,p_188011_2_,p_188011_3_,p_188011_4_ +net/minecraft/client/renderer/block/model/multipart/Multipart.bake(Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraftforge/common/model/IModelState;ZLnet/minecraft/client/renderer/vertex/VertexFormat;)Lnet/minecraft/client/renderer/block/model/IBakedModel;=|p_209558_1_,p_209558_2_,p_209558_3_,p_209558_4_,format +net/minecraft/client/renderer/block/model/ModelBlock.bake(Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraftforge/common/model/IModelState;ZLnet/minecraft/client/renderer/vertex/VertexFormat;)Lnet/minecraft/client/renderer/block/model/IBakedModel;=|p_209558_1_,p_209558_2_,p_209558_3_,p_209558_4_,format +net/minecraft/client/renderer/block/model/ModelBlock.bake(Lnet/minecraft/client/renderer/block/model/ModelBlock;Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraftforge/common/model/IModelState;Z)Lnet/minecraft/client/renderer/block/model/IBakedModel;=|p_209565_1_,p_209565_2_,p_209565_3_,p_209565_4_,p_209565_5_ +net/minecraft/client/renderer/block/model/ModelBlock.makeBakedQuad(Lnet/minecraft/client/renderer/block/model/BlockPart;Lnet/minecraft/client/renderer/block/model/BlockPartFace;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/util/EnumFacing;Lnet/minecraftforge/common/model/IModelState;Z)Lnet/minecraft/client/renderer/block/model/BakedQuad;=|p_209567_0,p_209567_1_,p_209567_2_,p_209567_3_,p_209567_4_,p_209567_5_ +net/minecraft/client/renderer/block/model/VariantList.bake(Ljava/util/function/Function;Ljava/util/function/Function;Lnet/minecraftforge/common/model/IModelState;ZLnet/minecraft/client/renderer/vertex/VertexFormat;)Lnet/minecraft/client/renderer/block/model/IBakedModel;=|p_209558_1_,p_209558_2_,p_209558_3_,p_209558_4_,format +net/minecraft/client/renderer/block/model/ItemOverrideList.(Lnet/minecraft/client/renderer/block/model/IUnbakedModel;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/List;)V=|p_i49525_1_,p_i49525_2_,p_i49525_3_,p_i49525_4_ #net/minecraft/item/ItemBlock.setTileEntityNBT(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/item/ItemStack;Lnet/minecraft/entity/player/EntityPlayer;)Z=|p_179224_0_,p_179224_1_,p_179224_2_,player @@ -57,7 +63,7 @@ net/minecraft/client/renderer/block/model/FaceBakery.makeQuadVertexData(Lnet/min #net/minecraft/stats/StatList.replaceAllSimilarBlocks([Lnet/minecraft/stats/StatBase;Z)V=|p_75924_0_,useItemIds #net/minecraft/stats/StatList.mergeStatBases([Lnet/minecraft/stats/StatBase;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Z)V=|p_151180_0_,p_151180_1_,p_151180_2_,useItemIds -#net/minecraft/item/ItemStack.(Lnet/minecraft/item/Item;IILnet/minecraft/nbt/NBTTagCompound;)V=|p_i1881_1_,p_i1881_2_,p_i1881_3_,capNBT +net/minecraft/item/ItemStack.(Lnet/minecraft/util/IItemProvider;ILnet/minecraft/nbt/NBTTagCompound;)V=|p_i48204_1_,p_i48204_2_,capNBT #net/minecraft/block/BlockRedstoneWire.canConnectTo(Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/util/EnumFacing;Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/util/math/BlockPos;)Z=|p_176343_0_,p_176343_1_,world,pos net/minecraft/client/renderer/block/model/BakedQuad.([IILnet/minecraft/util/EnumFacing;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;ZLnet/minecraft/client/renderer/vertex/VertexFormat;)V=|p_i46574_1_,p_i46574_2_,p_i46574_3_,p_i46574_4_,applyDiffuseLighting,format @@ -82,4 +88,4 @@ net/minecraft/village/Village.modifyPlayerReputation(Ljava/util/UUID;I)I=|p_8268 #net/minecraft/client/renderer/ActiveRenderInfo.updateRenderInfo(Lnet/minecraft/entity/Entity;Z)V=|p_74583_0_,p_74583_1_ #net/minecraft/client/audio/SoundManager.setListener(Lnet/minecraft/entity/Entity;F)V=|p_148615_1_,p_148615_2_ -#net/minecraft/item/ArmorMaterial.create(Ljava/lang/String;Ljava/lang/String;I[IILnet/minecraft/util/SoundEvent;FLjava/util/function/Supplier;)V=|name,p_i48533_3_,p_i48533_4_,p_i48533_5_,p_i48533_6_,p_i48533_7_,p_i48533_8_,p_i48533_9_ +net/minecraft/item/ArmorMaterial.create(Ljava/lang/String;Ljava/lang/String;I[IILnet/minecraft/util/SoundEvent;FLjava/util/function/Supplier;)Lnet/minecraft/item/ArmorMaterial;=|name,p_i48533_3_,p_i48533_4_,p_i48533_5_,p_i48533_6_,p_i48533_7_,p_i48533_8_,p_i48533_9_