generated from tilera/1710mod
chore: format code
This commit is contained in:
parent
329b608b37
commit
2c24ce2b70
6 changed files with 408 additions and 346 deletions
|
@ -6,9 +6,10 @@ import thaumcraft.api.aspects.Aspect;
|
||||||
import thaumcraft.api.aspects.AspectList;
|
import thaumcraft.api.aspects.AspectList;
|
||||||
|
|
||||||
public class ItemAspects {
|
public class ItemAspects {
|
||||||
|
|
||||||
public static void init() {
|
public static void init() {
|
||||||
ThaumcraftApi.registerObjectTag(new ItemStack(CCItems.wandCastingApprentice, 1, 32767), new AspectList().add(Aspect.MAGIC, 4).add(Aspect.TOOL, 2).add(Aspect.CRAFT, 2));
|
ThaumcraftApi.registerObjectTag(
|
||||||
|
new ItemStack(CCItems.wandCastingApprentice, 1, 32767),
|
||||||
|
new AspectList().add(Aspect.MAGIC, 4).add(Aspect.TOOL, 2).add(Aspect.CRAFT, 2)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -351,7 +351,8 @@ public class Recipes {
|
||||||
|
|
||||||
public static void addClusters() {
|
public static void addClusters() {
|
||||||
for (int i = 0; i <= 10; i++) {
|
for (int i = 0; i <= 10; i++) {
|
||||||
if (i == 6 || i == 7 || i == 9) continue;
|
if (i == 6 || i == 7 || i == 9)
|
||||||
|
continue;
|
||||||
int k = i > 6 ? i - 1 : i;
|
int k = i > 6 ? i - 1 : i;
|
||||||
Research.clusters[k] = AuracoreRecipes.addShapelessInfusionCraftingRecipe(
|
Research.clusters[k] = AuracoreRecipes.addShapelessInfusionCraftingRecipe(
|
||||||
"CRYSTALCLUSTER" + i,
|
"CRYSTALCLUSTER" + i,
|
||||||
|
@ -405,14 +406,18 @@ public class Recipes {
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public static void removeClusters() {
|
public static void removeClusters() {
|
||||||
CraftingManager.getInstance().getRecipeList().removeIf((r) -> isCrystalCluster(r));
|
CraftingManager.getInstance().getRecipeList().removeIf(
|
||||||
|
(r) -> isCrystalCluster(r)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isCrystalCluster(Object recipe) {
|
public static boolean isCrystalCluster(Object recipe) {
|
||||||
if (!(recipe instanceof IRecipe)) return false;
|
if (!(recipe instanceof IRecipe))
|
||||||
|
return false;
|
||||||
IRecipe r = (IRecipe) recipe;
|
IRecipe r = (IRecipe) recipe;
|
||||||
ItemStack output = r.getRecipeOutput();
|
ItemStack output = r.getRecipeOutput();
|
||||||
if (output == null) return false;
|
if (output == null)
|
||||||
|
return false;
|
||||||
Item item = output.getItem();
|
Item item = output.getItem();
|
||||||
return Block.getBlockFromItem(item) == ConfigBlocks.blockCrystal;
|
return Block.getBlockFromItem(item) == ConfigBlocks.blockCrystal;
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,353 +83,405 @@ public class Research {
|
||||||
new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png")
|
new ResourceLocation("thaumcraft", "textures/gui/gui_researchback.png")
|
||||||
);
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem("CCAURA", "CLASSICCASTING", new AspectList(), -2, -4, 1, new ResourceLocation("classiccasting", "textures/misc/aura.png"))
|
CCResearchManager.addDiscoverableResearch(
|
||||||
.setPages(
|
new ResearchItem(
|
||||||
new ResearchPage("classiccasting.research_page.CCAURA.1"),
|
"CCAURA",
|
||||||
new ResearchPage("classiccasting.research_page.CCAURA.2")
|
"CLASSICCASTING",
|
||||||
|
new AspectList(),
|
||||||
|
-2,
|
||||||
|
-4,
|
||||||
|
1,
|
||||||
|
new ResourceLocation("classiccasting", "textures/misc/aura.png")
|
||||||
)
|
)
|
||||||
.setAutoUnlock()
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.CCAURA.1"),
|
||||||
|
new ResearchPage("classiccasting.research_page.CCAURA.2")
|
||||||
|
)
|
||||||
|
.setAutoUnlock()
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem("CCFLUX", "CLASSICCASTING", new AspectList(), -4, -4, 1, new ResourceLocation("classiccasting", "textures/misc/flux.png"))
|
CCResearchManager.addDiscoverableResearch(
|
||||||
.setPages(
|
new ResearchItem(
|
||||||
new ResearchPage("classiccasting.research_page.CCFLUX.1"),
|
"CCFLUX",
|
||||||
new ResearchPage("classiccasting.research_page.CCFLUX.2")
|
"CLASSICCASTING",
|
||||||
|
new AspectList(),
|
||||||
|
-4,
|
||||||
|
-4,
|
||||||
|
1,
|
||||||
|
new ResourceLocation("classiccasting", "textures/misc/flux.png")
|
||||||
)
|
)
|
||||||
.setAutoUnlock()
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.CCFLUX.1"),
|
||||||
|
new ResearchPage("classiccasting.research_page.CCFLUX.2")
|
||||||
|
)
|
||||||
|
.setAutoUnlock()
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
// TODO: move research to right place
|
// TODO: move research to right place
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"MAGBLOCKS",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"MAGBLOCKS",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspects.ROCK, 1)
|
new AspectList()
|
||||||
.add(Aspect.METAL, 1)
|
.add(Aspects.ROCK, 1)
|
||||||
.add(Aspect.MAGIC, 1)
|
.add(Aspect.METAL, 1)
|
||||||
.add(Aspect.TREE, 1)
|
.add(Aspect.MAGIC, 1)
|
||||||
.add(Aspect.CRAFT, 1),
|
.add(Aspect.TREE, 1)
|
||||||
-2,
|
.add(Aspect.CRAFT, 1),
|
||||||
-2,
|
-2,
|
||||||
2,
|
-2,
|
||||||
new ItemStack(CCBlocks.infusionWorkbench)
|
2,
|
||||||
)
|
new ItemStack(CCBlocks.infusionWorkbench)
|
||||||
.setPages(
|
|
||||||
new ResearchPage("classiccasting.research_page.MAGBLOCKS.1"),
|
|
||||||
new ResearchPage(arcaneRecipes.get("ArcaneStone")),
|
|
||||||
new ResearchPage(arcaneRecipes.get("ArcaneWood1")),
|
|
||||||
new ResearchPage(arcaneRecipes.get("ArcaneWood2")),
|
|
||||||
new ResearchPage("classiccasting.research_page.MAGBLOCKS.2"),
|
|
||||||
new ResearchPage(infusionStructure),
|
|
||||||
new ResearchPage("classiccasting.research_page.MAGBLOCKS.3")
|
|
||||||
)
|
)
|
||||||
.setParents("THAUMIUM")
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.MAGBLOCKS.1"),
|
||||||
|
new ResearchPage(arcaneRecipes.get("ArcaneStone")),
|
||||||
|
new ResearchPage(arcaneRecipes.get("ArcaneWood1")),
|
||||||
|
new ResearchPage(arcaneRecipes.get("ArcaneWood2")),
|
||||||
|
new ResearchPage("classiccasting.research_page.MAGBLOCKS.2"),
|
||||||
|
new ResearchPage(infusionStructure),
|
||||||
|
new ResearchPage("classiccasting.research_page.MAGBLOCKS.3")
|
||||||
|
)
|
||||||
|
.setParents("THAUMIUM")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"AURACOMPASS",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"AURACOMPASS",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspect.MAGIC, 8)
|
new AspectList()
|
||||||
.add(Aspect.MIND, 8)
|
.add(Aspect.MAGIC, 8)
|
||||||
.add(Aspect.MECHANISM, 4),
|
.add(Aspect.MIND, 8)
|
||||||
-2,
|
.add(Aspect.MECHANISM, 4),
|
||||||
0,
|
-2,
|
||||||
2,
|
0,
|
||||||
new ItemStack(CCItems.auraCompass)
|
2,
|
||||||
)
|
new ItemStack(CCItems.auraCompass)
|
||||||
.setPages(
|
|
||||||
new ResearchPage("classiccasting.research_page.AURACOMPASS"),
|
|
||||||
new ResearchPage(arcaneRecipes.get("AuraCompass"))
|
|
||||||
)
|
)
|
||||||
.setParents("MAGBLOCKS")
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.AURACOMPASS"),
|
||||||
|
new ResearchPage(arcaneRecipes.get("AuraCompass"))
|
||||||
|
)
|
||||||
|
.setParents("MAGBLOCKS")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"CRYSTALCORE",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"CRYSTALCORE",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspect.MAGIC, 32)
|
new AspectList()
|
||||||
.add(Aspects.CONTROL, 32)
|
.add(Aspect.MAGIC, 32)
|
||||||
.add(Aspect.EXCHANGE, 24)
|
.add(Aspects.CONTROL, 32)
|
||||||
.add(Aspects.FLUX, 16)
|
.add(Aspect.EXCHANGE, 24)
|
||||||
.add(Aspect.MOTION, 32)
|
.add(Aspects.FLUX, 16)
|
||||||
.add(Aspect.VOID, 16),
|
.add(Aspect.MOTION, 32)
|
||||||
-3,
|
.add(Aspect.VOID, 16),
|
||||||
7,
|
-3,
|
||||||
3,
|
7,
|
||||||
new ItemStack(CCBlocks.crystal)
|
3,
|
||||||
)
|
new ItemStack(CCBlocks.crystal)
|
||||||
.setPages(
|
|
||||||
new ResearchPage("classiccasting.research_page.CRYSTALCORE.1"),
|
|
||||||
new ResearchPageInfusion(infusionRecipes.get("CrystalCore")),
|
|
||||||
new ResearchPage("classiccasting.research_page.CRYSTALCORE.2"),
|
|
||||||
new ResearchPage(magnetStructure)
|
|
||||||
)
|
)
|
||||||
.setParents("THETHEORYOFEVERYTHING", "CRYSTALCLUSTER")
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.CRYSTALCORE.1"),
|
||||||
|
new ResearchPageInfusion(infusionRecipes.get("CrystalCore")),
|
||||||
|
new ResearchPage("classiccasting.research_page.CRYSTALCORE.2"),
|
||||||
|
new ResearchPage(magnetStructure)
|
||||||
|
)
|
||||||
|
.setParents("THETHEORYOFEVERYTHING", "CRYSTALCLUSTER")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"CRYSTALCAPACITOR",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"CRYSTALCAPACITOR",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspect.CRYSTAL, 24)
|
new AspectList()
|
||||||
.add(Aspect.MAGIC, 32)
|
.add(Aspect.CRYSTAL, 24)
|
||||||
.add(Aspect.EXCHANGE, 24),
|
.add(Aspect.MAGIC, 32)
|
||||||
-5,
|
.add(Aspect.EXCHANGE, 24),
|
||||||
7,
|
-5,
|
||||||
1,
|
7,
|
||||||
new ItemStack(CCBlocks.crystal, 1, 1)
|
1,
|
||||||
)
|
new ItemStack(CCBlocks.crystal, 1, 1)
|
||||||
.setPages(
|
|
||||||
new ResearchPage("classiccasting.research_page.CRYSTALCORE"),
|
|
||||||
new ResearchPageInfusion(infusionRecipes.get("CrystalCapacitor"))
|
|
||||||
)
|
)
|
||||||
.setParents("CRYSTALCORE")
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.CRYSTALCORE"),
|
||||||
|
new ResearchPageInfusion(infusionRecipes.get("CrystalCapacitor"))
|
||||||
|
)
|
||||||
|
.setParents("CRYSTALCORE")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"UNIFIEDTHAUMICFIELDTHEORY",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"UNIFIEDTHAUMICFIELDTHEORY",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspect.MIND, 8)
|
new AspectList()
|
||||||
.add(Aspects.FLUX, 8)
|
.add(Aspect.MIND, 8)
|
||||||
.add(Aspect.MAGIC, 8)
|
.add(Aspects.FLUX, 8)
|
||||||
.add(Aspect.FIRE, 8)
|
.add(Aspect.MAGIC, 8)
|
||||||
.add(Aspect.AIR, 8)
|
.add(Aspect.FIRE, 8)
|
||||||
.add(Aspect.EARTH, 8)
|
.add(Aspect.AIR, 8)
|
||||||
.add(Aspect.WATER, 8)
|
.add(Aspect.EARTH, 8)
|
||||||
.add(Aspects.TIME, 4),
|
.add(Aspect.WATER, 8)
|
||||||
0,
|
.add(Aspects.TIME, 4),
|
||||||
0,
|
0,
|
||||||
3,
|
0,
|
||||||
new ResourceLocation(
|
3,
|
||||||
"classiccasting", "textures/misc/unified_thaumic_field_theory.png"
|
new ResourceLocation(
|
||||||
|
"classiccasting", "textures/misc/unified_thaumic_field_theory.png"
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
.setPages(
|
||||||
.setPages(
|
new ResearchPage(
|
||||||
new ResearchPage("classiccasting.research_page.UNIFIEDTHAUMICFIELDTHEORY"
|
"classiccasting.research_page.UNIFIEDTHAUMICFIELDTHEORY"
|
||||||
),
|
),
|
||||||
new ResearchPageInfusion(infusionRecipes.get("AdeptWand"))
|
new ResearchPageInfusion(infusionRecipes.get("AdeptWand"))
|
||||||
)
|
)
|
||||||
.setParents("MAGBLOCKS")
|
.setParents("MAGBLOCKS")
|
||||||
.setSpecial()
|
.setSpecial()
|
||||||
.registerResearchItem());
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"WANDFIRE",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"WANDFIRE",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspects.DESTRUCTION, 8)
|
new AspectList()
|
||||||
.add(Aspect.MAGIC, 8)
|
.add(Aspects.DESTRUCTION, 8)
|
||||||
.add(Aspect.WEAPON, 8)
|
.add(Aspect.MAGIC, 8)
|
||||||
.add(Aspect.FIRE, 8),
|
.add(Aspect.WEAPON, 8)
|
||||||
1,
|
.add(Aspect.FIRE, 8),
|
||||||
2,
|
1,
|
||||||
2,
|
2,
|
||||||
new ItemStack(CCItems.wandFire)
|
2,
|
||||||
)
|
new ItemStack(CCItems.wandFire)
|
||||||
.setPages(
|
|
||||||
new ResearchPage("classiccasting.research_page.WANDFIRE"),
|
|
||||||
new ResearchPageInfusion(infusionRecipes.get("WandFire"))
|
|
||||||
)
|
)
|
||||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.WANDFIRE"),
|
||||||
|
new ResearchPageInfusion(infusionRecipes.get("WandFire"))
|
||||||
|
)
|
||||||
|
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"WANDFROST",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"WANDFROST",
|
||||||
new AspectList().add(Aspect.COLD, 16).add(Aspect.WEAPON, 4),
|
"CLASSICCASTING",
|
||||||
1,
|
new AspectList().add(Aspect.COLD, 16).add(Aspect.WEAPON, 4),
|
||||||
3,
|
1,
|
||||||
2,
|
3,
|
||||||
new ItemStack(CCItems.wandFrost)
|
2,
|
||||||
)
|
new ItemStack(CCItems.wandFrost)
|
||||||
.setPages(
|
|
||||||
new ResearchPage("classiccasting.research_page.WANDFROST"),
|
|
||||||
new ResearchPageInfusion(infusionRecipes.get("WandFrost"))
|
|
||||||
)
|
)
|
||||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.WANDFROST"),
|
||||||
|
new ResearchPageInfusion(infusionRecipes.get("WandFrost"))
|
||||||
|
)
|
||||||
|
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"WANDTRADE",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"WANDTRADE",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspect.EXCHANGE, 16)
|
new AspectList()
|
||||||
.add(Aspect.MAGIC, 8)
|
.add(Aspect.EXCHANGE, 16)
|
||||||
.add(Aspect.TOOL, 8),
|
.add(Aspect.MAGIC, 8)
|
||||||
-1,
|
.add(Aspect.TOOL, 8),
|
||||||
4,
|
-1,
|
||||||
2,
|
4,
|
||||||
new ItemStack(CCItems.wandTrade)
|
2,
|
||||||
)
|
new ItemStack(CCItems.wandTrade)
|
||||||
.setPages(
|
|
||||||
new ResearchPage("classiccasting.research_page.WANDTRADE"),
|
|
||||||
new ResearchPageInfusion(infusionRecipes.get("WandTrade"))
|
|
||||||
)
|
)
|
||||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.WANDTRADE"),
|
||||||
|
new ResearchPageInfusion(infusionRecipes.get("WandTrade"))
|
||||||
|
)
|
||||||
|
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"WANDEXCAVATE",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"WANDEXCAVATE",
|
||||||
new AspectList().add(Aspect.METAL, 16).add(Aspect.TOOL, 4),
|
"CLASSICCASTING",
|
||||||
-1,
|
new AspectList().add(Aspect.METAL, 16).add(Aspect.TOOL, 4),
|
||||||
3,
|
-1,
|
||||||
2,
|
3,
|
||||||
new ItemStack(CCItems.wandExcavation)
|
2,
|
||||||
)
|
new ItemStack(CCItems.wandExcavation)
|
||||||
.setPages(
|
|
||||||
new ResearchPage("classiccasting.research_page.WANDEXCAVATE"),
|
|
||||||
new ResearchPageInfusion(infusionRecipes.get("WandExcavate"))
|
|
||||||
)
|
)
|
||||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.WANDEXCAVATE"),
|
||||||
|
new ResearchPageInfusion(infusionRecipes.get("WandExcavate"))
|
||||||
|
)
|
||||||
|
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"WANDLIGHTNING",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"WANDLIGHTNING",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspects.DESTRUCTION, 8)
|
new AspectList()
|
||||||
.add(Aspect.MAGIC, 8)
|
.add(Aspects.DESTRUCTION, 8)
|
||||||
.add(Aspect.WEAPON, 8)
|
.add(Aspect.MAGIC, 8)
|
||||||
.add(Aspect.ENERGY, 8),
|
.add(Aspect.WEAPON, 8)
|
||||||
1,
|
.add(Aspect.ENERGY, 8),
|
||||||
4,
|
1,
|
||||||
2,
|
4,
|
||||||
new ItemStack(CCItems.wandLightning)
|
2,
|
||||||
)
|
new ItemStack(CCItems.wandLightning)
|
||||||
.setPages(
|
|
||||||
new ResearchPage("classiccasting.research_page.WANDLIGHTNING"),
|
|
||||||
new ResearchPageInfusion(infusionRecipes.get("WandLightning"))
|
|
||||||
)
|
)
|
||||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.WANDLIGHTNING"),
|
||||||
|
new ResearchPageInfusion(infusionRecipes.get("WandLightning"))
|
||||||
|
)
|
||||||
|
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"BASICFLUX",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"BASICFLUX",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspects.FLUX, 20)
|
new AspectList()
|
||||||
.add(Aspects.CONTROL, 8)
|
.add(Aspects.FLUX, 20)
|
||||||
.add(Aspect.EXCHANGE, 8)
|
.add(Aspects.CONTROL, 8)
|
||||||
.add(Aspects.PURE, 8)
|
.add(Aspect.EXCHANGE, 8)
|
||||||
.add(Aspect.MECHANISM, 4),
|
.add(Aspects.PURE, 8)
|
||||||
-3,
|
.add(Aspect.MECHANISM, 4),
|
||||||
4,
|
-3,
|
||||||
2,
|
4,
|
||||||
new ResourceLocation("classiccasting", "textures/misc/basic_flux.png")
|
2,
|
||||||
)
|
new ResourceLocation("classiccasting", "textures/misc/basic_flux.png")
|
||||||
.setPages(
|
|
||||||
new ResearchPage("classiccasting.research_page.BASICFLUX.1"),
|
|
||||||
new ResearchPageInfusion(infusionRecipes.get("FluxFilter")),
|
|
||||||
new ResearchPage("classiccasting.research_page.BASICFLUX.2"),
|
|
||||||
new ResearchPageInfusion(infusionRecipes.get("Alembic")),
|
|
||||||
new ResearchPage("classiccasting.research_page.BASICFLUX.3")
|
|
||||||
)
|
)
|
||||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY", "DISTILESSENTIA")
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.BASICFLUX.1"),
|
||||||
|
new ResearchPageInfusion(infusionRecipes.get("FluxFilter")),
|
||||||
|
new ResearchPage("classiccasting.research_page.BASICFLUX.2"),
|
||||||
|
new ResearchPageInfusion(infusionRecipes.get("Alembic")),
|
||||||
|
new ResearchPage("classiccasting.research_page.BASICFLUX.3")
|
||||||
|
)
|
||||||
|
.setParents("UNIFIEDTHAUMICFIELDTHEORY", "DISTILESSENTIA")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"THETHEORYOFEVERYTHING",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"THETHEORYOFEVERYTHING",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspect.MIND, 24)
|
new AspectList()
|
||||||
.add(Aspect.ARMOR, 8)
|
.add(Aspect.MIND, 24)
|
||||||
.add(Aspects.INSECT, 8)
|
.add(Aspect.ARMOR, 8)
|
||||||
.add(Aspect.PLANT, 8)
|
.add(Aspects.INSECT, 8)
|
||||||
.add(Aspect.WEAPON, 8)
|
.add(Aspect.PLANT, 8)
|
||||||
.add(Aspect.BEAST, 8)
|
.add(Aspect.WEAPON, 8)
|
||||||
.add(Aspect.FLESH, 8)
|
.add(Aspect.BEAST, 8)
|
||||||
.add(Aspect.LIFE, 8)
|
.add(Aspect.FLESH, 8)
|
||||||
.add(Aspect.POISON, 8)
|
.add(Aspect.LIFE, 8)
|
||||||
.add(Aspect.TREE, 8)
|
.add(Aspect.POISON, 8)
|
||||||
.add(Aspect.CROP, 8)
|
.add(Aspect.TREE, 8)
|
||||||
.add(Aspects.FLOWER, 8)
|
.add(Aspect.CROP, 8)
|
||||||
.add(Aspect.MECHANISM, 8)
|
.add(Aspects.FLOWER, 8)
|
||||||
.add(Aspects.SOUND, 8)
|
.add(Aspect.MECHANISM, 8)
|
||||||
.add(Aspect.CRYSTAL, 8)
|
.add(Aspects.SOUND, 8)
|
||||||
.add(Aspects.FUNGUS, 8)
|
.add(Aspect.CRYSTAL, 8)
|
||||||
.add(Aspect.METAL, 8)
|
.add(Aspects.FUNGUS, 8)
|
||||||
.add(Aspect.TOOL, 8),
|
.add(Aspect.METAL, 8)
|
||||||
0,
|
.add(Aspect.TOOL, 8),
|
||||||
7,
|
0,
|
||||||
3,
|
7,
|
||||||
new ResourceLocation(
|
3,
|
||||||
"classiccasting", "textures/misc/the_theory_of_everything.png"
|
new ResourceLocation(
|
||||||
|
"classiccasting", "textures/misc/the_theory_of_everything.png"
|
||||||
|
)
|
||||||
)
|
)
|
||||||
)
|
.setPages(
|
||||||
.setPages(
|
new ResearchPage("classiccasting.research_page.THETHEORYOFEVERYTHING"
|
||||||
new ResearchPage("classiccasting.research_page.THETHEORYOFEVERYTHING"),
|
),
|
||||||
new ResearchPageInfusion(infusionRecipes.get("MageWand"))
|
new ResearchPageInfusion(infusionRecipes.get("MageWand"))
|
||||||
)
|
)
|
||||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY", "BASICFLUX", "GOLEMSTRAW")
|
.setParents("UNIFIEDTHAUMICFIELDTHEORY", "BASICFLUX", "GOLEMSTRAW")
|
||||||
.setSpecial()
|
.setSpecial()
|
||||||
.registerResearchItem());
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"HELLROD",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"HELLROD",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspect.FIRE, 24)
|
new AspectList()
|
||||||
.add(Aspect.MAGIC, 16)
|
.add(Aspect.FIRE, 24)
|
||||||
.add(Aspect.WEAPON, 16)
|
.add(Aspect.MAGIC, 16)
|
||||||
.add(Aspect.BEAST, 24)
|
.add(Aspect.WEAPON, 16)
|
||||||
.add(Aspects.EVIL, 24),
|
.add(Aspect.BEAST, 24)
|
||||||
3,
|
.add(Aspects.EVIL, 24),
|
||||||
7,
|
3,
|
||||||
2,
|
7,
|
||||||
new ItemStack(CCItems.wandHellrod)
|
2,
|
||||||
)
|
new ItemStack(CCItems.wandHellrod)
|
||||||
.setPages(
|
|
||||||
new ResearchPage("classiccasting.research_page.HELLROD"),
|
|
||||||
new ResearchPageInfusion(infusionRecipes.get("WandHellrod"))
|
|
||||||
)
|
)
|
||||||
.setParents("THETHEORYOFEVERYTHING", "WANDFIRE")
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.HELLROD"),
|
||||||
|
new ResearchPageInfusion(infusionRecipes.get("WandHellrod"))
|
||||||
|
)
|
||||||
|
.setParents("THETHEORYOFEVERYTHING", "WANDFIRE")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
ThaumcraftApi.addWarpToResearch("HELLROD", 2);
|
ThaumcraftApi.addWarpToResearch("HELLROD", 2);
|
||||||
ThaumcraftApi.addWarpToItem(new ItemStack(CCItems.wandHellrod), 1);
|
ThaumcraftApi.addWarpToItem(new ItemStack(CCItems.wandHellrod), 1);
|
||||||
|
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"PORTABLEHOLE",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"PORTABLEHOLE",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspect.VOID, 20)
|
new AspectList()
|
||||||
.add(Aspect.MOTION, 8)
|
.add(Aspect.VOID, 20)
|
||||||
.add(Aspect.ELDRITCH, 8)
|
.add(Aspect.MOTION, 8)
|
||||||
.add(Aspect.EXCHANGE, 8),
|
.add(Aspect.ELDRITCH, 8)
|
||||||
-3,
|
.add(Aspect.EXCHANGE, 8),
|
||||||
2,
|
-3,
|
||||||
1,
|
2,
|
||||||
new ItemStack(CCItems.portableHole)
|
1,
|
||||||
)
|
new ItemStack(CCItems.portableHole)
|
||||||
.setPages(
|
|
||||||
new ResearchPage("classiccasting.research_page.PORTABLEHOLE"),
|
|
||||||
new ResearchPageInfusion(infusionRecipes.get("PortableHole"))
|
|
||||||
)
|
)
|
||||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY", "ENCHFABRIC")
|
.setPages(
|
||||||
.registerResearchItem());
|
new ResearchPage("classiccasting.research_page.PORTABLEHOLE"),
|
||||||
|
new ResearchPageInfusion(infusionRecipes.get("PortableHole"))
|
||||||
|
)
|
||||||
|
.setParents("UNIFIEDTHAUMICFIELDTHEORY", "ENCHFABRIC")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
|
|
||||||
ResearchPage crystalPage = new ResearchPageInfusion(clusters);
|
ResearchPage crystalPage = new ResearchPageInfusion(clusters);
|
||||||
crystalPage.recipeOutput = new ItemStack(ConfigBlocks.blockCrystal, 1, 9);
|
crystalPage.recipeOutput = new ItemStack(ConfigBlocks.blockCrystal, 1, 9);
|
||||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
CCResearchManager.addDiscoverableResearch(
|
||||||
"CRYSTALCLUSTER",
|
new ResearchItem(
|
||||||
"CLASSICCASTING",
|
"CRYSTALCLUSTER",
|
||||||
new AspectList()
|
"CLASSICCASTING",
|
||||||
.add(Aspect.CRYSTAL, 24)
|
new AspectList()
|
||||||
.add(Aspect.MAGIC, 32)
|
.add(Aspect.CRYSTAL, 24)
|
||||||
.add(Aspect.EXCHANGE, 24),
|
.add(Aspect.MAGIC, 32)
|
||||||
-2,
|
.add(Aspect.EXCHANGE, 24),
|
||||||
6,
|
-2,
|
||||||
1,
|
6,
|
||||||
new ItemStack(ConfigBlocks.blockCrystal, 1, 9)
|
1,
|
||||||
)
|
new ItemStack(ConfigBlocks.blockCrystal, 1, 9)
|
||||||
.setPages(
|
)
|
||||||
new ResearchPage("classiccasting.research_page.CRYSTALCLUSTER"),
|
.setPages(
|
||||||
crystalPage
|
new ResearchPage("classiccasting.research_page.CRYSTALCLUSTER"),
|
||||||
)
|
crystalPage
|
||||||
.setParents("BASICFLUX")
|
)
|
||||||
.registerResearchItem());
|
.setParents("BASICFLUX")
|
||||||
|
.registerResearchItem()
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,7 +7,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
||||||
import net.minecraft.world.IBlockAccess;
|
import net.minecraft.world.IBlockAccess;
|
||||||
|
|
||||||
public class BlockArcaneWood extends Block {
|
public class BlockArcaneWood extends Block {
|
||||||
|
|
||||||
public BlockArcaneWood() {
|
public BlockArcaneWood() {
|
||||||
super(Material.wood);
|
super(Material.wood);
|
||||||
this.setHardness(2.0f);
|
this.setHardness(2.0f);
|
||||||
|
@ -28,8 +27,9 @@ public class BlockArcaneWood extends Block {
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean isBeaconBase(IBlockAccess arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6) {
|
public boolean isBeaconBase(
|
||||||
|
IBlockAccess arg0, int arg1, int arg2, int arg3, int arg4, int arg5, int arg6
|
||||||
|
) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,7 +18,8 @@ class SlotResearchTableOutput extends Slot {
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isItemValid(ItemStack par1ItemStack) {
|
public boolean isItemValid(ItemStack par1ItemStack) {
|
||||||
return (par1ItemStack.getItem() == CCItems.researchNotes || par1ItemStack.getItem() == ConfigItems.itemResearchNotes)
|
return (par1ItemStack.getItem() == CCItems.researchNotes
|
||||||
|
|| par1ItemStack.getItem() == ConfigItems.itemResearchNotes)
|
||||||
&& par1ItemStack.getItemDamage() < 64;
|
&& par1ItemStack.getItemDamage() < 64;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -27,7 +28,9 @@ class SlotResearchTableOutput extends Slot {
|
||||||
if (note != null && note.getItem() == ConfigItems.itemResearchNotes) {
|
if (note != null && note.getItem() == ConfigItems.itemResearchNotes) {
|
||||||
ResearchNoteData data = ResearchManager.getData(note);
|
ResearchNoteData data = ResearchManager.getData(note);
|
||||||
if (data != null && !CCResearchManager.isDiscoverable(data.key)) {
|
if (data != null && !CCResearchManager.isDiscoverable(data.key)) {
|
||||||
note = CCResearchManager.createNote(new ItemStack(CCItems.researchNotes), data.key);
|
note = CCResearchManager.createNote(
|
||||||
|
new ItemStack(CCItems.researchNotes), data.key
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
note = new ItemStack(Items.paper);
|
note = new ItemStack(Items.paper);
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,6 @@ import thaumcraft.common.config.ConfigItems;
|
||||||
import thaumcraft.common.lib.research.ResearchManager;
|
import thaumcraft.common.lib.research.ResearchManager;
|
||||||
|
|
||||||
public class CCResearchManager {
|
public class CCResearchManager {
|
||||||
|
|
||||||
public static Set<String> discoverable = new HashSet<>();
|
public static Set<String> discoverable = new HashSet<>();
|
||||||
|
|
||||||
public static ItemStack createNote(ItemStack stack, String key) {
|
public static ItemStack createNote(ItemStack stack, String key) {
|
||||||
|
@ -276,7 +275,9 @@ public class CCResearchManager {
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
ResearchItem item = ResearchCategories.getResearch(key);
|
ResearchItem item = ResearchCategories.getResearch(key);
|
||||||
return item != null && (item.category == "ALCHEMY" || item.category == "ARTIFICE" || item.category == "GOLEMANCY");
|
return item != null
|
||||||
|
&& (item.category == "ALCHEMY" || item.category == "ARTIFICE"
|
||||||
|
|| item.category == "GOLEMANCY");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue