fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #1099 Client crash on load up due to FML quirks

Browse Source
This commit is contained in:
thatsIch
2015-03-26 13:57:08 +01:00
parent b756a3f564
commit d1f2625262
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/core/sync/GuiBridge.java
+4 -8
View File
@@ -20,7 +20,6 @@ package appeng.core.sync;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.util.regex.Pattern;
import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.entity.player.InventoryPlayer;
@@ -191,8 +190,6 @@ public enum GuiBridge implements IGuiHandler
GUI_CRAFTING_STATUS(ContainerCraftingStatus.class, ITerminalHost.class, ITEM_OR_WORLD, SecurityPermissions.CRAFT); GUI_CRAFTING_STATUS(ContainerCraftingStatus.class, ITerminalHost.class, ITEM_OR_WORLD, SecurityPermissions.CRAFT);
private static final Pattern PATTERN_PRE_CONTAINER = Pattern.compile( ".Container", Pattern.LITERAL );
private static final Pattern PATTERN_POST_CONTAINER = Pattern.compile( "container." );
private final Class Tile; private final Class Tile;
private Class Gui; private Class Gui;
private final Class Container; private final Class Container;
@@ -214,14 +211,13 @@ public enum GuiBridge implements IGuiHandler
if ( Platform.isClient() ) if ( Platform.isClient() )
{ {
final String start = this.Container.getName(); final String start = this.Container.getName();
final String guiClassPostReplaced = PATTERN_POST_CONTAINER.matcher( start ).replaceFirst( "client.gui." ); String guiClass = start.replaceFirst( "container.", "client.gui." ).replace( ".Container", ".Gui" );
final String guiClassPreReplaced = PATTERN_PRE_CONTAINER.matcher( guiClassPostReplaced ).replaceAll( ".Gui" );
if ( start.equals( guiClassPreReplaced ) ) if ( start.equals( guiClass ) )
throw new RuntimeException( "Unable to find gui class" ); throw new RuntimeException( "Unable to find gui class" );
this.Gui = ReflectionHelper.getClass( this.getClass().getClassLoader(), guiClassPreReplaced ); this.Gui = ReflectionHelper.getClass( this.getClass().getClassLoader(), guiClass );
if ( this.Gui == null ) if ( this.Gui == null )
throw new RuntimeException( "Cannot Load class: " + guiClassPreReplaced ); throw new RuntimeException( "Cannot Load class: " + guiClass );
} }
} }