From 2ce4f5ece59d9e7dae6b807c0008d29b8914dec0 Mon Sep 17 00:00:00 2001 From: DaemonUmbra Date: Tue, 25 Feb 2020 22:45:14 -0500 Subject: [PATCH] Updated ForgeDev MCP Mapping Version (#6532) --- build.gradle | 2 +- .../renderer/FluidBlockRenderer.java.patch | 44 +++++----- .../renderer/model/ModelBakery.java.patch | 2 +- .../renderer/model/ModelManager.java.patch | 2 +- .../template/StructureProcessor.java.patch | 8 +- .../minecraftforge/client/CloudRenderer.java | 58 ++++++------- .../client/ForgeHooksClient.java | 36 ++++---- .../event/PlayerSPPushOutOfBlocksEvent.java | 2 +- .../extensions/IForgeModelTransform.java | 2 +- .../IForgeTransformationMatrix.java | 48 +++++------ .../extensions/IForgeVertexBuilder.java | 22 ++--- .../client/gui/ForgeIngameGui.java | 16 ++-- .../client/gui/ScrollPanel.java | 36 ++++---- .../client/model/BlockModelConfiguration.java | 4 +- .../client/model/CompositeModel.java | 8 +- .../client/model/DynamicBucketModel.java | 10 +-- .../client/model/FancyMissingModel.java | 12 +-- .../client/model/FluidModel.java | 4 +- .../client/model/ItemLayerModel.java | 8 +- .../model/ItemTextureQuadConverter.java | 6 +- .../client/model/ModelLoader.java | 4 +- .../client/model/ModelLoaderRegistry.java | 4 +- .../model/ModelTransformComposition.java | 4 +- .../client/model/MultiLayerModel.java | 8 +- .../client/model/PerspectiveMapWrapper.java | 2 +- .../client/model/QuadTransformer.java | 20 ++--- .../client/model/SimpleModelFontRenderer.java | 2 +- .../client/model/SimpleModelTransform.java | 8 +- .../animation/AnimationItemOverrideList.java | 2 +- .../model/animation/ModelBlockAnimation.java | 12 +-- .../TileEntityRendererAnimation.java | 4 +- .../client/model/b3d/B3DClip.java | 2 +- .../client/model/b3d/B3DLoader.java | 24 +++--- .../client/model/b3d/B3DModel.java | 20 ++--- .../client/model/obj/OBJModel.java | 12 +-- .../model/pipeline/BakedQuadBuilder.java | 4 +- .../client/model/pipeline/BlockInfo.java | 10 +-- .../model/pipeline/IVertexConsumer.java | 4 +- .../client/model/pipeline/LightUtil.java | 22 ++--- .../pipeline/QuadGatheringTransformer.java | 6 +- .../model/pipeline/TRSRTransformer.java | 2 +- .../model/pipeline/VertexBufferConsumer.java | 4 +- .../model/pipeline/VertexLighterFlat.java | 14 ++-- .../common/DimensionManager.java | 2 +- .../common/VillagerTradingManager.java | 4 +- .../common/data/LanguageProvider.java | 2 +- .../common/extensions/IForgeBlock.java | 6 +- .../common/extensions/IForgeDimension.java | 4 +- .../extensions/IForgeEntityMinecart.java | 6 +- .../common/extensions/IForgeFluid.java | 2 +- .../common/extensions/IForgeFluidState.java | 2 +- .../common/model/TransformationHelper.java | 18 ++-- .../common/model/animation/Clips.java | 6 +- .../common/model/animation/JointClips.java | 2 +- .../common/util/ChunkCoordComparator.java | 4 +- .../energy/CapabilityEnergy.java | 2 +- .../event/ForgeEventFactory.java | 2 +- .../event/entity/living/LivingSpawnEvent.java | 2 +- .../fluids/FluidAttributes.java | 2 +- .../net/minecraftforge/fluids/FluidUtil.java | 4 +- .../fluids/ForgeFlowingFluid.java | 2 +- .../fml/client/ClientModLoader.java | 2 +- .../fml/client/EarlyLoaderGUI.java | 2 +- .../fml/client/gui/GuiUtils.java | 26 +++--- .../fml/client/gui/screen/ModListScreen.java | 4 +- .../client/registry/RenderingRegistry.java | 2 +- .../fml/network/FMLPlayMessages.java | 10 +-- .../fml/packs/DelegatingResourcePack.java | 4 +- .../fml/packs/ModFileResourcePack.java | 2 +- .../items/ItemHandlerHelper.java | 4 +- .../registries/ForgeRegistry.java | 2 +- .../minecraftforge/registries/GameData.java | 2 +- .../server/command/CommandEntity.java | 2 +- .../server/command/CommandGenerate.java | 4 +- .../server/command/CommandSetDimension.java | 4 +- .../server/command/CommandTps.java | 2 +- src/main/resources/forge.exc | 84 +++++++++++-------- src/main/resources/forge.srg | 1 - .../debug/block/CustomTNTTest.java | 4 +- .../client/model/ModelLoaderRegistryTest.java | 6 +- .../client/model/MultiLayerModelTest.java | 4 +- .../client/model/NewModelLoaderTest.java | 2 +- .../debug/entity/GravityAttributeTest.java | 2 +- 83 files changed, 392 insertions(+), 379 deletions(-) diff --git a/build.gradle b/build.gradle index d5fe2d21d..9298f9876 100644 --- a/build.gradle +++ b/build.gradle @@ -62,7 +62,7 @@ ext { ] } MAPPING_CHANNEL = 'snapshot' - MAPPING_VERSION = '20190719-1.14.3' + MAPPING_VERSION = '20200225-1.15.1' MC_VERSION = '1.15.2' MCP_VERSION = '20200122.131323' } diff --git a/patches/minecraft/net/minecraft/client/renderer/FluidBlockRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/FluidBlockRenderer.java.patch index fbb0a95e8..d411af522 100644 --- a/patches/minecraft/net/minecraft/client/renderer/FluidBlockRenderer.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/FluidBlockRenderer.java.patch @@ -20,19 +20,19 @@ - this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f8, d2 + 1.0D, f25, f26, f27, f14, f18, j); - this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f9, d2 + 1.0D, f25, f26, f27, f15, f19, j); - this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f10, d2 + 0.0D, f25, f26, f27, f16, f20, j); -+ this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f7, d2 + 0.0D, f25, f26, f27, alpha, f13, f17, j); -+ this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f8, d2 + 1.0D, f25, f26, f27, alpha, f14, f18, j); -+ this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f9, d2 + 1.0D, f25, f26, f27, alpha, f15, f19, j); -+ this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f10, d2 + 0.0D, f25, f26, f27, alpha, f16, f20, j); ++ this.vertex(p_228796_3_, d0 + 0.0D, d1 + (double)f7, d2 + 0.0D, f25, f26, f27, alpha, f13, f17, j); ++ this.vertex(p_228796_3_, d0 + 0.0D, d1 + (double)f8, d2 + 1.0D, f25, f26, f27, alpha, f14, f18, j); ++ this.vertex(p_228796_3_, d0 + 1.0D, d1 + (double)f9, d2 + 1.0D, f25, f26, f27, alpha, f15, f19, j); ++ this.vertex(p_228796_3_, d0 + 1.0D, d1 + (double)f10, d2 + 0.0D, f25, f26, f27, alpha, f16, f20, j); if (p_228796_4_.func_205586_a(p_228796_1_, p_228796_2_.func_177984_a())) { - this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f7, d2 + 0.0D, f25, f26, f27, f13, f17, j); - this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f10, d2 + 0.0D, f25, f26, f27, f16, f20, j); - this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f9, d2 + 1.0D, f25, f26, f27, f15, f19, j); - this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f8, d2 + 1.0D, f25, f26, f27, f14, f18, j); -+ this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f7, d2 + 0.0D, f25, f26, f27, alpha, f13, f17, j); -+ this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f10, d2 + 0.0D, f25, f26, f27, alpha, f16, f20, j); -+ this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f9, d2 + 1.0D, f25, f26, f27, alpha, f15, f19, j); -+ this.func_228797_a_(p_228796_3_, d0 + 0.0D, d1 + (double)f8, d2 + 1.0D, f25, f26, f27, alpha, f14, f18, j); ++ this.vertex(p_228796_3_, d0 + 0.0D, d1 + (double)f7, d2 + 0.0D, f25, f26, f27, alpha, f13, f17, j); ++ this.vertex(p_228796_3_, d0 + 1.0D, d1 + (double)f10, d2 + 0.0D, f25, f26, f27, alpha, f16, f20, j); ++ this.vertex(p_228796_3_, d0 + 1.0D, d1 + (double)f9, d2 + 1.0D, f25, f26, f27, alpha, f15, f19, j); ++ this.vertex(p_228796_3_, d0 + 0.0D, d1 + (double)f8, d2 + 1.0D, f25, f26, f27, alpha, f14, f18, j); } } @@ -44,10 +44,10 @@ - this.func_228797_a_(p_228796_3_, d0, d1 + (double)f12, d2, f40, f41, f42, f34, f37, i1); - this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f12, d2, f40, f41, f42, f35, f37, i1); - this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f12, d2 + 1.0D, f40, f41, f42, f35, f39, i1); -+ this.func_228797_a_(p_228796_3_, d0, d1 + (double)f12, d2 + 1.0D, f40, f41, f42, alpha, f34, f39, i1); -+ this.func_228797_a_(p_228796_3_, d0, d1 + (double)f12, d2, f40, f41, f42, alpha, f34, f37, i1); -+ this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f12, d2, f40, f41, f42, alpha, f35, f37, i1); -+ this.func_228797_a_(p_228796_3_, d0 + 1.0D, d1 + (double)f12, d2 + 1.0D, f40, f41, f42, alpha, f35, f39, i1); ++ this.vertex(p_228796_3_, d0, d1 + (double)f12, d2 + 1.0D, f40, f41, f42, alpha, f34, f39, i1); ++ this.vertex(p_228796_3_, d0, d1 + (double)f12, d2, f40, f41, f42, alpha, f34, f37, i1); ++ this.vertex(p_228796_3_, d0 + 1.0D, d1 + (double)f12, d2, f40, f41, f42, alpha, f35, f37, i1); ++ this.vertex(p_228796_3_, d0 + 1.0D, d1 + (double)f12, d2 + 1.0D, f40, f41, f42, alpha, f35, f39, i1); flag7 = true; } @@ -78,15 +78,15 @@ - this.func_228797_a_(p_228796_3_, d5, d1 + (double)f12, d6, f31, f32, f33, f49, f29, k); - this.func_228797_a_(p_228796_3_, d5, d1 + (double)f38, d6, f31, f32, f33, f49, f28, k); - this.func_228797_a_(p_228796_3_, d3, d1 + (double)f36, d4, f31, f32, f33, f48, f50, k); -+ this.func_228797_a_(p_228796_3_, d3, d1 + (double)f36, d4, f31, f32, f33, alpha, f48, f50, k); -+ this.func_228797_a_(p_228796_3_, d5, d1 + (double)f38, d6, f31, f32, f33, alpha, f49, f28, k); -+ this.func_228797_a_(p_228796_3_, d5, d1 + (double)f12, d6, f31, f32, f33, alpha, f49, f29, k); -+ this.func_228797_a_(p_228796_3_, d3, d1 + (double)f12, d4, f31, f32, f33, alpha, f48, f29, k); ++ this.vertex(p_228796_3_, d3, d1 + (double)f36, d4, f31, f32, f33, alpha, f48, f50, k); ++ this.vertex(p_228796_3_, d5, d1 + (double)f38, d6, f31, f32, f33, alpha, f49, f28, k); ++ this.vertex(p_228796_3_, d5, d1 + (double)f12, d6, f31, f32, f33, alpha, f49, f29, k); ++ this.vertex(p_228796_3_, d3, d1 + (double)f12, d4, f31, f32, f33, alpha, f48, f29, k); + if (textureatlassprite2 != atextureatlassprite[2]) { -+ this.func_228797_a_(p_228796_3_, d3, d1 + (double)f12, d4, f31, f32, f33, alpha, f48, f29, k); -+ this.func_228797_a_(p_228796_3_, d5, d1 + (double)f12, d6, f31, f32, f33, alpha, f49, f29, k); -+ this.func_228797_a_(p_228796_3_, d5, d1 + (double)f38, d6, f31, f32, f33, alpha, f49, f28, k); -+ this.func_228797_a_(p_228796_3_, d3, d1 + (double)f36, d4, f31, f32, f33, alpha, f48, f50, k); ++ this.vertex(p_228796_3_, d3, d1 + (double)f12, d4, f31, f32, f33, alpha, f48, f29, k); ++ this.vertex(p_228796_3_, d5, d1 + (double)f12, d6, f31, f32, f33, alpha, f49, f29, k); ++ this.vertex(p_228796_3_, d5, d1 + (double)f38, d6, f31, f32, f33, alpha, f49, f28, k); ++ this.vertex(p_228796_3_, d3, d1 + (double)f36, d4, f31, f32, f33, alpha, f48, f50, k); } } } @@ -97,10 +97,10 @@ + @Deprecated private void func_228797_a_(IVertexBuilder p_228797_1_, double p_228797_2_, double p_228797_4_, double p_228797_6_, float p_228797_8_, float p_228797_9_, float p_228797_10_, float p_228797_11_, float p_228797_12_, int p_228797_13_) { - p_228797_1_.func_225582_a_(p_228797_2_, p_228797_4_, p_228797_6_).func_227885_a_(p_228797_8_, p_228797_9_, p_228797_10_, 1.0F).func_225583_a_(p_228797_11_, p_228797_12_).func_227886_a_(p_228797_13_).func_225584_a_(0.0F, 1.0F, 0.0F).func_181675_d(); -+ func_228797_a_(p_228797_1_, p_228797_2_, p_228797_4_, p_228797_6_, p_228797_8_, p_228797_9_, p_228797_10_, 1.0F, p_228797_11_, p_228797_12_, p_228797_13_); ++ vertex(p_228797_1_, p_228797_2_, p_228797_4_, p_228797_6_, p_228797_8_, p_228797_9_, p_228797_10_, 1.0F, p_228797_11_, p_228797_12_, p_228797_13_); } -+ private void func_228797_a_(IVertexBuilder p_228797_1_, double p_228797_2_, double p_228797_4_, double p_228797_6_, float p_228797_8_, float p_228797_9_, float p_228797_10_, float alpha, float p_228797_11_, float p_228797_12_, int p_228797_13_) { ++ private void vertex(IVertexBuilder p_228797_1_, double p_228797_2_, double p_228797_4_, double p_228797_6_, float p_228797_8_, float p_228797_9_, float p_228797_10_, float alpha, float p_228797_11_, float p_228797_12_, int p_228797_13_) { + p_228797_1_.func_225582_a_(p_228797_2_, p_228797_4_, p_228797_6_).func_227885_a_(p_228797_8_, p_228797_9_, p_228797_10_, alpha).func_225583_a_(p_228797_11_, p_228797_12_).func_227886_a_(p_228797_13_).func_225584_a_(0.0F, 1.0F, 0.0F).func_181675_d(); + } + diff --git a/patches/minecraft/net/minecraft/client/renderer/model/ModelBakery.java.patch b/patches/minecraft/net/minecraft/client/renderer/model/ModelBakery.java.patch index 5c00aa4e6..355ed3264 100644 --- a/patches/minecraft/net/minecraft/client/renderer/model/ModelBakery.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/model/ModelBakery.java.patch @@ -50,7 +50,7 @@ this.field_217848_D.addAll(p_209593_2_.func_187965_e()); } -+ // Same as func_217843_a but without restricting to MRL's ++ // Same as loadTopModel but without restricting to MRL's + private void addModelToCache(ResourceLocation p_217843_1_) { + IUnbakedModel iunbakedmodel = this.func_209597_a(p_217843_1_); + this.field_217849_F.put(p_217843_1_, iunbakedmodel); diff --git a/patches/minecraft/net/minecraft/client/renderer/model/ModelManager.java.patch b/patches/minecraft/net/minecraft/client/renderer/model/ModelManager.java.patch index d69070365..c9094f9b5 100644 --- a/patches/minecraft/net/minecraft/client/renderer/model/ModelManager.java.patch +++ b/patches/minecraft/net/minecraft/client/renderer/model/ModelManager.java.patch @@ -41,7 +41,7 @@ } public AtlasTexture func_229356_a_(ResourceLocation p_229356_1_) { -+ if (this.field_229352_b_ == null) throw new RuntimeException("func_229356_a_ called too early!"); ++ if (this.field_229352_b_ == null) throw new RuntimeException("getAtlasTexture called too early!"); return this.field_229352_b_.func_229152_a_(p_229356_1_); } diff --git a/patches/minecraft/net/minecraft/world/gen/feature/template/StructureProcessor.java.patch b/patches/minecraft/net/minecraft/world/gen/feature/template/StructureProcessor.java.patch index 510d06032..6c5705112 100644 --- a/patches/minecraft/net/minecraft/world/gen/feature/template/StructureProcessor.java.patch +++ b/patches/minecraft/net/minecraft/world/gen/feature/template/StructureProcessor.java.patch @@ -13,11 +13,11 @@ + /** + * FORGE: Add template parameter + * -+ * @param p_215194_1_ -+ * @param p_215194_2_ ++ * @param worldReaderIn ++ * @param pos + * @param p_215194_3_ -+ * @param p_215194_4_ -+ * @param p_215194_5_ ++ * @param blockInfo ++ * @param placementSettingsIn + * @param template The template being placed, can be null due to deprecated + * method calls. + * @see #process(IWorldReader, BlockPos, diff --git a/src/main/java/net/minecraftforge/client/CloudRenderer.java b/src/main/java/net/minecraftforge/client/CloudRenderer.java index 758c02bab..46e2132ac 100644 --- a/src/main/java/net/minecraftforge/client/CloudRenderer.java +++ b/src/main/java/net/minecraftforge/client/CloudRenderer.java @@ -141,18 +141,18 @@ public class CloudRenderer implements ISelectiveResourceReloadListener float v1 = sectZ1 * sectPx; // Bottom - buffer.func_225582_a_(sectX0, 0, sectZ0).func_225583_a_(u0, v0).func_227885_a_(bCol, bCol, bCol, ALPHA).endVertex(); - buffer.func_225582_a_(sectX1, 0, sectZ0).func_225583_a_(u1, v0).func_227885_a_(bCol, bCol, bCol, ALPHA).endVertex(); - buffer.func_225582_a_(sectX1, 0, sectZ1).func_225583_a_(u1, v1).func_227885_a_(bCol, bCol, bCol, ALPHA).endVertex(); - buffer.func_225582_a_(sectX0, 0, sectZ1).func_225583_a_(u0, v1).func_227885_a_(bCol, bCol, bCol, ALPHA).endVertex(); + buffer.pos(sectX0, 0, sectZ0).tex(u0, v0).color(bCol, bCol, bCol, ALPHA).endVertex(); + buffer.pos(sectX1, 0, sectZ0).tex(u1, v0).color(bCol, bCol, bCol, ALPHA).endVertex(); + buffer.pos(sectX1, 0, sectZ1).tex(u1, v1).color(bCol, bCol, bCol, ALPHA).endVertex(); + buffer.pos(sectX0, 0, sectZ1).tex(u0, v1).color(bCol, bCol, bCol, ALPHA).endVertex(); if (fancy) { // Top - buffer.func_225582_a_(sectX0, HEIGHT, sectZ0).func_225583_a_(u0, v0).func_227885_a_(1, 1, 1, ALPHA).endVertex(); - buffer.func_225582_a_(sectX0, HEIGHT, sectZ1).func_225583_a_(u0, v1).func_227885_a_(1, 1, 1, ALPHA).endVertex(); - buffer.func_225582_a_(sectX1, HEIGHT, sectZ1).func_225583_a_(u1, v1).func_227885_a_(1, 1, 1, ALPHA).endVertex(); - buffer.func_225582_a_(sectX1, HEIGHT, sectZ0).func_225583_a_(u1, v0).func_227885_a_(1, 1, 1, ALPHA).endVertex(); + buffer.pos(sectX0, HEIGHT, sectZ0).tex(u0, v0).color(1, 1, 1, ALPHA).endVertex(); + buffer.pos(sectX0, HEIGHT, sectZ1).tex(u0, v1).color(1, 1, 1, ALPHA).endVertex(); + buffer.pos(sectX1, HEIGHT, sectZ1).tex(u1, v1).color(1, 1, 1, ALPHA).endVertex(); + buffer.pos(sectX1, HEIGHT, sectZ0).tex(u1, v0).color(1, 1, 1, ALPHA).endVertex(); float slice; float sliceCoord0; @@ -167,10 +167,10 @@ public class CloudRenderer implements ISelectiveResourceReloadListener if (slice > -CULL_DIST) { slice += INSET; - buffer.func_225582_a_(slice, 0, sectZ1).func_225583_a_(sliceCoord0, v1).func_227885_a_(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); - buffer.func_225582_a_(slice, HEIGHT, sectZ1).func_225583_a_(sliceCoord1, v1).func_227885_a_(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); - buffer.func_225582_a_(slice, HEIGHT, sectZ0).func_225583_a_(sliceCoord1, v0).func_227885_a_(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); - buffer.func_225582_a_(slice, 0, sectZ0).func_225583_a_(sliceCoord0, v0).func_227885_a_(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); + buffer.pos(slice, 0, sectZ1).tex(sliceCoord0, v1).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); + buffer.pos(slice, HEIGHT, sectZ1).tex(sliceCoord1, v1).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); + buffer.pos(slice, HEIGHT, sectZ0).tex(sliceCoord1, v0).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); + buffer.pos(slice, 0, sectZ0).tex(sliceCoord0, v0).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); slice -= INSET; } @@ -179,10 +179,10 @@ public class CloudRenderer implements ISelectiveResourceReloadListener if (slice <= CULL_DIST) { slice -= INSET; - buffer.func_225582_a_(slice, 0, sectZ0).func_225583_a_(sliceCoord0, v0).func_227885_a_(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); - buffer.func_225582_a_(slice, HEIGHT, sectZ0).func_225583_a_(sliceCoord1, v0).func_227885_a_(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); - buffer.func_225582_a_(slice, HEIGHT, sectZ1).func_225583_a_(sliceCoord1, v1).func_227885_a_(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); - buffer.func_225582_a_(slice, 0, sectZ1).func_225583_a_(sliceCoord0, v1).func_227885_a_(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); + buffer.pos(slice, 0, sectZ0).tex(sliceCoord0, v0).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); + buffer.pos(slice, HEIGHT, sectZ0).tex(sliceCoord1, v0).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); + buffer.pos(slice, HEIGHT, sectZ1).tex(sliceCoord1, v1).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); + buffer.pos(slice, 0, sectZ1).tex(sliceCoord0, v1).color(0.9F, 0.9F, 0.9F, ALPHA).endVertex(); slice += INSET; } } @@ -196,10 +196,10 @@ public class CloudRenderer implements ISelectiveResourceReloadListener if (slice > -CULL_DIST) { slice += INSET; - buffer.func_225582_a_(sectX0, 0, slice).func_225583_a_(u0, sliceCoord0).func_227885_a_(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); - buffer.func_225582_a_(sectX0, HEIGHT, slice).func_225583_a_(u0, sliceCoord1).func_227885_a_(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); - buffer.func_225582_a_(sectX1, HEIGHT, slice).func_225583_a_(u1, sliceCoord1).func_227885_a_(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); - buffer.func_225582_a_(sectX1, 0, slice).func_225583_a_(u1, sliceCoord0).func_227885_a_(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); + buffer.pos(sectX0, 0, slice).tex(u0, sliceCoord0).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); + buffer.pos(sectX0, HEIGHT, slice).tex(u0, sliceCoord1).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); + buffer.pos(sectX1, HEIGHT, slice).tex(u1, sliceCoord1).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); + buffer.pos(sectX1, 0, slice).tex(u1, sliceCoord0).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); slice -= INSET; } @@ -208,10 +208,10 @@ public class CloudRenderer implements ISelectiveResourceReloadListener if (slice <= CULL_DIST) { slice -= INSET; - buffer.func_225582_a_(sectX1, 0, slice).func_225583_a_(u1, sliceCoord0).func_227885_a_(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); - buffer.func_225582_a_(sectX1, HEIGHT, slice).func_225583_a_(u1, sliceCoord1).func_227885_a_(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); - buffer.func_225582_a_(sectX0, HEIGHT, slice).func_225583_a_(u0, sliceCoord1).func_227885_a_(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); - buffer.func_225582_a_(sectX0, 0, slice).func_225583_a_(u0, sliceCoord0).func_227885_a_(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); + buffer.pos(sectX1, 0, slice).tex(u1, sliceCoord0).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); + buffer.pos(sectX1, HEIGHT, slice).tex(u1, sliceCoord1).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); + buffer.pos(sectX0, HEIGHT, slice).tex(u0, sliceCoord1).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); + buffer.pos(sectX0, 0, slice).tex(u0, sliceCoord0).color(0.8F, 0.8F, 0.8F, ALPHA).endVertex(); slice += INSET; } } @@ -290,12 +290,12 @@ public class CloudRenderer implements ISelectiveResourceReloadListener double totalOffset = cloudTicks + partialTicks; - double x = entity.prevPosX + (entity.func_226277_ct_() - entity.prevPosX) * partialTicks + double x = entity.prevPosX + (entity.getPosX() - entity.prevPosX) * partialTicks + totalOffset * 0.03; double y = mc.world.dimension.getCloudHeight() - - (entity.lastTickPosY + (entity.func_226278_cu_() - entity.lastTickPosY) * partialTicks) + - (entity.lastTickPosY + (entity.getPosY() - entity.lastTickPosY) * partialTicks) + 0.33; - double z = entity.prevPosZ + (entity.func_226281_cx_() - entity.prevPosZ) * partialTicks; + double z = entity.prevPosZ + (entity.getPosZ() - entity.prevPosZ) * partialTicks; int scale = getScale(); @@ -388,7 +388,7 @@ public class CloudRenderer implements ISelectiveResourceReloadListener VertexBuffer.unbindBuffer(); // Unbind buffer and disable pointers. buffer.limit(0); - for (int i = 0; i < FORMAT.func_227894_c_().size(); i++) + for (int i = 0; i < FORMAT.getElements().size(); i++) FORMAT.getElements().get(i).getUsage().postDraw(FORMAT, i, FORMAT.getSize(), buffer); buffer.position(0); @@ -454,4 +454,4 @@ public class CloudRenderer implements ISelectiveResourceReloadListener } } -*/ \ No newline at end of file +*/ diff --git a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java index 00cb3fefc..c23e50d16 100644 --- a/src/main/java/net/minecraftforge/client/ForgeHooksClient.java +++ b/src/main/java/net/minecraftforge/client/ForgeHooksClient.java @@ -286,7 +286,7 @@ public class ForgeHooksClient for (int z = -distance; z <= distance; ++z) { BlockPos pos = center.add(x, 0, z); - Biome biome = world.func_225526_b_(pos.getX(), pos.getY(), pos.getZ()); + Biome biome = world.getNoiseBiome(pos.getX(), pos.getY(), pos.getZ()); int colour = 0xFFFFFF; // TODO: biome.getSkyColorByTemp(biome.getTemperature(pos)); r += (colour & 0xFF0000) >> 16; g += (colour & 0x00FF00) >> 8; @@ -388,7 +388,7 @@ public class ForgeHooksClient private static final net.minecraft.client.renderer.Matrix4f flipX; private static final net.minecraft.client.renderer.Matrix3f flipXNormal; static { - flipX = Matrix4f.func_226593_a_(-1,1,1); + flipX = Matrix4f.makeScale(-1,1,1); flipXNormal = new net.minecraft.client.renderer.Matrix3f(flipX); } @@ -398,20 +398,20 @@ public class ForgeHooksClient model = model.handlePerspective(cameraTransformType, stack); // If the stack is not empty, the code has added a matrix for us to use. - if (!stack.func_227867_d_()) + if (!stack.clear()) { // Apply the transformation to the real matrix stack, flipping for left hand - net.minecraft.client.renderer.Matrix4f tMat = stack.func_227866_c_().func_227870_a_(); - net.minecraft.client.renderer.Matrix3f nMat = stack.func_227866_c_().func_227872_b_(); + net.minecraft.client.renderer.Matrix4f tMat = stack.getLast().getMatrix(); + net.minecraft.client.renderer.Matrix3f nMat = stack.getLast().getNormal(); if (leftHandHackery) { tMat.multiplyBackward(flipX); - tMat.func_226595_a_(flipX); + tMat.mul(flipX); nMat.multiplyBackward(flipXNormal); - nMat.func_226118_b_(flipXNormal); + nMat.mul(flipXNormal); } - matrixStack.func_227866_c_().func_227870_a_().func_226595_a_(tMat); - matrixStack.func_227866_c_().func_227872_b_().func_226118_b_(nMat); + matrixStack.getLast().getMatrix().mul(tMat); + matrixStack.getLast().getNormal().mul(nMat); } return model; } @@ -420,7 +420,7 @@ public class ForgeHooksClient public static void preDraw(Usage attrType, VertexFormat format, int element, int stride, ByteBuffer buffer) { - VertexFormatElement attr = format.func_227894_c_().get(element); + VertexFormatElement attr = format.getElements().get(element); int count = attr.getElementCount(); int constant = attr.getType().getGlConstant(); buffer.position(format.getOffset(element)); @@ -461,7 +461,7 @@ public class ForgeHooksClient public static void postDraw(Usage attrType, VertexFormat format, int element, int stride, ByteBuffer buffer) { - VertexFormatElement attr = format.func_227894_c_().get(element); + VertexFormatElement attr = format.getElements().get(element); switch(attrType) { case POSITION: @@ -490,7 +490,7 @@ public class ForgeHooksClient public static int getColorIndex(VertexFormat fmt) { - ImmutableList elements = fmt.func_227894_c_(); + ImmutableList elements = fmt.getElements(); for(int i=0;i> 4; int slBaked = Short.toUnsignedInt(data.getShort(offset + 2)) >> 4; bl = Math.max(bl, blBaked); sl = Math.max(sl, slBaked); - return LightTexture.func_228451_a_(bl, sl); + return LightTexture.packLight(bl, sl); } default void applyBakedNormals(Vector3f generated, ByteBuffer data, Matrix3f normalTransform) { @@ -124,7 +124,7 @@ public interface IForgeVertexBuilder byte nz = data.get(30); if (nx != 0 || ny != 0 || nz != 0) { generated.set(nx / 127f, ny / 127f, nz / 127f); - generated.func_229188_a_(normalTransform); + generated.transform(normalTransform); } } } diff --git a/src/main/java/net/minecraftforge/client/gui/ForgeIngameGui.java b/src/main/java/net/minecraftforge/client/gui/ForgeIngameGui.java index 926b3bf35..49ddc3337 100644 --- a/src/main/java/net/minecraftforge/client/gui/ForgeIngameGui.java +++ b/src/main/java/net/minecraftforge/client/gui/ForgeIngameGui.java @@ -107,9 +107,9 @@ public class ForgeIngameGui extends IngameGui @Override public void renderGameOverlay(float partialTicks) { - this.scaledWidth = this.mc.func_228018_at_().getScaledWidth(); - this.scaledHeight = this.mc.func_228018_at_().getScaledHeight(); - eventParent = new RenderGameOverlayEvent(partialTicks, this.mc.func_228018_at_()); + this.scaledWidth = this.mc.getMainWindow().getScaledWidth(); + this.scaledHeight = this.mc.getMainWindow().getScaledHeight(); + eventParent = new RenderGameOverlayEvent(partialTicks, this.mc.getMainWindow()); renderHealthMount = mc.player.getRidingEntity() instanceof LivingEntity; renderFood = mc.player.getRidingEntity() == null; renderJumpBar = mc.player.isRidingHorse(); @@ -845,14 +845,14 @@ public class ForgeIngameGui extends IngameGui public void update() { Entity entity = this.mc.getRenderViewEntity(); - this.rayTraceBlock = entity.func_213324_a(rayTraceDistance, 0.0F, false); - this.rayTraceFluid = entity.func_213324_a(rayTraceDistance, 0.0F, true); + this.rayTraceBlock = entity.pick(rayTraceDistance, 0.0F, false); + this.rayTraceFluid = entity.pick(rayTraceDistance, 0.0F, true); } - @Override protected void func_230024_c_(){} - @Override protected void func_230025_d_(){} + @Override protected void renderDebugInfoLeft(){} + @Override protected void renderDebugInfoRight(){} private List getLeft() { - List ret = this.call(); + List ret = this.getDebugInfoLeft(); 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/gui/ScrollPanel.java b/src/main/java/net/minecraftforge/client/gui/ScrollPanel.java index 7a830dd2a..33869e69e 100644 --- a/src/main/java/net/minecraftforge/client/gui/ScrollPanel.java +++ b/src/main/java/net/minecraftforge/client/gui/ScrollPanel.java @@ -189,9 +189,9 @@ public abstract class ScrollPanel extends FocusableGui implements IRenderable Tessellator tess = Tessellator.getInstance(); BufferBuilder worldr = tess.getBuffer(); - double scale = client.func_228018_at_().getGuiScaleFactor(); + double scale = client.getMainWindow().getGuiScaleFactor(); GL11.glEnable(GL11.GL_SCISSOR_TEST); - GL11.glScissor((int)(left * scale), (int)(client.func_228018_at_().getFramebufferHeight() - (bottom * scale)), + GL11.glScissor((int)(left * scale), (int)(client.getMainWindow().getFramebufferHeight() - (bottom * scale)), (int)(width * scale), (int)(height * scale)); if (this.client.world != null) @@ -206,10 +206,10 @@ public abstract class ScrollPanel extends FocusableGui implements IRenderable RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); final float texScale = 32.0F; worldr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); - worldr.func_225582_a_(this.left, this.bottom, 0.0D).func_225583_a_(this.left / texScale, (this.bottom + (int)this.scrollDistance) / texScale).func_225586_a_(0x20, 0x20, 0x20, 0xFF).endVertex(); - worldr.func_225582_a_(this.right, this.bottom, 0.0D).func_225583_a_(this.right / texScale, (this.bottom + (int)this.scrollDistance) / texScale).func_225586_a_(0x20, 0x20, 0x20, 0xFF).endVertex(); - worldr.func_225582_a_(this.right, this.top, 0.0D).func_225583_a_(this.right / texScale, (this.top + (int)this.scrollDistance) / texScale).func_225586_a_(0x20, 0x20, 0x20, 0xFF).endVertex(); - worldr.func_225582_a_(this.left, this.top, 0.0D).func_225583_a_(this.left / texScale, (this.top + (int)this.scrollDistance) / texScale).func_225586_a_(0x20, 0x20, 0x20, 0xFF).endVertex(); + worldr.pos(this.left, this.bottom, 0.0D).tex(this.left / texScale, (this.bottom + (int)this.scrollDistance) / texScale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); + worldr.pos(this.right, this.bottom, 0.0D).tex(this.right / texScale, (this.bottom + (int)this.scrollDistance) / texScale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); + worldr.pos(this.right, this.top, 0.0D).tex(this.right / texScale, (this.top + (int)this.scrollDistance) / texScale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); + worldr.pos(this.left, this.top, 0.0D).tex(this.left / texScale, (this.top + (int)this.scrollDistance) / texScale).color(0x20, 0x20, 0x20, 0xFF).endVertex(); tess.draw(); } @@ -231,22 +231,22 @@ public abstract class ScrollPanel extends FocusableGui implements IRenderable RenderSystem.disableTexture(); worldr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); - worldr.func_225582_a_(barLeft, this.bottom, 0.0D).func_225583_a_(0.0F, 1.0F).func_225586_a_(0x00, 0x00, 0x00, 0xFF).endVertex(); - worldr.func_225582_a_(barLeft + barWidth, this.bottom, 0.0D).func_225583_a_(1.0F, 1.0F).func_225586_a_(0x00, 0x00, 0x00, 0xFF).endVertex(); - worldr.func_225582_a_(barLeft + barWidth, this.top, 0.0D).func_225583_a_(1.0F, 0.0F).func_225586_a_(0x00, 0x00, 0x00, 0xFF).endVertex(); - worldr.func_225582_a_(barLeft, this.top, 0.0D).func_225583_a_(0.0F, 0.0F).func_225586_a_(0x00, 0x00, 0x00, 0xFF).endVertex(); + worldr.pos(barLeft, this.bottom, 0.0D).tex(0.0F, 1.0F).color(0x00, 0x00, 0x00, 0xFF).endVertex(); + worldr.pos(barLeft + barWidth, this.bottom, 0.0D).tex(1.0F, 1.0F).color(0x00, 0x00, 0x00, 0xFF).endVertex(); + worldr.pos(barLeft + barWidth, this.top, 0.0D).tex(1.0F, 0.0F).color(0x00, 0x00, 0x00, 0xFF).endVertex(); + worldr.pos(barLeft, this.top, 0.0D).tex(0.0F, 0.0F).color(0x00, 0x00, 0x00, 0xFF).endVertex(); tess.draw(); worldr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); - worldr.func_225582_a_(barLeft, barTop + barHeight, 0.0D).func_225583_a_(0.0F, 1.0F).func_225586_a_(0x80, 0x80, 0x80, 0xFF).endVertex(); - worldr.func_225582_a_(barLeft + barWidth, barTop + barHeight, 0.0D).func_225583_a_(1.0F, 1.0F).func_225586_a_(0x80, 0x80, 0x80, 0xFF).endVertex(); - worldr.func_225582_a_(barLeft + barWidth, barTop, 0.0D).func_225583_a_(1.0F, 0.0F).func_225586_a_(0x80, 0x80, 0x80, 0xFF).endVertex(); - worldr.func_225582_a_(barLeft, barTop, 0.0D).func_225583_a_(0.0F, 0.0F).func_225586_a_(0x80, 0x80, 0x80, 0xFF).endVertex(); + worldr.pos(barLeft, barTop + barHeight, 0.0D).tex(0.0F, 1.0F).color(0x80, 0x80, 0x80, 0xFF).endVertex(); + worldr.pos(barLeft + barWidth, barTop + barHeight, 0.0D).tex(1.0F, 1.0F).color(0x80, 0x80, 0x80, 0xFF).endVertex(); + worldr.pos(barLeft + barWidth, barTop, 0.0D).tex(1.0F, 0.0F).color(0x80, 0x80, 0x80, 0xFF).endVertex(); + worldr.pos(barLeft, barTop, 0.0D).tex(0.0F, 0.0F).color(0x80, 0x80, 0x80, 0xFF).endVertex(); tess.draw(); worldr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); - worldr.func_225582_a_(barLeft, barTop + barHeight - 1, 0.0D).func_225583_a_(0.0F, 1.0F).func_225586_a_(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); - worldr.func_225582_a_(barLeft + barWidth - 1, barTop + barHeight - 1, 0.0D).func_225583_a_(1.0F, 1.0F).func_225586_a_(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); - worldr.func_225582_a_(barLeft + barWidth - 1, barTop, 0.0D).func_225583_a_(1.0F, 0.0F).func_225586_a_(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); - worldr.func_225582_a_(barLeft, barTop, 0.0D).func_225583_a_(0.0F, 0.0F).func_225586_a_(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); + worldr.pos(barLeft, barTop + barHeight - 1, 0.0D).tex(0.0F, 1.0F).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); + worldr.pos(barLeft + barWidth - 1, barTop + barHeight - 1, 0.0D).tex(1.0F, 1.0F).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); + worldr.pos(barLeft + barWidth - 1, barTop, 0.0D).tex(1.0F, 0.0F).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); + worldr.pos(barLeft, barTop, 0.0D).tex(0.0F, 0.0F).color(0xC0, 0xC0, 0xC0, 0xFF).endVertex(); tess.draw(); } diff --git a/src/main/java/net/minecraftforge/client/model/BlockModelConfiguration.java b/src/main/java/net/minecraftforge/client/model/BlockModelConfiguration.java index 82a680420..4b13d5ac1 100644 --- a/src/main/java/net/minecraftforge/client/model/BlockModelConfiguration.java +++ b/src/main/java/net/minecraftforge/client/model/BlockModelConfiguration.java @@ -101,7 +101,7 @@ public class BlockModelConfiguration implements IModelConfiguration @Override public Material resolveTexture(String name) { - return owner.func_228816_c_(name); + return owner.resolveTextureName(name); } @Override @@ -133,7 +133,7 @@ public class BlockModelConfiguration implements IModelConfiguration IModelTransform state = getCustomModelState(); return state != null - ? new SimpleModelTransform(PerspectiveMapWrapper.getTransformsWithFallback(state, getCameraTransforms()), state.func_225615_b_()) + ? new SimpleModelTransform(PerspectiveMapWrapper.getTransformsWithFallback(state, getCameraTransforms()), state.getRotation()) : new SimpleModelTransform(PerspectiveMapWrapper.getTransforms(getCameraTransforms())); } diff --git a/src/main/java/net/minecraftforge/client/model/CompositeModel.java b/src/main/java/net/minecraftforge/client/model/CompositeModel.java index 5bfa38908..5a9836066 100644 --- a/src/main/java/net/minecraftforge/client/model/CompositeModel.java +++ b/src/main/java/net/minecraftforge/client/model/CompositeModel.java @@ -180,16 +180,16 @@ public class CompositeModel implements IDynamicBakedModel throw new UnsupportedOperationException("Attempted to call adQuads on a Submodel instance. Please don't."); } - public IBakedModel func_225613_a_(ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation) + public IBakedModel bakeModel(ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation) { - return model.func_225613_a_(bakery, spriteGetter, new ModelTransformComposition(this.modelTransform, modelTransform, + return model.bakeModel(bakery, spriteGetter, new ModelTransformComposition(this.modelTransform, modelTransform, this.modelTransform.isUvLock() || modelTransform.isUvLock()), modelLocation); } @Override public Collection getTextures(IModelConfiguration owner, Function modelGetter, Set> missingTextureErrors) { - return model.func_225614_a_(modelGetter, missingTextureErrors); + return model.getTextures(modelGetter, missingTextureErrors); } } @@ -226,7 +226,7 @@ public class CompositeModel implements IDynamicBakedModel Submodel submodel = part.getValue(); if (!owner.getPartVisibility(submodel)) continue; - bakedParts.put(part.getKey(), submodel.func_225613_a_(bakery, spriteGetter, modelTransform, modelLocation)); + bakedParts.put(part.getKey(), submodel.bakeModel(bakery, spriteGetter, modelTransform, modelLocation)); } return new CompositeModel(owner.isShadedInGui(), owner.useSmoothLighting(), particle, bakedParts.build(), owner.getCombinedTransform(), overrides); } diff --git a/src/main/java/net/minecraftforge/client/model/DynamicBucketModel.java b/src/main/java/net/minecraftforge/client/model/DynamicBucketModel.java index d801c243d..4bf63a5a2 100644 --- a/src/main/java/net/minecraftforge/client/model/DynamicBucketModel.java +++ b/src/main/java/net/minecraftforge/client/model/DynamicBucketModel.java @@ -97,25 +97,25 @@ public final class DynamicBucketModel implements IModelGeometry spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation) { Material particleLocation = owner.resolveTexture("particle"); - if (MissingTextureSprite.getLocation().equals(particleLocation.func_229313_b_())) + if (MissingTextureSprite.getLocation().equals(particleLocation.getTextureLocation())) { particleLocation = null; } Material baseLocation = owner.resolveTexture("base"); - if (MissingTextureSprite.getLocation().equals(baseLocation.func_229313_b_())) + if (MissingTextureSprite.getLocation().equals(baseLocation.getTextureLocation())) { baseLocation = null; } Material fluidMaskLocation = owner.resolveTexture("fluid"); - if (MissingTextureSprite.getLocation().equals(fluidMaskLocation.func_229313_b_())) + if (MissingTextureSprite.getLocation().equals(fluidMaskLocation.getTextureLocation())) { fluidMaskLocation = null; } Material coverLocation = owner.resolveTexture("cover"); - if (!MissingTextureSprite.getLocation().equals(coverLocation.func_229313_b_())) + if (!MissingTextureSprite.getLocation().equals(coverLocation.getTextureLocation())) { // cover (the actual item around the other two) coverLocation = null; @@ -135,7 +135,7 @@ public final class DynamicBucketModel implements IModelGeometry func_225614_a_(Function p_225614_1_, Set> p_225614_2_) + public Collection getTextures(Function p_225614_1_, Set> p_225614_2_) { return ImmutableList.of(font2); } @@ -104,11 +104,11 @@ final class FancyMissingModel implements IUnbakedModel @Nullable @Override - public IBakedModel func_225613_a_(ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation) + public IBakedModel bakeModel(ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation) { - IBakedModel bigMissing = missingModel.func_225613_a_(bakery, spriteGetter, modelTransform, modelLocation); + IBakedModel bigMissing = missingModel.bakeModel(bakery, spriteGetter, modelTransform, modelLocation); ModelTransformComposition smallState = new ModelTransformComposition(modelTransform, new SimpleModelTransform(smallTransformation)); - IBakedModel smallMissing = missingModel.func_225613_a_(bakery, spriteGetter, smallState, modelLocation); + IBakedModel smallMissing = missingModel.bakeModel(bakery, spriteGetter, smallState, modelLocation); return new BakedModel(bigMissing, smallMissing, fontRenderer, message, spriteGetter.apply(font2)); } @@ -198,7 +198,7 @@ final class FancyMissingModel implements IUnbakedModel @Override public IBakedModel handlePerspective(ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) { - TransformationMatrix transform = TransformationMatrix.func_227983_a_(); + TransformationMatrix transform = TransformationMatrix.identity(); boolean big = true; switch (cameraTransformType) { @@ -235,7 +235,7 @@ final class FancyMissingModel implements IUnbakedModel default: break; } - mat.func_227866_c_().func_227870_a_().func_226595_a_(transform.func_227988_c_()); + mat.getLast().getMatrix().mul(transform.getMatrix()); if (big != this.big) { return otherModel; diff --git a/src/main/java/net/minecraftforge/client/model/FluidModel.java b/src/main/java/net/minecraftforge/client/model/FluidModel.java index c2c340830..30c2212d3 100644 --- a/src/main/java/net/minecraftforge/client/model/FluidModel.java +++ b/src/main/java/net/minecraftforge/client/model/FluidModel.java @@ -83,7 +83,7 @@ public final class FluidModel implements IModelGeometry { FluidAttributes attrs = fluid.getAttributes(); return new CachingBakedFluid( - modelTransform.func_225615_b_(), + modelTransform.getRotation(), PerspectiveMapWrapper.getTransforms(modelTransform), modelLocation, attrs.getColor(), @@ -389,7 +389,7 @@ public final class FluidModel implements IModelGeometry private void putVertex(IVertexConsumer consumer, Direction side, boolean offset, float x, float y, float z, float u, float v) { VertexFormat format = DefaultVertexFormats.BLOCK; - ImmutableList elements = format.func_227894_c_(); + ImmutableList elements = format.getElements(); for(int e = 0; e < elements.size(); e++) { switch(elements.get(e).getUsage()) diff --git a/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java b/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java index 7e410f48c..e2c633b36 100644 --- a/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java +++ b/src/main/java/net/minecraftforge/client/model/ItemLayerModel.java @@ -84,7 +84,7 @@ public final class ItemLayerModel implements IModelGeometry public IBakedModel bake(IModelConfiguration owner, ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, ItemOverrideList overrides, ResourceLocation modelLocation) { //TODO: Verify - TransformationMatrix transform = modelTransform.func_225615_b_(); + TransformationMatrix transform = modelTransform.getRotation(); ImmutableList quads = getQuadsForSprites(textures, transform, spriteGetter); TextureAtlasSprite particle = spriteGetter.apply( owner.isTexturePresent("particle") ? owner.resolveTexture("particle") : textures.get(0) @@ -396,9 +396,9 @@ public final class ItemLayerModel implements IModelGeometry private static void putVertex(IVertexConsumer consumer, Direction side, float x, float y, float z, float u, float v) { VertexFormat format = consumer.getVertexFormat(); - for(int e = 0; e < format.func_227894_c_().size(); e++) + for(int e = 0; e < format.getElements().size(); e++) { - switch(format.func_227894_c_().get(e).getUsage()) + switch(format.getElements().get(e).getUsage()) { case POSITION: consumer.put(e, x, y, z, 1f); @@ -413,7 +413,7 @@ public final class ItemLayerModel implements IModelGeometry consumer.put(e, offX, offY, offZ, 0f); break; case UV: - if(format.func_227894_c_().get(e).getIndex() == 0) + if(format.getElements().get(e).getIndex() == 0) { consumer.put(e, u, v, 0f, 1f); break; diff --git a/src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java b/src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java index e5d5b117a..6bd20db23 100644 --- a/src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java +++ b/src/main/java/net/minecraftforge/client/model/ItemTextureQuadConverter.java @@ -264,9 +264,9 @@ public final class ItemTextureQuadConverter float x, float y, float z, float u, float v, int color) { VertexFormat format = consumer.getVertexFormat(); - for (int e = 0; e < format.func_227894_c_().size(); e++) + for (int e = 0; e < format.getElements().size(); e++) { - switch (format.func_227894_c_().get(e).getUsage()) + switch (format.getElements().get(e).getUsage()) { case POSITION: consumer.put(e, x, y, z, 1f); @@ -285,7 +285,7 @@ public final class ItemTextureQuadConverter consumer.put(e, offX, offY, offZ, 0f); break; case UV: - if (format.func_227894_c_().get(e).getIndex() == 0) + if (format.getElements().get(e).getIndex() == 0) { consumer.put(e, u, v, 0f, 1f); break; diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java index ede816811..719315981 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java @@ -162,7 +162,7 @@ public final class ModelLoader extends ModelBakery { if (instance == null) { - instance = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, LOCATION).func_229314_c_(); + instance = new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, LOCATION).getSprite(); } return instance; } @@ -264,7 +264,7 @@ public final class ModelLoader extends ModelBakery */ public static Function defaultTextureGetter() { - return Material::func_229314_c_; + return Material::getSprite; } public static Function defaultModelGetter() diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoaderRegistry.java b/src/main/java/net/minecraftforge/client/model/ModelLoaderRegistry.java index 52afb38da..e185b96be 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoaderRegistry.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoaderRegistry.java @@ -223,7 +223,7 @@ public class ModelLoaderRegistry { throw new JsonParseException("transform: allowed keys: 'thirdperson', 'firstperson', 'gui', 'head', 'matrix', 'translation', 'rotation', 'scale', 'post-rotation'"); } - TransformationMatrix base = TransformationMatrix.func_227983_a_(); + TransformationMatrix base = TransformationMatrix.identity(); if(!transform.entrySet().isEmpty()) { base = context.deserialize(transform, TransformationMatrix.class); @@ -282,7 +282,7 @@ public class ModelLoaderRegistry modelBuilder.addGeneralQuad(BlockModel.makeBakedQuad(blockpart, blockpartface, textureatlassprite1, direction, modelTransform, modelLocation)); } else { modelBuilder.addFaceQuad( - modelTransform.func_225615_b_().rotateTransform(blockpartface.cullFace), + modelTransform.getRotation().rotateTransform(blockpartface.cullFace), BlockModel.makeBakedQuad(blockpart, blockpartface, textureatlassprite1, direction, modelTransform, modelLocation)); } } diff --git a/src/main/java/net/minecraftforge/client/model/ModelTransformComposition.java b/src/main/java/net/minecraftforge/client/model/ModelTransformComposition.java index 34bfe7bf2..8176e7435 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelTransformComposition.java +++ b/src/main/java/net/minecraftforge/client/model/ModelTransformComposition.java @@ -51,9 +51,9 @@ public class ModelTransformComposition implements IModelTransform } @Override - public TransformationMatrix func_225615_b_() + public TransformationMatrix getRotation() { - return first.func_225615_b_().compose(second.func_225615_b_()); + return first.getRotation().compose(second.getRotation()); } @Override diff --git a/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java b/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java index 3cd7f572e..578302ebd 100644 --- a/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java +++ b/src/main/java/net/minecraftforge/client/model/MultiLayerModel.java @@ -72,7 +72,7 @@ public final class MultiLayerModel implements IModelGeometry Set materials = Sets.newHashSet(); materials.add(owner.resolveTexture("particle")); for (IUnbakedModel m : models.values()) - materials.addAll(m.func_225614_a_(modelGetter, missingTextureErrors)); + materials.addAll(m.getTextures(modelGetter, missingTextureErrors)); return materials; } @@ -81,7 +81,7 @@ public final class MultiLayerModel implements IModelGeometry ImmutableMap.Builder builder = ImmutableMap.builder(); for(Map.Entry entry : models.entrySet()) { - builder.put(entry.getKey(), entry.getValue().func_225613_a_(bakery, spriteGetter, modelTransform, modelLocation)); + builder.put(entry.getKey(), entry.getValue().bakeModel(bakery, spriteGetter, modelTransform, modelLocation)); } return builder.build(); } @@ -95,7 +95,7 @@ public final class MultiLayerModel implements IModelGeometry owner.useSmoothLighting(), owner.isShadedInGui(), owner.isSideLit(), spriteGetter.apply(owner.resolveTexture("particle")), overrides, buildModels(models, modelTransform, bakery, spriteGetter, modelLocation), - missing.func_225613_a_(bakery, spriteGetter, modelTransform, modelLocation), + missing.bakeModel(bakery, spriteGetter, modelTransform, modelLocation), PerspectiveMapWrapper.getTransforms(new ModelTransformComposition(owner.getCombinedTransform(), modelTransform))); } @@ -220,7 +220,7 @@ public final class MultiLayerModel implements IModelGeometry { ImmutableMap.Builder builder = ImmutableMap.builder(); JsonObject layersObject = JSONUtils.getJsonObject(modelContents, "layers"); - for(RenderType layer : RenderType.func_228661_n_()) // block layers + for(RenderType layer : RenderType.getBlockRenderTypes()) // block layers { String layerName = layer.toString(); // mc overrides toString to return the ID for the layer if(layersObject.has(layerName)) diff --git a/src/main/java/net/minecraftforge/client/model/PerspectiveMapWrapper.java b/src/main/java/net/minecraftforge/client/model/PerspectiveMapWrapper.java index 3f8994969..eb443b906 100644 --- a/src/main/java/net/minecraftforge/client/model/PerspectiveMapWrapper.java +++ b/src/main/java/net/minecraftforge/client/model/PerspectiveMapWrapper.java @@ -106,7 +106,7 @@ public class PerspectiveMapWrapper implements IDynamicBakedModel public static IBakedModel handlePerspective(IBakedModel model, ImmutableMap transforms, ItemCameraTransforms.TransformType cameraTransformType, MatrixStack mat) { - TransformationMatrix tr = transforms.getOrDefault(cameraTransformType, TransformationMatrix.func_227983_a_()); + TransformationMatrix tr = transforms.getOrDefault(cameraTransformType, TransformationMatrix.identity()); if (!tr.isIdentity()) { tr.push(mat); diff --git a/src/main/java/net/minecraftforge/client/model/QuadTransformer.java b/src/main/java/net/minecraftforge/client/model/QuadTransformer.java index f28105df4..7372375f4 100644 --- a/src/main/java/net/minecraftforge/client/model/QuadTransformer.java +++ b/src/main/java/net/minecraftforge/client/model/QuadTransformer.java @@ -57,7 +57,7 @@ public class QuadTransformer Vector4f pos = new Vector4f(x, y, z, 1); transform.transformPosition(pos); - pos.func_229375_f_(); + pos.perspectiveDivide(); putAtByteOffset(outData, offset, Float.floatToRawIntBits(pos.getX())); putAtByteOffset(outData,offset + 4, Float.floatToRawIntBits(pos.getY())); @@ -77,7 +77,7 @@ public class QuadTransformer Vector3f pos = new Vector3f(x, y, z); transform.transformNormal(pos); - pos.func_229194_d_(); + pos.normalize(); int normalOut = ((((byte)(x / 127.0f)) & 0xFF) << 24) | ((((byte)(y / 127.0f)) & 0xFF) << 16) | @@ -125,16 +125,16 @@ public class QuadTransformer { int index; VertexFormatElement element = null; - for (index = 0; index < fmt.func_227894_c_().size(); index++) + for (index = 0; index < fmt.getElements().size(); index++) { - VertexFormatElement el = fmt.func_227894_c_().get(index); + VertexFormatElement el = fmt.getElements().get(index); if (el.getUsage() == VertexFormatElement.Usage.POSITION) { element = el; break; } } - if (index == fmt.func_227894_c_().size() || element == null) + if (index == fmt.getElements().size() || element == null) throw new RuntimeException("Expected vertex format to have a POSITION attribute"); if (element.getType() != VertexFormatElement.Type.FLOAT) throw new RuntimeException("Expected POSITION attribute to have data type FLOAT"); @@ -147,16 +147,16 @@ public class QuadTransformer { int index; VertexFormatElement element = null; - for (index = 0; index < fmt.func_227894_c_().size(); index++) + for (index = 0; index < fmt.getElements().size(); index++) { - VertexFormatElement el = fmt.func_227894_c_().get(index); + VertexFormatElement el = fmt.getElements().get(index); if (el.getUsage() == VertexFormatElement.Usage.NORMAL) { element = el; break; } } - if (index == fmt.func_227894_c_().size() || element == null) + if (index == fmt.getElements().size() || element == null) throw new IllegalStateException("BLOCK format does not have normals?"); if (element.getType() != VertexFormatElement.Type.BYTE) throw new RuntimeException("Expected NORMAL attribute to have data type BYTE"); @@ -176,7 +176,7 @@ public class QuadTransformer int[] outData = Arrays.copyOf(inData, inData.length); processVertices(inData, outData); - return new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.getSprite(), input.shouldApplyDiffuseLighting()); + return new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.func_187508_a(), input.shouldApplyDiffuseLighting()); } /** @@ -208,7 +208,7 @@ public class QuadTransformer int[] outData = Arrays.copyOf(inData, inData.length); processVertices(inData, outData); - outputs.add(new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.getSprite(), input.shouldApplyDiffuseLighting())); + outputs.add(new BakedQuad(outData, input.getTintIndex(), input.getFace(), input.func_187508_a(), input.shouldApplyDiffuseLighting())); } return outputs; } diff --git a/src/main/java/net/minecraftforge/client/model/SimpleModelFontRenderer.java b/src/main/java/net/minecraftforge/client/model/SimpleModelFontRenderer.java index fbb04c929..d07e83bf0 100644 --- a/src/main/java/net/minecraftforge/client/model/SimpleModelFontRenderer.java +++ b/src/main/java/net/minecraftforge/client/model/SimpleModelFontRenderer.java @@ -69,7 +69,7 @@ public abstract class SimpleModelFontRenderer extends FontRenderer { private void addVertex(BakedQuadBuilder quadBuilder, float x, float y, float u, float v) { - ImmutableList elements = quadBuilder.getVertexFormat().func_227894_c_(); + ImmutableList elements = quadBuilder.getVertexFormat().getElements(); for(int e = 0; e < elements.size(); e++) { VertexFormatElement element = elements.get(e); diff --git a/src/main/java/net/minecraftforge/client/model/SimpleModelTransform.java b/src/main/java/net/minecraftforge/client/model/SimpleModelTransform.java index a5c52d9dc..6b05b9b41 100644 --- a/src/main/java/net/minecraftforge/client/model/SimpleModelTransform.java +++ b/src/main/java/net/minecraftforge/client/model/SimpleModelTransform.java @@ -29,14 +29,14 @@ import com.google.common.collect.ImmutableMap; */ public final class SimpleModelTransform implements IModelTransform { - public static final SimpleModelTransform IDENTITY = new SimpleModelTransform(TransformationMatrix.func_227983_a_()); + public static final SimpleModelTransform IDENTITY = new SimpleModelTransform(TransformationMatrix.identity()); private final ImmutableMap map; private final TransformationMatrix base; public SimpleModelTransform(ImmutableMap map) { - this(map, TransformationMatrix.func_227983_a_()); + this(map, TransformationMatrix.identity()); } public SimpleModelTransform(TransformationMatrix base) @@ -51,7 +51,7 @@ public final class SimpleModelTransform implements IModelTransform } @Override - public TransformationMatrix func_225615_b_() + public TransformationMatrix getRotation() { return base; } @@ -59,6 +59,6 @@ public final class SimpleModelTransform implements IModelTransform @Override public TransformationMatrix getPartTransformation(Object part) { - return map.getOrDefault(part, TransformationMatrix.func_227983_a_()); + return map.getOrDefault(part, TransformationMatrix.identity()); } } 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 caf069ac7..b9b7e0713 100644 --- a/src/main/java/net/minecraftforge/client/model/animation/AnimationItemOverrideList.java +++ b/src/main/java/net/minecraftforge/client/model/animation/AnimationItemOverrideList.java @@ -79,7 +79,7 @@ public final class AnimationItemOverrideList extends ItemOverrideList return asm.apply(Animation.getWorldTime(world, Animation.getPartialTickTime())).getLeft(); }) // TODO where should uvlock data come from? - .map(state -> model.func_225613_a_(bakery, bakedTextureGetter, new ModelTransformComposition(state, this.state), modelLoc)) + .map(state -> model.bakeModel(bakery, bakedTextureGetter, new ModelTransformComposition(state, this.state), modelLoc)) .orElseGet(() -> super.getModelWithOverrides(originalModel, stack, world, entity)); } } 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 14f0a3b40..ae551d1cf 100644 --- a/src/main/java/net/minecraftforge/client/model/animation/ModelBlockAnimation.java +++ b/src/main/java/net/minecraftforge/client/model/animation/ModelBlockAnimation.java @@ -408,8 +408,8 @@ public class ModelBlockAnimation } Quaternion rot = new Quaternion(rotation_axis, rotation_angle, false); TransformationMatrix base = new TransformationMatrix(translation, rot, scale, null); - Vector3f negOrigin = origin.func_229195_e_(); - negOrigin.func_229192_b_(-1,-1,-1); + Vector3f negOrigin = origin.copy(); + negOrigin.mul(-1,-1,-1); base = new TransformationMatrix(origin, null, null, null).compose(base).compose(new TransformationMatrix(negOrigin, null, null, null)); return base.blockCenterToCorner(); } @@ -428,7 +428,7 @@ public class ModelBlockAnimation @Override public TransformationMatrix getInvBindPose() { - return TransformationMatrix.func_227983_a_(); + return TransformationMatrix.identity(); } @Override @@ -537,8 +537,8 @@ public class ModelBlockAnimation if(!trOp.isIdentity()) { float w = info.getWeights().get(i)[0]; - tmp = trOp.func_227988_c_(); - tmp.func_226592_a_(w); + tmp = trOp.getMatrix(); + tmp.mul(w); m.add(tmp); weight += w; } @@ -546,7 +546,7 @@ public class ModelBlockAnimation } if(weight > 1e-5) { - m.func_226592_a_(1f / weight); + m.mul(1f / weight); return new TransformationMatrix(m); } } diff --git a/src/main/java/net/minecraftforge/client/model/animation/TileEntityRendererAnimation.java b/src/main/java/net/minecraftforge/client/model/animation/TileEntityRendererAnimation.java index beaa15fbc..bb06b3887 100644 --- a/src/main/java/net/minecraftforge/client/model/animation/TileEntityRendererAnimation.java +++ b/src/main/java/net/minecraftforge/client/model/animation/TileEntityRendererAnimation.java @@ -57,7 +57,7 @@ public class TileEntityRendererAnimation extends TileEntit protected static BlockRendererDispatcher blockRenderer; @Override - public void func_225616_a_(T te, float partialTick, MatrixStack mat, IRenderTypeBuffer renderer, int light, int otherlight) + public void render(T te, float partialTick, MatrixStack mat, IRenderTypeBuffer renderer, int light, int otherlight) { LazyOptional cap = te.getCapability(CapabilityAnimation.ANIMATION_CAPABILITY); if(!cap.isPresent()) @@ -80,7 +80,7 @@ public class TileEntityRendererAnimation extends TileEntit // TODO: caching? data.setData(Properties.AnimationProperty, pair.getLeft()); - blockRenderer.getBlockModelRenderer().renderModel(world, model, state, pos, mat, renderer.getBuffer(Atlases.func_228782_g_()), false, new Random(), 42, light, data); + blockRenderer.getBlockModelRenderer().renderModel(world, model, state, pos, mat, renderer.getBuffer(Atlases.getSolidBlockType()), false, new Random(), 42, light, data); }); } } diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DClip.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DClip.java index 738e32abf..8c1e474ff 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DClip.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DClip.java @@ -65,7 +65,7 @@ public enum B3DClip implements IClip @Override public TransformationMatrix apply(float time) { - TransformationMatrix ret = TransformationMatrix.func_227983_a_(); + TransformationMatrix ret = TransformationMatrix.identity(); if(node.getAnimation() == null) { return ret.compose(new TransformationMatrix(node.getPos(), node.getRot(), node.getScale(), null)); 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 83e5fb61a..0788c3c74 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java @@ -226,13 +226,13 @@ public enum B3DLoader implements ISelectiveResourceReloadListener @Override - public TransformationMatrix func_225615_b_() + public TransformationMatrix getRotation() { if(parent != null) { - return parent.func_225615_b_(); + return parent.getRotation(); } - return TransformationMatrix.func_227983_a_(); + return TransformationMatrix.identity(); } @Override @@ -242,7 +242,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener if(!(part instanceof NodeJoint)) { - return TransformationMatrix.func_227983_a_(); + return TransformationMatrix.identity(); } Node node = ((NodeJoint)part).getNode(); TransformationMatrix nodeTransform; @@ -290,7 +290,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener public static TransformationMatrix getNodeMatrix(@Nullable Animation animation, Node node, int frame) { - TransformationMatrix ret = TransformationMatrix.func_227983_a_(); + TransformationMatrix ret = TransformationMatrix.identity(); Key key = null; if(animation != null) key = animation.getKeys().get(frame, node); else if(node.getAnimation() != null) key = node.getAnimation().getKeys().get(frame, node); @@ -355,8 +355,8 @@ public enum B3DLoader implements ISelectiveResourceReloadListener @Override public TransformationMatrix getInvBindPose() { - Matrix4f m = new TransformationMatrix(node.getPos(), node.getRot(), node.getScale(), null).func_227988_c_(); - m.func_226600_c_(); + Matrix4f m = new TransformationMatrix(node.getPos(), node.getRot(), node.getScale(), null).getMatrix(); + m.invert(); TransformationMatrix pose = new TransformationMatrix(m); if(node.getParent() != null) @@ -446,7 +446,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener } @Override - public Collection func_225614_a_(Function p_225614_1_, Set> p_225614_2_) + public Collection getTextures(Function p_225614_1_, Set> p_225614_2_) { return textures.values().stream().filter(loc -> !loc.startsWith("#")) .map(t -> new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, new ResourceLocation(t))) @@ -461,7 +461,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener @Nullable @Override - public IBakedModel func_225613_a_(ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation) + public IBakedModel bakeModel(ModelBakery bakery, Function spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation) { ImmutableMap.Builder builder = ImmutableMap.builder(); TextureAtlasSprite missing = spriteGetter.apply(new Material(AtlasTexture.LOCATION_BLOCKS_TEXTURE, MissingTextureSprite.getLocation())); @@ -694,7 +694,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener Mesh mesh = (Mesh)node.getKind(); Collection faces = mesh.bake(new Function, Matrix4f>() { - private final TransformationMatrix global = state.func_225615_b_(); + private final TransformationMatrix global = state.getRotation(); private final LoadingCache, TransformationMatrix> localCache = CacheBuilder.newBuilder() .maximumSize(32) .build(new CacheLoader, TransformationMatrix>() @@ -709,7 +709,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener @Override public Matrix4f apply(Node node) { - return global.compose(localCache.getUnchecked(node)).func_227988_c_(); + return global.compose(localCache.getUnchecked(node)).getMatrix(); } }); for(Face f : faces) @@ -735,7 +735,7 @@ public enum B3DLoader implements ISelectiveResourceReloadListener private final void putVertexData(IVertexConsumer consumer, Vertex v, Vector3f faceNormal, TextureAtlasSprite sprite) { // TODO handle everything not handled (texture transformations, bones, transformations, normals, e.t.c) - ImmutableList vertexFormatElements = consumer.getVertexFormat().func_227894_c_(); + ImmutableList vertexFormatElements = consumer.getVertexFormat().getElements(); for(int e = 0; e < vertexFormatElements.size(); e++) { switch(vertexFormatElements.get(e).getUsage()) diff --git a/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java b/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java index ac036812d..47ed161a7 100644 --- a/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java +++ b/src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java @@ -663,7 +663,7 @@ public class B3DModel Matrix4f t = new Matrix4f(); if(mesh.getWeightMap().get(this).isEmpty()) { - t.func_226591_a_(); + t.setIdentity(); } else { @@ -671,11 +671,11 @@ public class B3DModel { totalWeight += bone.getLeft(); Matrix4f bm = animator.apply(bone.getRight()); - bm.func_226592_a_(bone.getLeft()); + bm.mul(bone.getLeft()); t.add(bm); } - if(Math.abs(totalWeight) > 1e-4) t.func_226592_a_(1f / totalWeight); - else t.func_226591_a_(); + if(Math.abs(totalWeight) > 1e-4) t.mul(1f / totalWeight); + else t.setIdentity(); } TransformationMatrix trsr = new TransformationMatrix(t); @@ -684,7 +684,7 @@ public class B3DModel Vector4f pos = new Vector4f(this.pos); pos.setW(1); trsr.transformPosition(pos); - pos.func_229374_e_(); + pos.normalize(); Vector3f rPos = new Vector3f(pos.getX(), pos.getY(), pos.getZ()); // normal @@ -692,7 +692,7 @@ public class B3DModel if(this.normal != null) { - rNormal = this.normal.func_229195_e_(); + rNormal = this.normal.copy(); trsr.transformNormal(rNormal); } @@ -784,13 +784,13 @@ public class B3DModel public static Vector3f getNormal(Vertex v1, Vertex v2, Vertex v3) { - Vector3f a = v2.getPos().func_229195_e_(); + Vector3f a = v2.getPos().copy(); a.sub(v1.getPos()); - Vector3f b = v3.getPos().func_229195_e_(); + Vector3f b = v3.getPos().copy(); b.sub(v1.getPos()); - Vector3f c = a.func_229195_e_(); + Vector3f c = a.copy(); c.cross(b); - c.func_229194_d_(); + c.normalize(); return c; } } 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 c5a5b0d34..09a290e0a 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java +++ b/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java @@ -350,12 +350,12 @@ public class OBJModel implements IMultipartModelGeometry Vector3f a = positions.get(indices[0][0]); Vector3f ab = positions.get(indices[1][0]); Vector3f ac = positions.get(indices[2][0]); - Vector3f abs = ab.func_229195_e_(); + Vector3f abs = ab.copy(); abs.sub(a); - Vector3f acs = ac.func_229195_e_(); + Vector3f acs = ac.copy(); acs.sub(a); abs.cross(acs); - abs.func_229194_d_(); + abs.normalize(); faceNormal = abs; } @@ -389,7 +389,7 @@ public class OBJModel implements IMultipartModelGeometry Vector4f color = index.length >= 4 && colors.size() > 0 ? colors.get(index[3]) : COLOR_WHITE; if (hasTransform) { - normal = norm0.func_229195_e_(); + normal = norm0.copy(); transformation.transformPosition(position); transformation.transformNormal(normal); }; @@ -463,7 +463,7 @@ public class OBJModel implements IMultipartModelGeometry private void putVertexData(IVertexConsumer consumer, Vector4f position0, Vec2f texCoord0, Vector3f normal0, Vector4f color0, Vec2f uv2, TextureAtlasSprite texture) { - ImmutableList elements = consumer.getVertexFormat().func_227894_c_(); + ImmutableList elements = consumer.getVertexFormat().getElements(); for(int j=0;j for (int[][] face : mesh.faces) { - Pair quad = makeQuad(face, tintIndex, colorTint, mat.ambientColor, texture, modelTransform.func_225615_b_()); + Pair quad = makeQuad(face, tintIndex, colorTint, mat.ambientColor, texture, modelTransform.getRotation()); if (quad.getRight() == null) modelBuilder.addGeneralQuad(quad.getLeft()); else diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/BakedQuadBuilder.java b/src/main/java/net/minecraftforge/client/model/pipeline/BakedQuadBuilder.java index ddf1e880e..1dfe57f4c 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/BakedQuadBuilder.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/BakedQuadBuilder.java @@ -34,7 +34,7 @@ import net.minecraft.util.Direction; */ public class BakedQuadBuilder implements IVertexConsumer { - private static final int SIZE = DefaultVertexFormats.BLOCK.func_227894_c_().size(); + private static final int SIZE = DefaultVertexFormats.BLOCK.getElements().size(); private final float[][][] unpackedData = new float[4][SIZE][4]; private int tint = -1; @@ -134,7 +134,7 @@ public class BakedQuadBuilder implements IVertexConsumer float tS = tX > tY ? tX : tY; float ep = 1f / (tS * 0x100); int uve = 0; - ImmutableList elements = DefaultVertexFormats.BLOCK.func_227894_c_(); + ImmutableList elements = DefaultVertexFormats.BLOCK.getElements(); while(uve < elements.size()) { VertexFormatElement e = elements.get(uve); 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 f49605d51..9e9885d74 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/BlockInfo.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/BlockInfo.java @@ -63,7 +63,7 @@ public class BlockInfo { if(cachedTint == tint) return cachedMultiplier; cachedTint = tint; - cachedMultiplier = colors.func_228054_a_(state, world, blockPos, tint); + cachedMultiplier = colors.getColor(state, world, blockPos, tint); return cachedMultiplier; } @@ -130,7 +130,7 @@ public class BlockInfo int brightness = 0x00FF00FF; // FIXME: state.getPackedLightmapCoords(world, pos); s[x][y][z] = (brightness >> 0x14) & 0xF; b[x][y][z] = (brightness >> 0x04) & 0xF; - ao[x][y][z] = state.func_215703_d(world, pos); + ao[x][y][z] = state.getAmbientOcclusionLightValue(world, pos); } } } @@ -139,10 +139,10 @@ public class BlockInfo BlockPos pos = blockPos.offset(side); BlockState state = world.getBlockState(pos); - BlockState thisStateShape = this.state.isSolid() && this.state.func_215691_g() ? this.state : Blocks.AIR.getDefaultState(); - BlockState otherStateShape = state.isSolid() && state.func_215691_g() ? state : Blocks.AIR.getDefaultState(); + BlockState thisStateShape = this.state.isSolid() && this.state.isTransparent() ? this.state : Blocks.AIR.getDefaultState(); + BlockState otherStateShape = state.isSolid() && state.isTransparent() ? state : Blocks.AIR.getDefaultState(); - if(state.getOpacity(world, blockPos) == 15 || VoxelShapes.func_223416_b(thisStateShape.func_215702_a(world, blockPos, side), otherStateShape.func_215702_a(world, pos, side.getOpposite()))) + if(state.getOpacity(world, blockPos) == 15 || VoxelShapes.faceShapeCovers(thisStateShape.getFaceOcclusionShape(world, blockPos, side), otherStateShape.getFaceOcclusionShape(world, pos, side.getOpposite()))) { int x = side.getXOffset() + 1; int y = side.getYOffset() + 1; diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/IVertexConsumer.java b/src/main/java/net/minecraftforge/client/model/pipeline/IVertexConsumer.java index 9afc30440..8302c72e0 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/IVertexConsumer.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/IVertexConsumer.java @@ -24,8 +24,8 @@ import net.minecraft.client.renderer.vertex.VertexFormat; import net.minecraft.util.Direction; /** - * Assumes that the data length is not less than e.func_227894_c_().size(). - * Also assumes that element index passed will increment from 0 to format.func_227894_c_().size() - 1. + * Assumes that the data length is not less than e.getElements().size(). + * Also assumes that element index passed will increment from 0 to format.getElements().size() - 1. * Normal, Color and UV are assumed to be in 0-1 range. */ public interface IVertexConsumer diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java b/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java index b1f8d0c66..e522ad11f 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/LightUtil.java @@ -87,7 +87,7 @@ public class LightUtil public static void putBakedQuad(IVertexConsumer consumer, BakedQuad quad) { - consumer.setTexture(quad.getSprite()); + consumer.setTexture(quad.func_187508_a()); consumer.setQuadOrientation(quad.getFace()); if(quad.hasTintIndex()) { @@ -97,8 +97,8 @@ public class LightUtil float[] data = new float[4]; VertexFormat formatFrom = consumer.getVertexFormat(); VertexFormat formatTo = DefaultVertexFormats.BLOCK; - int countFrom = formatFrom.func_227894_c_().size(); - int countTo = formatTo.func_227894_c_().size(); + int countFrom = formatFrom.getElements().size(); + int countTo = formatTo.getElements().size(); int[] eMap = mapFormats(formatFrom, formatTo); for(int v = 0; v < 4; v++) { @@ -131,17 +131,17 @@ public class LightUtil private static int[] generateMapping(VertexFormat from, VertexFormat to) { - int fromCount = from.func_227894_c_().size(); - int toCount = to.func_227894_c_().size(); + int fromCount = from.getElements().size(); + int toCount = to.getElements().size(); int[] eMap = new int[fromCount]; for(int e = 0; e < fromCount; e++) { - VertexFormatElement expected = from.func_227894_c_().get(e); + VertexFormatElement expected = from.getElements().get(e); int e2; for(e2 = 0; e2 < toCount; e2++) { - VertexFormatElement current = to.func_227894_c_().get(e2); + VertexFormatElement current = to.getElements().get(e2); if(expected.getUsage() == current.getUsage() && expected.getIndex() == current.getIndex()) { break; @@ -155,7 +155,7 @@ public class LightUtil public static void unpack(int[] from, float[] to, VertexFormat formatFrom, int v, int e) { int length = 4 < to.length ? 4 : to.length; - VertexFormatElement element = formatFrom.func_227894_c_().get(e); + VertexFormatElement element = formatFrom.getElements().get(e); int vertexStart = v * formatFrom.getSize() + formatFrom.getOffset(e); int count = element.getElementCount(); VertexFormatElement.Type type = element.getType(); @@ -210,7 +210,7 @@ public class LightUtil public static void pack(float[] from, int[] to, VertexFormat formatTo, int v, int e) { - VertexFormatElement element = formatTo.func_227894_c_().get(e); + VertexFormatElement element = formatTo.getElements().get(e); int vertexStart = v * formatTo.getSize() + formatTo.getOffset(e); int count = element.getElementCount(); VertexFormatElement.Type type = element.getType(); @@ -319,7 +319,7 @@ public class LightUtil @Override public void put(int element, float... data) { - if(getVertexFormat().func_227894_c_().get(element).getUsage() == VertexFormatElement.Usage.COLOR) + if(getVertexFormat().getElements().get(element).getUsage() == VertexFormatElement.Usage.COLOR) { System.arraycopy(auxColor, 0, buf, 0, buf.length); int n = Math.min(4, data.length); @@ -333,7 +333,7 @@ public class LightUtil { super.put(element, data); } - if(element == getVertexFormat().func_227894_c_().size() - 1) + if(element == getVertexFormat().getElements().size() - 1) { vertices++; if(vertices == 4) diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/QuadGatheringTransformer.java b/src/main/java/net/minecraftforge/client/model/pipeline/QuadGatheringTransformer.java index 875bd41f8..79f50188e 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/QuadGatheringTransformer.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/QuadGatheringTransformer.java @@ -38,8 +38,8 @@ public abstract class QuadGatheringTransformer implements IVertexConsumer public void setVertexFormat(VertexFormat format) { this.format = format; - dataLength = new byte[format.func_227894_c_().size()]; - quadData = new float[format.func_227894_c_().size()][4][4]; + dataLength = new byte[format.getElements().size()]; + quadData = new float[format.getElements().size()][4][4]; } @Override @@ -56,7 +56,7 @@ public abstract class QuadGatheringTransformer implements IVertexConsumer { dataLength[element] = (byte)data.length; } - if (element == getVertexFormat().func_227894_c_().size() - 1) + if (element == getVertexFormat().getElements().size() - 1) { vertices++; } diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/TRSRTransformer.java b/src/main/java/net/minecraftforge/client/model/pipeline/TRSRTransformer.java index 77f645ce0..7a47a98cf 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/TRSRTransformer.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/TRSRTransformer.java @@ -36,7 +36,7 @@ public class TRSRTransformer extends VertexTransformer @Override public void put(int element, float... data) { - switch (getVertexFormat().func_227894_c_().get(element).getUsage()) + switch (getVertexFormat().getElements().get(element).getUsage()) { case POSITION: Vector4f pos = new Vector4f(data[0], data[1], data[2], data[3]); diff --git a/src/main/java/net/minecraftforge/client/model/pipeline/VertexBufferConsumer.java b/src/main/java/net/minecraftforge/client/model/pipeline/VertexBufferConsumer.java index db90b402e..461e8ccb3 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/VertexBufferConsumer.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/VertexBufferConsumer.java @@ -59,12 +59,12 @@ public class VertexBufferConsumer implements IVertexConsumer // TODO /* VertexFormat format = getVertexFormat(); - if(renderer.isColorDisabled() && format.func_227894_c_().get(e).getUsage() == Usage.COLOR) + if(renderer.isColorDisabled() && format.getElements().get(e).getUsage() == Usage.COLOR) { data = dummyColor; } LightUtil.pack(data, quadData, format, v, e); - if(e == format.func_227894_c_().size() - 1) + if(e == format.getElements().size() - 1) { v++; if(v == 4) 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 a880fefea..b386f1cce 100644 --- a/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java +++ b/src/main/java/net/minecraftforge/client/model/pipeline/VertexLighterFlat.java @@ -66,9 +66,9 @@ public class VertexLighterFlat extends QuadGatheringTransformer private void updateIndices() { - for(int i = 0; i < getVertexFormat().func_227894_c_().size(); i++) + for(int i = 0; i < getVertexFormat().getElements().size(); i++) { - switch(getVertexFormat().func_227894_c_().get(i).getUsage()) + switch(getVertexFormat().getElements().get(i).getUsage()) { case POSITION: posIndex = i; @@ -80,7 +80,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer colorIndex = i; break; case UV: - if(getVertexFormat().func_227894_c_().get(i).getIndex() == 2) + if(getVertexFormat().getElements().get(i).getIndex() == 2) { lightmapIndex = i; } @@ -123,7 +123,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer { if (format == null || format.hasNormal()) return format; - List l = Lists.newArrayList(format.func_227894_c_()); + List l = Lists.newArrayList(format.getElements()); l.add(NORMAL_4F); return new VertexFormat(ImmutableList.copyOf(l)); } @@ -153,7 +153,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer t.set(position[0]); v2.sub(t); v2.cross(v1); - v2.func_229194_d_(); + v2.normalize(); for(int v = 0; v < 4; v++) { normal[v][0] = v2.getX(); @@ -170,7 +170,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer } VertexFormat format = parent.getVertexFormat(); - int count = format.func_227894_c_().size(); + int count = format.getElements().size(); for(int v = 0; v < 4; v++) { @@ -209,7 +209,7 @@ public class VertexLighterFlat extends QuadGatheringTransformer // no need for remapping cause all we could've done is add 1 element to the end for(int e = 0; e < count; e++) { - VertexFormatElement element = format.func_227894_c_().get(e); + VertexFormatElement element = format.getElements().get(e); switch(element.getUsage()) { case POSITION: diff --git a/src/main/java/net/minecraftforge/common/DimensionManager.java b/src/main/java/net/minecraftforge/common/DimensionManager.java index d6c7e06d8..8ad4399ae 100644 --- a/src/main/java/net/minecraftforge/common/DimensionManager.java +++ b/src/main/java/net/minecraftforge/common/DimensionManager.java @@ -490,7 +490,7 @@ public class DimensionManager this.type = data.getModType().getRegistryName(); if (data.getData() != null) this.data = data.getData().array(); - this.skyLight = data.func_218272_d(); + this.skyLight = data.hasSkyLight(); } private CompoundNBT write() diff --git a/src/main/java/net/minecraftforge/common/VillagerTradingManager.java b/src/main/java/net/minecraftforge/common/VillagerTradingManager.java index 5a8a7faed..1ea6327cb 100644 --- a/src/main/java/net/minecraftforge/common/VillagerTradingManager.java +++ b/src/main/java/net/minecraftforge/common/VillagerTradingManager.java @@ -46,7 +46,7 @@ public class VillagerTradingManager static { - VillagerTrades.field_221239_a.entrySet().forEach(e -> + VillagerTrades.VILLAGER_DEFAULT_TRADES.entrySet().forEach(e -> { Int2ObjectMap copy = new Int2ObjectOpenHashMap<>(); e.getValue().int2ObjectEntrySet().forEach(ent -> copy.put(ent.getIntKey(), Arrays.copyOf(ent.getValue(), ent.getValue().length))); @@ -95,7 +95,7 @@ public class VillagerTradingManager MinecraftForge.EVENT_BUS.post(new VillagerTradesEvent(mutableTrades, prof)); Int2ObjectMap newTrades = new Int2ObjectOpenHashMap<>(); mutableTrades.int2ObjectEntrySet().forEach(e -> newTrades.put(e.getIntKey(), e.getValue().toArray(new ITrade[0]))); - VillagerTrades.field_221239_a.put(prof, newTrades); + VillagerTrades.VILLAGER_DEFAULT_TRADES.put(prof, newTrades); } } diff --git a/src/main/java/net/minecraftforge/common/data/LanguageProvider.java b/src/main/java/net/minecraftforge/common/data/LanguageProvider.java index 7f9196f37..405955f25 100644 --- a/src/main/java/net/minecraftforge/common/data/LanguageProvider.java +++ b/src/main/java/net/minecraftforge/common/data/LanguageProvider.java @@ -84,7 +84,7 @@ public abstract class LanguageProvider implements IDataProvider { } } - cache.func_208316_a(target, hash); + cache.recordHash(target, hash); } public void addBlock(Supplier key, String name) { diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java b/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java index e5422d836..c29655211 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeBlock.java @@ -900,7 +900,7 @@ public interface IForgeBlock */ default boolean isStickyBlock(BlockState state) { - return state.getBlock() == Blocks.SLIME_BLOCK || state.getBlock() == Blocks.field_226907_mc_; + return state.getBlock() == Blocks.SLIME_BLOCK || state.getBlock() == Blocks.HONEY_BLOCK; } /** @@ -911,8 +911,8 @@ public interface IForgeBlock */ default boolean canStickTo(BlockState state, BlockState other) { - if (state.getBlock() == Blocks.field_226907_mc_ && other.getBlock() == Blocks.SLIME_BLOCK) return false; - if (state.getBlock() == Blocks.SLIME_BLOCK && other.getBlock() == Blocks.field_226907_mc_) return false; + if (state.getBlock() == Blocks.HONEY_BLOCK && other.getBlock() == Blocks.SLIME_BLOCK) return false; + if (state.getBlock() == Blocks.SLIME_BLOCK && other.getBlock() == Blocks.HONEY_BLOCK) return false; return state.isStickyBlock() || other.isStickyBlock(); } diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeDimension.java b/src/main/java/net/minecraftforge/common/extensions/IForgeDimension.java index 88bc65890..a9bad6f69 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeDimension.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeDimension.java @@ -151,7 +151,7 @@ public interface IForgeDimension */ default SleepResult canSleepAt(net.minecraft.entity.player.PlayerEntity player, BlockPos pos) { - return (getDimension().canRespawnHere() && getWorld().func_226691_t_(pos) != Biomes.NETHER) ? SleepResult.ALLOW : SleepResult.BED_EXPLODES; + return (getDimension().canRespawnHere() && getWorld().getBiome(pos) != Biomes.NETHER) ? SleepResult.ALLOW : SleepResult.BED_EXPLODES; } enum SleepResult @@ -221,7 +221,7 @@ public interface IForgeDimension default boolean isHighHumidity(BlockPos pos) { - return getWorld().func_226691_t_(pos).isHighHumidity(); + return getWorld().getBiome(pos).isHighHumidity(); } default int getHeight() diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeEntityMinecart.java b/src/main/java/net/minecraftforge/common/extensions/IForgeEntityMinecart.java index 98913eb07..4bf6901d2 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeEntityMinecart.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeEntityMinecart.java @@ -52,9 +52,9 @@ public interface IForgeEntityMinecart */ default BlockPos getCurrentRailPosition() { - int x = MathHelper.floor(getMinecart().func_226277_ct_()); - int y = MathHelper.floor(getMinecart().func_226278_cu_()); - int z = MathHelper.floor(getMinecart().func_226281_cx_()); + int x = MathHelper.floor(getMinecart().getPosX()); + int y = MathHelper.floor(getMinecart().getPosY()); + int z = MathHelper.floor(getMinecart().getPosZ()); BlockPos pos = new BlockPos(x, y - 1, z); if (getMinecart().world.getBlockState(pos).isIn(BlockTags.RAILS)) pos = pos.down(); return pos; diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeFluid.java b/src/main/java/net/minecraftforge/common/extensions/IForgeFluid.java index ed917a257..92bf59e6d 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeFluid.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeFluid.java @@ -56,7 +56,7 @@ public interface IForgeFluid */ default boolean isEntityInside(IFluidState state, IWorldReader world, BlockPos pos, Entity entity, double yToTest, Tag tag, boolean testingHead) { - return state.isTagged(tag) && yToTest < (double)(pos.getY() + state.func_215679_a(world, pos) + 0.11111111F); + return state.isTagged(tag) && yToTest < (double)(pos.getY() + state.getActualHeight(world, pos) + 0.11111111F); } /** diff --git a/src/main/java/net/minecraftforge/common/extensions/IForgeFluidState.java b/src/main/java/net/minecraftforge/common/extensions/IForgeFluidState.java index 08daf5426..799a47acf 100644 --- a/src/main/java/net/minecraftforge/common/extensions/IForgeFluidState.java +++ b/src/main/java/net/minecraftforge/common/extensions/IForgeFluidState.java @@ -50,7 +50,7 @@ public interface IForgeFluidState */ default boolean isEntityInside(IWorldReader world, BlockPos pos, Entity entity, double yToTest, Tag tag, boolean testingHead) { -// return ifluidstate.isTagged(p_213290_1_) && d0 < (double)((float)blockpos.getY() + ifluidstate.func_215679_a(this.world, blockpos) + 0.11111111F); +// return ifluidstate.isTagged(p_213290_1_) && d0 < (double)((float)blockpos.getY() + ifluidstate.getActualHeight(this.world, blockpos) + 0.11111111F); return getFluidState().getFluid().isEntityInside(getFluidState(), world, pos, entity, yToTest, tag, testingHead); } diff --git a/src/main/java/net/minecraftforge/common/model/TransformationHelper.java b/src/main/java/net/minecraftforge/common/model/TransformationHelper.java index 45c2a5663..132ac6daf 100644 --- a/src/main/java/net/minecraftforge/common/model/TransformationHelper.java +++ b/src/main/java/net/minecraftforge/common/model/TransformationHelper.java @@ -40,7 +40,7 @@ public final class TransformationHelper @OnlyIn(Dist.CLIENT) public static TransformationMatrix toTransformation(ItemTransformVec3f transform) { - if (transform.equals(ItemTransformVec3f.DEFAULT)) return TransformationMatrix.func_227983_a_(); + if (transform.equals(ItemTransformVec3f.DEFAULT)) return TransformationMatrix.identity(); return new TransformationMatrix(transform.translation, quatFromXYZ(transform.rotation, true), transform.scale, null); } @@ -62,8 +62,8 @@ public final class TransformationHelper public static Vector3f lerp(Vector3f from, Vector3f to, float progress) { - Vector3f res = from.func_229195_e_(); - res.func_229190_a_(to, progress); + Vector3f res = from.copy(); + res.lerp(to, progress); return res; } @@ -116,7 +116,7 @@ public final class TransformationHelper { return new TransformationMatrix( lerp(one.getTranslation(), that.getTranslation(), progress), - slerp(one.func_227989_d_(), that.func_227989_d_(), progress), + slerp(one.getRotationLeft(), that.getRotationLeft(), progress), lerp(one.getScale(), that.getScale(), progress), slerp(one.getRightRot(), that.getRightRot(), progress) ); @@ -140,7 +140,7 @@ public final class TransformationHelper String transform = json.getAsString(); if(transform.equals("identity")) { - return TransformationMatrix.func_227983_a_(); + return TransformationMatrix.identity(); } else { @@ -266,15 +266,15 @@ public final class TransformationHelper { if (entry.getKey().equals("x")) { - ret = Vector3f.field_229179_b_.func_229187_a_(entry.getValue().getAsNumber().floatValue()); + ret = Vector3f.XP.rotationDegrees(entry.getValue().getAsNumber().floatValue()); } else if (entry.getKey().equals("y")) { - ret = Vector3f.field_229181_d_.func_229187_a_(entry.getValue().getAsNumber().floatValue()); + ret = Vector3f.YP.rotationDegrees(entry.getValue().getAsNumber().floatValue()); } else if (entry.getKey().equals("z")) { - ret = Vector3f.field_229183_f_.func_229187_a_(entry.getValue().getAsNumber().floatValue()); + ret = Vector3f.ZP.rotationDegrees(entry.getValue().getAsNumber().floatValue()); } else throw new JsonParseException("Axis rotation: expected single axis key, got: " + entry.getKey()); } @@ -291,7 +291,7 @@ public final class TransformationHelper { if (e.getAsJsonArray().get(0).isJsonObject()) { - Quaternion ret = Quaternion.field_227060_a_.func_227068_g_(); + Quaternion ret = Quaternion.ONE.copy(); for (JsonElement a : e.getAsJsonArray()) { ret.multiply(parseAxisRotation(a)); 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 8966009df..62232f7f4 100644 --- a/src/main/java/net/minecraftforge/common/model/animation/Clips.java +++ b/src/main/java/net/minecraftforge/common/model/animation/Clips.java @@ -307,9 +307,9 @@ public final class Clips return Pair.of(new IModelTransform() { @Override - public TransformationMatrix func_225615_b_() + public TransformationMatrix getRotation() { - return TransformationMatrix.func_227983_a_(); + return TransformationMatrix.identity(); } @Override @@ -317,7 +317,7 @@ public final class Clips { if(!(part instanceof IJoint)) { - return TransformationMatrix.func_227983_a_(); + return TransformationMatrix.identity(); } IJoint joint = (IJoint)part; // TODO: Cache clip application? diff --git a/src/main/java/net/minecraftforge/common/model/animation/JointClips.java b/src/main/java/net/minecraftforge/common/model/animation/JointClips.java index ce1a77acc..fc8355685 100644 --- a/src/main/java/net/minecraftforge/common/model/animation/JointClips.java +++ b/src/main/java/net/minecraftforge/common/model/animation/JointClips.java @@ -33,7 +33,7 @@ public final class JointClips @Override public TransformationMatrix apply(float time) { - return TransformationMatrix.func_227983_a_(); + return TransformationMatrix.identity(); } } diff --git a/src/main/java/net/minecraftforge/common/util/ChunkCoordComparator.java b/src/main/java/net/minecraftforge/common/util/ChunkCoordComparator.java index d02705301..bfb0431a8 100644 --- a/src/main/java/net/minecraftforge/common/util/ChunkCoordComparator.java +++ b/src/main/java/net/minecraftforge/common/util/ChunkCoordComparator.java @@ -30,8 +30,8 @@ public class ChunkCoordComparator implements java.util.Comparator public ChunkCoordComparator(ServerPlayerEntity entityplayer) { - x = (int) entityplayer.func_226277_ct_() >> 4; - z = (int) entityplayer.func_226281_cx_() >> 4; + x = (int) entityplayer.getPosX() >> 4; + z = (int) entityplayer.getPosZ() >> 4; } @Override diff --git a/src/main/java/net/minecraftforge/energy/CapabilityEnergy.java b/src/main/java/net/minecraftforge/energy/CapabilityEnergy.java index 6a1128ca1..a21e65661 100644 --- a/src/main/java/net/minecraftforge/energy/CapabilityEnergy.java +++ b/src/main/java/net/minecraftforge/energy/CapabilityEnergy.java @@ -37,7 +37,7 @@ public class CapabilityEnergy @Override public INBT writeNBT(Capability capability, IEnergyStorage instance, Direction side) { - return IntNBT.func_229692_a_(instance.getEnergyStored()); + return IntNBT.valueOf(instance.getEnergyStored()); } @Override diff --git a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java index 1c4a80d83..95d240920 100644 --- a/src/main/java/net/minecraftforge/event/ForgeEventFactory.java +++ b/src/main/java/net/minecraftforge/event/ForgeEventFactory.java @@ -425,7 +425,7 @@ public class ForgeEventFactory if(isCanceled) { - entityMounting.setPositionAndRotation(entityMounting.func_226277_ct_(), entityMounting.func_226278_cu_(), entityMounting.func_226281_cx_(), entityMounting.prevRotationYaw, entityMounting.prevRotationPitch); + entityMounting.setPositionAndRotation(entityMounting.getPosX(), entityMounting.getPosY(), entityMounting.getPosZ(), entityMounting.prevRotationYaw, entityMounting.prevRotationPitch); return false; } else 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 c67747f3b..ba9d11303 100644 --- a/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java +++ b/src/main/java/net/minecraftforge/event/entity/living/LivingSpawnEvent.java @@ -173,7 +173,7 @@ public class LivingSpawnEvent extends LivingEvent { public AllowDespawn(MobEntity entity) { - super(entity, entity.world, entity.func_226277_ct_(), entity.func_226278_cu_(), entity.func_226281_cx_()); + super(entity, entity.world, entity.getPosX(), entity.getPosY(), entity.getPosZ()); } } diff --git a/src/main/java/net/minecraftforge/fluids/FluidAttributes.java b/src/main/java/net/minecraftforge/fluids/FluidAttributes.java index 647613c1e..cf6686e3f 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidAttributes.java +++ b/src/main/java/net/minecraftforge/fluids/FluidAttributes.java @@ -443,7 +443,7 @@ public class FluidAttributes @Override public int getColor(ILightReader world, BlockPos pos) { - return BiomeColors.func_228363_c_(world, pos) | 0xFF000000; + return BiomeColors.getWaterColor(world, pos) | 0xFF000000; } public static Builder builder(ResourceLocation stillTexture, ResourceLocation flowingTexture) { diff --git a/src/main/java/net/minecraftforge/fluids/FluidUtil.java b/src/main/java/net/minecraftforge/fluids/FluidUtil.java index d953fd910..fb5ba4337 100644 --- a/src/main/java/net/minecraftforge/fluids/FluidUtil.java +++ b/src/main/java/net/minecraftforge/fluids/FluidUtil.java @@ -143,7 +143,7 @@ public class FluidUtil if (player != null) { SoundEvent soundevent = simulatedTransfer.getFluid().getAttributes().getFillSound(simulatedTransfer); - player.world.playSound(null, player.func_226277_ct_(), player.func_226278_cu_() + 0.5, player.func_226281_cx_(), soundevent, SoundCategory.BLOCKS, 1.0F, 1.0F); + player.world.playSound(null, player.getPosX(), player.getPosY() + 0.5, player.getPosZ(), soundevent, SoundCategory.BLOCKS, 1.0F, 1.0F); } } else @@ -187,7 +187,7 @@ public class FluidUtil if (doDrain && player != null) { SoundEvent soundevent = transfer.getFluid().getAttributes().getEmptySound(transfer); - player.world.playSound(null, player.func_226277_ct_(), player.func_226278_cu_() + 0.5, player.func_226281_cx_(), soundevent, SoundCategory.BLOCKS, 1.0F, 1.0F); + player.world.playSound(null, player.getPosX(), player.getPosY() + 0.5, player.getPosZ(), soundevent, SoundCategory.BLOCKS, 1.0F, 1.0F); } ItemStack resultContainer = containerFluidHandler.getContainer(); diff --git a/src/main/java/net/minecraftforge/fluids/ForgeFlowingFluid.java b/src/main/java/net/minecraftforge/fluids/ForgeFlowingFluid.java index 5b52cd8ca..bffdcbd39 100644 --- a/src/main/java/net/minecraftforge/fluids/ForgeFlowingFluid.java +++ b/src/main/java/net/minecraftforge/fluids/ForgeFlowingFluid.java @@ -121,7 +121,7 @@ public abstract class ForgeFlowingFluid extends FlowingFluid } @Override - protected boolean func_215665_a(IFluidState state, IBlockReader world, BlockPos pos, Fluid fluidIn, Direction direction) + protected boolean canDisplace(IFluidState state, IBlockReader world, BlockPos pos, Fluid fluidIn, Direction direction) { // Based on the water implementation, may need to be overriden for mod fluids that shouldn't behave like water. return direction == Direction.DOWN && !isEquivalentTo(fluidIn); diff --git a/src/main/java/net/minecraftforge/fml/client/ClientModLoader.java b/src/main/java/net/minecraftforge/fml/client/ClientModLoader.java index 142b926e6..a1c5d9390 100644 --- a/src/main/java/net/minecraftforge/fml/client/ClientModLoader.java +++ b/src/main/java/net/minecraftforge/fml/client/ClientModLoader.java @@ -93,7 +93,7 @@ public class ClientModLoader SidedProvider.setClient(()->minecraft); LogicalSidedProvider.setClient(()->minecraft); LanguageHook.loadForgeAndMCLangs(); - earlyLoaderGUI = new EarlyLoaderGUI(minecraft.func_228018_at_()); + earlyLoaderGUI = new EarlyLoaderGUI(minecraft.getMainWindow()); createRunnableWithCatch(() -> ModLoader.get().gatherAndInitializeMods(earlyLoaderGUI::renderTick)).run(); ResourcePackLoader.loadResourcePacks(defaultResourcePacks, ClientModLoader::buildPackFinder); mcResourceManager.addReloadListener(ClientModLoader::onreload); diff --git a/src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java b/src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java index 45cbcb310..2652ac53a 100644 --- a/src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java +++ b/src/main/java/net/minecraftforge/fml/client/EarlyLoaderGUI.java @@ -95,7 +95,7 @@ public class EarlyLoaderGUI { } void renderMessage(final String message, final float[] colour, int line, float alpha) { - GlStateManager.func_227770_y_(GL11.GL_VERTEX_ARRAY); + GlStateManager.enableClientState(GL11.GL_VERTEX_ARRAY); ByteBuffer charBuffer = MemoryUtil.memAlloc(message.length() * 270); int quads = STBEasyFont.stb_easy_font_print(0, 0, message, null, charBuffer); GL14.glVertexPointer(2, GL11.GL_FLOAT, 16, charBuffer); diff --git a/src/main/java/net/minecraftforge/fml/client/gui/GuiUtils.java b/src/main/java/net/minecraftforge/fml/client/gui/GuiUtils.java index cccd153c5..39d448aa3 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/GuiUtils.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/GuiUtils.java @@ -208,10 +208,10 @@ public class GuiUtils Tessellator tessellator = Tessellator.getInstance(); BufferBuilder wr = tessellator.getBuffer(); wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX); - wr.func_225582_a_(x , y + height, zLevel).func_225583_a_( u * uScale, ((v + height) * vScale)).endVertex(); - wr.func_225582_a_(x + width, y + height, zLevel).func_225583_a_((u + width) * uScale, ((v + height) * vScale)).endVertex(); - wr.func_225582_a_(x + width, y , zLevel).func_225583_a_((u + width) * uScale, ( v * vScale)).endVertex(); - wr.func_225582_a_(x , y , zLevel).func_225583_a_( u * uScale, ( v * vScale)).endVertex(); + wr.pos(x , y + height, zLevel).tex( u * uScale, ((v + height) * vScale)).endVertex(); + wr.pos(x + width, y + height, zLevel).tex((u + width) * uScale, ((v + height) * vScale)).endVertex(); + wr.pos(x + width, y , zLevel).tex((u + width) * uScale, ( v * vScale)).endVertex(); + wr.pos(x , y , zLevel).tex( u * uScale, ( v * vScale)).endVertex(); tessellator.draw(); } @@ -374,10 +374,10 @@ public class GuiUtils MinecraftForge.EVENT_BUS.post(new RenderTooltipEvent.PostBackground(stack, textLines, tooltipX, tooltipY, font, tooltipTextWidth, tooltipHeight)); - IRenderTypeBuffer.Impl renderType = IRenderTypeBuffer.func_228455_a_(Tessellator.getInstance().getBuffer()); + IRenderTypeBuffer.Impl renderType = IRenderTypeBuffer.getImpl(Tessellator.getInstance().getBuffer()); MatrixStack textStack = new MatrixStack(); - textStack.func_227861_a_(0.0D, 0.0D, (double)zLevel); - Matrix4f textLocation = textStack.func_227866_c_().func_227870_a_(); + textStack.translate(0.0D, 0.0D, (double)zLevel); + Matrix4f textLocation = textStack.getLast().getMatrix(); int tooltipTop = tooltipY; @@ -385,7 +385,7 @@ public class GuiUtils { String line = textLines.get(lineNumber); if (line != null) - font.func_228079_a_(line, (float)tooltipX, (float)tooltipY, -1, true, textLocation, renderType, false, 0, 15728880); + font.renderString(line, (float)tooltipX, (float)tooltipY, -1, true, textLocation, renderType, false, 0, 15728880); if (lineNumber + 1 == titleLinesCount) tooltipY += 2; @@ -393,7 +393,7 @@ public class GuiUtils tooltipY += 10; } - renderType.func_228461_a_(); + renderType.finish(); MinecraftForge.EVENT_BUS.post(new RenderTooltipEvent.PostText(stack, textLines, tooltipX, tooltipTop, font, tooltipTextWidth, tooltipHeight)); @@ -422,10 +422,10 @@ public class GuiUtils Tessellator tessellator = Tessellator.getInstance(); BufferBuilder buffer = tessellator.getBuffer(); buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); - buffer.func_225582_a_(right, top, zLevel).func_227885_a_(startRed, startGreen, startBlue, startAlpha).endVertex(); - buffer.func_225582_a_( left, top, zLevel).func_227885_a_(startRed, startGreen, startBlue, startAlpha).endVertex(); - buffer.func_225582_a_( left, bottom, zLevel).func_227885_a_( endRed, endGreen, endBlue, endAlpha).endVertex(); - buffer.func_225582_a_(right, bottom, zLevel).func_227885_a_( endRed, endGreen, endBlue, endAlpha).endVertex(); + buffer.pos(right, top, zLevel).color(startRed, startGreen, startBlue, startAlpha).endVertex(); + buffer.pos( left, top, zLevel).color(startRed, startGreen, startBlue, startAlpha).endVertex(); + buffer.pos( left, bottom, zLevel).color( endRed, endGreen, endBlue, endAlpha).endVertex(); + buffer.pos(right, bottom, zLevel).color( endRed, endGreen, endBlue, endAlpha).endVertex(); tessellator.draw(); RenderSystem.shadeModel(GL11.GL_FLAT); diff --git a/src/main/java/net/minecraftforge/fml/client/gui/screen/ModListScreen.java b/src/main/java/net/minecraftforge/fml/client/gui/screen/ModListScreen.java index 7662fcea4..51468eedb 100644 --- a/src/main/java/net/minecraftforge/fml/client/gui/screen/ModListScreen.java +++ b/src/main/java/net/minecraftforge/fml/client/gui/screen/ModListScreen.java @@ -437,10 +437,10 @@ public class ModListScreen extends Screen @Override public void updateDynamicTexture() { - this.func_229148_d_(); + this.bindTexture(); NativeImage td = this.getTextureData(); // Use custom "blur" value which controls texture filtering (nearest-neighbor vs linear) - this.getTextureData().func_227789_a_(0, 0, 0, 0, 0, td.getWidth(), td.getHeight(), selectedMod.getLogoBlur(), false, false, false); + this.getTextureData().uploadTextureSub(0, 0, 0, 0, 0, td.getWidth(), td.getHeight(), selectedMod.getLogoBlur(), false, false, false); } }), new Size2i(logo.getWidth(), logo.getHeight())); } diff --git a/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java b/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java index 4ea238a61..82f839403 100644 --- a/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java +++ b/src/main/java/net/minecraftforge/fml/client/registry/RenderingRegistry.java @@ -53,6 +53,6 @@ public class RenderingRegistry @SuppressWarnings("unchecked") private static void register(EntityRendererManager manager, EntityType entityType, IRenderFactory renderFactory) { - manager.func_229087_a_(entityType, ((IRenderFactory)renderFactory).createRenderFor(manager)); + manager.register(entityType, ((IRenderFactory)renderFactory).createRenderFor(manager)); } } diff --git a/src/main/java/net/minecraftforge/fml/network/FMLPlayMessages.java b/src/main/java/net/minecraftforge/fml/network/FMLPlayMessages.java index fd7e3faa3..6e7e4b859 100644 --- a/src/main/java/net/minecraftforge/fml/network/FMLPlayMessages.java +++ b/src/main/java/net/minecraftforge/fml/network/FMLPlayMessages.java @@ -73,9 +73,9 @@ public class FMLPlayMessages this.typeId = Registry.ENTITY_TYPE.getId(e.getType()); this.entityId = e.getEntityId(); this.uuid = e.getUniqueID(); - this.posX = e.func_226277_ct_(); - this.posY = e.func_226278_cu_(); - this.posZ = e.func_226281_cx_(); + this.posX = e.getPosX(); + this.posY = e.getPosY(); + this.posZ = e.getPosZ(); this.pitch = (byte) MathHelper.floor(e.rotationPitch * 256.0F / 360.0F); this.yaw = (byte) MathHelper.floor(e.rotationYaw * 256.0F / 360.0F); this.headYaw = (byte) (e.getRotationYawHead() * 256.0F / 360.0F); @@ -158,7 +158,7 @@ public class FMLPlayMessages return; } - e.func_213312_b(msg.posX, msg.posY, msg.posZ); + e.setPacketCoordinates(msg.posX, msg.posY, msg.posZ); e.setPositionAndRotation(msg.posX, msg.posY, msg.posZ, (msg.yaw * 360) / 256.0F, (msg.pitch * 360) / 256.0F); e.setRotationYawHead((msg.headYaw * 360) / 256.0F); e.setRenderYawOffset((msg.headYaw * 360) / 256.0F); @@ -323,7 +323,7 @@ public class FMLPlayMessages id = type.getId() + 1; dimName = type.getRegistryName(); modDimensionName = type.getModType().getRegistryName(); - skylight = type.func_218272_d(); + skylight = type.hasSkyLight(); extraData = new PacketBuffer(Unpooled.buffer()); type.getModType().write(extraData, true); } diff --git a/src/main/java/net/minecraftforge/fml/packs/DelegatingResourcePack.java b/src/main/java/net/minecraftforge/fml/packs/DelegatingResourcePack.java index 0852a4578..cd4aa3684 100644 --- a/src/main/java/net/minecraftforge/fml/packs/DelegatingResourcePack.java +++ b/src/main/java/net/minecraftforge/fml/packs/DelegatingResourcePack.java @@ -82,12 +82,12 @@ public class DelegatingResourcePack extends ResourcePack } @Override - public Collection func_225637_a_(ResourcePackType type, String pathIn, String pathIn2, int maxDepth, Predicate filter) + public Collection getAllResourceLocations(ResourcePackType type, String pathIn, String pathIn2, int maxDepth, Predicate filter) { synchronized(delegates) { return delegates.stream() - .flatMap(r -> r.func_225637_a_(type, pathIn, pathIn2, maxDepth, filter).stream()) + .flatMap(r -> r.getAllResourceLocations(type, pathIn, pathIn2, maxDepth, filter).stream()) .collect(Collectors.toList()); } } diff --git a/src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java b/src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java index 3935e893d..558c90b8e 100644 --- a/src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java +++ b/src/main/java/net/minecraftforge/fml/packs/ModFileResourcePack.java @@ -74,7 +74,7 @@ public class ModFileResourcePack extends DelegatableResourcePack @Override - public Collection func_225637_a_(ResourcePackType type, String resourceNamespace, String pathIn, int maxDepth, Predicate filter) + public Collection getAllResourceLocations(ResourcePackType type, String resourceNamespace, String pathIn, int maxDepth, Predicate filter) { try { diff --git a/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java b/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java index dadebf4e5..a3d8226fd 100644 --- a/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java +++ b/src/main/java/net/minecraftforge/items/ItemHandlerHelper.java @@ -183,14 +183,14 @@ public class ItemHandlerHelper // play sound if something got picked up if (remainder.isEmpty() || remainder.getCount() != stack.getCount()) { - world.playSound(null, player.func_226277_ct_(), player.func_226278_cu_() + 0.5, player.func_226281_cx_(), + world.playSound(null, player.getPosX(), player.getPosY() + 0.5, player.getPosZ(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 0.2F, ((world.rand.nextFloat() - world.rand.nextFloat()) * 0.7F + 1.0F) * 2.0F); } // drop remaining itemstack into the world if (!remainder.isEmpty() && !world.isRemote) { - ItemEntity entityitem = new ItemEntity(world, player.func_226277_ct_(), player.func_226278_cu_() + 0.5, player.func_226281_cx_(), remainder); + ItemEntity entityitem = new ItemEntity(world, player.getPosX(), player.getPosY() + 0.5, player.getPosZ(), remainder); entityitem.setPickupDelay(40); entityitem.setMotion(entityitem.getMotion().mul(0, 1, 0)); diff --git a/src/main/java/net/minecraftforge/registries/ForgeRegistry.java b/src/main/java/net/minecraftforge/registries/ForgeRegistry.java index 7574eb838..721538284 100644 --- a/src/main/java/net/minecraftforge/registries/ForgeRegistry.java +++ b/src/main/java/net/minecraftforge/registries/ForgeRegistry.java @@ -849,7 +849,7 @@ public class ForgeRegistry> implements IForgeRe data.putIntArray("blocked", blocked); ListNBT dummied = new ListNBT(); - this.dummied.stream().sorted().forEach(e -> dummied.add(StringNBT.func_229705_a_(e.toString()))); + this.dummied.stream().sorted().forEach(e -> dummied.add(StringNBT.valueOf(e.toString()))); data.put("dummied", dummied); return data; diff --git a/src/main/java/net/minecraftforge/registries/GameData.java b/src/main/java/net/minecraftforge/registries/GameData.java index e4ed6c15e..16f93a36b 100644 --- a/src/main/java/net/minecraftforge/registries/GameData.java +++ b/src/main/java/net/minecraftforge/registries/GameData.java @@ -461,7 +461,7 @@ public class GameData for (BlockState state : block.getStateContainer().getValidStates()) { blockstateMap.add(state); - state.func_215692_c(); + state.cacheState(); } block.getLootTable(); diff --git a/src/main/java/net/minecraftforge/server/command/CommandEntity.java b/src/main/java/net/minecraftforge/server/command/CommandEntity.java index 3298392fa..2ba4dcee7 100644 --- a/src/main/java/net/minecraftforge/server/command/CommandEntity.java +++ b/src/main/java/net/minecraftforge/server/command/CommandEntity.java @@ -70,7 +70,7 @@ class CommandEntity .then(Commands.argument("filter", StringArgumentType.string()) .suggests((ctx, builder) -> ISuggestionProvider.suggest(ForgeRegistries.ENTITIES.getKeys().stream().map(id -> id.toString()), builder)) .then(Commands.argument("dim", DimensionArgument.getDimension()) - .executes(ctx -> execute(ctx.getSource(), StringArgumentType.getString(ctx, "filter"), DimensionArgument.func_212592_a(ctx, "dim"))) + .executes(ctx -> execute(ctx.getSource(), StringArgumentType.getString(ctx, "filter"), DimensionArgument.getDimensionArgument(ctx, "dim"))) ) .executes(ctx -> execute(ctx.getSource(), StringArgumentType.getString(ctx, "filter"), ctx.getSource().getWorld().dimension.getType())) ) diff --git a/src/main/java/net/minecraftforge/server/command/CommandGenerate.java b/src/main/java/net/minecraftforge/server/command/CommandGenerate.java index 131d4dd13..e87f32596 100644 --- a/src/main/java/net/minecraftforge/server/command/CommandGenerate.java +++ b/src/main/java/net/minecraftforge/server/command/CommandGenerate.java @@ -42,9 +42,9 @@ class CommandGenerate .then(Commands.argument("count", IntegerArgumentType.integer(1)) .then(Commands.argument("dim", DimensionArgument.getDimension()) .then(Commands.argument("interval", IntegerArgumentType.integer()) - .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), DimensionArgument.func_212592_a(ctx, "dim"), getInt(ctx, "interval"))) + .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), DimensionArgument.getDimensionArgument(ctx, "dim"), getInt(ctx, "interval"))) ) - .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), DimensionArgument.func_212592_a(ctx, "dim"), -1)) + .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), DimensionArgument.getDimensionArgument(ctx, "dim"), -1)) ) .executes(ctx -> execute(ctx.getSource(), BlockPosArgument.getBlockPos(ctx, "pos"), getInt(ctx, "count"), ctx.getSource().getWorld().dimension.getType(), -1)) ) diff --git a/src/main/java/net/minecraftforge/server/command/CommandSetDimension.java b/src/main/java/net/minecraftforge/server/command/CommandSetDimension.java index 7d3ed7d29..b06b81a31 100644 --- a/src/main/java/net/minecraftforge/server/command/CommandSetDimension.java +++ b/src/main/java/net/minecraftforge/server/command/CommandSetDimension.java @@ -50,9 +50,9 @@ public class CommandSetDimension .then(Commands.argument("targets", EntityArgument.entities()) .then(Commands.argument("dim", DimensionArgument.getDimension()) .then(Commands.argument("pos", BlockPosArgument.blockPos()) - .executes(ctx -> execute(ctx.getSource(), EntityArgument.getEntitiesAllowingNone(ctx, "targets"), DimensionArgument.func_212592_a(ctx, "dim"), BlockPosArgument.getBlockPos(ctx, "pos"))) + .executes(ctx -> execute(ctx.getSource(), EntityArgument.getEntitiesAllowingNone(ctx, "targets"), DimensionArgument.getDimensionArgument(ctx, "dim"), BlockPosArgument.getBlockPos(ctx, "pos"))) ) - .executes(ctx -> execute(ctx.getSource(), EntityArgument.getEntitiesAllowingNone(ctx, "targets"), DimensionArgument.func_212592_a(ctx, "dim"), new BlockPos(ctx.getSource().getPos()))) + .executes(ctx -> execute(ctx.getSource(), EntityArgument.getEntitiesAllowingNone(ctx, "targets"), DimensionArgument.getDimensionArgument(ctx, "dim"), new BlockPos(ctx.getSource().getPos()))) ) ); } diff --git a/src/main/java/net/minecraftforge/server/command/CommandTps.java b/src/main/java/net/minecraftforge/server/command/CommandTps.java index c598b7ce4..dba313875 100644 --- a/src/main/java/net/minecraftforge/server/command/CommandTps.java +++ b/src/main/java/net/minecraftforge/server/command/CommandTps.java @@ -42,7 +42,7 @@ class CommandTps return Commands.literal("tps") .requires(cs->cs.hasPermissionLevel(0)) //permission .then(Commands.argument("dim", DimensionArgument.getDimension()) - .executes(ctx -> sendTime(ctx.getSource(), DimensionArgument.func_212592_a(ctx, "dim"))) + .executes(ctx -> sendTime(ctx.getSource(), DimensionArgument.getDimensionArgument(ctx, "dim"))) ) .executes(ctx -> { for (DimensionType dim : DimensionType.getAll()) diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index af47c2bab..81794b5cd 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -1,59 +1,72 @@ net/minecraft/block/FireBlock.tryCatchFire(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;ILjava/util/Random;ILnet/minecraft/util/Direction;)V=|p_176536_1_,p_176536_2_,p_176536_3_,p_176536_4_,p_176536_5_,face net/minecraft/block/FlowerPotBlock.(Lnet/minecraft/block/FlowerPotBlock;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block$Properties;)V=|emptyPot,p_i48395_1_,p_i48395_2_ +net/minecraft/block/PoweredRailBlock.(Lnet/minecraft/block/Block$Properties;Z)=|p_i48349_1_,isActivator net/minecraft/block/RedstoneWireBlock.canConnectTo(Lnet/minecraft/block/BlockState;Lnet/minecraft/world/IBlockReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/Direction;)Z=|p_176343_0_,world,pos,p_176343_1_ -net/minecraft/block/PoweredRailBlock.(Lnet/minecraft/block/Block$Properties;Z)=|p_i48349_1_,isActivator - -net/minecraft/client/renderer/BlockRendererDispatcher.renderBlock(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/ILightReader;Lnet/minecraft/client/renderer/BufferBuilder;Ljava/util/Random;Lnet/minecraftforge/client/model/data/IModelData;)Z=|p_215330_1_,p_215330_2_,p_215330_3_,p_215330_4_,p_215330_5_,modelData - -net/minecraft/client/renderer/BlockModelRenderer.renderModel(Lnet/minecraft/world/IEnviromentReader;Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/client/renderer/BufferBuilder;ZLjava/util/Random;JLnet/minecraftforge/client/model/data/IModelData;)Z=|p_217631_1_,p_217631_2_,p_217631_3_,p_217631_4_,p_217631_5_,p_217631_6_,p_217631_7_,p_217631_8_,modelData -net/minecraft/client/renderer/BlockModelRenderer.renderModelSmooth(Lnet/minecraft/world/IEnviromentReader;Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/client/renderer/BufferBuilder;ZLjava/util/Random;JLnet/minecraftforge/client/model/data/IModelData;)Z=|p_217634_1_,p_217634_2_,p_217634_3_,p_217634_4_,p_217634_5_,p_217634_6_,p_217634_7_,p_217634_8_,modelData -net/minecraft/client/renderer/BlockModelRenderer.renderModelFlat(Lnet/minecraft/world/IEnviromentReader;Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/client/renderer/BufferBuilder;ZLjava/util/Random;JLnet/minecraftforge/client/model/data/IModelData;)Z=|p_217635_1_,p_217635_2_,p_217635_3_,p_217635_4_,p_217635_5_,p_217635_6_,p_217635_7_,p_217635_8_,modelData - -net/minecraft/client/renderer/FluidBlockRenderer.func_228797_a_(Lcom/mojang/blaze3d/vertex/IVertexBuilder;DDDFFFFFFI)V=|p_228797_1_,p_228797_2_,p_228797_4_,p_228797_6_,p_228797_8_,p_228797_9_,p_228797_10_,alpha,p_228797_11_,p_228797_12_,p_228797_13_ +net/minecraft/client/gui/ScreenManager.getScreenFactory(Lnet/minecraft/inventory/container/ContainerType;Lnet/minecraft/client/Minecraft;ILnet/minecraft/util/text/ITextComponent;)Ljava/util/Optional;=|p_216909_0_,p_216909_1_,p_216909_2_,p_216909_3_ +net/minecraft/client/renderer/BlockModelRenderer.renderModel(Lnet/minecraft/world/ILightReader;Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lcom/mojang/blaze3d/matrix/MatrixStack;Lcom/mojang/blaze3d/vertex/IVertexBuilder;ZLjava/util/Random;JILnet/minecraftforge/client/model/data/IModelData;)Z=|p_228802_1_,p_228802_2_,p_228802_3_,p_228802_4_,p_228802_5_,p_228802_6_,p_228802_7_,p_228802_8_,p_228802_9_,p_228802_11_,modelData +net/minecraft/client/renderer/BlockModelRenderer.renderModel(Lcom/mojang/blaze3d/matrix/MatrixStack$Entry;Lcom/mojang/blaze3d/vertex/IVertexBuilder;Lnet/minecraft/block/BlockState;Lnet/minecraft/client/renderer/model/IBakedModel;FFFIILnet/minecraftforge/client/model/data/IModelData;)V=|p_228804_1_,p_228804_2_,p_228804_3_,p_228804_4_,p_228804_5_,p_228804_6_,p_228804_7_,p_228804_8_,p_228804_9_,modelData +net/minecraft/client/renderer/BlockModelRenderer.renderModelFlat(Lnet/minecraft/world/ILightReader;Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lcom/mojang/blaze3d/matrix/MatrixStack;Lcom/mojang/blaze3d/vertex/IVertexBuilder;ZLjava/util/Random;JILnet/minecraftforge/client/model/data/IModelData;)Z=|p_228806_1_,p_228806_2_,p_228806_3_,p_228806_4_,p_228806_5_,p_228806_6_,p_228806_7_,p_228806_8_,p_228806_9_,p_228806_11_,modelData +net/minecraft/client/renderer/BlockModelRenderer.renderModelSmooth(Lnet/minecraft/world/ILightReader;Lnet/minecraft/client/renderer/model/IBakedModel;Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lcom/mojang/blaze3d/matrix/MatrixStack;Lcom/mojang/blaze3d/vertex/IVertexBuilder;ZLjava/util/Random;JILnet/minecraftforge/client/model/data/IModelData;)Z=|p_228805_1_,p_228805_2_,p_228805_3_,p_228805_4_,p_228805_5_,p_228805_6_,p_228805_7_,p_228805_8_,p_228805_9_,p_228805_11_,modelData +net/minecraft/client/renderer/BlockRendererDispatcher.renderBlock(Lnet/minecraft/block/BlockState;Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;IILnet/minecraftforge/client/model/data/IModelData;)V=|p_228791_1_,p_228791_2_,p_228791_3_,p_228791_4_,p_228791_5_,modelData +net/minecraft/client/renderer/BlockRendererDispatcher.renderModel(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/ILightReader;Lcom/mojang/blaze3d/matrix/MatrixStack;Lcom/mojang/blaze3d/vertex/IVertexBuilder;Lnet/minecraftforge/client/model/data/IModelData;)V=|p_228792_1_,p_228792_2_,p_228792_3_,p_228792_4_,p_228792_5_,modelData +net/minecraft/client/renderer/BlockRendererDispatcher.renderModel(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/ILightReader;Lcom/mojang/blaze3d/matrix/MatrixStack;Lcom/mojang/blaze3d/vertex/IVertexBuilder;ZLjava/util/Random;Lnet/minecraftforge/client/model/data/IModelData;)Z=|p_228793_1_,p_228793_2_,p_228793_3_,p_228793_4_,p_228793_5_,p_228793_6_,p_228793_7_,modelData +net/minecraft/client/renderer/FluidBlockRenderer.vertex(Lcom/mojang/blaze3d/vertex/IVertexBuilder;DDDFFFFFFI)V=|p_228797_1_,p_228797_2_,p_228797_4_,p_228797_6_,p_228797_8_,p_228797_9_,p_228797_10_,alpha,p_228797_11_,p_228797_12_,p_228797_13_ net/minecraft/client/renderer/FogRenderer.setupFog(Lnet/minecraft/client/renderer/ActiveRenderInfo;Lnet/minecraft/client/renderer/FogRenderer$FogType;FZF)V=|p_228372_0_,p_228372_1_,p_228372_2_,p_228372_3_,partialTicks +net/minecraft/client/renderer/OverlayRenderer.getOverlayBlock(Lnet/minecraft/entity/player/PlayerEntity;)Lorg/apache/commons/lang3/tuple/Pair;=|p_230018_0_ + +net/minecraft/client/renderer/chunk/ChunkRenderDispatcher.(Lnet/minecraft/world/World;Lnet/minecraft/client/renderer/WorldRenderer;Ljava/util/concurrent/Executor;ZLnet/minecraft/client/renderer/RegionRenderCacheBuilder;I)V=|p_i226020_1_,p_i226020_2_,p_i226020_3_,p_i226020_4_,p_i226020_5_,countRenderBuilders +net/minecraft/client/renderer/chunk/ChunkRenderDispatcher$ChunkRender$ChunkRenderTask.(Lnet/minecraft/util/math/ChunkPos;D)V=|pos,p_i226023_2_ +net/minecraft/client/renderer/chunk/ChunkRenderDispatcher$ChunkRender$RebuildTask.(Lnet/minecraft/util/math/ChunkPos;DLnet/minecraft/client/renderer/chunk/ChunkRenderCache;)V=|pos,p_i226024_2_,p_i226024_4_ +net/minecraft/client/renderer/chunk/ChunkRenderDispatcher$ChunkRender$SortTransparencyTask.(Lnet/minecraft/util/math/ChunkPos;DLnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$CompiledChunk;)V=|pos,p_i226025_2_,p_i226025_4_ + +net/minecraft/client/renderer/entity/layers/ArmorLayer.renderArmor(Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;IZLnet/minecraft/client/renderer/entity/model/BipedModel;FFFLnet/minecraft/util/ResourceLocation;)V=|p_229128_1_,p_229128_2_,p_229128_3_,p_229128_5_,p_229128_6_,p_229128_8_,p_229128_9_,p_229128_10_,armorResource net/minecraft/client/renderer/model/BakedQuad.([IILnet/minecraft/util/Direction;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Z)V=|p_i46574_1_,p_i46574_2_,p_i46574_3_,p_i46574_4_,applyDiffuseLighting - -net/minecraft/client/renderer/model/ModelBakery.getBakedModel(Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/IModelTransform;Ljava/util/function/Function;Lnet/minecraft/client/renderer/vertex/VertexFormat;)Lnet/minecraft/client/renderer/model/IBakedModel;=|p_217845_1_,p_217845_2_,textureGetter,format - +net/minecraft/client/renderer/model/BlockModel.bake(Lnet/minecraft/client/renderer/model/ModelBakery;Lnet/minecraft/client/renderer/model/BlockModel;Ljava/util/function/Function;Lnet/minecraft/client/renderer/texture/IModelTransform;Lnet/minecraft/client/renderer/vertex/VertexFormat;)Lnet/minecraft/client/renderer/model/IBakedModel;=|p_217644_1_,p_217644_2_,p_217644_3_,p_217644_4_,format +net/minecraft/client/renderer/model/BlockModel.bakeVanilla(Lnet/minecraft/client/renderer/model/ModelBakery;Lnet/minecraft/client/renderer/model/BlockModel;Ljava/util/function/Function;Lnet/minecraft/client/renderer/model/IModelTransform;Lnet/minecraft/util/ResourceLocation;Z)Lnet/minecraft/client/renderer/model/IBakedModel;=|p_228813_1_,p_228813_2_,p_228813_3_,p_228813_4_,p_228813_5_,p_228813_6_ +net/minecraft/client/renderer/model/BlockModel.getOverrides(Lnet/minecraft/client/renderer/model/ModelBakery;Lnet/minecraft/client/renderer/model/BlockModel;Ljava/util/function/Function;)Lnet/minecraft/client/renderer/model/ItemOverrideList;=|p_217646_1_,p_217646_2_,textureGetter +net/minecraft/client/renderer/model/BlockModel.makeBakedQuad(Lnet/minecraft/client/renderer/model/BlockPart;Lnet/minecraft/client/renderer/model/BlockPartFace;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/util/Direction;Lnet/minecraft/client/renderer/model/IModelTransform;Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/model/BakedQuad;=|p_228812_0_,p_228812_1_,p_228812_2_,p_228812_3_,p_228812_4_,p_228812_5_ +net/minecraft/client/renderer/model/FaceBakery.fillVertexData([IILnet/minecraft/util/Direction;Lnet/minecraft/client/renderer/model/BlockFaceUV;[FLnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraftforge/common/model/ITransformation;Lnet/minecraft/client/renderer/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/model/FaceBakery.makeBakedQuad(Lnet/minecraft/client/renderer/Vector3f;Lnet/minecraft/client/renderer/Vector3f;Lnet/minecraft/client/renderer/model/BlockPartFace;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/util/Direction;Lnet/minecraft/client/renderer/texture/IModelTransform;Lnet/minecraft/client/renderer/model/BlockPartRotation;Z)Lnet/minecraft/client/renderer/model/BakedQuad;=|p_217648_1_,p_217648_2_,p_217648_3_,p_217648_4_,p_217648_5_,p_217648_6_,p_217648_7_,p_217648_8_,p_217648_9_ net/minecraft/client/renderer/model/FaceBakery.makeQuadVertexData(Lnet/minecraft/client/renderer/model/BlockFaceUV;Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraft/util/Direction;[FLnet/minecraftforge/common/model/ITransformation;Lnet/minecraft/client/renderer/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/model/FaceBakery.fillVertexData([IILnet/minecraft/util/Direction;Lnet/minecraft/client/renderer/model/BlockFaceUV;[FLnet/minecraft/client/renderer/texture/TextureAtlasSprite;Lnet/minecraftforge/common/model/ITransformation;Lnet/minecraft/client/renderer/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/model/ItemOverrideList.(Lnet/minecraft/client/renderer/model/ModelBakery;Lnet/minecraft/client/renderer/model/IUnbakedModel;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/List;Lnet/minecraft/client/renderer/vertex/VertexFormat;)V=|p_i50984_1_,p_i50984_2_,p_i50984_3_,textureGetter,p_i50984_4_,format - -net/minecraft/client/renderer/model/BlockModel.bake(Lnet/minecraft/client/renderer/model/ModelBakery;Lnet/minecraft/client/renderer/model/BlockModel;Ljava/util/function/Function;Lnet/minecraft/client/renderer/texture/IModelTransform;Lnet/minecraft/client/renderer/vertex/VertexFormat;)Lnet/minecraft/client/renderer/model/IBakedModel;=|p_217644_1_,p_217644_2_,p_217644_3_,p_217644_4_,format - +net/minecraft/client/renderer/model/ItemOverrideList.(Lnet/minecraft/client/renderer/model/ModelBakery;Lnet/minecraft/client/renderer/model/IUnbakedModel;Ljava/util/function/Function;Ljava/util/function/Function;Ljava/util/List;)V=|p_i50984_1_,p_i50984_2_,p_i50984_3_,textureGetter,p_i50984_4_ +net/minecraft/client/renderer/model/ModelBakery.(Lnet/minecraft/resources/IResourceManager;Lnet/minecraft/client/renderer/color/BlockColors;Z)V=|p_i226056_1_,p_i226056_2_,vanillaBakery +net/minecraft/client/renderer/model/ModelBakery.addModelToCache(Lnet/minecraft/util/ResourceLocation;)V=|p_217843_1_ +net/minecraft/client/renderer/model/ModelBakery.getBakedModel(Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/model/IModelTransform;Ljava/util/function/Function;)Lnet/minecraft/client/renderer/model/IBakedModel;=|p_217845_1_,p_217845_2_,textureGetter +net/minecraft/client/renderer/model/ModelBakery.processLoading(Lnet/minecraft/profiler/IProfiler;I)V=|p_i226056_3_,p_i226056_4_ net/minecraft/client/renderer/model/VariantList.bake(Lnet/minecraft/client/renderer/model/ModelBakery;Ljava/util/function/Function;Lnet/minecraft/client/renderer/texture/IModelTransform;Lnet/minecraft/client/renderer/vertex/VertexFormat;)Lnet/minecraft/client/renderer/model/IBakedModel;=|p_217641_1_,p_217641_2_,p_217641_3_,format net/minecraft/client/renderer/model/multipart/Multipart.bake(Lnet/minecraft/client/renderer/model/ModelBakery;Ljava/util/function/Function;Lnet/minecraft/client/renderer/texture/IModelTransform;Lnet/minecraft/client/renderer/vertex/VertexFormat;)Lnet/minecraft/client/renderer/model/IBakedModel;=|p_217641_1_,p_217641_2_,p_217641_3_,format net/minecraft/client/resources/ClientResourcePackInfo.(Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/resources/IResourcePack;Lnet/minecraft/resources/data/PackMetadataSection;Lnet/minecraft/resources/ResourcePackInfo$Priority;Z)V=|p_i48113_1_,p_i48113_2_,p_i48113_3_,p_i48113_4_,p_i48113_5_,p_i48113_6_,hidden net/minecraft/client/resources/ClientResourcePackInfo.(Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/util/text/ITextComponent;Lnet/minecraft/util/text/ITextComponent;Lnet/minecraft/resources/PackCompatibility;Lnet/minecraft/resources/ResourcePackInfo$Priority;ZLnet/minecraft/client/renderer/texture/NativeImage;Z)V=|p_i48114_1_,p_i48114_2_,p_i48114_3_,p_i48114_4_,p_i48114_5_,p_i48114_6_,p_i48114_7_,p_i48114_8_,p_i48114_9_,hidden -net/minecraft/client/gui/ScreenManager.getScreenFactory(Lnet/minecraft/inventory/container/ContainerType;Lnet/minecraft/client/Minecraft;ILnet/minecraft/util/text/ITextComponent;)Ljava/util/Optional;=|p_216909_0_,p_216909_1_,p_216909_2_,p_216909_3_ -net/minecraft/entity/EntityClassification.create(Ljava/lang/String;Ljava/lang/String;IZZ)Lnet/minecraft/entity/EntityClassification;=|name,p_i50381_3_,p_i50381_4_,p_i50381_5_,p_i50381_6_ net/minecraft/entity/Entity.changeDimension(Lnet/minecraft/world/dimension/DimensionType;Lnet/minecraftforge/common/util/ITeleporter;)Lnet/minecraft/entity/Entity;=|p_212321_1_,teleporter +net/minecraft/entity/EntityClassification.create(Ljava/lang/String;Ljava/lang/String;IZZ)Lnet/minecraft/entity/EntityClassification;=|name,p_i50381_3_,p_i50381_4_,p_i50381_5_,p_i50381_6_ +net/minecraft/entity/EntityType.(Lnet/minecraft/entity/EntityType$IFactory;Lnet/minecraft/entity/EntityClassification;ZZZZLnet/minecraft/entity/EntitySize;Ljava/util/function/Predicate;Ljava/util/function/ToIntFunction;Ljava/util/function/ToIntFunction;Ljava/util/function/BiFunction;)V=|p_i51559_1_,p_i51559_2_,p_i51559_3_,p_i51559_4_,p_i51559_5_,p_i51559_6_,p_i51559_7_,velocityUpdateSupplier,trackingRangeSupplier,updateIntervalSupplier,customClientFactory + net/minecraft/entity/item/EnderPearlEntity.changeDimension(Lnet/minecraft/world/dimension/DimensionType;Lnet/minecraftforge/common/util/ITeleporter;)Lnet/minecraft/entity/Entity;=|p_212321_1_,teleporter net/minecraft/entity/item/ItemEntity.changeDimension(Lnet/minecraft/world/dimension/DimensionType;Lnet/minecraftforge/common/util/ITeleporter;)Lnet/minecraft/entity/Entity;=|p_212321_1_,teleporter net/minecraft/entity/item/minecart/ContainerMinecartEntity.changeDimension(Lnet/minecraft/world/dimension/DimensionType;Lnet/minecraftforge/common/util/ITeleporter;)Lnet/minecraft/entity/Entity;=|p_212321_1_,teleporter + net/minecraft/entity/merchant/villager/AbstractVillagerEntity.changeDimension(Lnet/minecraft/world/dimension/DimensionType;Lnet/minecraftforge/common/util/ITeleporter;)Lnet/minecraft/entity/Entity;=|p_212321_1_,teleporter net/minecraft/entity/player/PlayerEntity.getDigSpeed(Lnet/minecraft/block/BlockState;Lnet/minecraft/util/math/BlockPos;)F=|p_184813_1_,pos net/minecraft/entity/player/ServerPlayerEntity.changeDimension(Lnet/minecraft/world/dimension/DimensionType;Lnet/minecraftforge/common/util/ITeleporter;)Lnet/minecraft/entity/Entity;=|p_212321_1_,teleporter -net/minecraft/item/Rarity.create(Ljava/lang/String;Lnet/minecraft/util/text/TextFormatting;)Lnet/minecraft/item/EnumRarity;=|name,p_i48837_3_ - +net/minecraft/item/BoneMealItem.applyBonemeal(Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;)Z=|p_195966_0_,p_195966_1_,p_195966_2_,player +net/minecraft/item/FilledMapItem.getCustomMapData(Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;)Lnet/minecraft/world/storage/MapData;=|p_195950_0_,p_195950_1_ net/minecraft/item/ItemStack.(Lnet/minecraft/util/IItemProvider;ILnet/minecraft/nbt/CompoundNBT;)V=|p_i48204_1_,p_i48204_2_,capNBT net/minecraft/item/ItemStack.onItemUse(Lnet/minecraft/item/ItemUseContext;)Lnet/minecraft/util/ActionResultType;=|p_196084_1_ net/minecraft/item/ItemStack.onItemUse(Lnet/minecraft/item/ItemUseContext;Ljava/util/function/Function;)Lnet/minecraft/util/ActionResultType;=|p_196084_1_,callback -net/minecraft/item/FilledMapItem.getCustomMapData(Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;)Lnet/minecraft/world/storage/MapData;=|p_195950_0_,p_195950_1_ -net/minecraft/potion/PotionBrewing$MixPredicate.(Lnet/minecraftforge/registries/ForgeRegistryEntry;Lnet/minecraft/item/crafting/Ingredient;Lnet/minecraftforge/registries/ForgeRegistryEntry;)V=|p_i47570_1_,p_i47570_2_,p_i47570_3_ +net/minecraft/item/Rarity.create(Ljava/lang/String;Lnet/minecraft/util/text/TextFormatting;)Lnet/minecraft/item/EnumRarity;=|name,p_i48837_3_ net/minecraft/network/PacketBuffer.writeItemStack(Lnet/minecraft/item/ItemStack;Z)Lnet/minecraft/network/PacketBuffer;=|p_150788_1_,limitedTag +net/minecraft/potion/PotionBrewing$MixPredicate.(Lnet/minecraftforge/registries/ForgeRegistryEntry;Lnet/minecraft/item/crafting/Ingredient;Lnet/minecraftforge/registries/ForgeRegistryEntry;)V=|p_i47570_1_,p_i47570_2_,p_i47570_3_ + net/minecraft/resources/ResourcePackInfo.(Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/util/text/ITextComponent;Lnet/minecraft/util/text/ITextComponent;Lnet/minecraft/resources/PackCompatibility;Lnet/minecraft/resources/ResourcePackInfo$Priority;ZZ)V=|p_i47907_1_,p_i47907_2_,p_i47907_3_,p_i47907_4_,p_i47907_5_,p_i47907_6_,p_i47907_7_,p_i47907_8_,hidden net/minecraft/resources/ResourcePackInfo.(Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/resources/IResourcePack;Lnet/minecraft/resources/data/PackMetadataSection;Lnet/minecraft/resources/ResourcePackInfo$Priority;Z)V=|p_i47908_1_,p_i47908_2_,p_i47908_3_,p_i47908_4_,p_i47908_5_,p_i47908_6_,hidden @@ -64,34 +77,39 @@ net/minecraft/tags/Tag.(Lnet/minecraft/util/ResourceLocation;Ljava/util/Co net/minecraft/tileentity/BannerPattern.create(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/tileentity/BannerPattern;=|enumName,p_i47246_3_,p_i47246_4_,p_i47246_5_ net/minecraft/tileentity/BannerPattern.create(Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/tileentity/BannerPattern;=|enumName,p_i47247_3_,p_i47247_4_,p_i47247_5_,p_i47247_6_,p_i47247_7_ +net/minecraft/util/math/shapes/EntitySelectionContext.(Lnet/minecraft/entity/Entity;ZDLnet/minecraft/item/Item;)V=|entityIn,p_i51181_1_,p_i51181_2_,p_i51181_4_ + net/minecraft/world/World.getBiomeBody(Lnet/minecraft/util/math/BlockPos;)Lnet/minecraft/world/biome/Biome;=|p_180494_1_ net/minecraft/world/World.markAndNotifyBlock(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/chunk/Chunk;Lnet/minecraft/block/BlockState;Lnet/minecraft/block/BlockState;I)V=|p_180501_1_,chunk,blockstate,p_180501_2_,p_180501_3_ net/minecraft/world/World.getSunBrightnessBody(F)F=|p_72971_1_ net/minecraft/world/World.getSkyColorBody(Lnet/minecraft/util/math/BlockPos;F)Lnet/minecraft/util/math/Vec3d;=|p_217382_1_,p_217382_2_ net/minecraft/world/World.getCloudColorBody(F)Lnet/minecraft/util/math/Vec3d;=|p_72824_1_ -net/minecraft/world/server/ServerWorld.canMineBlockBody(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/math/BlockPos;)Z=|p_175660_1_,p_175660_2_ -net/minecraft/world/server/ServerWorld.removeEntityComplete(Lnet/minecraft/entity/Entity;Z)V=|p_217484_1_,keepData -net/minecraft/world/server/ServerWorld.removeEntity(Lnet/minecraft/entity/Entity;Z)V=|p_217467_1_,keepData -net/minecraft/world/server/ServerWorld.removePlayer(Lnet/minecraft/entity/player/ServerPlayerEntity;Z)V=|p_217434_1_,keepData + +net/minecraft/world/chunk/BlockStateContainer.setBits(IZ)V=|p_186012_1_,forceBits net/minecraft/world/dimension/DimensionType.(ILjava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;ZLnet/minecraftforge/common/ModDimension;Lnet/minecraft/network/PacketBuffer;)V=|p_i49935_1_,p_i49935_2_,p_i49935_3_,p_i49935_4_,p_i49935_5_,modType,data -net/minecraft/world/chunk/BlockStateContainer.setBits(IZ)V=|p_186012_1_,forceBits net/minecraft/world/end/DragonFightManager.(Lnet/minecraft/world/server/ServerWorld;Lnet/minecraft/nbt/CompoundNBT;Lnet/minecraft/world/dimension/EndDimension;)V=|p_i46669_1_,p_i46669_2_,dim net/minecraft/world/gen/feature/HugeTreesFeature.validSoil(Lnet/minecraft/world/gen/IWorldGenerationReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraftforge/common/IPlantable;)Z=|p_202405_1_,p_202405_2_,sapling net/minecraft/world/gen/feature/OreFeatureConfig$FillerBlockType.create(Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Predicate;)Lnet/minecraft/world/gen/feature/OreFeatureConfig$FillerBlockType;=|enumName,p_i50618_3_,p_i50618_4_ + net/minecraft/world/gen/feature/jigsaw/JigsawPattern$PlacementBehaviour.create(Ljava/lang/String;Ljava/lang/String;Lcom/google/common/collect/ImmutableList;)Lnet/minecraft/world/gen/feature/jigsaw/JigsawPattern$PlacementBehaviour;=|enumName,p_i50487_3_,p_i50487_4_ + net/minecraft/world/gen/feature/template/StructureProcessor.process(Lnet/minecraft/world/IWorldReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/gen/feature/template/Template$BlockInfo;Lnet/minecraft/world/gen/feature/template/Template$BlockInfo;Lnet/minecraft/world/gen/feature/template/PlacementSettings;Lnet/minecraft/world/gen/feature/template/Template;)Lnet/minecraft/world/gen/feature/template/Template$BlockInfo;=|p_215194_1_,p_215194_2_,p_215194_3_,p_215194_4_,p_215194_5_,template net/minecraft/world/gen/feature/template/Template.transformedVec3d(Lnet/minecraft/world/gen/feature/template/PlacementSettings;Lnet/minecraft/util/math/Vec3d;)Lnet/minecraft/util/math/Vec3d;=|p_186266_0_,p_186266_1_ net/minecraft/world/gen/feature/template/Template.processBlockInfos(Lnet/minecraft/world/gen/feature/template/Template;Lnet/minecraft/world/IWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/gen/feature/template/PlacementSettings;Ljava/util/List;)Ljava/util/List;=|template,p_215387_0_,p_215387_1_,p_215387_2_,p_215387_3_ net/minecraft/world/gen/feature/template/Template.processEntityInfos(Lnet/minecraft/world/gen/feature/template/Template;Lnet/minecraft/world/IWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/gen/feature/template/PlacementSettings;Ljava/util/List;)Ljava/util/List;=|template,p_215387_0_,p_215387_1_,p_215387_2_,p_215387_3_ net/minecraft/world/gen/feature/template/Template.addEntitiesToWorld(Lnet/minecraft/world/IWorld;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/gen/feature/template/PlacementSettings;Lnet/minecraft/util/Mirror;Lnet/minecraft/util/Rotation;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/MutableBoundingBox;)V=|p_207668_1_,p_207668_2_,placementIn,p_207668_3_,p_207668_4_,p_207668_5_,p_207668_6_ -net/minecraft/entity/EntityType.(Lnet/minecraft/entity/EntityType$IFactory;Lnet/minecraft/entity/EntityClassification;ZZZLcom/mojang/datafixers/types/Type;Lnet/minecraft/entity/EntitySize;Ljava/util/function/Predicate;Ljava/util/function/ToIntFunction;Ljava/util/function/ToIntFunction;Ljava/util/function/BiFunction;)V=|p_i50385_1_,p_i50385_2_,p_i50385_3_,p_i50385_4_,p_i50385_5_,p_i50385_6_,p_i50385_7_,velocityUpdateSupplier,trackingRangeSupplier,updateIntervalSupplier,customClientFactory +net/minecraft/world/server/ServerWorld.canMineBlockBody(Lnet/minecraft/entity/player/PlayerEntity;Lnet/minecraft/util/math/BlockPos;)Z=|p_175660_1_,p_175660_2_ +net/minecraft/world/server/ServerWorld.removeEntityComplete(Lnet/minecraft/entity/Entity;Z)V=|p_217484_1_,keepData +net/minecraft/world/server/ServerWorld.removeEntity(Lnet/minecraft/entity/Entity;Z)V=|p_217467_1_,keepData +net/minecraft/world/server/ServerWorld.removePlayer(Lnet/minecraft/entity/player/ServerPlayerEntity;Z)V=|p_217434_1_,keepData + +net/minecraft/world/spawner/WorldEntitySpawner.canSpawnAtBody(Lnet/minecraft/entity/EntitySpawnPlacementRegistry$PlacementType;Lnet/minecraft/world/IWorldReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/EntityType;)Z=|p_209382_0_,p_209382_1_,p_209382_2_,p_209382_3_ net/minecraft/world/spawner/WorldEntitySpawner.getSpawnList(Lnet/minecraft/world/gen/ChunkGenerator;Lnet/minecraft/entity/EntityClassification;Ljava/util/Random;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;)Z|p_222264_0_,p_222264_1_,p_222264_2_,p_222264_3_,world net/minecraft/world/spawner/WorldEntitySpawner.getSpawnList(Lnet/minecraft/world/gen/ChunkGenerator;Lnet/minecraft/entity/EntityClassification;Lnet/minecraft/world/biome/Biome$SpawnListEntry;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/world/World;)Z|p_222261_0_,p_222261_1_,p_222261_2_,p_222261_3_,world -net/minecraft/world/spawner/WorldEntitySpawner.canSpawnAtBody(Lnet/minecraft/entity/EntitySpawnPlacementRegistry$PlacementType;Lnet/minecraft/world/IWorldReader;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/EntityType;)Z=|p_209382_0_,p_209382_1_,p_209382_2_,p_209382_3_ net/minecraft/world/storage/SaveFormat.getWorldData(Ljava/io/File;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/world/storage/SaveHandler;)Lnet/minecraft/world/storage/WorldInfo;=|p_215780_0_,p_215780_1_,saveHandler @@ -100,7 +118,3 @@ net/minecraft/world/storage/loot/LootEntryEmpty.(II[Lnet/minecraft/world/s net/minecraft/world/storage/loot/LootEntryItem.(Lnet/minecraft/item/Item;II[Lnet/minecraft/world/storage/loot/functions/LootFunction;[Lnet/minecraft/world/storage/loot/conditions/LootCondition;Ljava/lang/String;)V=|p_i46644_1_,p_i46644_2_,p_i46644_3_,p_i46644_4_,p_i46644_5_,entryName net/minecraft/world/storage/loot/LootEntryTable.(Lnet/minecraft/util/ResourceLocation;II[Lnet/minecraft/world/storage/loot/conditions/LootCondition;Ljava/lang/String;)V=|p_i46639_1_,p_i46639_2_,p_i46639_3_,p_i46639_4_,entryName net/minecraft/world/storage/loot/LootPool.([Lnet/minecraft/world/storage/loot/LootEntry;[Lnet/minecraft/world/storage/loot/conditions/LootCondition;Lnet/minecraft/world/storage/loot/RandomValueRange;Lnet/minecraft/world/storage/loot/RandomValueRange;Ljava/lang/String;)V=|p_i46643_1_,p_i46643_2_,p_i46643_3_,p_i46643_4_ - -net/minecraft/util/math/shapes/EntitySelectionContext.(Lnet/minecraft/entity/Entity;ZDLnet/minecraft/item/Item;)V=|entityIn,p_i51181_1_,p_i51181_2_,p_i51181_4_ - -net/minecraft/item/BoneMealItem.applyBonemeal(Lnet/minecraft/item/ItemStack;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/entity/player/PlayerEntity;)Z=|p_195966_0_,p_195966_1_,p_195966_2_,player \ No newline at end of file diff --git a/src/main/resources/forge.srg b/src/main/resources/forge.srg index e8eb7d47b..e69de29bb 100644 --- a/src/main/resources/forge.srg +++ b/src/main/resources/forge.srg @@ -1 +0,0 @@ -MD: net/minecraft/server/management/ServerConfigurationManager/initializeConnectionToPlayer (Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/NetHandlerPlayServer;)V net/minecraft/server/management/ServerConfigurationManager/func_72355_a (Lnet/minecraft/network/NetworkManager;Lnet/minecraft/entity/player/EntityPlayerMP;Lnet/minecraft/network/NetHandlerPlayServer;)V diff --git a/src/test/java/net/minecraftforge/debug/block/CustomTNTTest.java b/src/test/java/net/minecraftforge/debug/block/CustomTNTTest.java index 309bc3ab7..c584f8218 100644 --- a/src/test/java/net/minecraftforge/debug/block/CustomTNTTest.java +++ b/src/test/java/net/minecraftforge/debug/block/CustomTNTTest.java @@ -94,7 +94,7 @@ public class CustomTNTTest { if (!world.isRemote) { TNTEntity tnt = new CustomTNTEntity(world, pos.getX() + 0.5F, pos.getY(), pos.getZ() + 0.5F, igniter); world.addEntity(tnt); - world.playSound(null, tnt.func_226277_ct_(), tnt.func_226278_cu_(), tnt.func_226281_cx_(), SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1.0F, 1.0F); + world.playSound(null, tnt.getPosX(), tnt.getPosY(), tnt.getPosZ(), SoundEvents.ENTITY_TNT_PRIMED, SoundCategory.BLOCKS, 1.0F, 1.0F); } } } @@ -122,7 +122,7 @@ public class CustomTNTTest { @Override protected void explode() { - this.world.createExplosion(this, this.func_226277_ct_(), this.func_226278_cu_(), this.func_226281_cx_(), 16.0F, Explosion.Mode.BREAK); + this.world.createExplosion(this, this.getPosX(), this.getPosY(), this.getPosZ(), 16.0F, Explosion.Mode.BREAK); } @Nonnull diff --git a/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java b/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java index a90261e83..6fba8d038 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/ModelLoaderRegistryTest.java @@ -364,7 +364,7 @@ public class ModelLoaderRegistryTest private final List hidden = new ArrayList(); private final IModelState state = new IModelState() { - private final Optional value = Optional.of(TransformationMatrix.func_227983_a_()); + private final Optional value = Optional.of(TransformationMatrix.identity()); @Override public Optional apply(Optional part) @@ -790,7 +790,7 @@ public class ModelLoaderRegistryTest if (world.getTileEntity(pos) != null && world.getTileEntity(pos) instanceof OBJDynamicEyeTileEntity) { OBJDynamicEyeTileEntity te = (OBJDynamicEyeTileEntity) world.getTileEntity(pos); - if (te.transform != TransformationMatrix.func_227983_a_()) + if (te.transform != TransformationMatrix.identity()) { return ((IExtendedBlockState) state).withProperty(Properties.AnimationProperty, te.transform); } @@ -807,7 +807,7 @@ public class ModelLoaderRegistryTest super(null); // TODO } - private TRSRTransformation transform = TransformationMatrix.func_227983_a_(); + private TRSRTransformation transform = TransformationMatrix.identity(); @Override public void tick() diff --git a/src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java b/src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java index 20cee4eff..8e089c843 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/MultiLayerModelTest.java @@ -53,7 +53,7 @@ public class MultiLayerModelTest if (!ENABLED) return; event.getRegistry().register( - new Block(Block.Properties.create(Material.WOOD).func_226896_b_()) + new Block(Block.Properties.create(Material.WOOD).notSolid()) { }.setRegistryName(blockId) ); @@ -73,7 +73,7 @@ public class MultiLayerModelTest if (!ENABLED) return; RenderTypeLookup.setRenderLayer(TEST_BLOCK, (layer) -> { - return layer == RenderType.func_228639_c_() || layer == RenderType.func_228645_f_(); + return layer == RenderType.getSolid() || layer == RenderType.getTranslucent(); }); } } diff --git a/src/test/java/net/minecraftforge/debug/client/model/NewModelLoaderTest.java b/src/test/java/net/minecraftforge/debug/client/model/NewModelLoaderTest.java index 95a17a2ef..72833d3fc 100644 --- a/src/test/java/net/minecraftforge/debug/client/model/NewModelLoaderTest.java +++ b/src/test/java/net/minecraftforge/debug/client/model/NewModelLoaderTest.java @@ -169,7 +169,7 @@ public class NewModelLoaderTest private void putVertex(BakedQuadBuilder builder, int x, float y, float z, float u, float v, float red, float green, float blue) { - ImmutableList elements = DefaultVertexFormats.BLOCK.func_227894_c_(); + ImmutableList elements = DefaultVertexFormats.BLOCK.getElements(); for(int i=0;i