diff --git a/src/main/java/appeng/core/AppEng.java b/src/main/java/appeng/core/AppEng.java index 3fc386c60..de021e2b8 100644 --- a/src/main/java/appeng/core/AppEng.java +++ b/src/main/java/appeng/core/AppEng.java @@ -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"; diff --git a/src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java b/src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java index c738f610d..02f4e872e 100644 --- a/src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java +++ b/src/main/java/appeng/hooks/DispenserBehaviorTinyTNT.java @@ -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(); diff --git a/src/main/java/appeng/hooks/DispenserBlockTool.java b/src/main/java/appeng/hooks/DispenserBlockTool.java index 6600a0bab..eb2e88f39 100644 --- a/src/main/java/appeng/hooks/DispenserBlockTool.java +++ b/src/main/java/appeng/hooks/DispenserBlockTool.java @@ -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(); diff --git a/src/main/java/appeng/hooks/DispenserMatterCannon.java b/src/main/java/appeng/hooks/DispenserMatterCannon.java index b7e7a9a6d..8dae68427 100644 --- a/src/main/java/appeng/hooks/DispenserMatterCannon.java +++ b/src/main/java/appeng/hooks/DispenserMatterCannon.java @@ -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 ) { diff --git a/src/main/java/appeng/transformer/AppEngCore.java b/src/main/java/appeng/transformer/AppEngCore.java index 2b05169f6..1b0f996c8 100644 --- a/src/main/java/appeng/transformer/AppEngCore.java +++ b/src/main/java/appeng/transformer/AppEngCore.java @@ -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(); diff --git a/src/main/java/appeng/util/Platform.java b/src/main/java/appeng/util/Platform.java index 1c1f7ee4c..caa2f124d 100644 --- a/src/main/java/appeng/util/Platform.java +++ b/src/main/java/appeng/util/Platform.java @@ -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;