diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/block')
13 files changed, 33 insertions, 253 deletions
diff --git a/src/main/java/gtPlusPlus/core/block/ModBlocks.java b/src/main/java/gtPlusPlus/core/block/ModBlocks.java index 5058ac51cd..634a073b02 100644 --- a/src/main/java/gtPlusPlus/core/block/ModBlocks.java +++ b/src/main/java/gtPlusPlus/core/block/ModBlocks.java @@ -16,14 +16,12 @@ import gtPlusPlus.core.block.machine.FishTrap; import gtPlusPlus.core.block.machine.Machine_PestKiller; import gtPlusPlus.core.block.machine.Machine_PooCollector; import gtPlusPlus.core.block.machine.Machine_ProjectTable; -import gtPlusPlus.core.block.machine.Machine_RoundRobinator; import gtPlusPlus.core.block.machine.Machine_SuperJukebox; import gtPlusPlus.core.block.machine.VolumetricFlaskSetter; import gtPlusPlus.core.fluids.FluidRegistryHandler; public final class ModBlocks { - public static Block blockRoundRobinator; public static Block blockCircuitProgrammer; public static Block blockVolumetricFlaskSetter; @@ -100,8 +98,6 @@ public final class ModBlocks { blockPestKiller = new Machine_PestKiller(); - blockRoundRobinator = new Machine_RoundRobinator(); - blockVolumetricFlaskSetter = new VolumetricFlaskSetter(); } diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java index 72e3b24124..006314b2db 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicBlock.java @@ -14,14 +14,6 @@ import gtPlusPlus.core.util.Utils; public class BasicBlock extends BlockContainer { - public BasicBlock(final String unlocalizedName, final Material material) { - this(BlockTypes.STANDARD, unlocalizedName, material, 2); - } - - public BasicBlock(final BlockTypes type, final String unlocalizedName, final Material material) { - this(type, unlocalizedName, material, 2); - } - public BasicBlock(BlockTypes type, final String unlocalizedName, final Material material, final int harvestLevel) { super(material); this.setBlockName(Utils.sanitizeString(unlocalizedName)); @@ -44,11 +36,11 @@ public class BasicBlock extends BlockContainer { FRAME("blockFrameGt", "wrench", soundTypeMetal), ORE("blockStone", "pickaxe", soundTypeStone); - private String TEXTURE_NAME; - private String HARVEST_TOOL; - private SoundType soundOfBlock; + private final String TEXTURE_NAME; + private final String HARVEST_TOOL; + private final SoundType soundOfBlock; - private BlockTypes(final String textureName, final String harvestTool, final SoundType blockSound) { + BlockTypes(final String textureName, final String harvestTool, final SoundType blockSound) { this.TEXTURE_NAME = textureName; this.HARVEST_TOOL = harvestTool; this.soundOfBlock = blockSound; @@ -62,9 +54,6 @@ public class BasicBlock extends BlockContainer { return this.HARVEST_TOOL; } - public SoundType getBlockSoundType() { - return this.soundOfBlock; - } } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java index 7f0a504a79..c4e8b191d0 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java +++ b/src/main/java/gtPlusPlus/core/block/base/BasicTileBlockWithTooltip.java @@ -51,8 +51,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * Does this block have any meta at all? - * - * @return */ public final boolean hasMeta() { return getMetaCount() > 0; @@ -60,8 +58,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * The amount of meta this block has. - * - * @return */ public abstract int getMetaCount(); @@ -82,15 +78,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement public abstract String getUnlocalBlockName(); /** - * Does this Block have {@link ITileTooltip} support? - * - * @return {@link boolean} that represents if this block supports {@link ITileTooltip} or not. - */ - public final boolean hasTooltip() { - return getTooltipID() >= -1; - } - - /** * Lazy Boilerplating. * * @return Block Hardness. @@ -114,8 +101,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * The ID used by the {@link ITileTooltip} handler. Return -1 if you are not providing a custom {@link ItemBlock} in * {@link #getItemBlockClass}(). - * - * @return */ @Override public abstract int getTooltipID(); @@ -138,8 +123,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement /** * The name of the Tile Entity. - * - * @return */ protected abstract String getTileEntityName(); @@ -148,7 +131,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement * * @return Sanitized {@link String}, containing no spaces or illegal characters. */ - private final String getTileEntityNameForTexturePathing() { + private String getTileEntityNameForTexturePathing() { return Utils.sanitizeString(getTileEntityName().replace(" ", "")); } @@ -156,8 +139,6 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement * An array of CubicObjects, one for each meta, else just a single cell array. Expected to be null regularly, as the * default texture handling should suffice. Handy if re-using textures or using a non-standard structure for them. * FULL texture path must be used, inclusive of the MODID and a colon. - * - * @return */ public CubicObject<String>[] getCustomTextureDirectoryObject() { return null; @@ -175,7 +156,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement } @SideOnly(Side.CLIENT) - private final void handleTextures() { + private void handleTextures() { Logger.INFO("[TeTexture] Building Texture Maps for " + getTileEntityName() + "."); @@ -188,7 +169,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement // Default Path Name, this will make us look inside 'miscutils\textures\blocks' final String aPrefixTexPath = GTPlusPlus.ID + ":"; - // Default Path Name, this will make us look in the sub-directory for this Tile Entity. + // Default Path Name, this will make us look in the subdirectory for this Tile Entity. final String aTexPathMid = "TileEntities" + CORE.SEPERATOR + getTileEntityNameForTexturePathing() + CORE.SEPERATOR; @@ -241,7 +222,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement aStringLeft = aTexPathBuilt + aStringLeft; aStringRight = aTexPathBuilt + aStringRight; // Convenience Blob - CubicObject<String> aMetaBlob = new CubicObject<String>( + CubicObject<String> aMetaBlob = new CubicObject<>( aStringBot, aStringTop, aStringBack, @@ -269,7 +250,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement // Store them in an Array SafeTexture[] aInjectBlob = new SafeTexture[] { aBottom, aTop, aBack, aFont, aWest, aEast }; // Convenience Blob - CubicObject<SafeTexture> aMetaBlob2 = new CubicObject<SafeTexture>(aInjectBlob); + CubicObject<SafeTexture> aMetaBlob2 = new CubicObject<>(aInjectBlob); // Store this Blob into mSidedTextureArray.put(aMetaBlob2); Logger.INFO("[TeTexture] Added SafeTexture data to map for meta " + (aIndex++)); @@ -323,8 +304,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement */ @Override public int getDamageValue(World aWorld, int aX, int aY, int aZ) { - int l = aWorld.getBlockMetadata(aX, aY, aZ); - return l; + return aWorld.getBlockMetadata(aX, aY, aZ); } @Override @@ -334,7 +314,7 @@ public abstract class BasicTileBlockWithTooltip extends BlockContainer implement @Override public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int metadata, int fortune) { - ArrayList<ItemStack> drops = new ArrayList<ItemStack>(); + ArrayList<ItemStack> drops = new ArrayList<>(); drops.add(ItemUtils.simpleMetaStack(this, metadata, 1)); return drops; } diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java index e992d01d60..0f6f5947e8 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseFluid.java @@ -28,7 +28,7 @@ import gtPlusPlus.core.util.Utils; public class BlockBaseFluid extends BlockFluidClassic { private final String name; - private final IIcon textureArray[] = new IIcon[6]; + private final IIcon[] textureArray = new IIcon[6]; protected float particleRed = 1.0F; protected float particleGreen = 1.0F; @@ -43,18 +43,6 @@ public class BlockBaseFluid extends BlockFluidClassic { GameRegistry.registerBlock(this, ItemBlockMeta.class, "fluid" + this.name); } - public BlockFluidClassic setParticleColor(int arg0) { - return this - .setParticleColor((arg0 >> 16 & 255) / 255.0F, (arg0 >> 8 & 255) / 255.0F, (arg0 >> 0 & 255) / 255.0F); - } - - public BlockFluidClassic setParticleColor(float arg0, float arg1, float arg2) { - this.particleRed = arg0; - this.particleGreen = arg1; - this.particleBlue = arg2; - return this; - } - @Override public boolean canCreatureSpawn(EnumCreatureType arg0, IBlockAccess arg1, int arg2, int arg3, int arg4) { return false; @@ -72,11 +60,9 @@ public class BlockBaseFluid extends BlockFluidClassic { @Override @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister iicon) { - this.textureArray[0] = iicon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Still"); - this.textureArray[1] = iicon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow"); - // IconRegistry.addIcon("Fluid" + this.name, this.modName + ":fluid/Fluid_" + this.name + "_Still", arg0); - // IconRegistry.addIcon("Fluid" + this.name + "1", this.modName + ":fluid/Fluid_" + this.name + "_Flow", arg0); + public void registerBlockIcons(IIconRegister icon) { + this.textureArray[0] = icon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Still"); + this.textureArray[1] = icon.registerIcon(GTPlusPlus.ID + ":" + "fluid/" + "Fluid_" + this.name + "_Flow"); } @Override diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java index f0ecd6def9..81c14bb16c 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseModular.java @@ -36,7 +36,7 @@ public class BlockBaseModular extends BasicBlock { protected String thisBlockMaterialTranslatedName; protected final String thisBlockType; - private static HashMap<String, Block> sBlockCache = new HashMap<String, Block>(); + private static final HashMap<String, Block> sBlockCache = new HashMap<>(); public static Block getMaterialBlock(Material aMaterial, BlockTypes aType) { return sBlockCache.get(aMaterial.getUnlocalizedName() + "." + aType.name()); @@ -56,11 +56,9 @@ public class BlockBaseModular extends BasicBlock { Math.min(Math.max(material.vTier, 1), 6)); blockMaterial = material; registerComponent(); - if (material != null) { - sBlockCache.put(material.getUnlocalizedName() + "." + blockType.name(), this); - thisBlockMaterialTranslatedName = material.getTranslatedName(); - GT_LanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", getProperName()); - } + sBlockCache.put(material.getUnlocalizedName() + "." + blockType.name(), this); + thisBlockMaterialTranslatedName = material.getTranslatedName(); + GT_LanguageManager.addStringLocalization("gtplusplus." + getUnlocalizedName() + ".name", getProperName()); } protected BlockBaseModular(final String unlocalizedName, final String blockMaterialString, @@ -75,8 +73,6 @@ public class BlockBaseModular extends BasicBlock { this.thisBlockType = blockType.name().toUpperCase(); this.setBlockName(this.getUnlocalizedProperName()); int fx = getBlockTypeMeta(); - // ItemBlockGtBlock.sNameCache.put("block."+blockMaterial.getUnlocalizedName()+"."+this.thisBlock.name().toLowerCase(), - // GetProperName()); GameRegistry.registerBlock( this, ItemBlockGtBlock.class, @@ -97,17 +93,17 @@ public class BlockBaseModular extends BasicBlock { return rawMaterName.replace(" ", "").replace("-", "").replace("_", ""); } - public boolean registerComponent() { + public void registerComponent() { Logger.MATERIALS("Attempting to register " + this.getUnlocalizedName() + "."); if (this.blockMaterial == null) { Logger.MATERIALS("Tried to register " + this.getUnlocalizedName() + " but the material was null."); - return false; + return; } String aName = blockMaterial.getUnlocalizedName(); // Register Component Map<String, ItemStack> aMap = Material.mComponentMap.get(aName); if (aMap == null) { - aMap = new HashMap<String, ItemStack>(); + aMap = new HashMap<>(); } int fx = getBlockTypeMeta(); String aKey = (fx == 0 ? OrePrefixes.block.name() @@ -117,11 +113,9 @@ public class BlockBaseModular extends BasicBlock { aMap.put(aKey, ItemUtils.getSimpleStack(this)); Logger.MATERIALS("Registering a material component. Item: [" + aName + "] Map: [" + aKey + "]"); Material.mComponentMap.put(aName, aMap); - return true; } else { // Bad Logger.MATERIALS("Tried to double register a material component."); - return false; } } diff --git a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java index 208838859b..91b49cb7a3 100644 --- a/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java +++ b/src/main/java/gtPlusPlus/core/block/base/BlockBaseOre.java @@ -30,7 +30,7 @@ public class BlockBaseOre extends BasicBlock implements ITexturedBlock { private final Material blockMaterial; - public BlockBaseOre(final Material material, final BlockTypes blockType, final int colour) { + public BlockBaseOre(final Material material, final BlockTypes blockType) { super( blockType, Utils.sanitizeString(material.getUnlocalizedName()), diff --git a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java index f62fc50a69..ceb9b5500b 100644 --- a/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java +++ b/src/main/java/gtPlusPlus/core/block/general/BlockSuperLight.java @@ -27,8 +27,6 @@ public class BlockSuperLight extends BlockContainer { @SideOnly(Side.CLIENT) private IIcon textureFront; - // propecia (Inhibit DHD - recover hair get depression) - public BlockSuperLight() { super(Material.circuits); this.setBlockName("blockSuperLight"); @@ -65,8 +63,6 @@ public class BlockSuperLight extends BlockContainer { private long mLastUpdateTick = 0; - private int mLitBlockCount = 0; - private int[][][][] aLitBlocks = new int[50][10][50][1]; private boolean mPowered = false; @@ -128,7 +124,7 @@ public class BlockSuperLight extends BlockContainer { updateLighting(powered); } } - } catch (Throwable t) {} + } catch (Throwable ignored) {} } @Override @@ -145,13 +141,9 @@ public class BlockSuperLight extends BlockContainer { mLastUpdateTick = System.currentTimeMillis(); - if (false) { - return; - } - aLitBlocks = new int[50][10][50][1]; int aLitCounter = 0; - AutoMap<BlockPos> aBlocksToUpdate = new AutoMap<BlockPos>(); + AutoMap<BlockPos> aBlocksToUpdate = new AutoMap<>(); Logger.INFO("Trying to relight area."); BlockPos aStartIterationPoint = new BlockPos( @@ -167,7 +159,7 @@ public class BlockSuperLight extends BlockContainer { int zOff = aStartIterationPoint.zPos + z; Block aBlockGet = this.worldObj.getBlock(xOff, yOff, zOff); if (aBlockGet != null) { - if (aBlockGet instanceof BlockAir || aBlockGet instanceof LightGlass) { + if (aBlockGet instanceof BlockAir) { int aLight = aBlockGet.getLightValue(); @@ -178,15 +170,8 @@ public class BlockSuperLight extends BlockContainer { // Turning Lights on else if (enable && aLight == 0) { aBlocksToUpdate.put(new BlockPos(xOff, yOff, zOff, this.worldObj)); - if (aBlockGet instanceof BlockAir) { - this.worldObj.setBlock( - xOff, - yOff, - zOff, - ModBlocks.MatterFabricatorEffectBlock, - 0, - 3); - } + this.worldObj + .setBlock(xOff, yOff, zOff, ModBlocks.MatterFabricatorEffectBlock, 0, 3); aLitCounter++; } // Turning Lights off @@ -196,7 +181,6 @@ public class BlockSuperLight extends BlockContainer { Logger.INFO("Dimmed air."); this.worldObj.setBlock(xOff, yOff, zOff, Blocks.air, 0, 3); } - // aBlockGet.setLightLevel(0); } aLitBlocks[x][y][z][0] = enable ? 15 : 0; } else { @@ -208,18 +192,6 @@ public class BlockSuperLight extends BlockContainer { } } } - mLitBlockCount = aLitCounter; - doLargeBlockUpdate(aBlocksToUpdate); - } - - public void doLargeBlockUpdate(AutoMap<BlockPos> aUpdateMap) { - if (aUpdateMap.isEmpty()) { - return; - } - for (BlockPos p : aUpdateMap) { - // this.worldObj.markBlockForUpdate(p.xPos, p.yPos, p.zPos); - // this.worldObj.markBlocksDirtyVertical(p_72975_1_, p_72975_2_, p_72975_3_, p_72975_4_); - } } } } diff --git a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java index 6254201261..a2773e646c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java +++ b/src/main/java/gtPlusPlus/core/block/general/MiningExplosives.java @@ -157,8 +157,7 @@ public class MiningExplosives extends BlockTNT { @Override public void onEntityCollidedWithBlock(final World world, final int x, final int y, final int z, final Entity entityTriggering) { - if ((entityTriggering instanceof EntityArrow) && !world.isRemote) { - final EntityArrow entityarrow = (EntityArrow) entityTriggering; + if ((entityTriggering instanceof final EntityArrow entityarrow) && !world.isRemote) { if (entityarrow.isBurning()) { this.func_150114_a( diff --git a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java index 1956d98a39..fa7372090c 100644 --- a/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java +++ b/src/main/java/gtPlusPlus/core/block/general/antigrief/BlockWitherProof.java @@ -37,10 +37,6 @@ public class BlockWitherProof extends Block { GameRegistry.registerBlock(this, Utils.sanitizeString("blockBlackGate")); } - public String GetProperName() { - return "Wither Cage"; - } - @Override @SideOnly(Side.CLIENT) public int getRenderBlockPass() { diff --git a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java index 0fc3b5b666..95dca7163e 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java +++ b/src/main/java/gtPlusPlus/core/block/machine/CircuitProgrammer.java @@ -147,7 +147,7 @@ public class CircuitProgrammer extends BasicTileBlockWithTooltip { GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I", GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_I" }; - CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<String>(aTexData) }; + CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) }; return aTextureData; } } diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java deleted file mode 100644 index d7c383cc6e..0000000000 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_RoundRobinator.java +++ /dev/null @@ -1,128 +0,0 @@ -package gtPlusPlus.core.block.machine; - -import static gregtech.api.enums.Mods.GTPlusPlus; - -import net.minecraft.block.material.Material; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.ForgeDirection; - -import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.api.objects.minecraft.CubicObject; -import gtPlusPlus.core.block.base.BasicTileBlockWithTooltip; -import gtPlusPlus.core.creative.AddToCreativeTab; -import gtPlusPlus.core.item.base.itemblock.ItemBlockRoundRobinator; -import gtPlusPlus.core.tileentities.machines.TileEntityRoundRobinator; -import gtPlusPlus.core.util.minecraft.ItemUtils; -import gtPlusPlus.core.util.minecraft.PlayerUtils; - -public class Machine_RoundRobinator extends BasicTileBlockWithTooltip { - - public Machine_RoundRobinator() { - super(Material.iron); - } - - /** - * Called upon block activation (right click on the block.) - */ - @Override - public boolean onBlockActivated(final World world, final int x, final int y, final int z, final EntityPlayer player, - final int ordinalSide, final float lx, final float ly, final float lz) { - if (world.isRemote) { - return true; - } else { - final ForgeDirection side = ForgeDirection.getOrientation(ordinalSide); - boolean mDidScrewDriver = false; - // Check For Screwdriver - try { - final ItemStack mHandStack = PlayerUtils.getItemStackInPlayersHand(world, player.getDisplayName()); - if (ItemUtils.isToolScrewdriver(mHandStack)) { - final TileEntityRoundRobinator tile = (TileEntityRoundRobinator) world.getTileEntity(x, y, z); - if (tile != null) { - mDidScrewDriver = tile.onScrewdriverRightClick(side, player, x, y, z); - } - } - } catch (final Throwable t) {} - - if (!mDidScrewDriver) { - final TileEntity te = world.getTileEntity(x, y, z); - if ((te != null) && (te instanceof TileEntityRoundRobinator)) { - return ((TileEntityRoundRobinator) te).onRightClick(side, player, x, y, z); - } - return false; - } else { - return true; - } - } - } - - @Override - public TileEntity createNewTileEntity(final World world, final int p_149915_2_) { - return new TileEntityRoundRobinator(); - } - - @Override - public int getMetaCount() { - return 5; - } - - @Override - public String getUnlocalBlockName() { - return "blockRoundRobinator"; - } - - @Override - protected float initBlockHardness() { - return 1; - } - - @Override - protected float initBlockResistance() { - return 1; - } - - @Override - protected CreativeTabs initCreativeTab() { - return AddToCreativeTab.tabMachines; - } - - @Override - public int getTooltipID() { - return -1; - } - - @Override - protected String getTileEntityName() { - return "Round Robinator"; - } - - @Override - public Class<? extends ItemBlock> getItemBlockClass() { - return ItemBlockRoundRobinator.class; - } - - @Override - public CubicObject<String>[] getCustomTextureDirectoryObject() { - AutoMap<String[]> aTemp = new AutoMap<String[]>(); - for (int i = 0; i < 5; i++) { - String[] aTexData = new String[] { GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Top_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Top_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, - GTPlusPlus.ID + ":" + "TileEntities/RoundRobinator/Side_" + i, }; - aTemp.put(aTexData); - } - AutoMap<CubicObject<String>> aTemp2 = new AutoMap<CubicObject<String>>(); - for (String[] y : aTemp) { - aTemp2.put(new CubicObject<String>(y)); - } - CubicObject<String>[] aTextureData = new CubicObject[] { aTemp2.get(0), aTemp2.get(1), aTemp2.get(2), - aTemp2.get(3), aTemp2.get(4) }; - return aTextureData; - } -} diff --git a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java index 52ddb7cc10..755636b4d3 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java +++ b/src/main/java/gtPlusPlus/core/block/machine/Machine_SuperJukebox.java @@ -109,9 +109,6 @@ public class Machine_SuperJukebox extends BlockJukebox { if (itemstack != null) { aWorld.playAuxSFX(1005, aX, aY, aZ, Item.getIdFromItem(itemstack.getItem())); - // aWorld.playRecord((String) null, aX, aY, aZ); - // tileentityjukebox.func_145857_a((ItemStack) null); - // aWorld.setBlockMetadataWithNotify(aX, aY, aZ, 0, 2); /* * float f = 0.7F; double d0 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.5D; * double d1 = (double) (aWorld.rand.nextFloat() * f) + (double) (1.0F - f) * 0.2D + 0.6D; double d2 @@ -295,7 +292,7 @@ public class Machine_SuperJukebox extends BlockJukebox { // Determine which record to play public boolean selectRecordToPlayFromInventoryAndSetViaVanillaHandler() { - AutoMap<ItemStack> mValidRecords = new AutoMap<ItemStack>(); + AutoMap<ItemStack> mValidRecords = new AutoMap<>(); for (ItemStack g : this.getInventory().getInventory()) { if (g != null) { if (g.getItem() instanceof ItemRecord) { diff --git a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java index 982b29ed97..68c054fb59 100644 --- a/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java +++ b/src/main/java/gtPlusPlus/core/block/machine/VolumetricFlaskSetter.java @@ -72,9 +72,8 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { if (!mDidScrewDriver) { final TileEntity te = world.getTileEntity(x, y, z); - if ((te != null) && (te instanceof TileEntityVolumetricFlaskSetter)) { + if ((te != null) && (te instanceof TileEntityVolumetricFlaskSetter aTile)) { player.openGui(GTplusplus.instance, GuiHandler.GUI18, world, x, y, z); - TileEntityVolumetricFlaskSetter aTile = (TileEntityVolumetricFlaskSetter) te; // new Packet_VolumetricFlaskGui2(aTile, aTile.getCustomValue()); return true; } @@ -152,7 +151,7 @@ public class VolumetricFlaskSetter extends BasicTileBlockWithTooltip { GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H", GTPlusPlus.ID + ":" + "metro/" + "TEXTURE_METAL_PANEL_H" }; - CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<String>(aTexData) }; + CubicObject<String>[] aTextureData = new CubicObject[] { new CubicObject<>(aTexData) }; return aTextureData; } } |