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;
|
||||
|
||||
public class ItemAspects {
|
||||
|
||||
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() {
|
||||
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;
|
||||
Research.clusters[k] = AuracoreRecipes.addShapelessInfusionCraftingRecipe(
|
||||
"CRYSTALCLUSTER" + i,
|
||||
|
@ -405,14 +406,18 @@ public class Recipes {
|
|||
|
||||
@SuppressWarnings("unchecked")
|
||||
public static void removeClusters() {
|
||||
CraftingManager.getInstance().getRecipeList().removeIf((r) -> isCrystalCluster(r));
|
||||
CraftingManager.getInstance().getRecipeList().removeIf(
|
||||
(r) -> isCrystalCluster(r)
|
||||
);
|
||||
}
|
||||
|
||||
public static boolean isCrystalCluster(Object recipe) {
|
||||
if (!(recipe instanceof IRecipe)) return false;
|
||||
if (!(recipe instanceof IRecipe))
|
||||
return false;
|
||||
IRecipe r = (IRecipe) recipe;
|
||||
ItemStack output = r.getRecipeOutput();
|
||||
if (output == null) return false;
|
||||
if (output == null)
|
||||
return false;
|
||||
Item item = output.getItem();
|
||||
return Block.getBlockFromItem(item) == ConfigBlocks.blockCrystal;
|
||||
}
|
||||
|
|
|
@ -83,24 +83,45 @@ public class Research {
|
|||
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(
|
||||
new ResearchItem(
|
||||
"CCAURA",
|
||||
"CLASSICCASTING",
|
||||
new AspectList(),
|
||||
-2,
|
||||
-4,
|
||||
1,
|
||||
new ResourceLocation("classiccasting", "textures/misc/aura.png")
|
||||
)
|
||||
.setPages(
|
||||
new ResearchPage("classiccasting.research_page.CCAURA.1"),
|
||||
new ResearchPage("classiccasting.research_page.CCAURA.2")
|
||||
)
|
||||
.setAutoUnlock()
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem("CCFLUX", "CLASSICCASTING", new AspectList(), -4, -4, 1, new ResourceLocation("classiccasting", "textures/misc/flux.png"))
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"CCFLUX",
|
||||
"CLASSICCASTING",
|
||||
new AspectList(),
|
||||
-4,
|
||||
-4,
|
||||
1,
|
||||
new ResourceLocation("classiccasting", "textures/misc/flux.png")
|
||||
)
|
||||
.setPages(
|
||||
new ResearchPage("classiccasting.research_page.CCFLUX.1"),
|
||||
new ResearchPage("classiccasting.research_page.CCFLUX.2")
|
||||
)
|
||||
.setAutoUnlock()
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
// TODO: move research to right place
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"MAGBLOCKS",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -124,9 +145,11 @@ public class Research {
|
|||
new ResearchPage("classiccasting.research_page.MAGBLOCKS.3")
|
||||
)
|
||||
.setParents("THAUMIUM")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"AURACOMPASS",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -143,9 +166,11 @@ public class Research {
|
|||
new ResearchPage(arcaneRecipes.get("AuraCompass"))
|
||||
)
|
||||
.setParents("MAGBLOCKS")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"CRYSTALCORE",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -167,9 +192,11 @@ public class Research {
|
|||
new ResearchPage(magnetStructure)
|
||||
)
|
||||
.setParents("THETHEORYOFEVERYTHING", "CRYSTALCLUSTER")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"CRYSTALCAPACITOR",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -186,9 +213,11 @@ public class Research {
|
|||
new ResearchPageInfusion(infusionRecipes.get("CrystalCapacitor"))
|
||||
)
|
||||
.setParents("CRYSTALCORE")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"UNIFIEDTHAUMICFIELDTHEORY",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -208,15 +237,18 @@ public class Research {
|
|||
)
|
||||
)
|
||||
.setPages(
|
||||
new ResearchPage("classiccasting.research_page.UNIFIEDTHAUMICFIELDTHEORY"
|
||||
new ResearchPage(
|
||||
"classiccasting.research_page.UNIFIEDTHAUMICFIELDTHEORY"
|
||||
),
|
||||
new ResearchPageInfusion(infusionRecipes.get("AdeptWand"))
|
||||
)
|
||||
.setParents("MAGBLOCKS")
|
||||
.setSpecial()
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"WANDFIRE",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -234,9 +266,11 @@ public class Research {
|
|||
new ResearchPageInfusion(infusionRecipes.get("WandFire"))
|
||||
)
|
||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"WANDFROST",
|
||||
"CLASSICCASTING",
|
||||
new AspectList().add(Aspect.COLD, 16).add(Aspect.WEAPON, 4),
|
||||
|
@ -250,9 +284,11 @@ public class Research {
|
|||
new ResearchPageInfusion(infusionRecipes.get("WandFrost"))
|
||||
)
|
||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"WANDTRADE",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -269,9 +305,11 @@ public class Research {
|
|||
new ResearchPageInfusion(infusionRecipes.get("WandTrade"))
|
||||
)
|
||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"WANDEXCAVATE",
|
||||
"CLASSICCASTING",
|
||||
new AspectList().add(Aspect.METAL, 16).add(Aspect.TOOL, 4),
|
||||
|
@ -285,9 +323,11 @@ public class Research {
|
|||
new ResearchPageInfusion(infusionRecipes.get("WandExcavate"))
|
||||
)
|
||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"WANDLIGHTNING",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -305,9 +345,11 @@ public class Research {
|
|||
new ResearchPageInfusion(infusionRecipes.get("WandLightning"))
|
||||
)
|
||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"BASICFLUX",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -329,9 +371,11 @@ public class Research {
|
|||
new ResearchPage("classiccasting.research_page.BASICFLUX.3")
|
||||
)
|
||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY", "DISTILESSENTIA")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"THETHEORYOFEVERYTHING",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -361,14 +405,17 @@ public class Research {
|
|||
)
|
||||
)
|
||||
.setPages(
|
||||
new ResearchPage("classiccasting.research_page.THETHEORYOFEVERYTHING"),
|
||||
new ResearchPage("classiccasting.research_page.THETHEORYOFEVERYTHING"
|
||||
),
|
||||
new ResearchPageInfusion(infusionRecipes.get("MageWand"))
|
||||
)
|
||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY", "BASICFLUX", "GOLEMSTRAW")
|
||||
.setSpecial()
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"HELLROD",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -387,11 +434,13 @@ public class Research {
|
|||
new ResearchPageInfusion(infusionRecipes.get("WandHellrod"))
|
||||
)
|
||||
.setParents("THETHEORYOFEVERYTHING", "WANDFIRE")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
ThaumcraftApi.addWarpToResearch("HELLROD", 2);
|
||||
ThaumcraftApi.addWarpToItem(new ItemStack(CCItems.wandHellrod), 1);
|
||||
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"PORTABLEHOLE",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -409,11 +458,13 @@ public class Research {
|
|||
new ResearchPageInfusion(infusionRecipes.get("PortableHole"))
|
||||
)
|
||||
.setParents("UNIFIEDTHAUMICFIELDTHEORY", "ENCHFABRIC")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
|
||||
ResearchPage crystalPage = new ResearchPageInfusion(clusters);
|
||||
crystalPage.recipeOutput = new ItemStack(ConfigBlocks.blockCrystal, 1, 9);
|
||||
CCResearchManager.addDiscoverableResearch(new ResearchItem(
|
||||
CCResearchManager.addDiscoverableResearch(
|
||||
new ResearchItem(
|
||||
"CRYSTALCLUSTER",
|
||||
"CLASSICCASTING",
|
||||
new AspectList()
|
||||
|
@ -430,6 +481,7 @@ public class Research {
|
|||
crystalPage
|
||||
)
|
||||
.setParents("BASICFLUX")
|
||||
.registerResearchItem());
|
||||
.registerResearchItem()
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -7,7 +7,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
|
|||
import net.minecraft.world.IBlockAccess;
|
||||
|
||||
public class BlockArcaneWood extends Block {
|
||||
|
||||
public BlockArcaneWood() {
|
||||
super(Material.wood);
|
||||
this.setHardness(2.0f);
|
||||
|
@ -28,8 +27,9 @@ public class BlockArcaneWood extends Block {
|
|||
}
|
||||
|
||||
@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;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -18,7 +18,8 @@ class SlotResearchTableOutput extends Slot {
|
|||
}
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
|
@ -27,7 +28,9 @@ class SlotResearchTableOutput extends Slot {
|
|||
if (note != null && note.getItem() == ConfigItems.itemResearchNotes) {
|
||||
ResearchNoteData data = ResearchManager.getData(note);
|
||||
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 {
|
||||
note = new ItemStack(Items.paper);
|
||||
}
|
||||
|
|
|
@ -19,7 +19,6 @@ import thaumcraft.common.config.ConfigItems;
|
|||
import thaumcraft.common.lib.research.ResearchManager;
|
||||
|
||||
public class CCResearchManager {
|
||||
|
||||
public static Set<String> discoverable = new HashSet<>();
|
||||
|
||||
public static ItemStack createNote(ItemStack stack, String key) {
|
||||
|
@ -276,7 +275,9 @@ public class CCResearchManager {
|
|||
return true;
|
||||
} else {
|
||||
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