diff --git a/build.gradle b/build.gradle index 58cdfc4e5..caadfe0d4 100644 --- a/build.gradle +++ b/build.gradle @@ -14,12 +14,12 @@ buildscript { apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'idea' -version = "1.10.2-r48" +version = "1.9.4-BTM2" group = "de.ellpeck.actuallyadditions" archivesBaseName = "ActuallyAdditions" minecraft { - version = "1.10.2-12.18.0.2002-1.10.0" + version = "1.9.4-12.17.0.1987" runDir = "idea" mappings = "snapshot_20160519" @@ -48,7 +48,7 @@ dependencies { //compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev" compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24" - deobfCompile "mezz.jei:jei_1.10:3.7.1.219" + deobfCompile "mezz.jei:jei_1.9.4:3.6.7.216" } processResources { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java index 9ea76f1a1..736771e7a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java @@ -23,7 +23,7 @@ public class DispenserHandlerFertilize extends BehaviorDefaultDispenseItem{ @Override public ItemStack dispenseStack(IBlockSource source, ItemStack stack){ - EnumFacing facing = source.func_189992_e().getValue(BlockDispenser.FACING); + EnumFacing facing = source.getWorld().getBlockState(source.getBlockPos()).getValue(BlockDispenser.FACING); BlockPos pos = source.getBlockPos().offset(facing); if(ItemDye.applyBonemeal(stack, source.getWorld(), pos)){ diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java index 22a3c12af..f75992a1c 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java @@ -188,7 +188,6 @@ public abstract class TileEntityBase extends TileEntity implements ITickable{ } } - @Override public ITextComponent getDisplayName(){ return new TextComponentTranslation("container."+ModUtil.MOD_ID+"."+this.name+".name"); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java index 65a202270..8e50c90f4 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java @@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.util; import de.ellpeck.actuallyadditions.mod.misc.ParticleColored; import de.ellpeck.actuallyadditions.mod.network.PacketHandler; import de.ellpeck.actuallyadditions.mod.network.PacketServerToClient; +import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase; import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.FontRenderer; @@ -51,7 +52,7 @@ public final class AssetUtil{ } @SideOnly(Side.CLIENT) - public static void displayNameString(FontRenderer font, int xSize, int yPositionOfMachineText, TileEntity tile){ + public static void displayNameString(FontRenderer font, int xSize, int yPositionOfMachineText, TileEntityBase tile){ displayNameString(font, xSize, yPositionOfMachineText, tile.getDisplayName().getFormattedText()); }