Skip to content

Commit 5157b1b

Browse files
tier940tier940
committed
Utilの再整理
1 parent 2ff8979 commit 5157b1b

16 files changed

Lines changed: 214 additions & 166 deletions

File tree

‎src/main/java/com/github/gtexpert/gtbm/integration/binnies/botany/recipes/BotanyItemsRecipe.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@
99

1010
import com.github.gtexpert.gtbm.api.util.Mods;
1111
import com.github.gtexpert.gtbm.integration.forestry.ForestryConfigHolder;
12-
import com.github.gtexpert.gtbm.integration.forestry.ForestryUtility;
1312
import com.github.gtexpert.gtbm.integration.forestry.recipes.machines.CarpenterLoader;
13+
import com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper;
1414

1515
import forestry.api.recipes.RecipeManagers;
1616

1717
public class BotanyItemsRecipe {
1818

1919
public static void init() {
20-
Enum<ForestryUtility.recipeMode> recipeMode = ForestryUtility.recipeMode
20+
Enum<ForestryRecipeHelper.RecipeMode> recipeMode = ForestryRecipeHelper.RecipeMode
2121
.safeValueOf(ForestryConfigHolder.gameMode);
2222

2323
// Botanist Database
2424
ModHandler.addShapelessNBTClearingRecipe("botanist_database_nbt",
2525
Mods.Botany.getItem("database"),
2626
Mods.Botany.getItem("database"));
2727

28-
if (recipeMode == ForestryUtility.recipeMode.HARD) {
28+
if (recipeMode == ForestryRecipeHelper.RecipeMode.HARD) {
2929
// Botanist Database
3030
CarpenterLoader.removeCarpenterRecipe(Mods.Botany.getItem("database"));
3131
RecipeManagers.carpenterManager.addRecipe(

‎src/main/java/com/github/gtexpert/gtbm/integration/binnies/extrabees/recipes/ExtraBeesItemsRecipe.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,23 @@
99

1010
import com.github.gtexpert.gtbm.api.util.Mods;
1111
import com.github.gtexpert.gtbm.integration.forestry.ForestryConfigHolder;
12-
import com.github.gtexpert.gtbm.integration.forestry.ForestryUtility;
1312
import com.github.gtexpert.gtbm.integration.forestry.recipes.machines.CarpenterLoader;
13+
import com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper;
1414

1515
import forestry.api.recipes.RecipeManagers;
1616

1717
public class ExtraBeesItemsRecipe {
1818

1919
public static void init() {
20-
Enum<ForestryUtility.recipeMode> recipeMode = ForestryUtility.recipeMode
20+
Enum<ForestryRecipeHelper.RecipeMode> recipeMode = ForestryRecipeHelper.RecipeMode
2121
.safeValueOf(ForestryConfigHolder.gameMode);
2222

2323
// Apiarist Database
2424
ModHandler.addShapelessNBTClearingRecipe("apiarist_database_nbt",
2525
Mods.ExtraBees.getItem("dictionary"),
2626
Mods.ExtraBees.getItem("dictionary"));
2727

28-
if (recipeMode == ForestryUtility.recipeMode.HARD) {
28+
if (recipeMode == ForestryRecipeHelper.RecipeMode.HARD) {
2929
// Apiarist Database
3030
CarpenterLoader.removeCarpenterRecipe(Mods.ExtraBees.getItem("dictionary"));
3131
RecipeManagers.carpenterManager.addRecipe(

‎src/main/java/com/github/gtexpert/gtbm/integration/binnies/extratrees/recipes/ExtraTreesItemsRecipe.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99

1010
import com.github.gtexpert.gtbm.api.util.Mods;
1111
import com.github.gtexpert.gtbm.integration.forestry.ForestryConfigHolder;
12-
import com.github.gtexpert.gtbm.integration.forestry.ForestryUtility;
1312
import com.github.gtexpert.gtbm.integration.forestry.recipes.machines.CarpenterLoader;
13+
import com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper;
1414

1515
import forestry.api.recipes.RecipeManagers;
1616

1717
public class ExtraTreesItemsRecipe {
1818

1919
public static void init() {
20-
Enum<ForestryUtility.recipeMode> recipeMode = ForestryUtility.recipeMode
20+
Enum<ForestryRecipeHelper.RecipeMode> recipeMode = ForestryRecipeHelper.RecipeMode
2121
.safeValueOf(ForestryConfigHolder.gameMode);
2222

2323
// Arborist Database
@@ -30,7 +30,7 @@ public static void init() {
3030
Mods.ExtraTrees.getItem("databaselepi"),
3131
Mods.ExtraTrees.getItem("databaselepi"));
3232

33-
if (recipeMode == ForestryUtility.recipeMode.HARD) {
33+
if (recipeMode == ForestryRecipeHelper.RecipeMode.HARD) {
3434
// Arborist Database
3535
CarpenterLoader.removeCarpenterRecipe(Mods.ExtraTrees.getItem("databasetree"));
3636
RecipeManagers.carpenterManager.addRecipe(

‎src/main/java/com/github/gtexpert/gtbm/integration/binnies/genetics/recipes/GeneticsItemsRecipe.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@
1717
import com.github.gtexpert.gtbm.api.util.ModUtility;
1818
import com.github.gtexpert.gtbm.api.util.Mods;
1919
import com.github.gtexpert.gtbm.integration.forestry.ForestryConfigHolder;
20-
import com.github.gtexpert.gtbm.integration.forestry.ForestryUtility;
2120
import com.github.gtexpert.gtbm.integration.forestry.recipes.machines.CarpenterLoader;
21+
import com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper;
2222

2323
import forestry.api.recipes.RecipeManagers;
2424

2525
public class GeneticsItemsRecipe {
2626

2727
public static void init() {
28-
Enum<ForestryUtility.recipeMode> recipeMode = ForestryUtility.recipeMode
28+
Enum<ForestryRecipeHelper.RecipeMode> recipeMode = ForestryRecipeHelper.RecipeMode
2929
.safeValueOf(ForestryConfigHolder.gameMode);
3030

3131
// Gene Database
3232
ModHandler.addShapelessNBTClearingRecipe("gene_database_nbt",
3333
Mods.Genetics.getItem("geneticdatabase"),
3434
Mods.Genetics.getItem("geneticdatabase"));
3535

36-
if (recipeMode == ForestryUtility.recipeMode.HARD) {
36+
if (recipeMode == ForestryRecipeHelper.RecipeMode.HARD) {
3737
// Reinforced Casing
3838
ModHandler.removeRecipeByName(Mods.Genetics.getResource("laboratory_casing"));
3939
RecipeMaps.ASSEMBLER_RECIPES.recipeBuilder()
4040
.input(plate, Materials.Aluminium, 4)
4141
.inputs(Mods.Forestry.getItem("sturdy_machine"))
4242
.fluidInputs(Materials.Water.getFluid(1000))
4343
.outputs(Mods.Genetics.getItem("misc"))
44-
.EUt(VA[MV]).duration(ForestryUtility.timeCarpenter(75)).buildAndRegister();
44+
.EUt(VA[MV]).duration(ForestryRecipeHelper.timeCarpenter(75)).buildAndRegister();
4545
RecipeManagers.carpenterManager.addRecipe(
4646
75, Materials.Water.getFluid(5000),
4747
ItemStack.EMPTY, Mods.Genetics.getItem("misc"),

‎src/main/java/com/github/gtexpert/gtbm/integration/binnies/recipes/BinniesItemsRecipe.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55

66
import com.github.gtexpert.gtbm.api.util.Mods;
77
import com.github.gtexpert.gtbm.integration.forestry.ForestryConfigHolder;
8-
import com.github.gtexpert.gtbm.integration.forestry.ForestryUtility;
8+
import com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper;
99

1010
import forestry.api.recipes.RecipeManagers;
1111

1212
public class BinniesItemsRecipe {
1313

1414
public static void init() {
15-
Enum<ForestryUtility.recipeMode> recipeMode = ForestryUtility.recipeMode
15+
Enum<ForestryRecipeHelper.RecipeMode> recipeMode = ForestryRecipeHelper.RecipeMode
1616
.safeValueOf(ForestryConfigHolder.gameMode);
1717

18-
if (recipeMode == ForestryUtility.recipeMode.HARD) {
18+
if (recipeMode == ForestryRecipeHelper.RecipeMode.HARD) {
1919
// Registry
2020
ModHandler.removeRecipeByName(Mods.Genetics.getResource("registry"));
2121
RecipeManagers.carpenterManager.addRecipe(

‎src/main/java/com/github/gtexpert/gtbm/integration/forestry/recipes/FFMBlockRecipe.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.github.gtexpert.gtbm.integration.forestry.recipes;
22

3-
import static com.github.gtexpert.gtbm.integration.forestry.ForestryUtility.feToEu;
4-
import static com.github.gtexpert.gtbm.integration.forestry.ForestryUtility.timeCarpenter;
3+
import static com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper.feToEu;
4+
import static com.github.gtexpert.gtbm.integration.forestry.util.ForestryRecipeHelper.timeCarpenter;
55
import static forestry.farming.ModuleFarming.getBlocks;
66
import static gregtech.api.unification.ore.OrePrefix.*;
77

0 commit comments

Comments
 (0)