upstream/ThaumicTinkerer
1
0 Fork 0
mirror of https://github.com/GTNewHorizons/ThaumicTinkerer.git synced 2026-11-08 12:44:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "First test to add hardcore recipes"

Browse Source 
This reverts commit 3c9322af05.
This commit is contained in:
Dream-Master committed 2016-03-27 15:53:48 +02:00
1 parent d179e36347
commit aa41a8485f
2 files changed
+9 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/thaumic/tinkerer/common/block/transvector/BlockTransvectorInterface.java
+2 -2
View File
@@ -83,14 +83,14 @@ public class BlockTransvectorInterface extends BlockCamo {
@Override
public IRegisterableResearch getResearchItem() {
return (IRegisterableResearch) new TTResearchItem(LibResearch.KEY_INTERFACE, new AspectList().add(Aspect.ENTROPY, 15).add(Aspect.ORDER, 12).add(Aspect.EARTH, 9).add(Aspect.MAGIC, 6).add(Aspect.ENERGY, 3), -4, 2, 4, new ItemStack(ThaumicTinkerer.registry.getFirstBlockFromClass(BlockTransvectorInterface.class))).setParents(LibResearch.KEY_DARK_QUARTZ).setParents("INFUSION")
return (IRegisterableResearch) new TTResearchItem(LibResearch.KEY_INTERFACE, new AspectList().add(Aspect.ENTROPY, 4).add(Aspect.ORDER, 4), -4, 2, 1, new ItemStack(ThaumicTinkerer.registry.getFirstBlockFromClass(BlockTransvectorInterface.class))).setParents(LibResearch.KEY_DARK_QUARTZ)
.setPages(new ResearchPage("0"), ResearchHelper.arcaneRecipePage(LibResearch.KEY_INTERFACE), new ResearchPage("1"), ResearchHelper.arcaneRecipePage(LibResearch.KEY_INTERFACE + "1"), new ResearchPage("2"));
}
@Override
public ThaumicTinkererRecipe getRecipeItem() {
return new ThaumicTinkererArcaneRecipe(LibResearch.KEY_INTERFACE, LibResearch.KEY_INTERFACE, new ItemStack(ThaumicTinkerer.registry.getFirstBlockFromClass(BlockTransvectorInterface.class)), new AspectList().add(Aspect.ORDER, 32).add(Aspect.ENTROPY, 32).add(Aspect.EARTH, 32),
return new ThaumicTinkererArcaneRecipe(LibResearch.KEY_INTERFACE, LibResearch.KEY_INTERFACE, new ItemStack(ThaumicTinkerer.registry.getFirstBlockFromClass(BlockTransvectorInterface.class)), new AspectList().add(Aspect.ORDER, 12).add(Aspect.ENTROPY, 16),
"BRB", "LEL", "BRB",
'B', new ItemStack(ConfigBlocks.blockCosmeticSolid, 1, 6),
'E', new ItemStack(Items.ender_pearl),
src/main/java/thaumic/tinkerer/common/item/ItemShareBook.java
+7 -7
View File
@@ -13,7 +13,6 @@ import net.minecraft.util.ChatComponentTranslation;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraftforge.common.util.Constants;
import thaumcraft.api.aspects.Aspect;
import thaumcraft.api.aspects.AspectList;
import thaumcraft.api.research.ResearchPage;
import thaumcraft.common.config.ConfigItems;
@@ -25,7 +24,6 @@ import thaumic.tinkerer.common.lib.LibItemNames;
import thaumic.tinkerer.common.lib.LibResearch;
import thaumic.tinkerer.common.registry.ItemBase;
import thaumic.tinkerer.common.registry.ThaumicTinkererCraftingBenchRecipe;
import thaumic.tinkerer.common.registry.ThaumicTinkererInfusionRecipe;
import thaumic.tinkerer.common.registry.ThaumicTinkererRecipe;
import thaumic.tinkerer.common.research.IRegisterableResearch;
import thaumic.tinkerer.common.research.ResearchHelper;
@@ -51,9 +49,9 @@ public class ItemShareBook extends ItemBase {
@Override
public IRegisterableResearch getResearchItem() {
IRegisterableResearch research = (TTResearchItem) new TTResearchItem(LibResearch.KEY_SHARE_TOME, new AspectList().add(Aspect.MIND, 15).add(Aspect.MAGIC, 12).add(Aspect.EXCHANGE, 9).add(Aspect.CRAFT, 6), 0, -1, 4, new ItemStack(this)).setWarp(3).setStub().setParentsHidden("INFUSION").setConcealed().setRound();
IRegisterableResearch research = (TTResearchItem) new TTResearchItem(LibResearch.KEY_SHARE_TOME, new AspectList(), 0, -1, 0, new ItemStack(this)).setStub().setAutoUnlock().setRound();
if (ConfigHandler.enableSurvivalShareTome)
((TTResearchItem) research).setPages(new ResearchPage("0"), ResearchHelper.infusionPage(LibResearch.KEY_SHARE_TOME));
((TTResearchItem) research).setPages(new ResearchPage("0"), ResearchHelper.recipePage(LibResearch.KEY_SHARE_TOME));
else ((TTResearchItem) research).setPages(new ResearchPage("0"));
return research;
}
@@ -61,9 +59,11 @@ public class ItemShareBook extends ItemBase {
@Override
public ThaumicTinkererRecipe getRecipeItem() {
if (ConfigHandler.enableSurvivalShareTome) {
return new ThaumicTinkererInfusionRecipe(LibResearch.KEY_SHARE_TOME, new ItemStack(this), 6,
new AspectList().add(Aspect.MIND, 32).add(Aspect.MAGIC, 32).add(Aspect.CRAFT, 16).add(Aspect.EXCHANGE, 16), new ItemStack(Items.skull, 1, 3),
new ItemStack(Items.nether_star), new ItemStack(Items.paper), new ItemStack(ConfigItems.itemInkwell), new ItemStack(ConfigItems.itemThaumonomicon), new ItemStack(Items.paper));
return new ThaumicTinkererCraftingBenchRecipe(LibResearch.KEY_SHARE_TOME, new ItemStack(this),
" S ", "PTP", " P ",
'S', new ItemStack(ConfigItems.itemInkwell),
'T', new ItemStack(ConfigItems.itemThaumonomicon),
'P', new ItemStack(Items.paper));
}
return null;
}