Auto format code
This commit is contained in:
parent
fc4d8686b8
commit
b25742dde0
175 changed files with 527 additions and 737 deletions
|
@ -24,21 +24,18 @@
|
|||
|
||||
package techreborn.items;
|
||||
|
||||
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.ActionResult;
|
||||
import net.minecraft.util.EnumActionResult;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import reborncore.RebornCore;
|
||||
|
||||
import techreborn.Core;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
|
||||
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
|
||||
|
||||
public class ItemDestructopack extends ItemTextureBase implements ITexturedItem {
|
||||
|
||||
public ItemDestructopack() {
|
||||
|
@ -49,9 +46,9 @@ public class ItemDestructopack extends ItemTextureBase implements ITexturedItem
|
|||
|
||||
@Override
|
||||
public ActionResult<ItemStack> onItemRightClick(final World world, final EntityPlayer player,
|
||||
final EnumHand hand) {
|
||||
final EnumHand hand) {
|
||||
player.openGui(Core.INSTANCE, EGui.DESTRUCTOPACK.ordinal(), world, (int) player.posX, (int) player.posY,
|
||||
(int) player.posY);
|
||||
(int) player.posY);
|
||||
return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand));
|
||||
}
|
||||
|
||||
|
|
|
@ -27,7 +27,6 @@ package techreborn.items;
|
|||
import com.google.common.base.CaseFormat;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
|
|
|
@ -27,7 +27,6 @@ package techreborn.items;
|
|||
import com.google.common.base.CaseFormat;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
|
|
|
@ -26,7 +26,6 @@ package techreborn.items;
|
|||
|
||||
import com.google.common.base.CaseFormat;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
|
|
|
@ -25,14 +25,11 @@
|
|||
package techreborn.items;
|
||||
|
||||
import com.google.common.base.CaseFormat;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import techreborn.Core;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
|
@ -42,13 +39,13 @@ import java.security.InvalidParameterException;
|
|||
|
||||
public class ItemParts extends ItemTRNoDestroy {
|
||||
public static final String[] types = new String[] { "energy_flow_circuit", "data_control_circuit", "data_storage_circuit",
|
||||
"data_orb", "diamond_grinding_head", "diamond_saw_blade", "tungsten_grinding_head", "helium_coolant_simple",
|
||||
"helium_coolant_triple", "helium_coolant_six", "nak_coolant_simple", "nak_coolant_triple", "nak_coolant_six",
|
||||
"cupronickel_heating_coil", "nichrome_heating_coil", "kanthal_heating_coil", ModItems.META_PLACEHOLDER, "super_conductor",
|
||||
"thorium_cell", "double_thorium_cell", "quad_thorium_cell", "plutonium_cell", "double_plutonium_cell",
|
||||
"quad_plutonium_cell", "computer_monitor", "machine_parts", "neutron_reflector", "iridium_neutron_reflector",
|
||||
"thick_neutron_reflector", "electronic_circuit", "advanced_circuit", "sap", "rubber", "scrap",
|
||||
"carbon_mesh", "carbon_fiber", "coolant_simple", "coolant_triple", "coolant_six" };
|
||||
"data_orb", "diamond_grinding_head", "diamond_saw_blade", "tungsten_grinding_head", "helium_coolant_simple",
|
||||
"helium_coolant_triple", "helium_coolant_six", "nak_coolant_simple", "nak_coolant_triple", "nak_coolant_six",
|
||||
"cupronickel_heating_coil", "nichrome_heating_coil", "kanthal_heating_coil", ModItems.META_PLACEHOLDER, "super_conductor",
|
||||
"thorium_cell", "double_thorium_cell", "quad_thorium_cell", "plutonium_cell", "double_plutonium_cell",
|
||||
"quad_plutonium_cell", "computer_monitor", "machine_parts", "neutron_reflector", "iridium_neutron_reflector",
|
||||
"thick_neutron_reflector", "electronic_circuit", "advanced_circuit", "sap", "rubber", "scrap",
|
||||
"carbon_mesh", "carbon_fiber", "coolant_simple", "coolant_triple", "coolant_six" };
|
||||
|
||||
public ItemParts() {
|
||||
this.setCreativeTab(TechRebornCreativeTab.instance);
|
||||
|
@ -110,7 +107,7 @@ public class ItemParts extends ItemTRNoDestroy {
|
|||
switch (itemStack.getItemDamage()) {
|
||||
case 37: // Destructo pack
|
||||
player.openGui(Core.INSTANCE, EGui.DESTRUCTOPACK.ordinal(), world, (int) player.posX, (int) player.posY,
|
||||
(int) player.posY);
|
||||
(int) player.posY);
|
||||
break;
|
||||
}
|
||||
return itemStack;
|
||||
|
|
|
@ -30,7 +30,6 @@ import net.minecraft.creativetab.CreativeTabs;
|
|||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.Container;
|
||||
import net.minecraft.inventory.IInventory;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
|
@ -105,10 +104,10 @@ public class ItemUpgrades extends ItemTRNoDestroy implements IUpgrade {
|
|||
@Override
|
||||
public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) {
|
||||
super.addInformation(stack, world, tooltip, flag);
|
||||
if(stack.getItemDamage() == 4 || stack.getItemDamage() == 5){
|
||||
if (stack.getItemDamage() == 4 || stack.getItemDamage() == 5) {
|
||||
tooltip.add("Facing: " + getFacing(stack).getName());
|
||||
String text = Core.proxy.getUpgradeConfigText();
|
||||
if(!text.isEmpty()){
|
||||
if (!text.isEmpty()) {
|
||||
tooltip.add(text);
|
||||
}
|
||||
}
|
||||
|
@ -123,77 +122,77 @@ public class ItemUpgrades extends ItemTRNoDestroy implements IUpgrade {
|
|||
@Nonnull
|
||||
ItemStack stack) {
|
||||
|
||||
if (stack.getItemDamage() == 0) {
|
||||
if(crafter != null) {
|
||||
crafter.addSpeedMulti(0.25);
|
||||
crafter.addPowerMulti(0.5);
|
||||
}
|
||||
if (stack.getItemDamage() == 0) {
|
||||
if (crafter != null) {
|
||||
crafter.addSpeedMulti(0.25);
|
||||
crafter.addPowerMulti(0.5);
|
||||
}
|
||||
|
||||
} else if(stack.getItemDamage() == 4){
|
||||
EnumFacing dir = getFacing(stack);
|
||||
TileEntity tileEntity = machineBase.getWorld().getTileEntity(machineBase.getPos().offset(dir));
|
||||
if(tileEntity instanceof IInventory){
|
||||
if(crafter != null){
|
||||
for(Integer outSlot : crafter.outputSlots){
|
||||
ItemStack outputStack = crafter.inventory.getStackInSlot(outSlot);
|
||||
if(!outputStack.isEmpty()){
|
||||
int amount = InventoryHelper.testInventoryInsertion((IInventory) tileEntity, outputStack, dir);
|
||||
if(amount > 0){
|
||||
InventoryHelper.insertItemIntoInventory((IInventory) tileEntity,outputStack);
|
||||
crafter.inventory.decrStackSize(outSlot, amount);
|
||||
}
|
||||
} else if (stack.getItemDamage() == 4) {
|
||||
EnumFacing dir = getFacing(stack);
|
||||
TileEntity tileEntity = machineBase.getWorld().getTileEntity(machineBase.getPos().offset(dir));
|
||||
if (tileEntity instanceof IInventory) {
|
||||
if (crafter != null) {
|
||||
for (Integer outSlot : crafter.outputSlots) {
|
||||
ItemStack outputStack = crafter.inventory.getStackInSlot(outSlot);
|
||||
if (!outputStack.isEmpty()) {
|
||||
int amount = InventoryHelper.testInventoryInsertion((IInventory) tileEntity, outputStack, dir);
|
||||
if (amount > 0) {
|
||||
InventoryHelper.insertItemIntoInventory((IInventory) tileEntity, outputStack);
|
||||
crafter.inventory.decrStackSize(outSlot, amount);
|
||||
}
|
||||
}
|
||||
} else if (machineBase instanceof IMachineSlotProvider){
|
||||
IMachineSlotProvider slotProvider = (IMachineSlotProvider) machineBase;
|
||||
for(Integer outSlot : slotProvider.getOuputSlots()){
|
||||
ItemStack outputStack = slotProvider.getMachineInv().getStackInSlot(outSlot);
|
||||
if(!outputStack.isEmpty()){
|
||||
int amount = InventoryHelper.testInventoryInsertion((IInventory) tileEntity, outputStack, dir);
|
||||
if(amount > 0){
|
||||
InventoryHelper.insertItemIntoInventory((IInventory) tileEntity,outputStack);
|
||||
slotProvider.getMachineInv().decrStackSize(outSlot, amount);
|
||||
}
|
||||
}
|
||||
} else if (machineBase instanceof IMachineSlotProvider) {
|
||||
IMachineSlotProvider slotProvider = (IMachineSlotProvider) machineBase;
|
||||
for (Integer outSlot : slotProvider.getOuputSlots()) {
|
||||
ItemStack outputStack = slotProvider.getMachineInv().getStackInSlot(outSlot);
|
||||
if (!outputStack.isEmpty()) {
|
||||
int amount = InventoryHelper.testInventoryInsertion((IInventory) tileEntity, outputStack, dir);
|
||||
if (amount > 0) {
|
||||
InventoryHelper.insertItemIntoInventory((IInventory) tileEntity, outputStack);
|
||||
slotProvider.getMachineInv().decrStackSize(outSlot, amount);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
IInventory inventory = machineBase;
|
||||
for (int outSlot = 0; outSlot < inventory.getSizeInventory(); outSlot++) {
|
||||
ItemStack outputStack = inventory.getStackInSlot(outSlot);
|
||||
if(!outputStack.isEmpty()){
|
||||
int amount = InventoryHelper.testInventoryInsertion((IInventory) tileEntity, outputStack, dir);
|
||||
if(amount > 0){
|
||||
InventoryHelper.insertItemIntoInventory((IInventory) tileEntity,outputStack);
|
||||
inventory.decrStackSize(outSlot, amount);
|
||||
}
|
||||
}
|
||||
} else {
|
||||
IInventory inventory = machineBase;
|
||||
for (int outSlot = 0; outSlot < inventory.getSizeInventory(); outSlot++) {
|
||||
ItemStack outputStack = inventory.getStackInSlot(outSlot);
|
||||
if (!outputStack.isEmpty()) {
|
||||
int amount = InventoryHelper.testInventoryInsertion((IInventory) tileEntity, outputStack, dir);
|
||||
if (amount > 0) {
|
||||
InventoryHelper.insertItemIntoInventory((IInventory) tileEntity, outputStack);
|
||||
inventory.decrStackSize(outSlot, amount);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} else if (stack.getItemDamage() == 5){
|
||||
if(machineBase.getWorld().getTotalWorldTime() % 10 != 0){
|
||||
return;
|
||||
}
|
||||
EnumFacing dir = getFacing(stack);
|
||||
TileEntity tileEntity = machineBase.getWorld().getTileEntity(machineBase.getPos().offset(dir));
|
||||
if(tileEntity != null && tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir.getOpposite())){
|
||||
IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir.getOpposite());
|
||||
for (int i = 0; i < itemHandler.getSlots(); i++) {
|
||||
ItemStack stack1 = itemHandler.getStackInSlot(i);
|
||||
if(crafter == null || crafter.isStackValidInput(stack1)){
|
||||
ItemStack extractedStack = itemHandler.extractItem(i, 1, true);
|
||||
int amount = InventoryHelper.testInventoryInsertion(machineBase, extractedStack, null);
|
||||
if(amount > 0){
|
||||
extractedStack = itemHandler.extractItem(i, 1, false);
|
||||
extractedStack.setCount(1);
|
||||
InventoryHelper.insertItemIntoInventory(machineBase , extractedStack);
|
||||
}
|
||||
}
|
||||
} else if (stack.getItemDamage() == 5) {
|
||||
if (machineBase.getWorld().getTotalWorldTime() % 10 != 0) {
|
||||
return;
|
||||
}
|
||||
EnumFacing dir = getFacing(stack);
|
||||
TileEntity tileEntity = machineBase.getWorld().getTileEntity(machineBase.getPos().offset(dir));
|
||||
if (tileEntity != null && tileEntity.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir.getOpposite())) {
|
||||
IItemHandler itemHandler = tileEntity.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, dir.getOpposite());
|
||||
for (int i = 0; i < itemHandler.getSlots(); i++) {
|
||||
ItemStack stack1 = itemHandler.getStackInSlot(i);
|
||||
if (crafter == null || crafter.isStackValidInput(stack1)) {
|
||||
ItemStack extractedStack = itemHandler.extractItem(i, 1, true);
|
||||
int amount = InventoryHelper.testInventoryInsertion(machineBase, extractedStack, null);
|
||||
if (amount > 0) {
|
||||
extractedStack = itemHandler.extractItem(i, 1, false);
|
||||
extractedStack.setCount(1);
|
||||
InventoryHelper.insertItemIntoInventory(machineBase, extractedStack);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if(machineBase instanceof TilePowerAcceptor){
|
||||
if (machineBase instanceof TilePowerAcceptor) {
|
||||
if (stack.getItemDamage() == 2) {
|
||||
TilePowerAcceptor acceptor = (TilePowerAcceptor) machineBase;
|
||||
acceptor.extraPowerStoage += 40000;
|
||||
|
@ -208,8 +207,8 @@ public class ItemUpgrades extends ItemTRNoDestroy implements IUpgrade {
|
|||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void handleRightClick(TileEntity tile, ItemStack stack, Container container, int slotID) {
|
||||
if(tile.getWorld().isRemote){
|
||||
if(stack.getItemDamage() == 4 || stack.getItemDamage() == 5){
|
||||
if (tile.getWorld().isRemote) {
|
||||
if (stack.getItemDamage() == 4 || stack.getItemDamage() == 5) {
|
||||
//TODO use the full gui handler
|
||||
Minecraft.getMinecraft().displayGuiScreen(new GuiSideConfig(Minecraft.getMinecraft().player, tile, getContainer(Minecraft.getMinecraft().player), slotID));
|
||||
}
|
||||
|
@ -217,11 +216,11 @@ public class ItemUpgrades extends ItemTRNoDestroy implements IUpgrade {
|
|||
}
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
public BuiltContainer getContainer(EntityPlayer player){
|
||||
public BuiltContainer getContainer(EntityPlayer player) {
|
||||
return new ContainerBuilder("sides").create();
|
||||
}
|
||||
|
||||
public EnumFacing getFacing(ItemStack stack){
|
||||
public EnumFacing getFacing(ItemStack stack) {
|
||||
return EnumFacing.VALUES[ItemNBTHelper.getInt(stack, "side", 0)];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -36,7 +36,6 @@ import net.minecraft.world.World;
|
|||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
|
|
@ -28,7 +28,6 @@ import net.minecraft.creativetab.CreativeTabs;
|
|||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.EntityEquipmentSlot;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemArmor;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
|
@ -36,7 +35,6 @@ import net.minecraft.world.World;
|
|||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
@ -108,7 +106,7 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack uncharged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK);
|
||||
ItemStack charged = new ItemStack(ModItems.LITHIUM_BATTERY_PACK);
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
@ -117,5 +115,4 @@ public class ItemLithiumBatpack extends ItemArmor implements IEnergyItemInfo {
|
|||
itemList.add(charged);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -32,7 +32,6 @@ import net.minecraft.world.World;
|
|||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
import techreborn.items.ItemTRNoDestroy;
|
||||
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
package techreborn.items.battery;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
package techreborn.items.battery;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
@ -43,7 +42,7 @@ public class ItemLapotronCrystal extends ItemBattery {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_CRYSTAL);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
package techreborn.items.battery;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
@ -44,7 +43,7 @@ public class ItemLapotronicOrb extends ItemBattery {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.LAPOTRONIC_ORB);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
package techreborn.items.battery;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
@ -43,7 +42,7 @@ public class ItemLithiumBattery extends ItemBattery {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.LITHIUM_BATTERY);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
package techreborn.items.battery;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
@ -43,7 +42,7 @@ public class ItemReBattery extends ItemBattery {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.RE_BATTERY);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
|
|
|
@ -27,7 +27,6 @@ package techreborn.items.tools;
|
|||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
@ -48,7 +47,7 @@ public class ItemAdvancedChainsaw extends ItemChainsaw {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.ADVANCED_CHAINSAW);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
|
|
|
@ -31,7 +31,6 @@ import net.minecraft.entity.EntityLivingBase;
|
|||
import net.minecraft.entity.item.EntityItem;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.NonNullList;
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
package techreborn.items.tools;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
@ -47,7 +46,7 @@ public class ItemAdvancedJackhammer extends ItemJackhammer {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.ADVANCED_JACKHAMMER);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
|
|
|
@ -38,7 +38,6 @@ import net.minecraft.world.World;
|
|||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
|
||||
|
|
|
@ -28,14 +28,12 @@ import net.minecraft.creativetab.CreativeTabs;
|
|||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.MobEffects;
|
||||
import net.minecraft.inventory.EntityEquipmentSlot;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
@ -107,7 +105,7 @@ public class ItemCloakingDevice extends ItemTRNoDestroy implements IEnergyItemIn
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack uncharged = new ItemStack(ModItems.CLOAKING_DEVICE);
|
||||
ItemStack charged = new ItemStack(ModItems.CLOAKING_DEVICE);
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
|
|
@ -27,7 +27,6 @@ package techreborn.items.tools;
|
|||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
@ -48,7 +47,7 @@ public class ItemDiamondChainsaw extends ItemChainsaw {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.DIAMOND_CHAINSAW);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
|
|
|
@ -27,7 +27,6 @@ package techreborn.items.tools;
|
|||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
@ -48,7 +47,7 @@ public class ItemDiamondDrill extends ItemDrill {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.DIAMOND_DRILL);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
package techreborn.items.tools;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
|
|
@ -34,7 +34,6 @@ import net.minecraft.item.ItemStack;
|
|||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
|
||||
|
|
|
@ -29,23 +29,21 @@ import net.minecraft.block.Block;
|
|||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.EnumActionResult;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.compat.CompatManager;
|
||||
import techreborn.init.ModItems;
|
||||
import techreborn.items.ItemTRNoDestroy;
|
||||
import techreborn.compat.CompatManager;
|
||||
|
||||
/**
|
||||
* Created by modmuss50 on 05/11/2016.
|
||||
|
@ -66,7 +64,7 @@ public class ItemElectricTreetap extends ItemTRNoDestroy implements IEnergyItemI
|
|||
public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
|
||||
IBlockState state = worldIn.getBlockState(pos);
|
||||
Block block = state.getBlock();
|
||||
if(CompatManager.isIC2Loaded && block == Block.getBlockFromName("ic2:rubber_wood") && PoweredItem.canUseEnergy(20, playerIn.getHeldItem(hand)))
|
||||
if (CompatManager.isIC2Loaded && block == Block.getBlockFromName("ic2:rubber_wood") && PoweredItem.canUseEnergy(20, playerIn.getHeldItem(hand)))
|
||||
if (ItemTreetap.attemptExtract(playerIn, worldIn, pos, side, state, null) && !worldIn.isRemote) {
|
||||
PoweredItem.useEnergy(20, playerIn.getHeldItem(hand));
|
||||
return EnumActionResult.SUCCESS;
|
||||
|
@ -111,4 +109,4 @@ public class ItemElectricTreetap extends ItemTRNoDestroy implements IEnergyItemI
|
|||
itemList.add(charged);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -31,7 +31,6 @@ import net.minecraft.enchantment.EnchantmentHelper;
|
|||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Enchantments;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemPickaxe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
|
@ -39,14 +38,11 @@ import net.minecraft.util.math.BlockPos;
|
|||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.RebornCore;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.utils.OreDictUtils;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo {
|
||||
|
@ -80,7 +76,7 @@ public class ItemJackhammer extends ItemPickaxe implements IEnergyItemInfo {
|
|||
@Override
|
||||
public boolean canHarvestBlock(final IBlockState state, final ItemStack stack) {
|
||||
return OreDictUtils.isOre(state, "stone")
|
||||
|| state.getBlock().getMaterial(state) == Material.ROCK && PoweredItem.canUseEnergy(this.cost, stack);
|
||||
|| state.getBlock().getMaterial(state) == Material.ROCK && PoweredItem.canUseEnergy(this.cost, stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
@ -34,7 +34,6 @@ import net.minecraft.entity.ai.attributes.AttributeModifier;
|
|||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.inventory.EntityEquipmentSlot;
|
||||
import net.minecraft.item.IItemPropertyGetter;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemSword;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
@ -46,7 +45,6 @@ import net.minecraft.world.World;
|
|||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
import reborncore.common.util.ChatUtils;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
|
@ -115,7 +113,7 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack inactiveUncharged = new ItemStack(ModItems.NANOSABER);
|
||||
inactiveUncharged.setTagCompound(new NBTTagCompound());
|
||||
inactiveUncharged.getTagCompound().setBoolean("isActive", false);
|
||||
|
@ -143,17 +141,16 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ActionResult<ItemStack> onItemRightClick(final World world, final EntityPlayer player,
|
||||
final EnumHand hand) {
|
||||
final EnumHand hand) {
|
||||
final ItemStack stack = player.getHeldItem(hand);
|
||||
if (player.isSneaking()) {
|
||||
if (!PoweredItem.canUseEnergy(this.cost, stack)) {
|
||||
ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new TextComponentString(
|
||||
TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.nanosaberEnergyErrorTo") + " "
|
||||
+ TextFormatting.GOLD + I18n
|
||||
.translateToLocal("techreborn.message.nanosaberActivate")));
|
||||
TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.nanosaberEnergyErrorTo") + " "
|
||||
+ TextFormatting.GOLD + I18n
|
||||
.translateToLocal("techreborn.message.nanosaberActivate")));
|
||||
} else {
|
||||
if (stack.getTagCompound() == null || !stack.getTagCompound().getBoolean("isActive")) {
|
||||
if (stack.getTagCompound() == null) {
|
||||
|
@ -162,17 +159,17 @@ public class ItemNanosaber extends ItemSword implements IEnergyItemInfo {
|
|||
stack.getTagCompound().setBoolean("isActive", true);
|
||||
if (world.isRemote && ConfigTechReborn.NanosaberChat) {
|
||||
ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new TextComponentString(
|
||||
TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " "
|
||||
+ TextFormatting.GOLD + I18n
|
||||
.translateToLocal("techreborn.message.nanosaberActive")));
|
||||
TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " "
|
||||
+ TextFormatting.GOLD + I18n
|
||||
.translateToLocal("techreborn.message.nanosaberActive")));
|
||||
}
|
||||
} else {
|
||||
stack.getTagCompound().setBoolean("isActive", false);
|
||||
if (world.isRemote && ConfigTechReborn.NanosaberChat) {
|
||||
ChatUtils.sendNoSpamMessages(MessageIDs.nanosaberID, new TextComponentString(
|
||||
TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " "
|
||||
+ TextFormatting.GOLD + I18n
|
||||
.translateToLocal("techreborn.message.nanosaberInactive")));
|
||||
TextFormatting.GRAY + I18n.translateToLocal("techreborn.message.setTo") + " "
|
||||
+ TextFormatting.GOLD + I18n
|
||||
.translateToLocal("techreborn.message.nanosaberInactive")));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -30,7 +30,6 @@ import net.minecraft.creativetab.CreativeTabs;
|
|||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemPickaxe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.*;
|
||||
|
@ -40,7 +39,6 @@ import net.minecraft.world.World;
|
|||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
import reborncore.common.util.TorchHelper;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
|
@ -146,7 +144,7 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack uncharged = new ItemStack(ModItems.OMNI_TOOL);
|
||||
ItemStack charged = new ItemStack(ModItems.OMNI_TOOL);
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
@ -155,7 +153,6 @@ public class ItemOmniTool extends ItemPickaxe implements IEnergyItemInfo {
|
|||
itemList.add(charged);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, World world, List<String> tooltip, ITooltipFlag flag) {
|
||||
tooltip.add(TextFormatting.RED + "WIP Coming Soon");
|
||||
|
|
|
@ -32,7 +32,6 @@ import net.minecraft.entity.EntityLivingBase;
|
|||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Enchantments;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemPickaxe;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
|
@ -41,7 +40,6 @@ import net.minecraft.world.World;
|
|||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.api.power.IEnergyItemInfo;
|
||||
import reborncore.common.powerSystem.PowerSystem;
|
||||
import reborncore.common.powerSystem.PoweredItem;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.config.ConfigTechReborn;
|
||||
|
@ -143,7 +141,7 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack uncharged = new ItemStack(ModItems.ROCK_CUTTER);
|
||||
ItemStack charged = new ItemStack(ModItems.ROCK_CUTTER);
|
||||
PoweredItem.setEnergy(getMaxPower(charged), charged);
|
||||
|
@ -152,5 +150,4 @@ public class ItemRockCutter extends ItemPickaxe implements IEnergyItemInfo {
|
|||
itemList.add(charged);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
|
@ -27,7 +27,6 @@ package techreborn.items.tools;
|
|||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
@ -48,7 +47,7 @@ public class ItemSteelChainsaw extends ItemChainsaw {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.STEEL_CHAINSAW);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
|
|
|
@ -27,7 +27,6 @@ package techreborn.items.tools;
|
|||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
@ -48,7 +47,7 @@ public class ItemSteelDrill extends ItemDrill {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.STEEL_DRILL);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
package techreborn.items.tools;
|
||||
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
|
@ -47,7 +46,7 @@ public class ItemSteelJackhammer extends ItemJackhammer {
|
|||
@SideOnly(Side.CLIENT)
|
||||
@Override
|
||||
public void getSubItems(
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
CreativeTabs par2CreativeTabs, NonNullList itemList) {
|
||||
ItemStack stack = new ItemStack(ModItems.STEEL_JACKHAMMER);
|
||||
ItemStack uncharged = stack.copy();
|
||||
ItemStack charged = stack.copy();
|
||||
|
|
|
@ -27,7 +27,6 @@ package techreborn.items.tools;
|
|||
import net.minecraft.item.ItemHoe;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.RebornCore;
|
||||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
|
||||
public class ItemTRHoe extends ItemHoe {
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
package techreborn.items.tools;
|
||||
|
||||
import net.minecraft.item.ItemPickaxe;
|
||||
import reborncore.RebornCore;
|
||||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
|
||||
public class ItemTRPickaxe extends ItemPickaxe {
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
package techreborn.items.tools;
|
||||
|
||||
import net.minecraft.item.ItemSpade;
|
||||
import reborncore.RebornCore;
|
||||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
|
||||
public class ItemTRSpade extends ItemSpade {
|
||||
|
|
|
@ -25,7 +25,6 @@
|
|||
package techreborn.items.tools;
|
||||
|
||||
import net.minecraft.item.ItemSword;
|
||||
import reborncore.RebornCore;
|
||||
import techreborn.client.TechRebornCreativeTabMisc;
|
||||
|
||||
public class ItemTRSword extends ItemSword {
|
||||
|
|
|
@ -33,7 +33,6 @@ import net.minecraft.util.EnumHand;
|
|||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.util.text.translation.I18n;
|
||||
import net.minecraft.world.World;
|
||||
|
||||
import techreborn.Core;
|
||||
import techreborn.client.EGui;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
|
@ -51,9 +50,9 @@ public class ItemTechManual extends ItemTRNoDestroy {
|
|||
|
||||
@Override
|
||||
public ActionResult<ItemStack> onItemRightClick(final World world, final EntityPlayer player,
|
||||
final EnumHand hand) {
|
||||
final EnumHand hand) {
|
||||
player.openGui(Core.INSTANCE, EGui.MANUAL.ordinal(), world, (int) player.posX, (int) player.posY,
|
||||
(int) player.posY);
|
||||
(int) player.posY);
|
||||
return new ActionResult<>(EnumActionResult.SUCCESS, player.getHeldItem(hand));
|
||||
}
|
||||
|
||||
|
|
|
@ -25,25 +25,18 @@
|
|||
package techreborn.items.tools;
|
||||
|
||||
import ic2.core.item.tool.ItemTreetap;
|
||||
import me.modmuss50.jsonDestroyer.api.ITexturedItem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.state.IBlockState;
|
||||
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.EnumActionResult;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import reborncore.RebornCore;
|
||||
import techreborn.client.TechRebornCreativeTab;
|
||||
import techreborn.items.ItemTRNoDestroy;
|
||||
import techreborn.compat.CompatManager;
|
||||
import techreborn.lib.ModInfo;
|
||||
import techreborn.items.ItemTRNoDestroy;
|
||||
|
||||
public class ItemTreeTap extends ItemTRNoDestroy {
|
||||
|
||||
|
@ -54,12 +47,11 @@ public class ItemTreeTap extends ItemTRNoDestroy {
|
|||
setCreativeTab(TechRebornCreativeTab.instance);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public EnumActionResult onItemUse(EntityPlayer playerIn, World worldIn, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
|
||||
IBlockState state = worldIn.getBlockState(pos);
|
||||
Block block = state.getBlock();
|
||||
if(CompatManager.isIC2Loaded && block == Block.getBlockFromName("ic2:rubber_wood")) {
|
||||
if (CompatManager.isIC2Loaded && block == Block.getBlockFromName("ic2:rubber_wood")) {
|
||||
ItemTreetap.attemptExtract(playerIn, worldIn, pos, side, state, null);
|
||||
if (!worldIn.isRemote)
|
||||
playerIn.getHeldItem(hand).damageItem(1, playerIn);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue