Anvilcraft/classic-casting
2
1
Fork 0
generated from tilera/1710mod
Code Issues 4 Pull requests Packages Projects Releases Wiki Activity

chore: format code

Browse source
This commit is contained in:
LordMZTE 2023-03-31 11:05:04 +02:00
parent 329b608b37
commit 2c24ce2b70
Signed by: LordMZTE
GPG key ID: B64802DC33A64FF6
6 changed files with 408 additions and 346 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/net/anvilcraft/classiccasting/ItemAspects.java
View file

@ -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)
);
} }
} }

13
src/main/java/net/anvilcraft/classiccasting/Recipes.java
View file

@ -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;
} }

124
src/main/java/net/anvilcraft/classiccasting/Research.java
View file

@ -83,24 +83,45 @@ 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(
new ResearchItem(
"CCAURA",
"CLASSICCASTING",
new AspectList(),
-2,
-4,
1,
new ResourceLocation("classiccasting", "textures/misc/aura.png")
)
.setPages( .setPages(
new ResearchPage("classiccasting.research_page.CCAURA.1"), new ResearchPage("classiccasting.research_page.CCAURA.1"),
new ResearchPage("classiccasting.research_page.CCAURA.2") new ResearchPage("classiccasting.research_page.CCAURA.2")
) )
.setAutoUnlock() .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( .setPages(
new ResearchPage("classiccasting.research_page.CCFLUX.1"), new ResearchPage("classiccasting.research_page.CCFLUX.1"),
new ResearchPage("classiccasting.research_page.CCFLUX.2") new ResearchPage("classiccasting.research_page.CCFLUX.2")
) )
.setAutoUnlock() .setAutoUnlock()
.registerResearchItem()); .registerResearchItem()
);
// TODO: move research to right place // TODO: move research to right place
CCResearchManager.addDiscoverableResearch(new ResearchItem( CCResearchManager.addDiscoverableResearch(
new ResearchItem(
"MAGBLOCKS", "MAGBLOCKS",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -124,9 +145,11 @@ public class Research {
new ResearchPage("classiccasting.research_page.MAGBLOCKS.3") new ResearchPage("classiccasting.research_page.MAGBLOCKS.3")
) )
.setParents("THAUMIUM") .setParents("THAUMIUM")
.registerResearchItem()); .registerResearchItem()
);
CCResearchManager.addDiscoverableResearch(new ResearchItem( CCResearchManager.addDiscoverableResearch(
new ResearchItem(
"AURACOMPASS", "AURACOMPASS",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -143,9 +166,11 @@ public class Research {
new ResearchPage(arcaneRecipes.get("AuraCompass")) new ResearchPage(arcaneRecipes.get("AuraCompass"))
) )
.setParents("MAGBLOCKS") .setParents("MAGBLOCKS")
.registerResearchItem()); .registerResearchItem()
);
CCResearchManager.addDiscoverableResearch(new ResearchItem( CCResearchManager.addDiscoverableResearch(
new ResearchItem(
"CRYSTALCORE", "CRYSTALCORE",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -167,9 +192,11 @@ public class Research {
new ResearchPage(magnetStructure) new ResearchPage(magnetStructure)
) )
.setParents("THETHEORYOFEVERYTHING", "CRYSTALCLUSTER") .setParents("THETHEORYOFEVERYTHING", "CRYSTALCLUSTER")
.registerResearchItem()); .registerResearchItem()
);
CCResearchManager.addDiscoverableResearch(new ResearchItem( CCResearchManager.addDiscoverableResearch(
new ResearchItem(
"CRYSTALCAPACITOR", "CRYSTALCAPACITOR",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -186,9 +213,11 @@ public class Research {
new ResearchPageInfusion(infusionRecipes.get("CrystalCapacitor")) new ResearchPageInfusion(infusionRecipes.get("CrystalCapacitor"))
) )
.setParents("CRYSTALCORE") .setParents("CRYSTALCORE")
.registerResearchItem()); .registerResearchItem()
);
CCResearchManager.addDiscoverableResearch(new ResearchItem( CCResearchManager.addDiscoverableResearch(
new ResearchItem(
"UNIFIEDTHAUMICFIELDTHEORY", "UNIFIEDTHAUMICFIELDTHEORY",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -208,15 +237,18 @@ public class Research {
) )
) )
.setPages( .setPages(
new ResearchPage("classiccasting.research_page.UNIFIEDTHAUMICFIELDTHEORY" new ResearchPage(
"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(
new ResearchItem(
"WANDFIRE", "WANDFIRE",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -234,9 +266,11 @@ public class Research {
new ResearchPageInfusion(infusionRecipes.get("WandFire")) new ResearchPageInfusion(infusionRecipes.get("WandFire"))
) )
.setParents("UNIFIEDTHAUMICFIELDTHEORY") .setParents("UNIFIEDTHAUMICFIELDTHEORY")
.registerResearchItem()); .registerResearchItem()
);
CCResearchManager.addDiscoverableResearch(new ResearchItem( CCResearchManager.addDiscoverableResearch(
new ResearchItem(
"WANDFROST", "WANDFROST",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList().add(Aspect.COLD, 16).add(Aspect.WEAPON, 4), new AspectList().add(Aspect.COLD, 16).add(Aspect.WEAPON, 4),
@ -250,9 +284,11 @@ public class Research {
new ResearchPageInfusion(infusionRecipes.get("WandFrost")) new ResearchPageInfusion(infusionRecipes.get("WandFrost"))
) )
.setParents("UNIFIEDTHAUMICFIELDTHEORY") .setParents("UNIFIEDTHAUMICFIELDTHEORY")
.registerResearchItem()); .registerResearchItem()
);
CCResearchManager.addDiscoverableResearch(new ResearchItem( CCResearchManager.addDiscoverableResearch(
new ResearchItem(
"WANDTRADE", "WANDTRADE",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -269,9 +305,11 @@ public class Research {
new ResearchPageInfusion(infusionRecipes.get("WandTrade")) new ResearchPageInfusion(infusionRecipes.get("WandTrade"))
) )
.setParents("UNIFIEDTHAUMICFIELDTHEORY") .setParents("UNIFIEDTHAUMICFIELDTHEORY")
.registerResearchItem()); .registerResearchItem()
);
CCResearchManager.addDiscoverableResearch(new ResearchItem( CCResearchManager.addDiscoverableResearch(
new ResearchItem(
"WANDEXCAVATE", "WANDEXCAVATE",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList().add(Aspect.METAL, 16).add(Aspect.TOOL, 4), new AspectList().add(Aspect.METAL, 16).add(Aspect.TOOL, 4),
@ -285,9 +323,11 @@ public class Research {
new ResearchPageInfusion(infusionRecipes.get("WandExcavate")) new ResearchPageInfusion(infusionRecipes.get("WandExcavate"))
) )
.setParents("UNIFIEDTHAUMICFIELDTHEORY") .setParents("UNIFIEDTHAUMICFIELDTHEORY")
.registerResearchItem()); .registerResearchItem()
);
CCResearchManager.addDiscoverableResearch(new ResearchItem( CCResearchManager.addDiscoverableResearch(
new ResearchItem(
"WANDLIGHTNING", "WANDLIGHTNING",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -305,9 +345,11 @@ public class Research {
new ResearchPageInfusion(infusionRecipes.get("WandLightning")) new ResearchPageInfusion(infusionRecipes.get("WandLightning"))
) )
.setParents("UNIFIEDTHAUMICFIELDTHEORY") .setParents("UNIFIEDTHAUMICFIELDTHEORY")
.registerResearchItem()); .registerResearchItem()
);
CCResearchManager.addDiscoverableResearch(new ResearchItem( CCResearchManager.addDiscoverableResearch(
new ResearchItem(
"BASICFLUX", "BASICFLUX",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -329,9 +371,11 @@ public class Research {
new ResearchPage("classiccasting.research_page.BASICFLUX.3") new ResearchPage("classiccasting.research_page.BASICFLUX.3")
) )
.setParents("UNIFIEDTHAUMICFIELDTHEORY", "DISTILESSENTIA") .setParents("UNIFIEDTHAUMICFIELDTHEORY", "DISTILESSENTIA")
.registerResearchItem()); .registerResearchItem()
);
CCResearchManager.addDiscoverableResearch(new ResearchItem( CCResearchManager.addDiscoverableResearch(
new ResearchItem(
"THETHEORYOFEVERYTHING", "THETHEORYOFEVERYTHING",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -361,14 +405,17 @@ public class Research {
) )
) )
.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(
new ResearchItem(
"HELLROD", "HELLROD",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -387,11 +434,13 @@ public class Research {
new ResearchPageInfusion(infusionRecipes.get("WandHellrod")) new ResearchPageInfusion(infusionRecipes.get("WandHellrod"))
) )
.setParents("THETHEORYOFEVERYTHING", "WANDFIRE") .setParents("THETHEORYOFEVERYTHING", "WANDFIRE")
.registerResearchItem()); .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(
new ResearchItem(
"PORTABLEHOLE", "PORTABLEHOLE",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -409,11 +458,13 @@ public class Research {
new ResearchPageInfusion(infusionRecipes.get("PortableHole")) new ResearchPageInfusion(infusionRecipes.get("PortableHole"))
) )
.setParents("UNIFIEDTHAUMICFIELDTHEORY", "ENCHFABRIC") .setParents("UNIFIEDTHAUMICFIELDTHEORY", "ENCHFABRIC")
.registerResearchItem()); .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(
new ResearchItem(
"CRYSTALCLUSTER", "CRYSTALCLUSTER",
"CLASSICCASTING", "CLASSICCASTING",
new AspectList() new AspectList()
@ -430,6 +481,7 @@ public class Research {
crystalPage crystalPage
) )
.setParents("BASICFLUX") .setParents("BASICFLUX")
.registerResearchItem()); .registerResearchItem()
);
} }
} }

6
src/main/java/net/anvilcraft/classiccasting/blocks/BlockArcaneWood.java
View file

@ -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;
} }
} }

7
src/main/java/net/anvilcraft/classiccasting/container/SlotResearchTableOutput.java
View file

@ -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);
} }

5
src/main/java/net/anvilcraft/classiccasting/research/CCResearchManager.java
View file

@ -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");
} }
} }