dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed unneeded method and checks

Browse Source
This commit is contained in:
raoulvdberge
2017-06-15 16:19:53 +02:00
parent 68f4ec749a
commit 8afef268a0
15 changed files with 10 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java
View File

@@ -9,7 +9,6 @@ import com.raoulvdberge.refinedstorage.api.storage.IStorageDiskProvider;
import com.raoulvdberge.refinedstorage.api.util.IStackList;
import com.raoulvdberge.refinedstorage.apiimpl.API;
import io.netty.buffer.ByteBuf;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.GlStateManager;
@@ -18,7 +17,6 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.TextureMap;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.init.Items;
@@ -655,12 +653,4 @@ public final class RSUtils {
.put(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, getTransform(0, 0, 0, 0, 225, 0, 0.4f))
.build();
}
public static boolean canAddToCreativeTab(Item item, CreativeTabs tab) {
return tab == CreativeTabs.SEARCH || tab == item.getCreativeTab();
}
public static boolean canAddToCreativeTab(Block block, CreativeTabs tab) {
return tab == CreativeTabs.SEARCH || tab == block.getCreativeTabToDisplayOn();
}
}

5
src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java
View File

@@ -2,7 +2,6 @@ package com.raoulvdberge.refinedstorage.block;
import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.item.ItemBlockController;
import com.raoulvdberge.refinedstorage.tile.TileController;
import net.minecraft.block.properties.PropertyEnum;
@@ -37,10 +36,6 @@ public class BlockController extends BlockBase {
@Override
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
return;
}
for (int i = 0; i <= 1; i++) {
items.add(ItemBlockController.createStackWithNBT(new ItemStack(this, 1, i)));
}

5
src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java
View File

@@ -2,7 +2,6 @@ package com.raoulvdberge.refinedstorage.block;
import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeFluidStorage;
import com.raoulvdberge.refinedstorage.item.ItemBlockFluidStorage;
import com.raoulvdberge.refinedstorage.tile.TileFluidStorage;
@@ -38,10 +37,6 @@ public class BlockFluidStorage extends BlockNode {
@Override
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
return;
}
for (int i = 0; i <= 4; ++i) {
items.add(ItemBlockFluidStorage.initNBT(new ItemStack(this, 1, i)));
}

5
src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java
View File

@@ -1,7 +1,6 @@
package com.raoulvdberge.refinedstorage.block;
import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.item.ItemBlockBase;
import com.raoulvdberge.refinedstorage.tile.grid.TileGrid;
import net.minecraft.block.properties.PropertyEnum;
@@ -32,10 +31,6 @@ public class BlockGrid extends BlockNode {
@Override
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
return;
}
for (int i = 0; i <= 3; i++) {
items.add(new ItemStack(this, 1, i));
}

5
src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java
View File

@@ -2,7 +2,6 @@ package com.raoulvdberge.refinedstorage.block;
import com.raoulvdberge.refinedstorage.RSBlocks;
import com.raoulvdberge.refinedstorage.RSGui;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeStorage;
import com.raoulvdberge.refinedstorage.item.ItemBlockStorage;
import com.raoulvdberge.refinedstorage.tile.TileStorage;
@@ -38,10 +37,6 @@ public class BlockStorage extends BlockNode {
@Override
public void getSubBlocks(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
return;
}
for (int i = 0; i <= 4; ++i) {
items.add(ItemBlockStorage.initNBT(new ItemStack(this, 1, i)));
}

3
src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockEnergyItem.java
View File

@@ -1,6 +1,5 @@
package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.block.Direction;
import net.minecraft.block.Block;
import net.minecraft.client.resources.I18n;
@@ -70,7 +69,7 @@ public abstract class ItemBlockEnergyItem extends ItemBlockBase {
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
if (!isInCreativeTab(tab)) {
return;
}

3
src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java
View File

@@ -1,6 +1,5 @@
package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RSUtils;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
@@ -18,7 +17,7 @@ public class ItemCore extends ItemBase {
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
if (!isInCreativeTab(tab)) {
return;
}

3
src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java
View File

@@ -1,6 +1,5 @@
package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RSUtils;
import net.minecraft.client.resources.I18n;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.creativetab.CreativeTabs;
@@ -71,7 +70,7 @@ public abstract class ItemEnergyItem extends ItemBase {
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
if (!isInCreativeTab(tab)) {
return;
}

3
src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java
View File

@@ -1,7 +1,6 @@
package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RSItems;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.storage.IStorageDisk;
import com.raoulvdberge.refinedstorage.api.storage.IStorageDiskProvider;
import com.raoulvdberge.refinedstorage.api.storage.StorageDiskType;
@@ -49,7 +48,7 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
if (!isInCreativeTab(tab)) {
return;
}

3
src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java
View File

@@ -1,6 +1,5 @@
package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RSUtils;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
@@ -20,7 +19,7 @@ public class ItemFluidStoragePart extends ItemBase {
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
if (!isInCreativeTab(tab)) {
return;
}

3
src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java
View File

@@ -1,6 +1,5 @@
package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RSUtils;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
@@ -23,7 +22,7 @@ public class ItemProcessor extends ItemBase {
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
if (!isInCreativeTab(tab)) {
return;
}

3
src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java
View File

@@ -1,7 +1,6 @@
package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RSItems;
import com.raoulvdberge.refinedstorage.RSUtils;
import com.raoulvdberge.refinedstorage.api.storage.IStorageDisk;
import com.raoulvdberge.refinedstorage.api.storage.IStorageDiskProvider;
import com.raoulvdberge.refinedstorage.api.storage.StorageDiskType;
@@ -48,7 +47,7 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider<It
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
if (!isInCreativeTab(tab)) {
return;
}

3
src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java
View File

@@ -1,6 +1,5 @@
package com.raoulvdberge.refinedstorage.item;
import com.raoulvdberge.refinedstorage.RSUtils;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.ItemStack;
import net.minecraft.util.NonNullList;
@@ -20,7 +19,7 @@ public class ItemStoragePart extends ItemBase {
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
if (!isInCreativeTab(tab)) {
return;
}

2
src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java
View File

@@ -53,7 +53,7 @@ public class ItemUpgrade extends ItemBase {
@Override
public void getSubItems(CreativeTabs tab, NonNullList<ItemStack> items) {
if (!RSUtils.canAddToCreativeTab(this, tab)) {
if (!isInCreativeTab(tab)) {
return;
}

2
src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java
View File

@@ -15,7 +15,7 @@ import org.lwjgl.opengl.GL11;
public class TileEntitySpecialRendererStorageMonitor extends TileEntitySpecialRenderer<TileStorageMonitor> {
@Override
public void renderTileEntityAt(TileStorageMonitor tile, double x, double y, double z, float partialTicks, int destroyStage, float colorAlpha) {
public void renderTileEntityAt(TileStorageMonitor tile, double x, double y, double z, float partialTicks, int destroyStage, float alpha) {
setLightmapDisabled(true);
float disX = 0, disXText = 0;