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

First update pass (1/3) - ~1400 -> 82 errors

Browse Source 
This is first update pass, which is mainly import reorganization, name
fixes, etc... Although some parts of second were done where changes
aren't important.
Errors: ~1400 -> 82.
This commit is contained in:
elix-x
2016-06-19 14:43:27 +02:00
parent d9725a7d9b
commit 5498eb6d7c
288 changed files with 1637 additions and 1420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/util/item/AEItemDef.java
+2 -2
View File
@@ -24,7 +24,6 @@ import java.util.List;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -49,6 +48,7 @@ public class AEItemDef
private String displayName;
@SideOnly( Side.CLIENT )
private List tooltip;
//TODO 1.9.4 - UniqueIdentifier => ?
@SideOnly( Side.CLIENT )
private UniqueIdentifier uniqueID;
private OreReference isOre;
@@ -110,7 +110,7 @@ public class AEItemDef
int getDamageValueHack( final ItemStack is )
{
return Items.blaze_rod.getDamage( is );
return Items.BLAZE_ROD.getDamage( is );
}
void reHash()
src/main/java/appeng/util/item/AEItemStack.java
+4 -4
View File
@@ -36,7 +36,6 @@ import net.minecraft.item.ItemStack;
import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.fml.common.registry.GameRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry.UniqueIdentifier;
import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.fml.relauncher.SideOnly;
@@ -218,7 +217,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
/*
* if ( id != null && id instanceof NBTTagShort ) ((NBTTagShort) id).data = (short) this.def.item.itemID; else
*/
i.setShort( "id", (short) Item.itemRegistry.getIDForObject( this.getDefinition().getItem() ) );
i.setShort( "id", (short) Item.REGISTRY.getIDForObject( this.getDefinition().getItem() ) );
/*
* if ( Count != null && Count instanceof NBTTagByte ) ((NBTTagByte) Count).data = (byte) 0; else
@@ -591,7 +590,8 @@ 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()
{
@@ -707,7 +707,7 @@ public final class AEItemStack extends AEStack<IAEItemStack> implements IAEItemS
@Override
void writeIdentity( final ByteBuf i ) throws IOException
{
i.writeShort( Item.itemRegistry.getIDForObject( this.getDefinition().getItem() ) );
i.writeShort( Item.REGISTRY.getIDForObject( this.getDefinition().getItem() ) );
i.writeShort( this.getItemDamage() );
}
src/main/java/appeng/util/item/SharedSearchObject.java
+1 -1
View File
@@ -35,7 +35,7 @@ public class SharedSearchObject
public SharedSearchObject( final Item itemID, final int damageValue, final NBTTagCompound tagCompound )
{
this.def = ( damageValue << Platform.DEF_OFFSET ) | Item.itemRegistry.getIDForObject( itemID );
this.def = ( damageValue << Platform.DEF_OFFSET ) | Item.REGISTRY.getIDForObject( itemID );
this.hash = Platform.NBTOrderlessHash( tagCompound );
this.setCompound( tagCompound );
}