Split KirinoCore into common,client, and server modules

tttsaurus · tttsaurus · commit 4c6fb613c476 · 2026-01-23T20:37:32.000-05:00
diff --git a/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch b/patches/minecraft/net/minecraft/client/renderer/EntityRenderer.java.patch
@@ -1,14 +1,22 @@
 --- before/net/minecraft/client/renderer/EntityRenderer.java
 +++ after/net/minecraft/client/renderer/EntityRenderer.java
-@@ -235,6 +235,7 @@
+@@ -13,7 +13,6 @@
+ import javax.annotation.Nullable;
+ import javax.imageio.ImageIO;
+ import net.minecraft.block.Block;
+-import net.minecraft.block.BlockBed;
+ import net.minecraft.block.material.Material;
+ import net.minecraft.block.state.IBlockState;
+ import net.minecraft.client.Minecraft;
+@@ -235,6 +234,7 @@
              {
                  this.loadShader(new ResourceLocation("shaders/post/invert.json"));
              }
 +            else net.minecraftforge.client.ForgeHooksClient.loadEntityShader(entityIn, this);
          }
      }
  
-@@ -315,7 +316,7 @@
+@@ -315,7 +315,7 @@
              this.mc.setRenderViewEntity(this.mc.player);
          }
  
@@ -17,7 +25,7 @@
          float f4 = (float)this.mc.gameSettings.renderDistanceChunks / 32.0F;
          float f2 = f3 * (1.0F - f4) + f4;
          this.fogColor1 = this.fogColor1 + (f2 - this.fogColor1) * 0.1F;
-@@ -445,7 +446,7 @@
+@@ -445,7 +445,7 @@
  
                          if (d3 < d2 || d2 == 0.0)
                          {
@@ -26,7 +34,7 @@
                              {
                                  if (d2 == 0.0)
                                  {
-@@ -538,7 +539,7 @@
+@@ -538,7 +538,7 @@
                  f = f * 60.0F / 70.0F;
              }
  
@@ -35,7 +43,7 @@
          }
      }
  
-@@ -604,13 +605,7 @@
+@@ -604,13 +604,7 @@
              {
                  BlockPos blockpos = new BlockPos(entity);
                  IBlockState iblockstate = this.mc.world.getBlockState(blockpos);
@@ -50,7 +58,7 @@
  
                  GlStateManager.rotate(entity.prevRotationYaw + (entity.rotationYaw - entity.prevRotationYaw) * partialTicks + 180.0F, 0.0F, -1.0F, 0.0F);
                  GlStateManager.rotate(entity.prevRotationPitch + (entity.rotationPitch - entity.prevRotationPitch) * partialTicks, -1.0F, 0.0F, 0.0F);
-@@ -683,19 +678,20 @@
+@@ -683,19 +677,20 @@
  
          if (!this.mc.gameSettings.debugCamEnable)
          {
@@ -81,15 +89,15 @@
          }
  
          GlStateManager.translate(0.0F, -f, 0.0F);
-@@ -825,6 +821,7 @@
+@@ -825,6 +820,7 @@
              boolean flag = this.mc.getRenderViewEntity() instanceof EntityLivingBase
                             && ((EntityLivingBase)this.mc.getRenderViewEntity()).isPlayerSleeping();
  
 +            if (!net.minecraftforge.client.ForgeHooksClient.renderFirstPersonHand(mc.renderGlobal, partialTicks, pass))
              if (this.mc.gameSettings.thirdPersonView == 0
                      && !flag
                      && !this.mc.gameSettings.hideGUI
-@@ -932,6 +929,15 @@
+@@ -932,6 +928,15 @@
                          f10 = 0.25F + f7 * 0.75F;
                      }
  
@@ -105,17 +113,17 @@
                      if (this.mc.player.isPotionActive(MobEffects.NIGHT_VISION))
                      {
                          float f15 = this.getNightVisionBrightness(this.mc.player, partialTicks);
-@@ -1108,7 +1114,17 @@
+@@ -1108,7 +1113,17 @@
                  j = Math.max(j, 60);
                  long k = System.nanoTime() - nanoTime;
                  long l = Math.max((long)(1000000000 / j / 4) - k, 0L);
 -                this.renderWorld(partialTicks, System.nanoTime() + l);
 +
-+                if (com.cleanroommc.kirino.KirinoCore.KIRINO_CONFIG_HUB.isEnable()
-+                        && com.cleanroommc.kirino.KirinoCore.KIRINO_CONFIG_HUB.isEnableRenderDelegate()
-+                        && !com.cleanroommc.kirino.KirinoCore.isRenderUnsupported())
++                if (com.cleanroommc.kirino.KirinoCommonCore.KIRINO_CONFIG_HUB.isEnable()
++                        && com.cleanroommc.kirino.KirinoCommonCore.KIRINO_CONFIG_HUB.isEnableRenderDelegate()
++                        && !com.cleanroommc.kirino.KirinoClientCore.isRenderUnsupported())
 +                {
-+                    com.cleanroommc.kirino.KirinoCore.EntityRenderer$renderWorld(System.nanoTime() + l);
++                    com.cleanroommc.kirino.KirinoClientCore.EntityRenderer$renderWorld(System.nanoTime() + l);
 +                }
 +                else
 +                {
@@ -124,7 +132,7 @@
  
                  if (this.mc.isSingleplayer() && this.timeWorldIcon < Minecraft.getSystemTime() - 1000L)
                  {
-@@ -1158,6 +1174,10 @@
+@@ -1158,6 +1173,10 @@
                  GlStateManager.loadIdentity();
                  this.setupOverlayRendering();
                  this.renderEndNanoTime = System.nanoTime();
@@ -135,7 +143,7 @@
              }
  
              if (this.mc.currentScreen != null)
-@@ -1166,7 +1186,7 @@
+@@ -1166,7 +1185,7 @@
  
                  try
                  {
@@ -144,7 +152,7 @@
                  }
                  catch (Throwable throwable)
                  {
-@@ -1275,7 +1295,7 @@
+@@ -1275,7 +1294,7 @@
  
                      if (this.mc.playerController.getCurrentGameType() == GameType.SPECTATOR)
                      {
@@ -153,25 +161,25 @@
                      }
                      else
                      {
-@@ -1323,6 +1343,17 @@
+@@ -1323,6 +1342,17 @@
  
      private void renderWorldPass(int pass, float partialTicks, long finishTimeNano)
      {
-+        if (com.cleanroommc.kirino.KirinoCore.KIRINO_CONFIG_HUB.isEnable()
-+                && (!com.cleanroommc.kirino.KirinoCore.KIRINO_CONFIG_HUB.isEnableRenderDelegate()
-+                || com.cleanroommc.kirino.KirinoCore.isRenderUnsupported()))
++        if (com.cleanroommc.kirino.KirinoCommonCore.KIRINO_CONFIG_HUB.isEnable()
++                && (!com.cleanroommc.kirino.KirinoCommonCore.KIRINO_CONFIG_HUB.isEnableRenderDelegate()
++                || com.cleanroommc.kirino.KirinoClientCore.isRenderUnsupported()))
 +        {
-+            if (com.cleanroommc.kirino.KirinoCore.KIRINO_ENGINE.nextExpectedPhase() == com.cleanroommc.kirino.engine.FramePhase.PREPARE)
++            if (com.cleanroommc.kirino.KirinoCommonCore.KIRINO_ENGINE.nextExpectedPhase() == com.cleanroommc.kirino.engine.FramePhase.PREPARE)
 +            {
-+                com.cleanroommc.kirino.KirinoCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.PREPARE);
++                com.cleanroommc.kirino.KirinoClientCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.PREPARE);
 +            }
-+            com.cleanroommc.kirino.KirinoCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.PRE_UPDATE);
++            com.cleanroommc.kirino.KirinoClientCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.PRE_UPDATE);
 +        }
 +
          RenderGlobal renderglobal = this.mc.renderGlobal;
          ParticleManager particlemanager = this.mc.effectRenderer;
          boolean flag = this.isDrawBlockOutline();
-@@ -1333,7 +1364,7 @@
+@@ -1333,7 +1363,7 @@
          GlStateManager.clear(16640);
          this.mc.profiler.endStartSection("camera");
          this.setupCameraTransform(partialTicks, pass);
@@ -180,22 +188,22 @@
          this.mc.profiler.endStartSection("frustum");
          ClippingHelperImpl.getInstance();
          this.mc.profiler.endStartSection("culling");
-@@ -1377,6 +1408,14 @@
+@@ -1377,6 +1407,14 @@
              this.renderCloudsCheck(renderglobal, partialTicks, pass, d0, d1, d2);
          }
  
-+        if (com.cleanroommc.kirino.KirinoCore.KIRINO_CONFIG_HUB.isEnable()
-+                && (!com.cleanroommc.kirino.KirinoCore.KIRINO_CONFIG_HUB.isEnableRenderDelegate()
-+                || com.cleanroommc.kirino.KirinoCore.isRenderUnsupported()))
++        if (com.cleanroommc.kirino.KirinoCommonCore.KIRINO_CONFIG_HUB.isEnable()
++                && (!com.cleanroommc.kirino.KirinoCommonCore.KIRINO_CONFIG_HUB.isEnableRenderDelegate()
++                || com.cleanroommc.kirino.KirinoClientCore.isRenderUnsupported()))
 +        {
-+            com.cleanroommc.kirino.KirinoCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.UPDATE);
-+            com.cleanroommc.kirino.KirinoCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.RENDER_OPAQUE);
++            com.cleanroommc.kirino.KirinoClientCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.UPDATE);
++            com.cleanroommc.kirino.KirinoClientCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.RENDER_OPAQUE);
 +        }
 +
          this.mc.profiler.endStartSection("prepareterrain");
          this.setupFog(0, partialTicks);
          this.mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
-@@ -1396,7 +1435,9 @@
+@@ -1396,7 +1434,9 @@
          GlStateManager.disableAlpha();
          renderglobal.renderBlockLayer(BlockRenderLayer.SOLID, (double)partialTicks, pass, entity);
          GlStateManager.enableAlpha();
@@ -205,7 +213,7 @@
          this.mc.getTextureManager().getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).setBlurMipmap(false, false);
          renderglobal.renderBlockLayer(BlockRenderLayer.CUTOUT, (double)partialTicks, pass, entity);
          this.mc.getTextureManager().getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).restoreLastBlurMipmap();
-@@ -1410,7 +1451,9 @@
+@@ -1410,7 +1450,9 @@
              GlStateManager.pushMatrix();
              RenderHelper.enableStandardItemLighting();
              this.mc.profiler.endStartSection("entities");
@@ -215,24 +223,24 @@
              RenderHelper.disableStandardItemLighting();
              this.disableLightmap();
          }
-@@ -1423,6 +1466,7 @@
+@@ -1423,6 +1465,7 @@
              EntityPlayer entityplayer = (EntityPlayer)entity;
              GlStateManager.disableAlpha();
              this.mc.profiler.endStartSection("outline");
 +            if (!net.minecraftforge.client.ForgeHooksClient.onDrawBlockHighlight(renderglobal, entityplayer, mc.objectMouseOver, 0, partialTicks))
              renderglobal.drawSelectionBox(entityplayer, this.mc.objectMouseOver, 0, partialTicks);
              GlStateManager.enableAlpha();
          }
-@@ -1471,8 +1515,27 @@
+@@ -1471,8 +1514,27 @@
          GlStateManager.depthMask(false);
          this.mc.getTextureManager().bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
          GlStateManager.shadeModel(7425);
 +
