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

Second update pass (2/3) - 82 -> 0 errors

Browse Source 
Second update pass which fixes all compile errors. Some parts may have
aftermath effect, hence why 3rd pass will check those maked with
"aftermath".
Errors: 82 -> 0. Mod can be launched.
This commit is contained in:
elix-x
2016-06-21 11:03:10 +02:00
parent 5498eb6d7c
commit 05aa6972c4
83 changed files with 564 additions and 405 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/item/AEItemStack.java
+4 -5
View File
@@ -35,7 +35,7 @@ import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -591,7 +591,6 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
return this.getDefinition().getDisplayName();
}
//TODO 1.9.4 - UniqueIdentifier => ResourceLocation ?
@SideOnly( Side.CLIENT )
public String getModID()
{
@@ -600,17 +599,17 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
return this.getModName( this.getDefinition().getUniqueID() );
}
return this.getModName( this.getDefinition().setUniqueID( GameRegistry.findUniqueIdentifierFor( this.getDefinition().getItem() ) ) );
return this.getModName( this.getDefinition().setUniqueID( Item.REGISTRY.getNameForObject( this.getDefinition().getItem() ) ) );
}
private String getModName( final UniqueIdentifier uniqueIdentifier )
private String getModName( final ResourceLocation uniqueIdentifier )
{
if( uniqueIdentifier == null )
{
return "** Null";
}
return uniqueIdentifier.modId == null ? "** Null" : uniqueIdentifier.modId;
return uniqueIdentifier.getResourceDomain() == null ? "** Null" : uniqueIdentifier.getResourceDomain();
}
IAEItemStack getLow( final FuzzyMode fuzzy, final boolean ignoreMeta )