mirror of
https://github.com/Ellpeck/ActuallyAdditions.git
synced 2024-11-22 15:18:34 +01:00
Hud display port and nulled out creativeTab
This commit is contained in:
Michael
parent
6139ca68fa
commit
78b9055eae
7 changed files with 407 additions and 394 deletions
|
|
@ -11,6 +11,7 @@ import de.ellpeck.actuallyadditions.mod.util.StackUtil;
|
|||
import de.ellpeck.actuallyadditions.mod.util.StringUtil;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.BlockDirectional;
|
||||
import net.minecraft.block.BlockState;
|
||||
import net.minecraft.block.SoundType;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.block.state.BlockStateContainer;
|
||||
|
|
@ -20,24 +21,27 @@ import net.minecraft.client.gui.ScaledResolution;
|
|||
import net.minecraft.client.util.ITooltipFlag;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.EnumRarity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.EnumFacing;
|
||||
import net.minecraft.util.EnumHand;
|
||||
import net.minecraft.util.Mirror;
|
||||
import net.minecraft.util.Rotation;
|
||||
import net.minecraft.util.*;
|
||||
import net.minecraft.util.math.BlockPos;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.MathHelper;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraft.world.IBlockReader;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.common.ToolType;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
import java.util.List;
|
||||
|
||||
public class BlockAtomicReconstructor extends BlockContainerBase implements IHudDisplay {
|
||||
|
|
@ -52,15 +56,19 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
|
|||
.sound(SoundType.STONE));
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isOpaqueCube(IBlockState state) {
|
||||
return false;
|
||||
}
|
||||
// @Override
|
||||
// public boolean isOpaqueCube(IBlockState state) {
|
||||
// return false;
|
||||
// }
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing par6, float par7, float par8, float par9) {
|
||||
public ActionResultType onBlockActivated(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockRayTraceResult hit) {
|
||||
ItemStack heldItem = player.getHeldItem(hand);
|
||||
if (this.tryToggleRedstone(world, pos, player)) { return true; }
|
||||
if (this.tryToggleRedstone(world, pos, player)) {
|
||||
return ActionResultType.SUCCESS;
|
||||
}
|
||||
|
||||
if (!world.isRemote) {
|
||||
TileEntityAtomicReconstructor reconstructor = (TileEntityAtomicReconstructor) world.getTileEntity(pos);
|
||||
if (reconstructor != null) {
|
||||
|
|
@ -73,7 +81,7 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
|
|||
player.inventory.decrStackSize(player.inventory.currentItem, 1);
|
||||
}
|
||||
//Shush, don't tell anyone!
|
||||
else if (ConfigIntValues.ELEVEN.getValue() == 11 && item == Items.RECORD_11) {
|
||||
else if (ConfigIntValues.ELEVEN.getValue() == 11 && item == Items.MUSIC_DISC_11) {
|
||||
reconstructor.counter++;
|
||||
reconstructor.markDirty();
|
||||
}
|
||||
|
|
@ -86,18 +94,19 @@ public class BlockAtomicReconstructor extends BlockContainerBase implements IHud
|
|||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
return ActionResultType.SUCCESS;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public TileEntity createNewTileEntity(World world, int i) {
|
||||
public TileEntity createTileEntity(BlockState state, IBlockReader world) {
|
||||
return new TileEntityAtomicReconstructor();
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution) {
|
||||
TileEntity tile = minecraft.world.getTileEntity(posHit.getBlockPos());
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
public void displayHud(Minecraft minecraft, PlayerEntity player, ItemStack stack, RayTraceResult posHit, int scaledWidth, int scaledHeight) {
|
||||
TileEntity tile = minecraft.world.getTileEntity(((BlockRayTraceResult) posHit).getPos());
|
||||
if (tile instanceof TileEntityAtomicReconstructor) {
|
||||
ItemStack slot = ((TileEntityAtomicReconstructor) tile).inv.getStackInSlot(0);
|
||||
String strg;
|
||||
|
|
|
|||
|
|
@ -1,16 +1,17 @@
|
|||
package de.ellpeck.actuallyadditions.mod.blocks;
|
||||
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.gui.ScaledResolution;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraftforge.fml.relauncher.Side;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
|
||||
import javax.annotation.Nullable;
|
||||
|
||||
public interface IHudDisplay {
|
||||
|
||||
@SideOnly(Side.CLIENT)
|
||||
void displayHud(Minecraft minecraft, EntityPlayer player, ItemStack stack, RayTraceResult posHit, ScaledResolution resolution);
|
||||
@OnlyIn(Dist.CLIENT)
|
||||
void displayHud(Minecraft minecraft, PlayerEntity player, ItemStack stack, @Nullable RayTraceResult posHit, int scaledWidth, int scaledHeight);
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,353 +1,354 @@
|
|||
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;
|
||||
import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
|
||||
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
|
||||
@SideOnly(Side.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);
|
||||
}
|
||||
}
|
||||
}
|
||||
// todo: reimplement this the normal 1.14+
|
||||
//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;
|
||||
//import net.minecraftforge.fml.relauncher.SideOnly;
|
||||
//
|
||||
//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
|
||||
// @SideOnly(Side.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);
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
|
|
|||
|
|
@ -20,12 +20,14 @@ import net.minecraft.client.gui.FontRenderer;
|
|||
import net.minecraft.client.gui.GuiScreen;
|
||||
import net.minecraft.client.renderer.GlStateManager;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.PlayerEntity;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.ItemSword;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraft.util.math.BlockRayTraceResult;
|
||||
import net.minecraft.util.math.RayTraceResult;
|
||||
import net.minecraft.util.text.TextFormatting;
|
||||
import net.minecraftforge.client.event.RenderGameOverlayEvent;
|
||||
|
|
@ -161,7 +163,7 @@ public class ClientEvents {
|
|||
public void onGameOverlay(RenderGameOverlayEvent.Post event) {
|
||||
if (event.getType() == RenderGameOverlayEvent.ElementType.ALL && Minecraft.getMinecraft().currentScreen == null) {
|
||||
Minecraft minecraft = Minecraft.getMinecraft();
|
||||
EntityPlayer player = minecraft.player;
|
||||
PlayerEntity player = minecraft.player;
|
||||
RayTraceResult posHit = minecraft.objectMouseOver;
|
||||
FontRenderer font = minecraft.fontRenderer;
|
||||
ItemStack stack = player.getHeldItemMainhand();
|
||||
|
|
|
|||
|
|
@ -27,13 +27,13 @@ public class ParticleBeam extends Particle {
|
|||
this.color = color;
|
||||
this.rotationTime = rotationTime;
|
||||
this.size = size;
|
||||
this.particleMaxAge = maxAge;
|
||||
this.maxAge = maxAge;
|
||||
this.alpha = alpha;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void renderParticle(BufferBuilder buffer, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ) {
|
||||
float ageRatio = (float) this.particleAge / (float) this.particleMaxAge;
|
||||
float ageRatio = (float) this.age / (float) this.maxAge;
|
||||
float currAlpha = this.alpha - ageRatio * this.alpha;
|
||||
AssetUtil.renderLaser(this.posX + 0.5, this.posY + 0.5, this.posZ + 0.5, this.endX + 0.5, this.endY + 0.5, this.endZ + 0.5, this.rotationTime, currAlpha, this.size, this.color);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,9 +2,9 @@ package de.ellpeck.actuallyadditions.mod.recipe;
|
|||
|
||||
import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
|
||||
import de.ellpeck.actuallyadditions.mod.items.InitItems;
|
||||
import net.minecraft.init.Blocks;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.block.Blocks;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
|
||||
public final class HairyBallHandler {
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ package de.ellpeck.actuallyadditions.mod.recipe;
|
|||
import de.ellpeck.actuallyadditions.api.ActuallyAdditionsAPI;
|
||||
import de.ellpeck.actuallyadditions.mod.items.InitItems;
|
||||
import de.ellpeck.actuallyadditions.mod.items.metalists.TheJams;
|
||||
import net.minecraft.init.Items;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.item.Items;
|
||||
|
||||
public final class TreasureChestHandler {
|
||||
|
||||
|
|
@ -17,18 +17,18 @@ public final class TreasureChestHandler {
|
|||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.EMERALD), 3, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.EXPERIENCE_BOTTLE), 5, 3, 6);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(InitItems.itemSolidifiedExperience), 15, 3, 6);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_11), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_13), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_BLOCKS), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_CAT), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_CHIRP), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_FAR), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_MALL), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_MELLOHI), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_STAL), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_STRAD), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_WARD), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.RECORD_WAIT), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.MUSIC_DISC_11), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.MUSIC_DISC_13), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.MUSIC_DISC_BLOCKS), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.MUSIC_DISC_CAT), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.MUSIC_DISC_CHIRP), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.MUSIC_DISC_FAR), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.MUSIC_DISC_MALL), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.MUSIC_DISC_MELLOHI), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.MUSIC_DISC_STAL), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.MUSIC_DISC_STRAD), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.MUSIC_DISC_WARD), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.MUSIC_DISC_WAIT), 1, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.SADDLE), 5, 1, 1);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(Items.NAME_TAG), 20, 1, 2);
|
||||
ActuallyAdditionsAPI.addTreasureChestLoot(new ItemStack(InitItems.itemJams, 1, TheJams.CU_BA_RA.ordinal()), 10, 1, 2);
|
||||
|
|
|
|||
Loading…
Reference in a new issue