-+        if (com.cleanroommc.kirino.KirinoCore.KIRINO_CONFIG_HUB.isEnable()
-+                && (!com.cleanroommc.kirino.KirinoCore.KIRINO_CONFIG_HUB.isEnableRenderDelegate()
-+                || com.cleanroommc.kirino.KirinoCore.isRenderUnsupported()))
++        if (com.cleanroommc.kirino.KirinoCommonCore.KIRINO_CONFIG_HUB.isEnable()
++                && (!com.cleanroommc.kirino.KirinoCommonCore.KIRINO_CONFIG_HUB.isEnableRenderDelegate()
++                || com.cleanroommc.kirino.KirinoClientCore.isRenderUnsupported()))
 +        {
-+            com.cleanroommc.kirino.KirinoCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.RENDER_TRANSPARENT);
++            com.cleanroommc.kirino.KirinoClientCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.RENDER_TRANSPARENT);
 +        }
 +
          this.mc.profiler.endStartSection("translucent");
@@ -251,7 +259,7 @@
          GlStateManager.shadeModel(7424);
          GlStateManager.depthMask(true);
          GlStateManager.enableCull();
-@@ -1485,6 +1548,9 @@
+@@ -1485,6 +1547,9 @@
              this.renderCloudsCheck(renderglobal, partialTicks, pass, d0, d1, d2);
          }
  
@@ -261,22 +269,22 @@
          this.mc.profiler.endStartSection("hand");
  
          if (this.renderHand)
-@@ -1492,6 +1558,14 @@
+@@ -1492,6 +1557,14 @@
              GlStateManager.clear(256);
              this.renderHand(partialTicks, pass);
          }
 +
-+        if (com.cleanroommc.kirino.KirinoCore.KIRINO_CONFIG_HUB.isEnable()
-+                && (!com.cleanroommc.kirino.KirinoCore.KIRINO_CONFIG_HUB.isEnableRenderDelegate()
-+                || com.cleanroommc.kirino.KirinoCore.isRenderUnsupported()))
++        if (com.cleanroommc.kirino.KirinoCommonCore.KIRINO_CONFIG_HUB.isEnable()
++                && (!com.cleanroommc.kirino.KirinoCommonCore.KIRINO_CONFIG_HUB.isEnableRenderDelegate()
++                || com.cleanroommc.kirino.KirinoClientCore.isRenderUnsupported()))
 +        {
-+            com.cleanroommc.kirino.KirinoCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.POST_UPDATE);
-+            com.cleanroommc.kirino.KirinoCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.RENDER_OVERLAY);
++            com.cleanroommc.kirino.KirinoClientCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.POST_UPDATE);
++            com.cleanroommc.kirino.KirinoClientCore.runHeadlessly(com.cleanroommc.kirino.engine.FramePhase.RENDER_OVERLAY);
 +        }
      }
  
      private void renderCloudsCheck(RenderGlobal renderGlobalIn, float partialTicks, int pass, double x, double y, double z)
-@@ -1635,6 +1709,13 @@
+@@ -1635,6 +1708,13 @@
  
      protected void renderRainSnow(float partialTicks)
      {
@@ -290,7 +298,7 @@
          float f = this.mc.world.getRainStrength(partialTicks);
  
          if (!(f <= 0.0F))
-@@ -1908,29 +1989,16 @@
+@@ -1908,29 +1988,16 @@
              this.fogColorGreen = (float)vec3d3.y;
              this.fogColorBlue = (float)vec3d3.z;
          }
@@ -330,7 +338,7 @@
          }
  
          float f13 = this.fogColor2 + (this.fogColor1 - this.fogColor2) * partialTicks;
-@@ -1989,6 +2057,9 @@
+@@ -1989,6 +2056,9 @@
                  f6 = 1.0F / this.fogColorBlue;
              }
  
@@ -340,7 +348,7 @@
              this.fogColorRed = this.fogColorRed * (1.0F - f15) + this.fogColorRed * f6 * f15;
              this.fogColorGreen = this.fogColorGreen * (1.0F - f15) + this.fogColorGreen * f6 * f15;
              this.fogColorBlue = this.fogColorBlue * (1.0F - f15) + this.fogColorBlue * f6 * f15;
-@@ -2004,6 +2075,13 @@
+@@ -2004,6 +2074,13 @@
              this.fogColorBlue = f7;
          }
  
