Skip to content

Commit 1917a3c

Browse files
tier940tier940
authored
Industrial Apiary (#13)
1 parent fb20516 commit 1917a3c

42 files changed

Lines changed: 1688 additions & 130 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# v1.3.0
2+
- Add Industrial Apiary [#13](https://github.com/GTModpackTeam/GTBeesMatrix/pull/13)
3+
- Please report any unusual behavior. However, please note that the UI being null is by design.
4+
5+
* * *
6+
17
# v1.2.0
28
- Add Forestry Multifarm support for GregTech/GTFO saplings and GT fertilizer [#11](https://github.com/GTModpackTeam/GTBeesMatrix/pull/11)
39

‎dependencies.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ dependencies {
7474
}
7575

7676
// Debug Binnies
77-
compileOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212
77+
compileOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:7731146") // Binnie's Mods Patched 2.5.1.213
7878
if (project.debug_all.toBoolean() || project.debug_binnies.toBoolean()) {
79-
runtimeOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:5492997") // Binnie's Mods Patched 2.5.1.212
79+
runtimeOnly rfg.deobf("curse.maven:binnies-mods-patched-899182:7731146") // Binnie's Mods Patched 2.5.1.213
8080
}
8181

8282
// Debug EnderIO

‎src/main/java/com/github/gtexpert/gtbm/api/gui/GTBMGuiTextures.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package com.github.gtexpert.gtbm.api.gui;
22

3+
import net.minecraft.util.ResourceLocation;
4+
35
import gregtech.api.gui.resources.TextureArea;
46

57
public class GTBMGuiTextures {
@@ -14,4 +16,16 @@ public class GTBMGuiTextures {
1416
.fullImage("textures/gui/icon/gtbm_logo_blinking_yellow.png");
1517
public static final TextureArea GTBM_LOGO_BLINKING_RED = TextureArea
1618
.fullImage("textures/gui/icon/gtbm_logo_blinking_red.png");
19+
20+
// Bee status icon (from JEI)
21+
public static final TextureArea BEE_INFO_ICON = new TextureArea(
22+
new ResourceLocation("jei", "textures/gui/icons/info.png"), 0, 0, 1, 1);
23+
24+
// Bee slot overlays (directly from Gendustry's hint icons)
25+
public static final TextureArea QUEEN_OVERLAY = new TextureArea(
26+
new ResourceLocation("gendustry", "textures/items/hints/queen.png"), 0, 0, 1, 1);
27+
public static final TextureArea DRONE_OVERLAY = new TextureArea(
28+
new ResourceLocation("gendustry", "textures/items/hints/drone.png"), 0, 0, 1, 1);
29+
public static final TextureArea UPGRADE_OVERLAY = new TextureArea(
30+
new ResourceLocation("gendustry", "textures/items/hints/upgrade.png"), 0, 0, 1, 1);
1731
}

‎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/ForestryConfigHolder.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,16 @@ public class ForestryConfigHolder {
1616
"valid: [NORMAL, HARD]" })
1717
public static String gameMode = "NORMAL";
1818

19-
@Config.Comment({ "If true, each will be uncraftable.", "default: false" })
20-
public static boolean Still = false,
21-
Fabricator = false,
22-
Centrifuge = false,
23-
Bottler = false,
24-
Fermenter = false,
25-
Rainmaker = false,
26-
Carpenter = false,
27-
Moistener = false,
28-
Raintank = false,
29-
Squeezer = false;
19+
@Config.Comment({ "If true, each will be uncraftable.", "default: true" })
20+
public static boolean still = true,
21+
fabricator = true,
22+
centrifuge = true,
23+
bottler = true,
24+
fermenter = true,
25+
rainmaker = true,
26+
carpenter = true,
27+
moistener = true,
28+
raintank = true,
29+
squeezer = true,
30+
farmBlock = true;
3031
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.github.gtexpert.gtbm.integration.forestry.loaders.FFMOreDictionaryLoader;
1313
import com.github.gtexpert.gtbm.integration.forestry.recipes.*;
1414
import com.github.gtexpert.gtbm.integration.forestry.recipes.machines.*;
15+
import com.github.gtexpert.gtbm.integration.forestry.util.BeeHousingInfoProvider;
1516
import com.github.gtexpert.gtbm.module.Modules;
1617

1718
@TModule(
@@ -36,6 +37,11 @@ public void postInit(FMLPostInitializationEvent event) {
3637
CarpenterLoader.initMode();
3738
CentrifugeLoader.init();
3839
FabricatorLoader.init();
40+
41+
// Register TOP provider for bee housing health display
42+
if (Mods.TheOneProbe.isModLoaded()) {
43+
mcjty.theoneprobe.TheOneProbe.theOneProbeImp.registerProvider(new BeeHousingInfoProvider());
44+
}
3945
}
4046

4147
@Override

0 commit comments

Comments
 (0)