tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed server bug

Browse source
This commit is contained in:
Magnar Polden 2021-12-21 00:59:04 +01:00
parent 74694b78a4
commit 69b4d533f8
4 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/mekanism/client/ClientProxy.java
View file

@ -2,6 +2,8 @@ package mekanism.client;
import java.io.File;
import com.jadarstudios.developercapes.DevCapes;
import cpw.mods.fml.common.Loader;
import mekanism.api.Coord4D;
import mekanism.api.MekanismConfig.client;
import mekanism.api.MekanismConfig.general;
@ -211,6 +213,7 @@ import cpw.mods.fml.relauncher.SideOnly;
@SideOnly(Side.CLIENT)
public class ClientProxy extends CommonProxy
{
public static boolean isThorfusionLoaded;
@Override
public void loadConfiguration()
{
@ -592,6 +595,18 @@ public class ClientProxy extends CommonProxy
public void preInit()
{
MekanismRenderer.init();
isThorfusionLoaded = Loader.isModLoaded("thorfusion");
}
@Override
public void Cape()
{
if(!isThorfusionLoaded) {
//proxy, tilentity
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
DevCapes.getInstance().registerConfig("http://eu-central-1.linodeobjects.com/files.thorfusion.xyz/capes/scape.json");
}
}
}
@Override

3
src/main/java/mekanism/common/CommonProxy.java
View file

@ -716,4 +716,7 @@ public class CommonProxy implements IGuiProvider
{
return null;
}
public void Cape() {
}
}

13
src/main/java/mekanism/common/Mekanism.java
View file

@ -10,8 +10,6 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import com.jadarstudios.developercapes.DevCapes;
import cpw.mods.fml.relauncher.Side;
import mekanism.api.Coord4D;
import mekanism.api.EnumColor;
import mekanism.api.MekanismAPI;
@ -149,7 +147,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
"after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore")
public class Mekanism
{
public static boolean isThorfusionLoaded;
/** Mekanism Packet Pipeline */
public static PacketHandler packetHandler = new PacketHandler();
@ -1216,8 +1213,6 @@ public class Mekanism
@EventHandler
public void preInit(FMLPreInitializationEvent event)
{
isThorfusionLoaded = Loader.isModLoaded("thorfusion");
File config = event.getSuggestedConfigurationFile();
//Set the mod's configuration
@ -1283,12 +1278,8 @@ public class Mekanism
@EventHandler
public void init(FMLInitializationEvent event)
{
if(!isThorfusionLoaded) {
//proxy, tilentity
if (FMLCommonHandler.instance().getEffectiveSide() == Side.CLIENT) {
DevCapes.getInstance().registerConfig("http://files.thorfusion.xyz.eu-central-1.linodeobjects.com/cape.json");
}
}
Mekanism.proxy.Cape();
//Register the mod's world generators
GameRegistry.registerWorldGenerator(genHandler, 1);

2
src/main/java/mekanism/common/ThreadGetData.java
View file

@ -21,7 +21,7 @@ public class ThreadGetData extends Thread
@Override
public void run()
{
List<String> ret = MekanismUtils.getHTML("http://files.thorfusion.xyz.eu-central-1.linodeobjects.com/mekanism/Mekanism.txt");
List<String> ret = MekanismUtils.getHTML("http://eu-central-1.linodeobjects.com/files.thorfusion.xyz/mekanism/Mekanism.txt");
Mekanism.latestVersionNumber = "null";
Mekanism.recentNews = "null";