@@ -354,7 +362,7 @@
          GlStateManager.clearColor(this.fogColorRed, this.fogColorGreen, this.fogColorBlue, 0.0F);
      }
  
-@@ -2014,7 +2092,9 @@
+@@ -2014,7 +2091,9 @@
          GlStateManager.glNormal3f(0.0F, -1.0F, 0.0F);
          GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
          IBlockState iblockstate = ActiveRenderInfo.getBlockStateAtEntityViewpoint(this.mc.world, entity, partialTicks);
@@ -365,7 +373,7 @@
          if (entity instanceof EntityLivingBase && ((EntityLivingBase)entity).isPotionActive(MobEffects.BLINDNESS))
          {
              float f1 = 5.0F;
-@@ -2100,6 +2180,7 @@
+@@ -2100,6 +2179,7 @@
                  GlStateManager.setFogStart(f * 0.05F);
                  GlStateManager.setFogEnd(Math.min(f, 192.0F) * 0.5F);
              }
diff --git a/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch b/patches/minecraft/net/minecraft/client/renderer/RenderGlobal.java.patch
@@ -152,14 +152,14 @@
          int j = pos.getY();
          int k = pos.getZ();
          this.markBlocksForUpdate(i - 1, j - 1, k - 1, i + 1, j + 1, k + 1, (flags & 8) != 0);
-+        com.cleanroommc.kirino.KirinoCore.RenderGlobal$notifyBlockUpdate(i, j, k, oldState, newState);
++        com.cleanroommc.kirino.KirinoClientCore.RenderGlobal$notifyBlockUpdate(i, j, k, oldState, newState);
      }
  
      @Override
      public void notifyLightSet(BlockPos pos)
      {
          this.setLightUpdates.add(pos.toImmutable());
-+        com.cleanroommc.kirino.KirinoCore.RenderGlobal$notifyLightUpdate(pos.getX(), pos.getY(), pos.getZ());
++        com.cleanroommc.kirino.KirinoClientCore.RenderGlobal$notifyLightUpdate(pos.getX(), pos.getY(), pos.getZ());
      }
  
      @Override
diff --git a/projects/kirino b/projects/kirino
@@ -1 +1 @@
-Subproject commit 870c13f44e9a8dd1e81e83b12101df999b358065
+Subproject commit 93b180bc29e207b5ab602ca7639fb351f49ec4ae
diff --git a/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java b/src/main/java/net/minecraftforge/fml/client/FMLClientHandler.java
@@ -35,7 +35,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Predicate;
 
-import com.cleanroommc.kirino.KirinoCore;
+import com.cleanroommc.kirino.KirinoClientCore;
+import com.cleanroommc.kirino.KirinoCommonCore;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.gui.Gui;
@@ -227,7 +228,7 @@ public void beginMinecraftLoading(Minecraft minecraft, List<IResourcePack> resou
             return;
         }
 
-        KirinoCore.configEvent();
+        KirinoCommonCore.configEvent();
 
         List<String> injectedModContainers = FMLCommonHandler.instance().beginLoading(this);
         try
@@ -289,7 +290,7 @@ public void beginMinecraftLoading(Minecraft minecraft, List<IResourcePack> resou
             }
         }
 
-        KirinoCore.init();
+        KirinoClientCore.init();
     }
 
     private void detectOptifine()
@@ -398,7 +399,7 @@ public void finishMinecraftLoading()
             Loader.instance().loadingComplete();
         SplashProgress.finish();
 
-        KirinoCore.postInit();
+        KirinoClientCore.postInit();
     }
 
     public void extendModList()
diff --git a/src/main/java/net/minecraftforge/fml/common/Loader.java b/src/main/java/net/minecraftforge/fml/common/Loader.java
@@ -40,7 +40,8 @@
 import com.cleanroommc.common.CleanroomContainer;
 import com.cleanroommc.common.MixinContainer;
 import com.cleanroommc.common.ConfigAnytimeContainer;
