Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-14 20:29:08 +01:00
Code Issues Projects Releases Wiki Activity

1.9.4 branch again, because BTM

Browse source
This commit is contained in:
Ellpeck 2016-07-07 06:52:53 +02:00
parent 44f39bf069
commit 4246d8caa1
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build.gradle
View file

@ -14,12 +14,12 @@ buildscript {
apply plugin: 'net.minecraftforge.gradle.forge' apply plugin: 'net.minecraftforge.gradle.forge'
apply plugin: 'idea' apply plugin: 'idea'
version = "1.10.2-r48" version = "1.9.4-BTM2"
group = "de.ellpeck.actuallyadditions" group = "de.ellpeck.actuallyadditions"
archivesBaseName = "ActuallyAdditions" archivesBaseName = "ActuallyAdditions"
minecraft { minecraft {
version = "1.10.2-12.18.0.2002-1.10.0" version = "1.9.4-12.17.0.1987"
runDir = "idea" runDir = "idea"
mappings = "snapshot_20160519" mappings = "snapshot_20160519"
@ -48,7 +48,7 @@ dependencies {
//compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev" //compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev"
compile "net.darkhax.tesla:Tesla:1.9.4-1.1.0.24" 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 { processResources {

2
src/main/java/de/ellpeck/actuallyadditions/mod/misc/DispenserHandlerFertilize.java
View file

@ -23,7 +23,7 @@ public class DispenserHandlerFertilize extends BehaviorDefaultDispenseItem{
@Override @Override
public ItemStack dispenseStack(IBlockSource source, ItemStack stack){ 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); BlockPos pos = source.getBlockPos().offset(facing);
if(ItemDye.applyBonemeal(stack, source.getWorld(), pos)){ if(ItemDye.applyBonemeal(stack, source.getWorld(), pos)){

1
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java
View file

@ -188,7 +188,6 @@ public abstract class TileEntityBase extends TileEntity implements ITickable{
} }
} }
@Override
public ITextComponent getDisplayName(){ public ITextComponent getDisplayName(){
return new TextComponentTranslation("container."+ModUtil.MOD_ID+"."+this.name+".name"); return new TextComponentTranslation("container."+ModUtil.MOD_ID+"."+this.name+".name");
} }

3
src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java
View file

@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.util;
import de.ellpeck.actuallyadditions.mod.misc.ParticleColored; import de.ellpeck.actuallyadditions.mod.misc.ParticleColored;
import de.ellpeck.actuallyadditions.mod.network.PacketHandler; import de.ellpeck.actuallyadditions.mod.network.PacketHandler;
import de.ellpeck.actuallyadditions.mod.network.PacketServerToClient; import de.ellpeck.actuallyadditions.mod.network.PacketServerToClient;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
import net.minecraft.block.Block; import net.minecraft.block.Block;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.FontRenderer; import net.minecraft.client.gui.FontRenderer;
@ -51,7 +52,7 @@ public final class AssetUtil{
} }
@SideOnly(Side.CLIENT) @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()); displayNameString(font, xSize, yPositionOfMachineText, tile.getDisplayName().getFormattedText());
} }