Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wand rebalance #18

Closed
wants to merge 10 commits into from
+35 −33
Closed

Wand rebalance #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cd18aed
Rebalancing the wands
Alastors Aug 9, 2024
1b0e4ae
minor tweak
Alastors Aug 9, 2024
0f4b4a2
spotlessApply
Aug 9, 2024
68708fb
I always miss spotless :fail:
Alastors Aug 9, 2024
c9c72e4
Everyone hates Wildcards apparently
Alastors Aug 9, 2024
dbd81ec
Merge branch 'wand-rebalance' of https://github.com/GTNewHorizons/GTN…
Alastors Aug 9, 2024
a0589f1
spotlessApply
Aug 9, 2024
0089d4c
Merge pull request #20 from GTNewHorizons/wand-rebalance-spotless-fixes
Alastors Aug 9, 2024
7a683a4
Update GTTier.java
Alastors Aug 9, 2024
98c78ea
Merge branch 'wand-rebalance' of https://github.com/GTNewHorizons/GTN…
Alastors Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions src/main/java/com/gtnewhorizons/tcwands/GTWandRegistry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,24 @@ public void register() {
0,
5,
GT_ModHandler.getModItem("Forestry", "oakStick", 1, 0, new ItemStack(Items.stick)),
GTTier.LV).regSceptreRecipe(2.0F);
new WandRecipeCreator("greatwood").regWandRecipe(20, 5, MV).regSceptreRecipe(2F).regUpwardStaffRecipe(75, 15)
GTTier.STEAM).regSceptreRecipe(2.0F);
new WandRecipeCreator("greatwood").regWandRecipe(20, 5, LV).regSceptreRecipe(2F).regUpwardStaffRecipe(75, 15)
.regStaffSceptreRecipe(1.4F);
new WandRecipeCreator("reed").regWandRecipe(60, 10, HV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15)
new WandRecipeCreator("reed").regWandRecipe(60, 10, MV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15)
.regStaffSceptreRecipe(1.5F);
new WandRecipeCreator("blaze").regWandRecipe(60, 10, HV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15)
new WandRecipeCreator("blaze").regWandRecipe(60, 10, MV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15)
.regStaffSceptreRecipe(1.5F);
new WandRecipeCreator("obsidian").regWandRecipe(60, 10, HV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15)
new WandRecipeCreator("obsidian").regWandRecipe(60, 10, MV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15)
.regStaffSceptreRecipe(1.5F);
new WandRecipeCreator("ice").regWandRecipe(60, 10, HV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15)
new WandRecipeCreator("ice").regWandRecipe(60, 10, MV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15)
.regStaffSceptreRecipe(1.5F);
new WandRecipeCreator("quartz").regWandRecipe(60, 10, HV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15)
new WandRecipeCreator("quartz").regWandRecipe(60, 10, MV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15)
.regStaffSceptreRecipe(1.5F);
new WandRecipeCreator("bone").regWandRecipe(60, 10, HV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15)
new WandRecipeCreator("bone").regWandRecipe(60, 10, MV).regSceptreRecipe(1.4F).regUpwardStaffRecipe(125, 15)
.regStaffSceptreRecipe(1.5F);
new WandRecipeCreator("silverwood").regWandRecipe(115, 15, EV).regSceptreRecipe(1.25F)
new WandRecipeCreator("silverwood").regWandRecipe(115, 15, HV).regSceptreRecipe(1.25F)
.regUpwardStaffRecipe(165, 15).regStaffSceptreRecipe(1.75F);
new WandRecipeCreator("primal").regStaffRecipe(175, 20, IV).regStaffSceptreRecipe(1.25F);
new WandRecipeCreator("primal").regStaffRecipe(175, 20, EV).regStaffSceptreRecipe(1.25F);

