mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-12-23 03:49:22 +01:00
Little fixes here and there...
This commit is contained in:
Flanks255
parent
148d05a27d
commit
a6cba0f69b
10 changed files with 23 additions and 393 deletions
|
|
@ -1,364 +0,0 @@
|
|||
// TODO: [port][note] not used, this isn't how we do this any more
|
||||
///*
|
||||
// * This file ("CreativeTab.java") is part of the Actually Additions mod for Minecraft.
|
||||
// * It is created and owned by Ellpeck and distributed
|
||||
// * under the Actually Additions License to be found at
|
||||
// * http://ellpeck.de/actaddlicense
|
||||
// * View the source code at https://github.com/Ellpeck/ActuallyAdditions
|
||||
// *
|
||||
// * © 2015-2017 Ellpeck
|
||||
// */
|
||||
//
|
||||
//package de.ellpeck.actuallyadditions.mod.creative;
|
||||
//
|
||||
//import de.ellpeck.actuallyadditions.api.misc.IDisableableItem;
|
||||
//import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
|
||||
//import de.ellpeck.actuallyadditions.mod.blocks.InitBlocks;
|
||||
//import de.ellpeck.actuallyadditions.mod.fluids.InitFluids;
|
||||
//import de.ellpeck.actuallyadditions.mod.items.InitItems;
|
||||
//import net.minecraft.block.Block;
|
||||
//import net.minecraft.creativetab.CreativeTabs;
|
||||
//import net.minecraft.item.Item;
|
||||
//import net.minecraft.item.ItemStack;
|
||||
//import net.minecraft.util.NonNullList;
|
||||
//import net.minecraftforge.fluids.Fluid;
|
||||
//import net.minecraftforge.fluids.FluidStack;
|
||||
//import net.minecraftforge.fluids.FluidUtil;
|
||||
//import net.minecraftforge.fml.relauncher.Side;
|
||||
//
|
||||
//
|
||||
//public class CreativeTab extends CreativeTabs {
|
||||
//
|
||||
// public static final CreativeTab INSTANCE = new CreativeTab();
|
||||
// private NonNullList<ItemStack> list;
|
||||
//
|
||||
// public CreativeTab() {
|
||||
// super(ActuallyAdditions.MODID);
|
||||
// this.setBackgroundImageName(ActuallyAdditions.MODID + ".png");
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public boolean hasSearchBar() {
|
||||
// return true;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public int getSearchbarWidth() {
|
||||
// return 70;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public ItemStack createIcon() {
|
||||
// return new ItemStack(InitItems.itemBooklet);
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// @OnlyIn(Dist.CLIENT)
|
||||
// public void displayAllRelevantItems(NonNullList<ItemStack> list) {
|
||||
// this.list = list;
|
||||
//
|
||||
// this.add(InitItems.itemBooklet);
|
||||
// this.add(InitBlocks.blockSmileyCloud);
|
||||
// this.add(InitBlocks.blockTinyTorch);
|
||||
//
|
||||
// this.add(InitBlocks.blockFireworkBox);
|
||||
// this.add(InitBlocks.blockLaserRelay);
|
||||
// this.add(InitBlocks.blockLaserRelayAdvanced);
|
||||
// this.add(InitBlocks.blockLaserRelayExtreme);
|
||||
// this.add(InitBlocks.blockLaserRelayFluids);
|
||||
// this.add(InitBlocks.blockLaserRelayItem);
|
||||
// this.add(InitBlocks.blockLaserRelayItemWhitelist);
|
||||
// this.add(InitBlocks.blockItemViewer);
|
||||
// this.add(InitBlocks.blockItemViewerHopping);
|
||||
// this.add(InitBlocks.blockAtomicReconstructor);
|
||||
// this.add(InitBlocks.blockEmpowerer);
|
||||
// this.add(InitBlocks.blockPhantomface);
|
||||
// this.add(InitBlocks.blockPhantomEnergyface);
|
||||
// this.add(InitBlocks.blockPhantomLiquiface);
|
||||
// this.add(InitBlocks.blockPhantomRedstoneface);
|
||||
// this.add(InitBlocks.blockPhantomPlacer);
|
||||
// this.add(InitBlocks.blockPhantomBreaker);
|
||||
// this.add(InitBlocks.blockPlayerInterface);
|
||||
// this.add(InitBlocks.blockInputter);
|
||||
// this.add(InitBlocks.blockInputterAdvanced);
|
||||
// this.add(InitBlocks.blockPhantomBooster);
|
||||
// this.add(InitBlocks.blockCoffeeMachine);
|
||||
// this.add(InitBlocks.blockXPSolidifier);
|
||||
// this.add(InitBlocks.blockDisplayStand);
|
||||
//
|
||||
// this.add(InitBlocks.blockFarmer);
|
||||
// this.add(InitBlocks.blockShockSuppressor);
|
||||
// this.add(InitBlocks.blockMiner);
|
||||
// this.add(InitBlocks.blockGreenhouseGlass);
|
||||
// this.add(InitBlocks.blockGrinder);
|
||||
// this.add(InitBlocks.blockGrinderDouble);
|
||||
// this.add(InitBlocks.blockFurnaceDouble);
|
||||
// this.add(InitBlocks.blockLavaFactoryController);
|
||||
//
|
||||
// this.add(InitBlocks.blockEnergizer);
|
||||
// this.add(InitBlocks.blockEnervator);
|
||||
//
|
||||
// this.add(InitBlocks.blockFurnaceSolar);
|
||||
// this.add(InitBlocks.blockHeatCollector);
|
||||
// this.add(InitBlocks.blockCoalGenerator);
|
||||
// this.add(InitBlocks.blockOilGenerator);
|
||||
// this.add(InitBlocks.blockLeafGenerator);
|
||||
// this.add(InitBlocks.blockBioReactor);
|
||||
//
|
||||
// this.add(InitBlocks.blockItemRepairer);
|
||||
// this.add(InitBlocks.blockFishingNet);
|
||||
// this.add(InitBlocks.blockBreaker);
|
||||
// this.add(InitBlocks.blockDirectionalBreaker);
|
||||
// this.add(InitBlocks.blockRangedCollector);
|
||||
// this.add(InitBlocks.blockPlacer);
|
||||
// this.add(InitBlocks.blockDropper);
|
||||
// this.add(InitBlocks.blockFluidPlacer);
|
||||
// this.add(InitBlocks.blockFluidCollector);
|
||||
// this.add(InitBlocks.blockBatteryBox);
|
||||
//
|
||||
// this.add(InitBlocks.blockMisc);
|
||||
// this.add(InitBlocks.blockFeeder);
|
||||
// this.add(InitBlocks.blockCompost);
|
||||
// this.add(InitBlocks.blockGiantChest);
|
||||
// this.add(InitBlocks.blockGiantChestMedium);
|
||||
// this.add(InitBlocks.blockGiantChestLarge);
|
||||
// this.add(InitBlocks.blockCanolaPress);
|
||||
// this.add(InitBlocks.blockFermentingBarrel);
|
||||
//
|
||||
// this.add(InitBlocks.blockTestifiBucksGreenWall);
|
||||
// this.add(InitBlocks.blockTestifiBucksWhiteWall);
|
||||
// this.add(InitBlocks.blockTestifiBucksGreenStairs);
|
||||
// this.add(InitBlocks.blockTestifiBucksWhiteStairs);
|
||||
// this.add(InitBlocks.blockTestifiBucksGreenSlab);
|
||||
// this.add(InitBlocks.blockTestifiBucksWhiteSlab);
|
||||
// this.add(InitBlocks.blockTestifiBucksGreenFence);
|
||||
// this.add(InitBlocks.blockTestifiBucksWhiteFence);
|
||||
//
|
||||
// this.add(InitBlocks.blockQuartzWall);
|
||||
// this.add(InitBlocks.blockQuartzStair);
|
||||
// this.add(InitBlocks.blockQuartzSlab);
|
||||
// this.add(InitBlocks.blockChiseledQuartzWall);
|
||||
// this.add(InitBlocks.blockChiseledQuartzStair);
|
||||
// this.add(InitBlocks.blockChiseledQuartzSlab);
|
||||
// this.add(InitBlocks.blockPillarQuartzWall);
|
||||
// this.add(InitBlocks.blockPillarQuartzStair);
|
||||
// this.add(InitBlocks.blockPillarQuartzSlab);
|
||||
//
|
||||
// this.add(InitBlocks.blockColoredLamp);
|
||||
// this.add(InitBlocks.blockColoredLampOn);
|
||||
// this.add(InitBlocks.blockLampPowerer);
|
||||
// this.add(InitBlocks.blockTreasureChest);
|
||||
//
|
||||
// this.add(InitBlocks.blockBlackLotus);
|
||||
//
|
||||
// this.add(InitItems.itemBag);
|
||||
// this.add(InitItems.itemVoidBag);
|
||||
//
|
||||
// this.add(InitItems.itemWorm);
|
||||
// this.add(InitItems.itemPlayerProbe);
|
||||
// this.add(InitItems.itemColorLens);
|
||||
// this.add(InitItems.itemExplosionLens);
|
||||
// this.add(InitItems.itemDamageLens);
|
||||
// this.add(InitItems.itemMoreDamageLens);
|
||||
// this.add(InitItems.itemDisenchantingLens);
|
||||
// this.add(InitItems.itemMiningLens);
|
||||
// this.add(InitItems.itemLaserWrench);
|
||||
// this.add(InitItems.itemLaserUpgradeInvisibility);
|
||||
// this.add(InitItems.itemLaserUpgradeRange);
|
||||
// this.add(InitItems.itemEngineerGoggles);
|
||||
// this.add(InitItems.itemEngineerGogglesAdvanced);
|
||||
// this.add(InitItems.itemCrateKeeper);
|
||||
// this.add(InitItems.itemChestToCrateUpgrade);
|
||||
// this.add(InitItems.itemSmallToMediumCrateUpgrade);
|
||||
// this.add(InitItems.itemMediumToLargeCrateUpgrade);
|
||||
// this.add(InitItems.itemSpawnerChanger);
|
||||
// this.add(InitItems.itemWaterBowl);
|
||||
//
|
||||
// this.add(InitItems.itemDrill);
|
||||
// this.add(InitItems.itemDrillUpgradeSpeed);
|
||||
// this.add(InitItems.itemDrillUpgradeSpeedII);
|
||||
// this.add(InitItems.itemDrillUpgradeSpeedIII);
|
||||
// this.add(InitItems.itemDrillUpgradeSilkTouch);
|
||||
// this.add(InitItems.itemDrillUpgradeFortune);
|
||||
// this.add(InitItems.itemDrillUpgradeFortuneII);
|
||||
// this.add(InitItems.itemDrillUpgradeThreeByThree);
|
||||
// this.add(InitItems.itemDrillUpgradeFiveByFive);
|
||||
// this.add(InitItems.itemDrillUpgradeBlockPlacing);
|
||||
// this.add(InitItems.itemBattery);
|
||||
// this.add(InitItems.itemBatteryDouble);
|
||||
// this.add(InitItems.itemBatteryTriple);
|
||||
// this.add(InitItems.itemBatteryQuadruple);
|
||||
// this.add(InitItems.itemBatteryQuintuple);
|
||||
// this.add(InitItems.itemTeleStaff);
|
||||
// this.add(InitItems.itemFillingWand);
|
||||
//
|
||||
// this.add(InitItems.itemGrowthRing);
|
||||
// this.add(InitItems.itemMagnetRing);
|
||||
// this.add(InitItems.itemWaterRemovalRing);
|
||||
//
|
||||
// this.list.add(FluidUtil.getFilledBucket(new FluidStack(InitFluids.fluidCanolaOil, Fluid.BUCKET_VOLUME)));
|
||||
// this.list.add(FluidUtil.getFilledBucket(new FluidStack(InitFluids.fluidRefinedCanolaOil, Fluid.BUCKET_VOLUME)));
|
||||
// this.list.add(FluidUtil.getFilledBucket(new FluidStack(InitFluids.fluidCrystalOil, Fluid.BUCKET_VOLUME)));
|
||||
// this.list.add(FluidUtil.getFilledBucket(new FluidStack(InitFluids.fluidEmpoweredOil, Fluid.BUCKET_VOLUME)));
|
||||
//
|
||||
// this.add(InitItems.itemPhantomConnector);
|
||||
// this.add(InitItems.itemFilter);
|
||||
// this.add(InitItems.itemWingsOfTheBats);
|
||||
//
|
||||
// this.add(InitItems.itemCoffeeSeed);
|
||||
// this.add(InitItems.itemCoffeeBean);
|
||||
// this.add(InitItems.itemRiceSeed);
|
||||
// this.add(InitItems.itemCanolaSeed);
|
||||
// this.add(InitItems.itemFlaxSeed);
|
||||
// this.add(InitItems.itemHairyBall);
|
||||
// this.add(InitItems.itemMisc);
|
||||
// this.add(InitItems.itemResonantRice);
|
||||
// this.add(InitItems.itemFertilizer);
|
||||
//
|
||||
// this.add(InitItems.itemCoffee);
|
||||
// this.add(InitItems.itemFoods);
|
||||
// this.add(InitItems.itemKnife);
|
||||
// this.add(InitItems.itemCrafterOnAStick);
|
||||
// this.add(InitItems.itemDust);
|
||||
// this.add(InitItems.itemSolidifiedExperience);
|
||||
// this.add(InitItems.itemLeafBlower);
|
||||
// this.add(InitItems.itemLeafBlowerAdvanced);
|
||||
//
|
||||
// this.add(InitItems.woodenPaxel);
|
||||
// this.add(InitItems.stonePaxel);
|
||||
// this.add(InitItems.ironPaxel);
|
||||
// this.add(InitItems.goldPaxel);
|
||||
// this.add(InitItems.diamondPaxel);
|
||||
// this.add(InitItems.emeraldPaxel);
|
||||
// this.add(InitItems.obsidianPaxel);
|
||||
// this.add(InitItems.quartzPaxel);
|
||||
// this.add(InitItems.itemPaxelCrystalRed);
|
||||
// this.add(InitItems.itemPaxelCrystalBlue);
|
||||
// this.add(InitItems.itemPaxelCrystalLightBlue);
|
||||
// this.add(InitItems.itemPaxelCrystalBlack);
|
||||
// this.add(InitItems.itemPaxelCrystalGreen);
|
||||
// this.add(InitItems.itemPaxelCrystalWhite);
|
||||
//
|
||||
// this.add(InitBlocks.blockCrystalClusterRedstone);
|
||||
// this.add(InitBlocks.blockCrystalClusterLapis);
|
||||
// this.add(InitBlocks.blockCrystalClusterDiamond);
|
||||
// this.add(InitBlocks.blockCrystalClusterCoal);
|
||||
// this.add(InitBlocks.blockCrystalClusterEmerald);
|
||||
// this.add(InitBlocks.blockCrystalClusterIron);
|
||||
// this.add(InitBlocks.blockCrystal);
|
||||
// this.add(InitBlocks.blockCrystalEmpowered);
|
||||
// this.add(InitItems.itemCrystal);
|
||||
// this.add(InitItems.itemCrystalEmpowered);
|
||||
// this.add(InitItems.itemCrystalShard);
|
||||
//
|
||||
// this.add(InitItems.itemJams);
|
||||
//
|
||||
// this.add(InitItems.itemPotionRing);
|
||||
// this.add(InitItems.itemPotionRingAdvanced);
|
||||
//
|
||||
// this.add(InitItems.itemPickaxeQuartz);
|
||||
// this.add(InitItems.itemSwordQuartz);
|
||||
// this.add(InitItems.itemAxeQuartz);
|
||||
// this.add(InitItems.itemShovelQuartz);
|
||||
// this.add(InitItems.itemHoeQuartz);
|
||||
//
|
||||
// this.add(InitItems.itemHelmQuartz);
|
||||
// this.add(InitItems.itemChestQuartz);
|
||||
// this.add(InitItems.itemPantsQuartz);
|
||||
// this.add(InitItems.itemBootsQuartz);
|
||||
//
|
||||
// this.add(InitItems.itemPickaxeEmerald);
|
||||
// this.add(InitItems.itemSwordEmerald);
|
||||
// this.add(InitItems.itemAxeEmerald);
|
||||
// this.add(InitItems.itemShovelEmerald);
|
||||
// this.add(InitItems.itemHoeEmerald);
|
||||
//
|
||||
// this.add(InitItems.itemHelmEmerald);
|
||||
// this.add(InitItems.itemChestEmerald);
|
||||
// this.add(InitItems.itemPantsEmerald);
|
||||
// this.add(InitItems.itemBootsEmerald);
|
||||
//
|
||||
// this.add(InitItems.itemPickaxeObsidian);
|
||||
// this.add(InitItems.itemSwordObsidian);
|
||||
// this.add(InitItems.itemAxeObsidian);
|
||||
// this.add(InitItems.itemShovelObsidian);
|
||||
// this.add(InitItems.itemHoeObsidian);
|
||||
//
|
||||
// this.add(InitItems.itemHelmObsidian);
|
||||
// this.add(InitItems.itemChestObsidian);
|
||||
// this.add(InitItems.itemPantsObsidian);
|
||||
// this.add(InitItems.itemBootsObsidian);
|
||||
//
|
||||
// this.add(InitItems.itemPickaxeCrystalRed);
|
||||
// this.add(InitItems.itemAxeCrystalRed);
|
||||
// this.add(InitItems.itemShovelCrystalRed);
|
||||
// this.add(InitItems.itemSwordCrystalRed);
|
||||
// this.add(InitItems.itemHoeCrystalRed);
|
||||
// this.add(InitItems.itemHelmCrystalRed);
|
||||
// this.add(InitItems.itemChestCrystalRed);
|
||||
// this.add(InitItems.itemPantsCrystalRed);
|
||||
// this.add(InitItems.itemBootsCrystalRed);
|
||||
//
|
||||
// this.add(InitItems.itemPickaxeCrystalBlue);
|
||||
// this.add(InitItems.itemAxeCrystalBlue);
|
||||
// this.add(InitItems.itemShovelCrystalBlue);
|
||||
// this.add(InitItems.itemSwordCrystalBlue);
|
||||
// this.add(InitItems.itemHoeCrystalBlue);
|
||||
// this.add(InitItems.itemHelmCrystalBlue);
|
||||
// this.add(InitItems.itemChestCrystalBlue);
|
||||
// this.add(InitItems.itemPantsCrystalBlue);
|
||||
// this.add(InitItems.itemBootsCrystalBlue);
|
||||
//
|
||||
// this.add(InitItems.itemPickaxeCrystalLightBlue);
|
||||
// this.add(InitItems.itemAxeCrystalLightBlue);
|
||||
// this.add(InitItems.itemShovelCrystalLightBlue);
|
||||
// this.add(InitItems.itemSwordCrystalLightBlue);
|
||||
// this.add(InitItems.itemHoeCrystalLightBlue);
|
||||
// this.add(InitItems.itemHelmCrystalLightBlue);
|
||||
// this.add(InitItems.itemChestCrystalLightBlue);
|
||||
// this.add(InitItems.itemPantsCrystalLightBlue);
|
||||
// this.add(InitItems.itemBootsCrystalLightBlue);
|
||||
//
|
||||
// this.add(InitItems.itemPickaxeCrystalBlack);
|
||||
// this.add(InitItems.itemAxeCrystalBlack);
|
||||
// this.add(InitItems.itemShovelCrystalBlack);
|
||||
// this.add(InitItems.itemSwordCrystalBlack);
|
||||
// this.add(InitItems.itemHoeCrystalBlack);
|
||||
// this.add(InitItems.itemHelmCrystalBlack);
|
||||
// this.add(InitItems.itemChestCrystalBlack);
|
||||
// this.add(InitItems.itemPantsCrystalBlack);
|
||||
// this.add(InitItems.itemBootsCrystalBlack);
|
||||
//
|
||||
// this.add(InitItems.itemPickaxeCrystalGreen);
|
||||
// this.add(InitItems.itemAxeCrystalGreen);
|
||||
// this.add(InitItems.itemShovelCrystalGreen);
|
||||
// this.add(InitItems.itemSwordCrystalGreen);
|
||||
// this.add(InitItems.itemHoeCrystalGreen);
|
||||
// this.add(InitItems.itemHelmCrystalGreen);
|
||||
// this.add(InitItems.itemChestCrystalGreen);
|
||||
// this.add(InitItems.itemPantsCrystalGreen);
|
||||
// this.add(InitItems.itemBootsCrystalGreen);
|
||||
//
|
||||
// this.add(InitItems.itemPickaxeCrystalWhite);
|
||||
// this.add(InitItems.itemAxeCrystalWhite);
|
||||
// this.add(InitItems.itemShovelCrystalWhite);
|
||||
// this.add(InitItems.itemSwordCrystalWhite);
|
||||
// this.add(InitItems.itemHoeCrystalWhite);
|
||||
// this.add(InitItems.itemHelmCrystalWhite);
|
||||
// this.add(InitItems.itemChestCrystalWhite);
|
||||
// this.add(InitItems.itemPantsCrystalWhite);
|
||||
// this.add(InitItems.itemBootsCrystalWhite);
|
||||
// }
|
||||
//
|
||||
// public void add(Item item) {
|
||||
// if (item != null && (!(item instanceof IDisableableItem) || item instanceof IDisableableItem && !((IDisableableItem) item).isDisabled())) {
|
||||
// item.getSubItems(INSTANCE, this.list);
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// public void add(Block block) {
|
||||
// if (block != null) {
|
||||
// block.getSubBlocks(INSTANCE, this.list);
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
|
@ -17,7 +17,6 @@ import de.ellpeck.actuallyadditions.mod.data.PlayerData;
|
|||
import de.ellpeck.actuallyadditions.mod.inventory.gui.*;
|
||||
import de.ellpeck.actuallyadditions.mod.items.ItemBooklet;
|
||||
import de.ellpeck.actuallyadditions.mod.tile.TileEntityBase;
|
||||
import de.ellpeck.actuallyadditions.mod.util.compat.CompatUtil;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
|
|
|
|||
|
|
@ -97,7 +97,6 @@ public final class ActuallyItems {
|
|||
public static final RegistryObject<Item> PLAYER_PROBE = ITEMS.register("player_probe", ItemPlayerProbe::new);
|
||||
public static final RegistryObject<Item> FILTER = ITEMS.register("filter", ItemFilter::new);
|
||||
public static final RegistryObject<Item> WATER_BOWL = ITEMS.register("water_bowl", ItemWaterBowl::new);
|
||||
public static final RegistryObject<Item> SPAWNER_CHANGER = ITEMS.register("spawner_changer", ItemSpawnerChanger::new);
|
||||
public static final RegistryObject<Item> CRATE_KEEPER = ITEMS.register("crate_keeper", () -> new ItemGeneric(defaultProps().stacksTo(1)));
|
||||
public static final RegistryObject<Item> COLOR_LENS = ITEMS.register("color_lens", () -> new ItemLens(ActuallyAdditionsAPI.lensColor));
|
||||
public static final RegistryObject<Item> EXPLOSION_LENS = ITEMS.register("explosion_lens", () -> new ItemLens(ActuallyAdditionsAPI.lensDetonation));
|
||||
|
|
|
|||
|
|
@ -17,21 +17,22 @@ import de.ellpeck.actuallyadditions.mod.items.base.ItemToolAA;
|
|||
import de.ellpeck.actuallyadditions.mod.util.IColorProvidingItem;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.enchantment.Enchantment;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.IItemTier;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.util.ActionResultType;
|
||||
import net.minecraft.util.Direction;
|
||||
import net.minecraft.util.EnumActionResult;
|
||||
import net.minecraft.util.Hand;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
|
@ -60,7 +61,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem {
|
|||
}
|
||||
|
||||
@Override
|
||||
public EnumActionResult onItemUse(PlayerEntity playerIn, World worldIn, BlockPos pos, Hand hand, Direction side, float hitX, float hitY, float hitZ) {
|
||||
public ActionResultType onItemUse(PlayerEntity playerIn, World worldIn, BlockPos pos, Hand hand, Direction side, float hitX, float hitY, float hitZ) {
|
||||
if (!playerIn.isShiftKeyDown()) {
|
||||
return Items.IRON_HOE.onItemUse(playerIn, worldIn, pos, hand, side, hitX, hitY, hitZ);
|
||||
}
|
||||
|
|
@ -103,7 +104,7 @@ public class ItemAllToolAA extends ItemToolAA implements IColorProvidingItem {
|
|||
|
||||
@Override
|
||||
public float getDestroySpeed(ItemStack stack, BlockState state) {
|
||||
if (state.getBlock() == Blocks.WEB) {
|
||||
if (state.getBlock() == Blocks.COBWEB) {
|
||||
return 15.0F;
|
||||
} else {
|
||||
return this.hasExtraWhitelist(state.getBlock()) || state.getBlock().getHarvestTool(state) == null || state.getBlock().getHarvestTool(state).isEmpty() || this.getToolClasses(stack).contains(state.getBlock().getHarvestTool(state))
|
||||
|
|
|
|||
|
|
@ -57,8 +57,7 @@ public class ItemDrill extends ItemEnergy {
|
|||
private static final int ENERGY_USE = 100;
|
||||
|
||||
public ItemDrill() {
|
||||
super(250000, 1000, name);
|
||||
this.setMaxDamage(0);
|
||||
super(ActuallyItems.defaultProps().defaultDurability(0).stacksTo(1), 250000, 1000);
|
||||
this.setHasSubtypes(true);
|
||||
this.setHarvestLevel("shovel", HARVEST_LEVEL);
|
||||
this.setHarvestLevel("pickaxe", HARVEST_LEVEL);
|
||||
|
|
@ -240,6 +239,7 @@ public class ItemDrill extends ItemEnergy {
|
|||
|
||||
@Override
|
||||
public boolean canHarvestBlock(ItemStack stack, BlockState state) {
|
||||
Block block = state.getBlock();
|
||||
return this.getEnergyStored(stack) >= this.getEnergyUsePerBlock(stack) && (this.hasExtraWhitelist(block) || state.getMaterial().isToolNotRequired() || block == Blocks.SNOW_LAYER || block == Blocks.SNOW || (block == Blocks.OBSIDIAN
|
||||
? HARVEST_LEVEL >= 3
|
||||
: block != Blocks.DIAMOND_BLOCK && block != Blocks.DIAMOND_ORE
|
||||
|
|
@ -247,7 +247,7 @@ public class ItemDrill extends ItemEnergy {
|
|||
? block != Blocks.GOLD_BLOCK && block != Blocks.GOLD_ORE
|
||||
? block != Blocks.IRON_BLOCK && block != Blocks.IRON_ORE
|
||||
? block != Blocks.LAPIS_BLOCK && block != Blocks.LAPIS_ORE
|
||||
? block != Blocks.REDSTONE_ORE && block != Blocks.LIT_REDSTONE_ORE
|
||||
? block != Blocks.REDSTONE_ORE
|
||||
? state.getMaterial() == Material.STONE || state.getMaterial() == Material.METAL || state.getMaterial() == Material.HEAVY_METAL
|
||||
: HARVEST_LEVEL >= 2
|
||||
: HARVEST_LEVEL >= 1
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ public class ItemPickaxeAA extends ItemToolAA {
|
|||
if (block != Blocks.GOLD_BLOCK && block != Blocks.GOLD_ORE) {
|
||||
if (block != Blocks.IRON_BLOCK && block != Blocks.IRON_ORE) {
|
||||
if (block != Blocks.LAPIS_BLOCK && block != Blocks.LAPIS_ORE) {
|
||||
if (block != Blocks.REDSTONE_ORE && block != Blocks.LIT_REDSTONE_ORE) {
|
||||
if (block != Blocks.REDSTONE_ORE) {
|
||||
Material material = blockIn.getMaterial();
|
||||
return material == Material.STONE || material == Material.METAL || material == Material.HEAVY_METAL;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -20,14 +20,10 @@ import de.ellpeck.actuallyadditions.mod.util.StringUtil;
|
|||
import de.ellpeck.actuallyadditions.mod.util.Util;
|
||||
import net.minecraft.client.renderer.color.IItemColor;
|
||||
import net.minecraft.client.util.ITooltipFlag;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.potion.Potion;
|
||||
import net.minecraft.potion.PotionEffect;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.NonNullList;
|
||||
import net.minecraft.util.math.AxisAlignedBB;
|
||||
|
|
|
|||
|
|
@ -48,6 +48,11 @@ public abstract class ItemEnergy extends ItemBase {
|
|||
this.maxPower = maxPower;
|
||||
this.transfer = transfer;
|
||||
}
|
||||
public ItemEnergy(Properties props, int maxPower, int transfer) {
|
||||
super(props);
|
||||
this.maxPower = maxPower;
|
||||
this.transfer = transfer;
|
||||
}
|
||||
|
||||
// TODO: [port] make sure this is right
|
||||
@Nullable
|
||||
|
|
|
|||
|
|
@ -16,10 +16,8 @@ import de.ellpeck.actuallyadditions.mod.util.ItemUtil;
|
|||
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
|
||||
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ToolItem;
|
||||
import net.minecraftforge.common.IRarity;
|
||||
import net.minecraftforge.oredict.OreDictionary;
|
||||
import net.minecraft.item.*;
|
||||
import net.minecraft.tags.ITag;
|
||||
|
||||
import java.util.Set;
|
||||
|
||||
|
|
@ -27,10 +25,10 @@ public class ItemToolAA extends ToolItem implements IDisableableItem {
|
|||
|
||||
private final String name;
|
||||
private final ItemStack repairItem;
|
||||
private String repairOredict;
|
||||
private final ITag<Item> repairTag;
|
||||
private final boolean disabled;
|
||||
|
||||
public ItemToolAA(float attack, float speed, ToolMaterial toolMat, String repairItem, String unlocalizedName, IRarity rarity, Set<Block> effectiveStuff) {
|
||||
public ItemToolAA(float attack, float speed, IItemTier toolMat, String repairItem, String unlocalizedName, Rarity rarity, Set<Block> effectiveStuff) {
|
||||
this(attack, speed, toolMat, ItemStack.EMPTY, unlocalizedName, rarity, effectiveStuff);
|
||||
this.repairOredict = repairItem;
|
||||
}
|
||||
|
|
@ -54,13 +52,8 @@ public class ItemToolAA extends ToolItem implements IDisableableItem {
|
|||
public boolean isValidRepairItem(ItemStack itemToRepair, ItemStack stack) {
|
||||
if (StackUtil.isValid(this.repairItem)) {
|
||||
return ItemUtil.areItemsEqual(this.repairItem, stack, false);
|
||||
} else if (this.repairOredict != null) {
|
||||
int[] idsStack = OreDictionary.getOreIDs(stack);
|
||||
for (int id : idsStack) {
|
||||
if (OreDictionary.getOreName(id).equals(this.repairOredict)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
} else if (this.repairTag != null) {
|
||||
return repairTag.contains(stack.getItem());
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.tile;
|
|||
|
||||
import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
|
||||
import de.ellpeck.actuallyadditions.api.recipe.OilGenRecipe;
|
||||
import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
|
||||
import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntListValues;
|
||||
import de.ellpeck.actuallyadditions.mod.inventory.ContainerOilGenerator;
|
||||
import de.ellpeck.actuallyadditions.mod.util.Util;
|
||||
|
|
@ -78,7 +79,7 @@ public class TileEntityOilGenerator extends TileEntityBase implements ISharingEn
|
|||
private int lastCompare;
|
||||
|
||||
public TileEntityOilGenerator() {
|
||||
super(ActuallyTiles.OILGENERATOR_TILE.get());
|
||||
super(ActuallyBlocks.OIL_GENERATOR.getTileEntityType());
|
||||
}
|
||||
|
||||
private static OilGenRecipe getRecipeForFluid(String fluidName) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue