diff --git a/build.gradle b/build.gradle index a902536c99..678d5aec94 100644 --- a/build.gradle +++ b/build.gradle @@ -231,7 +231,10 @@ project(':forge') { ideaModule "${rootProject.name}.${project.name}.userdev" mods { - forge { source sourceSets.main } + forge { + source sourceSets.main + source sourceSets.userdev + } } } diff --git a/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch b/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch index 6041eab8ad..b116b2480b 100644 --- a/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch +++ b/patches/minecraft/net/minecraft/server/management/PlayerList.java.patch @@ -106,6 +106,19 @@ if (flag2) { serverplayerentity.field_71135_a.func_147359_a(new SPlaySoundEffectPacket(SoundEvents.field_232818_ms_, SoundCategory.BLOCKS, (double)blockpos.func_177958_n(), (double)blockpos.func_177956_o(), (double)blockpos.func_177952_p(), 1.0F, 1.0F)); } +@@ -745,12 +_,6 @@ + if (serverstatisticsmanager == null) { + File file1 = this.field_72400_f.func_240776_a_(FolderName.field_237246_b_).toFile(); + File file2 = new File(file1, uuid + ".json"); +- if (!file2.exists()) { +- File file3 = new File(file1, p_152602_1_.func_200200_C_().getString() + ".json"); +- if (file3.exists() && file3.isFile()) { +- file3.renameTo(file2); +- } +- } + + serverstatisticsmanager = new ServerStatisticsManager(this.field_72400_f, file2); + this.field_148547_k.put(uuid, serverstatisticsmanager); @@ -769,6 +_,8 @@ this.field_192055_p.put(uuid, playeradvancements); } diff --git a/src/main/resources/forge.exc b/src/main/resources/forge.exc index edb68ecd92..1056712ae8 100644 --- a/src/main/resources/forge.exc +++ b/src/main/resources/forge.exc @@ -4,7 +4,7 @@ net/minecraft/block/FlowingFluidBlock.(Ljava/util/function/Supplier;Lnet/m 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/client/Minecraft.loadWorld(Ljava/lang/String;Lnet/minecraft/util/registry/DynamicRegistries$Impl;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function4;ZLnet/minecraft/client/Minecraft$WorldSelectionType;Z)V=|p_238195_1_,p_238195_2_,p_238195_3_,p_238195_4_,p_238195_5_,p_238195_6_,creating 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/gui/screen/Screen.renderToolTip(Lcom/mojang/blaze3d/matrix/MatrixStack;Ljava/util/List;IILnet/minecraft/client/gui/FontRenderer;)V=|p_238654_1_,p_238654_2_,p_238654_3_,p_238654_4_,font +net/minecraft/client/gui/screens/Screen.renderToolTip(Lcom/mojang/blaze3d/vertex/PoseStack;Ljava/util/List;IILnet/minecraft/client/gui/Font;)V=|p_238654_1_,p_238654_2_,p_238654_3_,p_238654_4_,font net/minecraft/client/particle/ParticleManager.renderParticles(Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer$Impl;Lnet/minecraft/client/renderer/LightTexture;Lnet/minecraft/client/renderer/ActiveRenderInfo;FLnet/minecraft/client/renderer/culling/ClippingHelper;)V=|p_228345_1_,p_228345_2_,p_228345_3_,p_228345_4_,p_228345_5_,clippingHelper 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/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