upstream/ThaumicTinkerer
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ThaumicTinkerer.git synced 2026-10-25 20:32:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed TTResearchItem.setPages calling twice

Browse Source
This commit is contained in:
TimeConqueror committed 2020-02-10 16:17:07 +03:00
1 parent 8e64099df4
commit 4c9d2a00ab
2 files changed
+7 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/thaumic/tinkerer/common/item/quartz/ItemDarkQuartz.java
+2 -1
View File
@@ -27,7 +27,8 @@ public class ItemDarkQuartz extends ItemBase {
@Override
public IRegisterableResearch getResearchItem() {
IRegisterableResearch researchItem = (IRegisterableResearch) new TTResearchItem(LibResearch.KEY_DARK_QUARTZ, new AspectList(), -2, 2, 0, new ItemStack(this), new ResearchPage("0"), ResearchHelper.recipePage(LibResearch.KEY_DARK_QUARTZ + 0), ResearchHelper.recipePage(LibResearch.KEY_DARK_QUARTZ + 1), ResearchHelper.recipePage(LibResearch.KEY_DARK_QUARTZ + 2), ResearchHelper.recipePage(LibResearch.KEY_DARK_QUARTZ + 3), ResearchHelper.recipePage(LibResearch.KEY_DARK_QUARTZ + 4), ResearchHelper.recipePage(LibResearch.KEY_DARK_QUARTZ + 5))
IRegisterableResearch researchItem = (IRegisterableResearch) new TTResearchItem(LibResearch.KEY_DARK_QUARTZ, new AspectList(), -2, 2, 0, new ItemStack(this))
.setPages(new ResearchPage("0"), ResearchHelper.recipePage(LibResearch.KEY_DARK_QUARTZ + 0), ResearchHelper.recipePage(LibResearch.KEY_DARK_QUARTZ + 1), ResearchHelper.recipePage(LibResearch.KEY_DARK_QUARTZ + 2), ResearchHelper.recipePage(LibResearch.KEY_DARK_QUARTZ + 3), ResearchHelper.recipePage(LibResearch.KEY_DARK_QUARTZ + 4), ResearchHelper.recipePage(LibResearch.KEY_DARK_QUARTZ + 5))
.setStub().setAutoUnlock().setRound().registerResearchItem();
return researchItem;
}
src/main/java/thaumic/tinkerer/common/research/TTResearchItem.java
+5 -7
View File
@@ -1,15 +1,15 @@
/**
* This class was created by <Vazkii>. It's distributed as
* part of the ThaumicTinkerer Mod.
*
* <p>
* ThaumicTinkerer is Open Source and distributed under a
* Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
* (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
*
* <p>
* ThaumicTinkerer is a Derivative Work on Thaumcraft 4.
* Thaumcraft 4 (c) Azanor 2012
* (http://www.minecraftforum.net/topic/1585216-)
*
* <p>
* File Created @ [8 Sep 2013, 16:53:14 (GMT)]
*/
package thaumic.tinkerer.common.research;
@@ -36,14 +36,12 @@ public class TTResearchItem extends ResearchItem implements IRegisterableResearc
super(par1, LibResearch.CATEGORY_THAUMICTINKERER);
}
public TTResearchItem(String par1, AspectList tags, int par3, int par4, int par5, ItemStack icon, ResearchPage... pages) {
public TTResearchItem(String par1, AspectList tags, int par3, int par4, int par5, ItemStack icon) {
super(par1, LibResearch.CATEGORY_THAUMICTINKERER, tags, par3, par4, par5, icon);
setPages(pages);
}
public TTResearchItem(String par1, AspectList tags, int par3, int par4, int par5, ResourceLocation icon, ResearchPage... pages) {
public TTResearchItem(String par1, AspectList tags, int par3, int par4, int par5, ResourceLocation icon) {
super(par1, LibResearch.CATEGORY_THAUMICTINKERER, tags, par3, par4, par5, icon);
setPages(pages);
}
public TTResearchItem setWarp(int warp) {