-import com.cleanroommc.kirino.KirinoCore;
+import com.cleanroommc.kirino.KirinoClientCore;
+import com.cleanroommc.kirino.KirinoCommonCore;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.common.ForgeVersion;
 import net.minecraftforge.common.capabilities.CapabilityManager;
@@ -376,7 +377,7 @@ private ModDiscoverer identifyMods(List<String> additionalContainers)
         mods.add(new InjectedModContainer(new CleanroomContainer(), FMLSanityChecker.fmlLocation));
         mods.add(new InjectedModContainer(new MixinContainer(), FMLSanityChecker.fmlLocation));
         mods.add(new InjectedModContainer(new ConfigAnytimeContainer(), FMLSanityChecker.fmlLocation));
-        KirinoCore.identifyMods(mods);
+        KirinoCommonCore.identifyMods(mods);
 
         for (String cont : injectedContainers)
         {
diff --git a/src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java b/src/main/java/net/minecraftforge/fml/server/FMLServerHandler.java

Original file line number	Diff line number	Diff line change
`@@ -152,14 +152,14 @@`
`152`	`152`	`int j = pos.getY();`
`153`	`153`	`int k = pos.getZ();`
`154`	`154`	`this.markBlocksForUpdate(i - 1, j - 1, k - 1, i + 1, j + 1, k + 1, (flags & 8) != 0);`
`155`		`-+ com.cleanroommc.kirino.KirinoCore.RenderGlobal$notifyBlockUpdate(i, j, k, oldState, newState);`
	`155`	`++ com.cleanroommc.kirino.KirinoClientCore.RenderGlobal$notifyBlockUpdate(i, j, k, oldState, newState);`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`@Override`
`159`	`159`	`public void notifyLightSet(BlockPos pos)`
`160`	`160`	`{`
`161`	`161`	`this.setLightUpdates.add(pos.toImmutable());`
`162`		`-+ com.cleanroommc.kirino.KirinoCore.RenderGlobal$notifyLightUpdate(pos.getX(), pos.getY(), pos.getZ());`
	`162`	`++ com.cleanroommc.kirino.KirinoClientCore.RenderGlobal$notifyLightUpdate(pos.getX(), pos.getY(), pos.getZ());`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@`
`35`	`35`	`import java.util.concurrent.TimeUnit;`
`36`	`36`	`import java.util.function.Predicate;`
`37`	`37`
`38`		`-import com.cleanroommc.kirino.KirinoCore;`
	`38`	`+import com.cleanroommc.kirino.KirinoClientCore;`
	`39`	`+import com.cleanroommc.kirino.KirinoCommonCore;`
`39`	`40`	`import net.minecraft.client.Minecraft;`
`40`	`41`	`import net.minecraft.client.entity.EntityPlayerSP;`
`41`	`42`	`import net.minecraft.client.gui.Gui;`
`@@ -227,7 +228,7 @@ public void beginMinecraftLoading(Minecraft minecraft, List<IResourcePack> resou`
`227`	`228`	`return;`
`228`	`229`	`}`
`229`	`230`
`230`		`- KirinoCore.configEvent();`
	`231`	`+ KirinoCommonCore.configEvent();`
`231`	`232`
`232`	`233`	`List<String> injectedModContainers = FMLCommonHandler.instance().beginLoading(this);`
`233`	`234`	`try`
`@@ -289,7 +290,7 @@ public void beginMinecraftLoading(Minecraft minecraft, List<IResourcePack> resou`
`289`	`290`	`}`
`290`	`291`	`}`
`291`	`292`
`292`		`- KirinoCore.init();`
	`293`	`+ KirinoClientCore.init();`
`293`	`294`	`}`
`294`	`295`
`295`	`296`	`private void detectOptifine()`
`@@ -398,7 +399,7 @@ public void finishMinecraftLoading()`
`398`	`399`	`Loader.instance().loadingComplete();`
`399`	`400`	`SplashProgress.finish();`
`400`	`401`
`401`		`- KirinoCore.postInit();`
	`402`	`+ KirinoClientCore.postInit();`
`402`	`403`	`}`
`403`	`404`
`404`	`405`	`public void extendModList()`