tilera
/
Applied-Energistics-2-tilera-Edition
1
1
Fork 0
Code Issues 7 Pull Requests Releases 1 Wiki Activity

Code updated to 1.10 

Code updated to 1.10. NOT 1.9.4 COMPATIBLE!!!
This commit is contained in:
elix-x 2016-06-25 11:00:17 +02:00
parent 44c86849b8
commit b7b5d2590c
6 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/appeng/core/AppEng.java
View File

@ -61,7 +61,7 @@ import appeng.services.version.VersionCheckerConfig;
import appeng.util.Platform;
@Mod( modid = AppEng.MOD_ID, acceptedMinecraftVersions = "[1.9.4]", name = AppEng.MOD_NAME, version = AEConfig.VERSION, dependencies = AppEng.MOD_DEPENDENCIES, guiFactory = "appeng.client.gui.config.AEConfigGuiFactory" )
@Mod( modid = AppEng.MOD_ID, acceptedMinecraftVersions = "[1.10]", name = AppEng.MOD_NAME, version = AEConfig.VERSION, dependencies = AppEng.MOD_DEPENDENCIES, guiFactory = "appeng.client.gui.config.AEConfigGuiFactory" )
public final class AppEng
{
public static final String MOD_ID = "appliedenergistics2";

2
src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java
View File

@ -35,7 +35,7 @@ public final class DispenserBehaviorTinyTNT extends BehaviorDefaultDispenseItem
@Override
protected ItemStack dispenseStack( final IBlockSource dispenser, final ItemStack dispensedItem )
{
final EnumFacing enumfacing = BlockDispenser.getFacing( dispenser.getBlockMetadata() );
final EnumFacing enumfacing = dispenser.func_189992_e().getValue( BlockDispenser.FACING );
final World world = dispenser.getWorld();
final int i = dispenser.getBlockPos().getX() + enumfacing.getFrontOffsetX();
final int j = dispenser.getBlockPos().getY() + enumfacing.getFrontOffsetY();

2
src/main/java/appeng/hooks/DispenserBlockTool.java
View File

@ -40,7 +40,7 @@ public final class DispenserBlockTool extends BehaviorDefaultDispenseItem
final Item i = dispensedItem.getItem();
if( i instanceof IBlockTool )
{
final EnumFacing enumfacing = BlockDispenser.getFacing( dispenser.getBlockMetadata() );
final EnumFacing enumfacing = dispenser.func_189992_e().getValue( BlockDispenser.FACING );
final IBlockTool tm = (IBlockTool) i;
final World w = dispenser.getWorld();

2
src/main/java/appeng/hooks/DispenserMatterCannon.java
View File

@ -43,7 +43,7 @@ public final class DispenserMatterCannon extends BehaviorDefaultDispenseItem
final Item i = dispensedItem.getItem();
if( i instanceof ToolMassCannon )
{
final EnumFacing enumfacing = BlockDispenser.getFacing( dispenser.getBlockMetadata() );
final EnumFacing enumfacing = dispenser.func_189992_e().getValue( BlockDispenser.FACING );
AEPartLocation dir = AEPartLocation.INTERNAL;
for( final AEPartLocation d : AEPartLocation.SIDE_LOCATIONS )
{

2
src/main/java/appeng/transformer/AppEngCore.java
View File

@ -37,7 +37,7 @@ import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.MCVersion;
import appeng.core.AEConfig;
@MCVersion( "1.9.4" )
@MCVersion( "1.10" )
public final class AppEngCore extends DummyModContainer implements IFMLLoadingPlugin
{
private final ModMetadata metadata = new ModMetadata();

22
src/main/java/appeng/util/Platform.java
View File

@ -54,10 +54,10 @@ import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTPrimitive;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import net.minecraft.network.Packet;
import net.minecraft.network.play.server.SPacketChunkData;
import net.minecraft.server.management.PlayerChunkMap;
import net.minecraft.server.management.PlayerChunkMapEntry;
@ -553,22 +553,22 @@ public class Platform
}
case 1: // ( A instanceof NBTTagByte )
return ( (NBTBase.NBTPrimitive) left ).getByte() == ( (NBTBase.NBTPrimitive) right ).getByte();
return ( (NBTPrimitive) left ).getByte() == ( (NBTPrimitive) right ).getByte();
case 4: // else if ( A instanceof NBTTagLong )
return ( (NBTBase.NBTPrimitive) left ).getLong() == ( (NBTBase.NBTPrimitive) right ).getLong();
return ( (NBTPrimitive) left ).getLong() == ( (NBTPrimitive) right ).getLong();
case 8: // else if ( A instanceof NBTTagString )
return ( (NBTTagString) left ).getString().equals( ( (NBTTagString) right ).getString() ) || ( (NBTTagString) left ).getString().equals( ( (NBTTagString) right ).getString() );
case 6: // else if ( A instanceof NBTTagDouble )
return ( (NBTBase.NBTPrimitive) left ).getDouble() == ( (NBTBase.NBTPrimitive) right ).getDouble();
return ( (NBTPrimitive) left ).getDouble() == ( (NBTPrimitive) right ).getDouble();
case 5: // else if ( A instanceof NBTTagFloat )
return ( (NBTBase.NBTPrimitive) left ).getFloat() == ( (NBTBase.NBTPrimitive) right ).getFloat();
return ( (NBTPrimitive) left ).getFloat() == ( (NBTPrimitive) right ).getFloat();
case 3: // else if ( A instanceof NBTTagInt )
return ( (NBTBase.NBTPrimitive) left ).getInt() == ( (NBTBase.NBTPrimitive) right ).getInt();
return ( (NBTPrimitive) left ).getInt() == ( (NBTPrimitive) right ).getInt();
default:
return left.equals( right );
@ -654,22 +654,22 @@ public class Platform
}
case 1: // ( A instanceof NBTTagByte )
return hash + ( (NBTBase.NBTPrimitive) nbt ).getByte();
return hash + ( (NBTPrimitive) nbt ).getByte();
case 4: // else if ( A instanceof NBTTagLong )
return hash + (int) ( (NBTBase.NBTPrimitive) nbt ).getLong();
return hash + (int) ( (NBTPrimitive) nbt ).getLong();
case 8: // else if ( A instanceof NBTTagString )
return hash + ( (NBTTagString) nbt ).getString().hashCode();
case 6: // else if ( A instanceof NBTTagDouble )
return hash + (int) ( (NBTBase.NBTPrimitive) nbt ).getDouble();
return hash + (int) ( (NBTPrimitive) nbt ).getDouble();
case 5: // else if ( A instanceof NBTTagFloat )
return hash + (int) ( (NBTBase.NBTPrimitive) nbt ).getFloat();
return hash + (int) ( (NBTPrimitive) nbt ).getFloat();
case 3: // else if ( A instanceof NBTTagInt )
return hash + ( (NBTBase.NBTPrimitive) nbt ).getInt();
return hash + ( (NBTPrimitive) nbt ).getInt();
default:
return hash;