diff --git a/build.gradle b/build.gradle index aa453e530..964b03edd 100755 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } @@ -20,7 +20,7 @@ apply plugin: 'maven' apply plugin: 'maven-publish' apply plugin: 'net.minecraftforge.gradle.forge' -version = "1.4.15" +version = "1.5" group = "refinedstorage" archivesBaseName = "refinedstorage" @@ -28,10 +28,10 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 minecraft { - version = "1.11.2-13.20.0.2315" + version = "1.12-14.21.0.2322" runDir = "run" useDepAts = true - mappings = "snapshot_20170609" + mappings = "snapshot_20170614" } repositories { @@ -50,11 +50,11 @@ repositories { } dependencies { - deobfCompile "mezz.jei:jei_1.11.2:4.5.0.287:api" - runtime "mezz.jei:jei_1.11.2:4.5.0.287" - deobfCompile "net.darkhax.tesla:Tesla:1.11-1.3.0.52" - deobfCompile "MCMultiPart2:MCMultiPart-exp:2.0.0_19" - deobfCompile "li.cil.oc:OpenComputers:MC1.11.2-1.7.0.28:api" + deobfCompile "mezz.jei:jei_1.12:4.6.0.61:api" + runtime "mezz.jei:jei_1.12:4.6.0.61" + deobfCompile "net.darkhax.tesla:Tesla-1.12:1.0.58" + // deobfCompile "MCMultiPart2:MCMultiPart-exp:2.0.0_19" + // deobfCompile "li.cil.oc:OpenComputers:MC1.11.2-1.7.0.28:api" } processResources { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RS.java b/src/main/java/com/raoulvdberge/refinedstorage/RS.java index e62aee4ba..ce017a732 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RS.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RS.java @@ -15,15 +15,14 @@ import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; -@Mod(modid = RS.ID, version = RS.VERSION, dependencies = RS.DEPENDENCIES, guiFactory = RS.GUI_FACTORY, updateJSON = RS.UPDATE_JSON) +@Mod(modid = RS.ID, version = RS.VERSION, guiFactory = RS.GUI_FACTORY, updateJSON = RS.UPDATE_JSON) public final class RS { static { FluidRegistry.enableUniversalBucket(); } public static final String ID = "refinedstorage"; - public static final String VERSION = "1.4.15"; - public static final String DEPENDENCIES = "required-after:forge@[13.19.1.2188,);after:jei@[4.5.0,);"; + public static final String VERSION = "1.5"; public static final String GUI_FACTORY = "com.raoulvdberge.refinedstorage.gui.config.ModGuiFactory"; public static final String UPDATE_JSON = "https://refinedstorage.raoulvdberge.com/update"; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java index 77e6acb0e..1ce7e694b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/RSUtils.java @@ -9,14 +9,16 @@ 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; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; 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; @@ -591,7 +593,7 @@ public final class RSUtils { Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer vertexBuffer = tessellator.getBuffer(); + BufferBuilder vertexBuffer = tessellator.getBuffer(); vertexBuffer.begin(7, DefaultVertexFormats.POSITION_TEX); vertexBuffer.pos(xCoord, yCoord + 16, zLevel).tex(uMin, vMax).endVertex(); vertexBuffer.pos(xCoord + 16 - maskRight, yCoord + 16, zLevel).tex(uMax, vMax).endVertex(); @@ -653,4 +655,12 @@ 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(); + } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java index 0081b7ab1..a738d2bc4 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/autocrafting/CraftingPattern.java @@ -12,12 +12,11 @@ import net.minecraft.inventory.InventoryCrafting; import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; +import net.minecraft.item.crafting.Ingredient; import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; import javax.annotation.Nullable; -import java.lang.reflect.InvocationTargetException; import java.util.*; import java.util.stream.Collectors; @@ -52,36 +51,32 @@ public class CraftingPattern implements ICraftingPattern { } if (!ItemPattern.isProcessing(stack)) { - recipe = CraftingManager.getInstance().getRecipeList().stream().filter(r -> r.matches(inv, world)).findFirst().orElse(null); + for (IRecipe r : CraftingManager.REGISTRY) { + if (r.matches(inv, world)) { + recipe = r; + break; + } + } + if (recipe != null) { ItemStack output = recipe.getCraftingResult(inv); if (!output.isEmpty()) { - boolean shapedOre = recipe instanceof ShapedOreRecipe; - // It is a dirty fix, but hey someone has to do it. ~ way2muchnoise 2016 "bite me" - boolean mekanism = recipe.getClass().getName().equals("mekanism.common.recipe.ShapedMekanismRecipe"); - outputs.add(Comparer.stripTags(output.copy())); - if ((isOredict() && shapedOre) || mekanism) { - Object[] inputs = new Object[0]; - if (shapedOre) { - inputs = ((ShapedOreRecipe) recipe).getInput(); - } else { - try { - inputs = (Object[]) recipe.getClass().getMethod("getInput").invoke(recipe); - } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { - e.printStackTrace(); - } + if (isOredict()) { + List> inputs = new LinkedList<>(); + + for (Ingredient ingredient : recipe.getIngredients()) { + inputs.add(Arrays.asList(ingredient.getMatchingStacks())); } - for (Object input : inputs) { - if (input == null) { + + for (List input : inputs) { + if (input.isEmpty()) { oreInputs.add(Collections.emptyList()); - } else if (input instanceof ItemStack) { - oreInputs.add(Collections.singletonList(Comparer.stripTags(((ItemStack) input).copy()))); } else { List cleaned = new LinkedList<>(); - for (ItemStack in : (List) input) { + for (ItemStack in : input) { cleaned.add(Comparer.stripTags(in.copy())); } oreInputs.add(cleaned); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeManager.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeManager.java index 286d050c1..bac6ffbd4 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeManager.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/NetworkNodeManager.java @@ -8,7 +8,7 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import net.minecraft.world.WorldSavedData; +import net.minecraft.world.storage.WorldSavedData; import net.minecraftforge.common.util.Constants; import javax.annotation.Nullable; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java index bff079089..63f08562d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNodeGrid.java @@ -207,7 +207,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { @Override public void onCraftingMatrixChanged() { - result.setInventorySlotContents(0, CraftingManager.getInstance().findMatchingRecipe(matrix, world)); + result.setInventorySlotContents(0, CraftingManager.findMatchingResult(matrix, world)); markDirty(); } @@ -303,7 +303,7 @@ public class NetworkNodeGrid extends NetworkNode implements IGrid { @Override public void onCrafted(EntityPlayer player) { - NonNullList remainder = CraftingManager.getInstance().getRemainingItems(matrix, world); + NonNullList remainder = CraftingManager.getRemainingItems(matrix, world); for (int i = 0; i < matrix.getSizeInventory(); ++i) { ItemStack slot = matrix.getStackInSlot(i); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java index 58322d5b7..e099fe6d5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockController.java @@ -2,6 +2,7 @@ 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; @@ -35,9 +36,13 @@ public class BlockController extends BlockBase { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubBlocks(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } + for (int i = 0; i <= 1; i++) { - subItems.add(ItemBlockController.createStackWithNBT(new ItemStack(item, 1, i))); + items.add(ItemBlockController.createStackWithNBT(new ItemStack(this, 1, i))); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java index 8b5c20b15..04a73534a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockFluidStorage.java @@ -2,6 +2,7 @@ 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; @@ -36,9 +37,13 @@ public class BlockFluidStorage extends BlockNode { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubBlocks(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } + for (int i = 0; i <= 4; ++i) { - subItems.add(ItemBlockFluidStorage.initNBT(new ItemStack(item, 1, i))); + items.add(ItemBlockFluidStorage.initNBT(new ItemStack(this, 1, i))); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java index c058a3d1c..7b69c1508 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockGrid.java @@ -1,6 +1,7 @@ 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; @@ -30,9 +31,13 @@ public class BlockGrid extends BlockNode { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubBlocks(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } + for (int i = 0; i <= 3; i++) { - subItems.add(new ItemStack(item, 1, i)); + items.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java index 71fd3be85..1e967b76d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockProcessingPatternEncoder.java @@ -5,6 +5,7 @@ import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.tile.TileProcessingPatternEncoder; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -23,8 +24,8 @@ public class BlockProcessingPatternEncoder extends BlockBase { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); tooltip.add(I18n.format("block.refinedstorage:processing_pattern_encoder.tooltip.0")); tooltip.add(I18n.format("block.refinedstorage:processing_pattern_encoder.tooltip.1", TextFormatting.WHITE + I18n.format("block.refinedstorage:grid.2.name") + TextFormatting.GRAY)); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java index 73cc993c9..605cdcc58 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockSolderer.java @@ -4,6 +4,7 @@ import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.tile.TileSolderer; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -16,6 +17,7 @@ import net.minecraft.world.World; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.fml.relauncher.SideOnly; +import javax.annotation.Nullable; import java.util.List; import java.util.Random; @@ -30,8 +32,8 @@ public class BlockSolderer extends BlockNode { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); tooltip.add(I18n.format( "block.refinedstorage:solderer.tooltip.0", diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java index 8f07a7d46..54e8f4cd5 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockStorage.java @@ -2,6 +2,7 @@ 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; @@ -36,9 +37,13 @@ public class BlockStorage extends BlockNode { } @Override - public void getSubBlocks(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubBlocks(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } + for (int i = 0; i <= 4; ++i) { - subItems.add(ItemBlockStorage.initNBT(new ItemStack(item, 1, i))); + items.add(ItemBlockStorage.initNBT(new ItemStack(this, 1, i))); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java index 7e8778200..cf055c756 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/block/BlockWirelessTransmitter.java @@ -5,6 +5,7 @@ import com.raoulvdberge.refinedstorage.tile.TileWirelessTransmitter; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -92,8 +93,8 @@ public class BlockWirelessTransmitter extends BlockNode { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); tooltip.add(I18n.format("block.refinedstorage:wireless_transmitter.tooltip", TextFormatting.WHITE + I18n.format("block.refinedstorage:cable.name") + TextFormatting.GRAY)); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java index 463cf33a3..8d473b580 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiBase.java @@ -104,8 +104,12 @@ public abstract class GuiBase extends GuiContainer { @Override public void drawScreen(int mouseX, int mouseY, float partialTicks) { + drawDefaultBackground(); + super.drawScreen(mouseX, mouseY, partialTicks); + renderHoveredToolTip(mouseX, mouseY); + if (scrollbar != null) { scrollbar.update(this, mouseX - guiLeft, mouseY - guiTop); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java index 7a31dc993..ee38a7093 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/GuiCraftingPreview.java @@ -12,6 +12,7 @@ import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.Container; import net.minecraft.item.ItemStack; @@ -145,7 +146,7 @@ public class GuiCraftingPreview extends GuiBase { } if (hoveringStack != null) { - drawTooltip(hoveringStack, mouseX, mouseY, hoveringStack.getTooltip(Minecraft.getMinecraft().player, false)); + drawTooltip(hoveringStack, mouseX, mouseY, hoveringStack.getTooltip(Minecraft.getMinecraft().player, Minecraft.getMinecraft().gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL)); } else if (hoveringFluid != null) { drawTooltip(mouseX, mouseY, hoveringFluid.getLocalizedName()); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java index 731aa47fb..d365d711b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/config/ModGuiFactory.java @@ -23,6 +23,7 @@ public class ModGuiFactory implements IModGuiFactory { } @Override + @SuppressWarnings("deprecation") public Class mainConfigGuiClass() { return ModGuiConfig.class; } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java index d369ba347..d6e28dd6c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/grid/stack/GridStackItem.java @@ -6,6 +6,7 @@ import io.netty.buffer.ByteBuf; import joptsimple.internal.Strings; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.text.TextFormatting; @@ -76,7 +77,7 @@ public class GridStackItem implements IGridStack { @Override public String getTooltip() { - List lines = stack.getTooltip(Minecraft.getMinecraft().player, Minecraft.getMinecraft().gameSettings.advancedItemTooltips); + List lines = stack.getTooltip(Minecraft.getMinecraft().player, Minecraft.getMinecraft().gameSettings.advancedItemTooltips ? ITooltipFlag.TooltipFlags.ADVANCED : ITooltipFlag.TooltipFlags.NORMAL); // From GuiScreen#renderToolTip for (int i = 0; i < lines.size(); ++i) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButton.java b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButton.java index daf116d47..ce970e534 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButton.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/gui/sidebutton/SideButton.java @@ -23,7 +23,7 @@ public abstract class SideButton extends GuiButton { } @Override - public void drawButton(Minecraft mc, int mouseX, int mouseY) { + public void drawButton(Minecraft mc, int mouseX, int mouseY, float partialTicks) { GlStateManager.enableAlpha(); hovered = gui.inBounds(x, y, width, height, mouseX, mouseY); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java index f462163ef..cd2c057f0 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RSJEIPlugin.java @@ -3,15 +3,15 @@ package com.raoulvdberge.refinedstorage.integration.jei; import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.container.ContainerSolderer; import com.raoulvdberge.refinedstorage.gui.GuiSolderer; -import mezz.jei.api.BlankModPlugin; import mezz.jei.api.IJeiRuntime; +import mezz.jei.api.IModPlugin; import mezz.jei.api.IModRegistry; import mezz.jei.api.JEIPlugin; import mezz.jei.api.recipe.IRecipeCategoryRegistration; import net.minecraft.item.ItemStack; @JEIPlugin -public class RSJEIPlugin extends BlankModPlugin { +public class RSJEIPlugin implements IModPlugin { public static RSJEIPlugin INSTANCE; private IJeiRuntime runtime; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java index d9d906fa9..1b45450e6 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeCategorySolderer.java @@ -5,14 +5,14 @@ import mezz.jei.api.gui.IDrawable; import mezz.jei.api.gui.IGuiItemStackGroup; import mezz.jei.api.gui.IRecipeLayout; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeCategory; +import mezz.jei.api.recipe.IRecipeCategory; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import javax.annotation.Nonnull; -public class RecipeCategorySolderer extends BlankRecipeCategory { +public class RecipeCategorySolderer implements IRecipeCategory { public static final String ID = "refinedstorage.solderer"; private IDrawable background; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperSolderer.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperSolderer.java index 3885de3a1..d3e8b3ed2 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperSolderer.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/jei/RecipeWrapperSolderer.java @@ -3,14 +3,14 @@ package com.raoulvdberge.refinedstorage.integration.jei; import mezz.jei.api.IGuiHelper; import mezz.jei.api.gui.IDrawableAnimated; import mezz.jei.api.ingredients.IIngredients; -import mezz.jei.api.recipe.BlankRecipeWrapper; +import mezz.jei.api.recipe.IRecipeWrapper; import net.minecraft.client.Minecraft; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; import java.util.List; -public class RecipeWrapperSolderer extends BlankRecipeWrapper { +public class RecipeWrapperSolderer implements IRecipeWrapper { private IDrawableAnimated progress; private List> inputs; @@ -42,8 +42,6 @@ public class RecipeWrapperSolderer extends BlankRecipeWrapper { @Override public void drawInfo(Minecraft minecraft, int recipeWidth, int recipeHeight, int mouseX, int mouseY) { - super.drawInfo(minecraft, recipeWidth, recipeHeight, mouseX, mouseY); - progress.draw(minecraft, 40, 18); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCable.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCable.java index aaffae8f1..d5b9b7a50 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCable.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCable.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.integration.mcmp; +/*package com.raoulvdberge.refinedstorage.integration.mcmp; import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.block.BlockCable; @@ -54,4 +54,4 @@ public class PartCable implements IMultipart { public void onPartChanged(IPartInfo part, IPartInfo otherPart) { API.instance().discoverNode(part.getActualWorld(), part.getContainer().getPartPos()); } -} +}*/ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCableTile.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCableTile.java index 601979f71..446afcb92 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCableTile.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/PartCableTile.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.integration.mcmp; +/*package com.raoulvdberge.refinedstorage.integration.mcmp; import mcmultipart.api.container.IPartInfo; import mcmultipart.api.multipart.IMultipartTile; @@ -25,4 +25,5 @@ public class PartCableTile implements IMultipartTile { public IPartInfo getInfo() { return info; } -} +}*/ + diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/RSMCMPAddon.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/RSMCMPAddon.java index 226b56258..068d5b483 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/RSMCMPAddon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/mcmp/RSMCMPAddon.java @@ -1,42 +1,21 @@ package com.raoulvdberge.refinedstorage.integration.mcmp; -import com.raoulvdberge.refinedstorage.RSBlocks; -import com.raoulvdberge.refinedstorage.block.BlockCable; import com.raoulvdberge.refinedstorage.tile.*; -import mcmultipart.api.addon.IMCMPAddon; -import mcmultipart.api.addon.MCMPAddon; -import mcmultipart.api.container.IPartInfo; -import mcmultipart.api.multipart.IMultipart; -import mcmultipart.api.multipart.IMultipartRegistry; -import mcmultipart.api.multipart.IMultipartTile; -import mcmultipart.api.multipart.MultipartOcclusionHelper; -import mcmultipart.api.ref.MCMPCapabilities; -import mcmultipart.api.slot.EnumCenterSlot; -import mcmultipart.block.BlockMultipartContainer; -import mcmultipart.block.TileMultipartContainer; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; -import net.minecraft.item.Item; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.EnumFacing; -import net.minecraft.util.ResourceLocation; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; -import net.minecraftforge.common.MinecraftForge; -import net.minecraftforge.common.capabilities.Capability; -import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import java.util.List; -import java.util.Optional; -@MCMPAddon -public class RSMCMPAddon implements IMCMPAddon { - @Override +//@MCMPAddon +public class RSMCMPAddon /*implements IMCMPAddon*/ { + /*@Override public void registerParts(IMultipartRegistry registry) { MinecraftForge.EVENT_BUS.register(this); @@ -53,7 +32,7 @@ public class RSMCMPAddon implements IMCMPAddon { private void register(IMultipartRegistry registry, BlockCable block) { registry.registerPartWrapper(block, new PartCable(block)); registry.registerStackWrapper(Item.getItemFromBlock(block), s -> true, block); - } + }*/ @SubscribeEvent public void onAttachCapability(AttachCapabilitiesEvent e) { @@ -79,7 +58,7 @@ public class RSMCMPAddon implements IMCMPAddon { } private void register(AttachCapabilitiesEvent e, String id) { - e.addCapability(new ResourceLocation("refinedstorage:" + id), new ICapabilityProvider() { + /*e.addCapability(new ResourceLocation("refinedstorage:" + id), new ICapabilityProvider() { private PartCableTile tile; @Override @@ -100,11 +79,11 @@ public class RSMCMPAddon implements IMCMPAddon { return null; } - }); + });*/ } public static boolean hasConnectionWith(TileEntity tile, List boxes) { - if (tile != null && tile.hasCapability(MCMPCapabilities.MULTIPART_TILE, null)) { + /*if (tile != null && tile.hasCapability(MCMPCapabilities.MULTIPART_TILE, null)) { IMultipartTile multipartTile = tile.getCapability(MCMPCapabilities.MULTIPART_TILE, null); if (multipartTile instanceof PartCableTile && ((PartCableTile) multipartTile).getInfo() != null) { @@ -116,7 +95,7 @@ public class RSMCMPAddon implements IMCMPAddon { } } } - } + }*/ return true; } @@ -125,13 +104,13 @@ public class RSMCMPAddon implements IMCMPAddon { public static TileEntity unwrapTile(IBlockAccess world, BlockPos pos) { TileEntity tile = world.getTileEntity(pos); - if (tile instanceof TileMultipartContainer.Ticking) { + /*if (tile instanceof TileMultipartContainer.Ticking) { Optional multipartTile = ((TileMultipartContainer.Ticking) tile).getPartTile(EnumCenterSlot.CENTER); if (multipartTile.isPresent()) { return multipartTile.get().getTileEntity(); } - } + }*/ return tile; } @@ -139,7 +118,7 @@ public class RSMCMPAddon implements IMCMPAddon { public static Block unwrapBlock(IBlockAccess world, BlockPos pos) { IBlockState state = world.getBlockState(pos); - if (state.getBlock() instanceof BlockMultipartContainer) { + /*if (state.getBlock() instanceof BlockMultipartContainer) { Optional multipartContainer = BlockMultipartContainer.getTile(world, pos); if (multipartContainer.isPresent()) { @@ -149,7 +128,7 @@ public class RSMCMPAddon implements IMCMPAddon { return info.get().getPart().getBlock(); } } - } + }*/ return state.getBlock(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java index 5cc212e34..e6ae239c1 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingPattern.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.integration.oc; +/*package com.raoulvdberge.refinedstorage.integration.oc; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import li.cil.oc.api.driver.Converter; @@ -17,4 +17,4 @@ public class ConverterCraftingPattern implements Converter { } } } - +*/ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java index 73b46adfc..bf0cb9bad 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/ConverterCraftingTask.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.integration.oc; +/*package com.raoulvdberge.refinedstorage.integration.oc; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; import li.cil.oc.api.driver.Converter; @@ -17,4 +17,4 @@ public class ConverterCraftingTask implements Converter { output.put("quantity", task.getQuantity()); } } -} \ No newline at end of file +}*/ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java index 15ba333ea..c5a30d639 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/DriverNetwork.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.integration.oc; +/*package com.raoulvdberge.refinedstorage.integration.oc; import com.raoulvdberge.refinedstorage.proxy.CapabilityNetworkNodeProxy; import li.cil.oc.api.Driver; @@ -28,4 +28,4 @@ public class DriverNetwork implements DriverBlock { Driver.add(new ConverterCraftingPattern()); Driver.add(new ConverterCraftingTask()); } -} +}*/ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java index 74d5b0ccd..9bf9898db 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/integration/oc/EnvironmentNetwork.java @@ -1,4 +1,4 @@ -package com.raoulvdberge.refinedstorage.integration.oc; +/*package com.raoulvdberge.refinedstorage.integration.oc; import com.raoulvdberge.refinedstorage.api.autocrafting.ICraftingPattern; import com.raoulvdberge.refinedstorage.api.autocrafting.task.ICraftingTask; @@ -312,5 +312,4 @@ public class EnvironmentNetwork extends AbstractManagedEnvironment { return new Object[]{node.getNetwork().getItemStorageCache().getList().getStacks()}; } -} - +}*/ diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java index 10190d544..67c3c570c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockController.java @@ -5,11 +5,13 @@ import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.block.ControllerType; import com.raoulvdberge.refinedstorage.tile.TileController; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.List; public class ItemBlockController extends ItemBlockBase { @@ -18,7 +20,9 @@ public class ItemBlockController extends ItemBlockBase { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); + if (stack.getMetadata() != ControllerType.CREATIVE.getId()) { tooltip.add(I18n.format("misc.refinedstorage:energy_stored", getEnergyStored(stack), getEnergyCapacity(stack))); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockEnergyItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockEnergyItem.java index 6edf3116d..e43cecdd7 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockEnergyItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockEnergyItem.java @@ -1,19 +1,21 @@ 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; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; +import javax.annotation.Nullable; import java.util.List; public abstract class ItemBlockEnergyItem extends ItemBlockBase { @@ -67,22 +69,26 @@ public abstract class ItemBlockEnergyItem extends ItemBlockBase { } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList list) { - list.add(new ItemStack(item, 1, TYPE_NORMAL)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } - ItemStack fullyCharged = new ItemStack(item, 1, TYPE_NORMAL); + items.add(new ItemStack(this, 1, TYPE_NORMAL)); + + ItemStack fullyCharged = new ItemStack(this, 1, TYPE_NORMAL); IEnergyStorage energy = fullyCharged.getCapability(CapabilityEnergy.ENERGY, null); energy.receiveEnergy(energy.getMaxEnergyStored(), false); - list.add(fullyCharged); + items.add(fullyCharged); - list.add(new ItemStack(item, 1, TYPE_CREATIVE)); + items.add(new ItemStack(this, 1, TYPE_CREATIVE)); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); if (stack.getItemDamage() != TYPE_CREATIVE) { IEnergyStorage energy = stack.getCapability(CapabilityEnergy.ENERGY, null); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java index cb3b67303..af2bcd639 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockFluidStorage.java @@ -6,6 +6,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeFluidStor import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskFluid; import com.raoulvdberge.refinedstorage.block.FluidStorageType; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryHelper; @@ -16,6 +17,7 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.List; public class ItemBlockFluidStorage extends ItemBlockBase { @@ -24,7 +26,9 @@ public class ItemBlockFluidStorage extends ItemBlockBase { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); + FluidStorageType type = FluidStorageType.getById(stack.getMetadata()); if (type != null && isValid(stack)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockPortableGrid.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockPortableGrid.java index f2431eb85..7bffaa498 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockPortableGrid.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockPortableGrid.java @@ -5,6 +5,7 @@ import com.raoulvdberge.refinedstorage.RSBlocks; import com.raoulvdberge.refinedstorage.RSGui; import com.raoulvdberge.refinedstorage.tile.grid.portable.PortableGrid; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.util.ActionResult; @@ -14,6 +15,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.List; public class ItemBlockPortableGrid extends ItemBlockEnergyItem { @@ -33,8 +35,8 @@ public class ItemBlockPortableGrid extends ItemBlockEnergyItem { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); tooltip.add(I18n.format("block.refinedstorage:portable_grid.tooltip")); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java index 8aa40abdc..005a2739b 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemBlockStorage.java @@ -6,6 +6,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNodeStorage; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskItem; import com.raoulvdberge.refinedstorage.block.ItemStorageType; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryHelper; @@ -16,6 +17,7 @@ import net.minecraft.util.EnumActionResult; import net.minecraft.util.EnumHand; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.List; public class ItemBlockStorage extends ItemBlockBase { @@ -24,7 +26,9 @@ public class ItemBlockStorage extends ItemBlockBase { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); + ItemStorageType type = ItemStorageType.getById(stack.getMetadata()); if (type != null && isValid(stack)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java index ade1af40d..d50599620 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemCore.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.RSUtils; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -17,9 +17,13 @@ public class ItemCore extends ItemBase { } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } + for (int i = 0; i < 2; ++i) { - subItems.add(new ItemStack(item, 1, i)); + items.add(new ItemStack(this, 1, i)); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java index 894e62895..a2d91b11c 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemEnergyItem.java @@ -1,17 +1,19 @@ 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; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; import net.minecraft.util.math.MathHelper; +import net.minecraft.world.World; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.energy.CapabilityEnergy; import net.minecraftforge.energy.IEnergyStorage; +import javax.annotation.Nullable; import java.util.List; public abstract class ItemEnergyItem extends ItemBase { @@ -68,22 +70,26 @@ public abstract class ItemEnergyItem extends ItemBase { } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList list) { - list.add(new ItemStack(item, 1, TYPE_NORMAL)); + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } - ItemStack fullyCharged = new ItemStack(item, 1, TYPE_NORMAL); + items.add(new ItemStack(this, 1, TYPE_NORMAL)); + + ItemStack fullyCharged = new ItemStack(this, 1, TYPE_NORMAL); IEnergyStorage energy = fullyCharged.getCapability(CapabilityEnergy.ENERGY, null); energy.receiveEnergy(energy.getMaxEnergyStored(), false); - list.add(fullyCharged); + items.add(fullyCharged); - list.add(new ItemStack(item, 1, TYPE_CREATIVE)); + items.add(new ItemStack(this, 1, TYPE_CREATIVE)); } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); if (stack.getItemDamage() != TYPE_CREATIVE) { IEnergyStorage energy = stack.getCapability(CapabilityEnergy.ENERGY, null); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java index 1fddac706..0dee19f15 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStorageDisk.java @@ -1,6 +1,7 @@ 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; @@ -8,11 +9,11 @@ import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskFluid; import com.raoulvdberge.refinedstorage.block.FluidStorageType; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryHelper; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.ActionResult; @@ -25,6 +26,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.List; public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvider { @@ -46,9 +48,13 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } + for (int i = 0; i < 5; ++i) { - subItems.add(API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, new ItemStack(item, 1, i))); + items.add(API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.FLUIDS, new ItemStack(this, 1, i))); } } @@ -101,10 +107,12 @@ public class ItemFluidStorageDisk extends ItemBase implements IStorageDiskProvid } @Override - public void addInformation(ItemStack disk, EntityPlayer player, List tooltip, boolean advanced) { - IStorageDisk storage = create(disk); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); - if (storage.isValid(disk)) { + IStorageDisk storage = create(stack); + + if (storage.isValid(stack)) { if (storage.getCapacity() == -1) { tooltip.add(I18n.format("misc.refinedstorage:storage.stored", storage.getStored())); } else { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java index 52d1a93f2..d37774e21 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemFluidStoragePart.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.RSUtils; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -19,9 +19,13 @@ public class ItemFluidStoragePart extends ItemBase { } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } + for (int i = 0; i <= 3; ++i) { - subItems.add(new ItemStack(item, 1, i)); + items.add(new ItemStack(this, 1, i)); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java index fefff621d..fff16bf8d 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkCard.java @@ -3,6 +3,7 @@ package com.raoulvdberge.refinedstorage.item; import com.raoulvdberge.refinedstorage.RSBlocks; import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -12,6 +13,7 @@ import net.minecraft.util.EnumHand; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.List; public class ItemNetworkCard extends ItemBase { @@ -47,8 +49,8 @@ public class ItemNetworkCard extends ItemBase { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); BlockPos pos = getReceiver(stack); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java index 1a774b258..9f206fe5c 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemNetworkItem.java @@ -5,6 +5,7 @@ import com.raoulvdberge.refinedstorage.api.network.item.INetworkItemProvider; import com.raoulvdberge.refinedstorage.tile.TileController; import net.minecraft.block.Block; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -15,6 +16,7 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.world.World; import net.minecraftforge.common.DimensionManager; +import javax.annotation.Nullable; import java.util.List; public abstract class ItemNetworkItem extends ItemEnergyItem implements INetworkItemProvider { @@ -53,8 +55,8 @@ public abstract class ItemNetworkItem extends ItemEnergyItem implements INetwork } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); if (isValid(stack)) { tooltip.add(I18n.format("misc.refinedstorage:network_item.tooltip", getX(stack), getY(stack), getZ(stack))); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java index 13005c543..af55c4ad8 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemPattern.java @@ -10,6 +10,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.autocrafting.CraftingPattern; import net.minecraft.client.gui.GuiScreen; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -23,6 +24,7 @@ import net.minecraft.world.World; import net.minecraftforge.common.util.Constants; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.*; public class ItemPattern extends ItemBase implements ICraftingPatternProvider { @@ -50,12 +52,14 @@ public class ItemPattern extends ItemBase implements ICraftingPatternProvider { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); + if (!stack.hasTagCompound()) { return; } - ICraftingPattern pattern = getPatternFromCache(player.getEntityWorld(), stack); + ICraftingPattern pattern = getPatternFromCache(world, stack); if (pattern.isValid()) { if (GuiScreen.isShiftKeyDown() || isProcessing(stack)) { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java index 5515bf40e..a3bb8e168 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemProcessor.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.RSUtils; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -22,9 +22,13 @@ public class ItemProcessor extends ItemBase { } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } + for (int i = 0; i <= 6; ++i) { - subItems.add(new ItemStack(item, 1, i)); + items.add(new ItemStack(this, 1, i)); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java index 7c335c214..9e2d41fc1 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemSecurityCard.java @@ -2,6 +2,7 @@ package com.raoulvdberge.refinedstorage.item; import com.raoulvdberge.refinedstorage.api.network.security.Permission; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -74,8 +75,8 @@ public class ItemSecurityCard extends ItemBase { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); if (stack.hasTagCompound() && stack.getTagCompound().hasKey(NBT_OWNER_NAME)) { tooltip.add(I18n.format("item.refinedstorage:security_card.owner", stack.getTagCompound().getString(NBT_OWNER_NAME))); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java index 584478bd5..2787ea877 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStorageDisk.java @@ -1,6 +1,7 @@ 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; @@ -8,6 +9,7 @@ import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskItem; import com.raoulvdberge.refinedstorage.block.ItemStorageType; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; @@ -22,6 +24,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.world.World; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import java.util.Iterator; import java.util.List; @@ -44,9 +47,13 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider subItems) { + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } + for (int i = 0; i < 5; ++i) { - subItems.add(API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, new ItemStack(item, 1, i))); + items.add(API.instance().getDefaultStorageDiskBehavior().initDisk(StorageDiskType.ITEMS, new ItemStack(this, 1, i))); } } @@ -77,7 +84,7 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider stacks = NonNullList.create(); - item.getSubItems(item, CreativeTabs.INVENTORY, stacks); + item.getSubItems(CreativeTabs.INVENTORY, stacks); for (ItemStack itemStack : stacks) { storage.insert(itemStack, 1000, false); @@ -92,10 +99,12 @@ public class ItemStorageDisk extends ItemBase implements IStorageDiskProvider tooltip, boolean advanced) { - IStorageDisk storage = create(disk); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); - if (storage.isValid(disk)) { + IStorageDisk storage = create(stack); + + if (storage.isValid(stack)) { if (storage.getCapacity() == -1) { tooltip.add(I18n.format("misc.refinedstorage:storage.stored", storage.getStored())); } else { diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java index ce733f7d9..bfd2e20e0 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemStoragePart.java @@ -1,7 +1,7 @@ package com.raoulvdberge.refinedstorage.item; +import com.raoulvdberge.refinedstorage.RSUtils; import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; @@ -19,9 +19,13 @@ public class ItemStoragePart extends ItemBase { } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } + for (int i = 0; i <= 3; ++i) { - subItems.add(new ItemStack(item, 1, i)); + items.add(new ItemStack(this, 1, i)); } } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java index 18b311970..00b5a9723 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemUpgrade.java @@ -4,19 +4,19 @@ import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.RSItems; import com.raoulvdberge.refinedstorage.RSUtils; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentData; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; -import net.minecraft.item.Item; +import net.minecraft.item.ItemEnchantedBook; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.NonNullList; -import net.minecraftforge.fml.relauncher.Side; -import net.minecraftforge.fml.relauncher.SideOnly; +import net.minecraft.world.World; import net.minecraftforge.oredict.OreDictionary; +import javax.annotation.Nullable; import java.util.List; public class ItemUpgrade extends ItemBase { @@ -43,21 +43,26 @@ public class ItemUpgrade extends ItemBase { } @Override - @SideOnly(Side.CLIENT) - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); + if (stack.getItemDamage() == TYPE_FORTUNE) { tooltip.add(I18n.format("enchantment.lootBonusDigger") + " " + I18n.format("enchantment.level." + ItemUpgrade.getFortuneLevel(stack))); } } @Override - public void getSubItems(Item item, CreativeTabs tab, NonNullList subItems) { + public void getSubItems(CreativeTabs tab, NonNullList items) { + if (!RSUtils.canAddToCreativeTab(this, tab)) { + return; + } + for (int i = 0; i <= 6; ++i) { - subItems.add(new ItemStack(item, 1, i)); + items.add(new ItemStack(this, 1, i)); } for (int j = 1; j <= 3; ++j) { - subItems.add(initializeForFortune(j)); + items.add(initializeForFortune(j)); } } @@ -112,9 +117,9 @@ public class ItemUpgrade extends ItemBase { case ItemUpgrade.TYPE_INTERDIMENSIONAL: return OreDictionary.getOres("netherStar"); case ItemUpgrade.TYPE_SILK_TOUCH: - return NonNullList.withSize(1, Items.ENCHANTED_BOOK.getEnchantedItemStack(new EnchantmentData(Enchantment.getEnchantmentByLocation("silk_touch"), 1))); + return NonNullList.withSize(1, ItemEnchantedBook.getEnchantedItemStack(new EnchantmentData(Enchantment.getEnchantmentByLocation("silk_touch"), 1))); case ItemUpgrade.TYPE_FORTUNE: - return NonNullList.withSize(1, Items.ENCHANTED_BOOK.getEnchantedItemStack(new EnchantmentData(Enchantment.getEnchantmentByLocation("fortune"), getFortuneLevel(stack)))); + return NonNullList.withSize(1, ItemEnchantedBook.getEnchantedItemStack(new EnchantmentData(Enchantment.getEnchantmentByLocation("fortune"), getFortuneLevel(stack)))); default: return RSUtils.emptyNonNullList(); } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java index 91d11991e..d92595188 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/ItemWrench.java @@ -6,6 +6,7 @@ import com.raoulvdberge.refinedstorage.tile.TileNode; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.InventoryHelper; import net.minecraft.item.ItemStack; @@ -21,6 +22,7 @@ import net.minecraft.util.text.TextComponentTranslation; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.List; public class ItemWrench extends ItemBase { @@ -178,8 +180,8 @@ public class ItemWrench extends ItemBase { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); WrenchMode mode = WrenchMode.readFromNBT(stack.getTagCompound()); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/item/filter/ItemFilter.java b/src/main/java/com/raoulvdberge/refinedstorage/item/filter/ItemFilter.java index 12e75c0f9..7b08772cd 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/item/filter/ItemFilter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/item/filter/ItemFilter.java @@ -8,6 +8,7 @@ import com.raoulvdberge.refinedstorage.inventory.ItemHandlerFilterItems; import com.raoulvdberge.refinedstorage.item.ItemBase; import com.raoulvdberge.refinedstorage.item.ItemPattern; import net.minecraft.client.resources.I18n; +import net.minecraft.client.util.ITooltipFlag; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -18,6 +19,7 @@ import net.minecraft.util.NonNullList; import net.minecraft.util.text.TextFormatting; import net.minecraft.world.World; +import javax.annotation.Nullable; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -79,8 +81,8 @@ public class ItemFilter extends ItemBase { } @Override - public void addInformation(ItemStack stack, EntityPlayer player, List tooltip, boolean advanced) { - super.addInformation(stack, player, tooltip, advanced); + public void addInformation(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { + super.addInformation(stack, world, tooltip, flag); tooltip.add(TextFormatting.YELLOW + I18n.format("sidebutton.refinedstorage:mode." + (getMode(stack) == MODE_WHITELIST ? "whitelist" : "blacklist")) + TextFormatting.RESET); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java index 08b46c7c0..c15c9ab26 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyClient.java @@ -18,9 +18,9 @@ import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.renderer.BufferBuilder; import net.minecraft.client.renderer.GlStateManager; import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.VertexBuffer; import net.minecraft.client.renderer.block.model.ModelBakery; import net.minecraft.client.renderer.block.model.ModelResourceLocation; import net.minecraft.client.renderer.block.statemap.StateMap; @@ -377,7 +377,7 @@ public class ProxyClient extends ProxyCommon { private void drawSelectionBoundingBox(AxisAlignedBB aabb) { Tessellator tessellator = Tessellator.getInstance(); - VertexBuffer buffer = tessellator.getBuffer(); + BufferBuilder buffer = tessellator.getBuffer(); buffer.begin(3, DefaultVertexFormats.POSITION); buffer.pos(aabb.minX, aabb.minY, aabb.minZ).endVertex(); diff --git a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java index 8239f54be..f05bc396a 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java @@ -14,17 +14,20 @@ import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriterHandlerFluids; import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriterHandlerItems; import com.raoulvdberge.refinedstorage.apiimpl.network.readerwriter.ReaderWriterHandlerRedstone; -import com.raoulvdberge.refinedstorage.apiimpl.solderer.*; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskFluid; -import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageDiskItem; -import com.raoulvdberge.refinedstorage.block.*; +import com.raoulvdberge.refinedstorage.apiimpl.solderer.SoldererRecipePrintedProcessor; +import com.raoulvdberge.refinedstorage.apiimpl.solderer.SoldererRecipeProcessor; +import com.raoulvdberge.refinedstorage.apiimpl.solderer.SoldererRecipeUpgrade; +import com.raoulvdberge.refinedstorage.block.BlockBase; +import com.raoulvdberge.refinedstorage.block.BlockCable; +import com.raoulvdberge.refinedstorage.block.GridType; import com.raoulvdberge.refinedstorage.gui.GuiHandler; import com.raoulvdberge.refinedstorage.integration.craftingtweaks.IntegrationCraftingTweaks; import com.raoulvdberge.refinedstorage.integration.forgeenergy.ReaderWriterHandlerForgeEnergy; -import com.raoulvdberge.refinedstorage.integration.oc.DriverNetwork; import com.raoulvdberge.refinedstorage.integration.oc.IntegrationOC; import com.raoulvdberge.refinedstorage.integration.tesla.IntegrationTesla; -import com.raoulvdberge.refinedstorage.item.*; +import com.raoulvdberge.refinedstorage.item.ItemBlockBase; +import com.raoulvdberge.refinedstorage.item.ItemProcessor; +import com.raoulvdberge.refinedstorage.item.ItemUpgrade; import com.raoulvdberge.refinedstorage.network.*; import com.raoulvdberge.refinedstorage.tile.*; import com.raoulvdberge.refinedstorage.tile.craftingmonitor.TileCraftingMonitor; @@ -33,7 +36,6 @@ import com.raoulvdberge.refinedstorage.tile.data.TileDataManager; import com.raoulvdberge.refinedstorage.tile.grid.TileGrid; import com.raoulvdberge.refinedstorage.tile.grid.portable.TilePortableGrid; import net.minecraft.block.Block; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -48,7 +50,6 @@ import net.minecraftforge.fml.common.network.NetworkRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; import net.minecraftforge.fml.relauncher.Side; import net.minecraftforge.oredict.OreDictionary; -import net.minecraftforge.oredict.ShapedOreRecipe; import java.util.ArrayList; import java.util.List; @@ -229,6 +230,7 @@ public class ProxyCommon { // Silicon GameRegistry.addSmelting(Items.QUARTZ, new ItemStack(RSItems.SILICON), 0.5f); + /* // Quartz Enriched Iron GameRegistry.addRecipe(new ItemStack(RSItems.QUARTZ_ENRICHED_IRON, 4), "II", @@ -337,7 +339,7 @@ public class ProxyCommon { 'C', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION), 'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), 'M', new ItemStack(RSBlocks.MACHINE_CASING) - ); + );*/ // Crafting Grid API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe( @@ -366,6 +368,7 @@ public class ProxyCommon { NonNullList.withSize(1, new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId())) )); + /* // Wireless Grid GameRegistry.addRecipe(new ItemStack(RSItems.WIRELESS_GRID, 1, ItemWirelessGrid.TYPE_NORMAL), "EPE", @@ -670,7 +673,7 @@ public class ProxyCommon { 'G', "blockGlass", 'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), 'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON) - )); + ));*/ API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_RANGE)); API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_SPEED)); @@ -681,7 +684,7 @@ public class ProxyCommon { API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.initializeForFortune(2))); API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.initializeForFortune(3))); - GameRegistry.addShapedRecipe(new ItemStack(RSItems.UPGRADE, 1, ItemUpgrade.TYPE_STACK), + /*GameRegistry.addShapedRecipe(new ItemStack(RSItems.UPGRADE, 1, ItemUpgrade.TYPE_STACK), "USU", "SUS", "USU", @@ -828,12 +831,12 @@ public class ProxyCommon { 'D', new ItemStack(RSItems.CORE, 1, ItemCore.TYPE_DESTRUCTION), 'M', new ItemStack(RSBlocks.MACHINE_CASING), 'G', "blockGlass" - )); + ));*/ } public void init(FMLInitializationEvent e) { if (IntegrationOC.isLoaded()) { - DriverNetwork.register(); + //DriverNetwork.register(); } } diff --git a/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java b/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java index 95cf43fc0..0c08d1f43 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/render/TileEntitySpecialRendererStorageMonitor.java @@ -15,7 +15,7 @@ import org.lwjgl.opengl.GL11; public class TileEntitySpecialRendererStorageMonitor extends TileEntitySpecialRenderer { @Override - public void renderTileEntityAt(TileStorageMonitor tile, double x, double y, double z, float partialTicks, int destroyStage) { + public void renderTileEntityAt(TileStorageMonitor tile, double x, double y, double z, float partialTicks, int destroyStage, float colorAlpha) { setLightmapDisabled(true); float disX = 0, disXText = 0; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/RSSerializers.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/RSSerializers.java index ef7ef49f0..d73839acc 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/data/RSSerializers.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/data/RSSerializers.java @@ -44,6 +44,11 @@ public final class RSSerializers { public DataParameter> createKey(int id) { return null; } + + @Override + public List func_192717_a(List p_192717_1_) { + return p_192717_1_; + } }; public static final DataSerializer FLUID_STACK_SERIALIZER = new DataSerializer() { @@ -76,6 +81,11 @@ public final class RSSerializers { public DataParameter createKey(int id) { return null; } + + @Override + public FluidStack func_192717_a(FluidStack p_192717_1_) { + return p_192717_1_; + } }; public static final DataSerializer ACCESS_TYPE_SERIALIZER = new DataSerializer() { @@ -93,5 +103,10 @@ public final class RSSerializers { public DataParameter createKey(int id) { return null; } + + @Override + public AccessType func_192717_a(AccessType p_192717_1_) { + return p_192717_1_; + } }; } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 4afa5d2ac..f22a0f5a1 100755 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,8 +3,8 @@ "modid": "refinedstorage", "name": "Refined Storage", "description": "An elegant solution to your hoarding problem", - "version": "1.4.15", - "mcversion": "1.11.2", + "version": "1.5", + "mcversion": "1.12", "url": "https://refinedstorage.raoulvdberge.com", "updateUrl": "", "authorList": ["Refined Storage contributors"],