Fixes for wrenching blocks. Closes #1417 and #1418

This commit is contained in:
drcrazy 2018-01-26 12:27:58 +03:00
parent 79582cd94b
commit 73b2f36b24
4 changed files with 101 additions and 15 deletions

View file

@ -38,6 +38,8 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraftforge.fml.common.registry.ForgeRegistries;
import org.apache.commons.lang3.tuple.Pair;
import reborncore.api.IToolDrop;
import reborncore.api.tile.IInventoryProvider;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.util.Inventory;
@ -45,6 +47,7 @@ import reborncore.common.util.ItemUtils;
import techreborn.client.container.IContainerProvider;
import techreborn.client.container.builder.BuiltContainer;
import techreborn.client.container.builder.ContainerBuilder;
import techreborn.init.ModBlocks;
import techreborn.init.ModSounds;
import javax.annotation.Nullable;
@ -54,7 +57,8 @@ import java.util.List;
/**
* Created by modmuss50 on 20/06/2017.
*/
public class TileAutoCraftingTable extends TilePowerAcceptor implements IContainerProvider, IInventoryProvider {
public class TileAutoCraftingTable extends TilePowerAcceptor
implements IContainerProvider, IInventoryProvider, IToolDrop {
ResourceLocation currentRecipe;
@ -445,4 +449,9 @@ public class TileAutoCraftingTable extends TilePowerAcceptor implements IContain
public EnumFacing getFacingEnum() {
return EnumFacing.NORTH;
}
@Override
public ItemStack getToolDrop(EntityPlayer playerIn) {
return new ItemStack(ModBlocks.AUTO_CRAFTING_TABLE, 1);
}
}

View file

@ -25,19 +25,22 @@
package techreborn.tiles;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import reborncore.api.IToolDrop;
import reborncore.common.blocks.BlockMachineBase;
import reborncore.common.powerSystem.TilePowerAcceptor;
import reborncore.common.registration.RebornRegistry;
import reborncore.common.registration.impl.ConfigRegistry;
import reborncore.common.util.WorldUtils;
import techreborn.init.ModBlocks;
import techreborn.lib.ModInfo;
import java.util.Iterator;
@RebornRegistry(modID = ModInfo.MOD_ID)
public class TilePlayerDectector extends TilePowerAcceptor {
public class TilePlayerDectector extends TilePowerAcceptor implements IToolDrop {
@ConfigRegistry(config = "machines", category = "player_detector", key = "PlayerDetectorMaxInput", comment = "Player Detector Max Input (Value in EU)")
public static int maxInput = 32;
@ -128,4 +131,9 @@ public class TilePlayerDectector extends TilePowerAcceptor {
tag.setString("ownerID", owenerUdid);
return tag;
}
@Override
public ItemStack getToolDrop(EntityPlayer p0) {
return new ItemStack(ModBlocks.PLAYER_DETECTOR, 1, 0);
}
}