TCWandAPI.regCap(new CapWrapper("iron", 0));
TCWandAPI.regCap(new CapWrapper("copper", 1));
Expand All @@ -50,15 +50,15 @@ public void register() {

if (CompatibleMods.FORBIDDEN_MAGIC.isPresent()) {
TCWandsMod.LOGGER.info("Detected Forbidden Magic. Applying GTNH Recipes...");
new WandRecipeCreator("profane").regWandRecipe(25, 5, HV).regSceptreRecipe(2F);
new WandRecipeCreator("tainted").regWandRecipe(175, 15, IV).regSceptreRecipe(1.4F);
new WandRecipeCreator("blood").regWandRecipe(115, 15, EV).regSceptreRecipe(1.35F)
new WandRecipeCreator("profane").regWandRecipe(25, 5, MV).regSceptreRecipe(2F);
new WandRecipeCreator("tainted").regWandRecipe(175, 15, EV).regSceptreRecipe(1.4F);
new WandRecipeCreator("blood").regWandRecipe(115, 15, HV).regSceptreRecipe(1.35F)
.regUpwardStaffRecipe(150, 15).regStaffSceptreRecipe(1.2F);
new WandRecipeCreator("infernal").regWandRecipe(165, 15, IV).regSceptreRecipe(1.35F);
new WandRecipeCreator("livingwood").regWandRecipe(105, 15, EV).regSceptreRecipe(1.35F);
new WandRecipeCreator("dreamwood").regWandRecipe(115, 15, EV).regSceptreRecipe(1.3F)
new WandRecipeCreator("infernal").regWandRecipe(165, 15, EV).regSceptreRecipe(1.35F);
new WandRecipeCreator("livingwood").regWandRecipe(105, 15, HV).regSceptreRecipe(1.35F);
new WandRecipeCreator("dreamwood").regWandRecipe(115, 15, HV).regSceptreRecipe(1.3F)
.regUpwardStaffRecipe(150, 15).regStaffSceptreRecipe(1.2F);
new WandRecipeCreator("witchwood").regWandRecipe(115, 15, EV).regSceptreRecipe(1.3F)
new WandRecipeCreator("witchwood").regWandRecipe(115, 15, HV).regSceptreRecipe(1.3F)
.regUpwardStaffRecipe(150, 15).regStaffSceptreRecipe(1.2F);

TCWandAPI.regCap(new CapWrapper("manasteel", 5));
Expand All @@ -70,14 +70,14 @@ public void register() {

if (CompatibleMods.THAUMIC_TINKERER.isPresent()) {
TCWandsMod.LOGGER.info("Detected Thaumic Tinkerer. Applying GTNH Recipes...");
new WandRecipeCreator("ICHORCLOTH").regWandRecipe(250, 25, UV).regSceptreRecipe(1.25F);
new WandRecipeCreator("ICHORCLOTH").regWandRecipe(250, 25, IV).regSceptreRecipe(1.25F);

TCWandAPI.regCap(new CapWrapper("ICHOR", 8));
}

if (CompatibleMods.BLOOD_ARSENAL.isPresent()) {
TCWandsMod.LOGGER.info("Detected Blood Arsenal. Applying GTNH Recipes...");
new WandRecipeCreator("blood_wood").regWandRecipe(110, 15, EV).regSceptreRecipe(1.2F)
new WandRecipeCreator("blood_wood").regWandRecipe(110, 15, HV).regSceptreRecipe(1.2F)
.regUpwardStaffRecipe(145, 20).regStaffSceptreRecipe(1.6F);

TCWandAPI.regCap(new CapWrapper("blood_iron", 6));
Expand All @@ -99,7 +99,7 @@ public void register() {
9,
new ResourceLocation("taintedmagic", "textures/models/ModelWAND_CAP_CRIMSON_CLOTH.png"));

new WandRecipeCreator("warpwood").regWandRecipe(190, 15, LUV).regSceptreRecipe(1.2F)
new WandRecipeCreator("warpwood").regWandRecipe(190, 15, IV).regSceptreRecipe(1.2F)
.regUpwardStaffRecipe(220, 25).regStaffSceptreRecipe(1.2F);

TCWandAPI.regCap(new CapWrapper("cloth", 3));
Expand All @@ -110,17 +110,17 @@ public void register() {

if (CompatibleMods.THAUMIC_BASES.isPresent()) {
TCWandsMod.LOGGER.info("Detected Thaumic Bases. Applying GTNH Recipes...");
new WandRecipeCreator("tbthaumium").regWandRecipe(75, 10, HV).regSceptreRecipe(1.5F);
new WandRecipeCreator("tbvoid").regWandRecipe(175, 15, EV).regSceptreRecipe(1.2F);
new WandRecipeCreator("tbthaumium").regWandRecipe(75, 10, MV).regSceptreRecipe(1.5F);
new WandRecipeCreator("tbvoid").regWandRecipe(175, 15, HV).regSceptreRecipe(1.2F);

TCWandAPI.regCap(new CapWrapper("thauminite", 6));
}

if (CompatibleMods.THAUMIC_EXPLORATION.isPresent()) {
TCWandsMod.LOGGER.info("Detected Thaumic Exploration. Applying GTNH Recipes...");
new WandRecipeCreator("AMBER").regWandRecipe(20, 5, MV).regSceptreRecipe(2F).regUpwardStaffRecipe(75, 15)
new WandRecipeCreator("AMBER").regWandRecipe(20, 5, LV).regSceptreRecipe(2F).regUpwardStaffRecipe(75, 15)
.regStaffSceptreRecipe(1.4F);
new WandRecipeCreator("TRANSMUTATION").regWandRecipe(50, 10, HV).regSceptreRecipe(1.5F)
new WandRecipeCreator("TRANSMUTATION").regWandRecipe(50, 10, MV).regSceptreRecipe(1.5F)
.regUpwardStaffRecipe(125, 15).regStaffSceptreRecipe(1.5F);
// FIXME where's NECROMANCER
// cores.add(new WandCore("BREAD",HV, LICH, 20, 5, 2F));//FIXME need or not need?
Expand All @@ -132,7 +132,7 @@ public void register() {
/** ChromatiCraft is non-supported content. if this ever errors out in some way feel free to remove this. */
if (CompatibleMods.CHROMATICRAFT.isPresent()) {
TCWandsMod.LOGGER.info("Detected ChromatiCraft. Applying GTNH Recipes...");
new WandRecipeCreator("CRYSTALWAND").regWandRecipe(300, 30, UV).regSceptreRecipe(2.7F);
new WandRecipeCreator("CRYSTALWAND").regWandRecipe(300, 30, IV).regSceptreRecipe(2.7F);

TCWandAPI.regCap(new CapWrapper("TIEREDCAP_FOCAL", 10));
TCWandAPI.regCap(new CapWrapper("TIEREDCAP_FIRAXITE", 5));
Expand Down
18 changes: 10 additions & 8 deletions src/main/java/com/gtnewhorizons/tcwands/api/GTTier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,20 @@

import gregtech.api.enums.Tier;
import gregtech.api.util.GT_ModHandler;
import thaumcraft.common.config.ConfigItems;

public enum GTTier {

LV(0, () -> GT_ModHandler.getModItem("TwilightForest", "item.nagaScale", 1, 0, new ItemStack(Items.wheat))),
MV(1, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))),
HV(2, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))),
EV(3, () -> GT_ModHandler.getModItem("TwilightForest", "item.fieryBlood", 1, 0, new ItemStack(Items.potato))),
IV(4, () -> GT_ModHandler
STEAM(0, () -> new ItemStack(ConfigItems.itemShard, 1, 32767)),
LV(1, () -> GT_ModHandler.getModItem("TwilightForest", "item.nagaScale", 1, 0, new ItemStack(Items.wheat))),
MV(2, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))),
HV(3, () -> GT_ModHandler.getModItem("dreamcraft", "item.LichBone", 1, 0, new ItemStack(Items.carrot))),
EV(4, () -> GT_ModHandler.getModItem("TwilightForest", "item.fieryBlood", 1, 0, new ItemStack(Items.potato))),
IV(5, () -> GT_ModHandler
.getModItem("TwilightForest", "item.fieryTears", 1, 0, new ItemStack(Items.poisonous_potato))),
LUV(5, () -> GT_ModHandler.getModItem("TwilightForest", "item.carminite", 1, 0, new ItemStack(Items.apple))),
ZPM(6, () -> GT_ModHandler.getModItem("TwilightForest", "item.carminite", 1, 0, new ItemStack(Items.apple))),
UV(7, () -> GT_ModHandler.getModItem("dreamcraft", "item.SnowQueenBlood", 1, 0, new ItemStack(Items.cake)));
LUV(6, () -> GT_ModHandler.getModItem("TwilightForest", "item.carminite", 1, 0, new ItemStack(Items.apple))),
ZPM(7, () -> GT_ModHandler.getModItem("TwilightForest", "item.carminite", 1, 0, new ItemStack(Items.apple))),
UV(8, () -> GT_ModHandler.getModItem("dreamcraft", "item.SnowQueenBlood", 1, 0, new ItemStack(Items.cake)));

private static final GTTier[] tiers;

Expand Down