Skip to content

Commit bc100be

Browse files
klikli-devklikli-dev
committed
chore: disable currently unavailable dependencies
1 parent b6dcb26 commit bc100be

12 files changed

+595
-748
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,5 @@ logs/
2828

2929
src/generated/resources/.cache/
3030

31-
runtime-mods/
31+
# local flatDir maven repo
32+
lib/

‎build.gradle

+5-6
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ repositories {
142142
}
143143
}
144144
flatDir {
145-
dirs 'runtime-mods'
145+
dirs 'lib'
146146
}
147147
}
148148

@@ -169,8 +169,8 @@ dependencies {
169169
//TODO: Enable when updated
170170
// implementation fg.deobf("curse.maven:smartbrainlib-661293:${smartbrainlib_file_id}-sources-${smartbrainlib_src_file_id}")
171171
//temporary file-based maven with local compilation:
172-
implementation fg.deobf("ignoredvalue:smartbrainlib:forge-1.8.1")
173-
//runtimeOnly fg.deobf("ignoredvalue:Hwyla:forge-1.10.11-B78_1.16.2")
172+
implementation fg.deobf("ignoredvalue:smartbrainlib:forge-1.19.4-1.8.1")
173+
174174
//almostunified
175175
//TODO: Enable when updated
176176
// compileOnly fg.deobf("com.almostreliable.mods:almostunified-forge:${almostunified_version}")
@@ -180,9 +180,8 @@ dependencies {
180180
implementation fg.deobf("com.klikli_dev:modonomicon:${modonomicon_mc_version}-${modonomicon_version}") //we build against full jar because we NEED IT ALL
181181

182182
//theurgy
183-
//TODO: Enable when updated
184-
// compileOnly fg.deobf("com.klikli_dev:theurgy:${theurgy_mc_version}-${theurgy_version}")
185-
// runtimeOnly fg.deobf("com.klikli_dev:theurgy:${theurgy_mc_version}-${theurgy_version}")
183+
compileOnly fg.deobf("com.klikli_dev:theurgy:${theurgy_mc_version}-${theurgy_version}")
184+
runtimeOnly fg.deobf("com.klikli_dev:theurgy:${theurgy_mc_version}-${theurgy_version}")
186185

187186
//runtime only helper mods for dev env, placed in ./runtime-mods, example: Hwyla-forge-1.10.11-B78_1.16.2.jar
188187
//runtimeOnly fg.deobf("ignoredvalue:Hwyla:forge-1.10.11-B78_1.16.2")

‎gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ modonomicon_mc_version=1.19.4
2929
modonomicon_version=1.30.0
3030

3131
theurgy_mc_version=1.19.4
32-
theurgy_version=TODO
32+
theurgy_version=1.3.0

‎src/main/java/com/github/klikli_dev/occultism/integration/almostunified/AlmostUnifiedIntegration.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.github.klikli_dev.occultism.integration.almostunified;
22

3-
import com.almostreliable.unified.api.AlmostUnifiedLookup;
43
import net.minecraft.tags.TagKey;
54
import net.minecraft.world.item.Item;
65
import net.minecraftforge.fml.ModList;
@@ -12,15 +11,15 @@ public static boolean isLoaded() {
1211

1312
public static Item getPreferredItemForTag(TagKey<Item> tag) {
1413
if (isLoaded()) {
15-
return AlmostUnifiedHelper.getPreferredItemForTag(tag);
16-
}
14+
// return AlmostUnifiedHelper.getPreferredItemForTag(tag);
15+
}
1716

1817
return null;
1918
}
2019

21-
public static class AlmostUnifiedHelper {
22-
public static Item getPreferredItemForTag(TagKey<Item> tag) {
23-
return AlmostUnifiedLookup.INSTANCE.getPreferredItemForTag(tag);
24-
}
25-
}
20+
// public static class AlmostUnifiedHelper {
21+
// public static Item getPreferredItemForTag(TagKey<Item> tag) {
22+
// return AlmostUnifiedLookup.INSTANCE.getPreferredItemForTag(tag);
23+
// }
24+
// }
2625
}

‎src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiAccess.java

+9-9
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@
2222

2323
package com.github.klikli_dev.occultism.integration.jei;
2424

25-
import com.google.common.base.Strings;
26-
import mezz.jei.api.runtime.IJeiRuntime;
27-
2825
public class JeiAccess {
2926
public static String getFilterText() {
30-
IJeiRuntime runtime = JeiPlugin.getJeiRuntime();
31-
if (runtime != null)
32-
return runtime.getIngredientFilter().getFilterText();
27+
//TODO: Re-enable
28+
29+
// IJeiRuntime runtime = JeiPlugin.getJeiRuntime();
30+
// if (runtime != null)
31+
// return runtime.getIngredientFilter().getFilterText();
3332
return "";
3433
}
3534

3635
public static void setFilterText(String filter) {
37-
IJeiRuntime runtime = JeiPlugin.getJeiRuntime();
38-
if (runtime != null)
39-
runtime.getIngredientFilter().setFilterText(Strings.nullToEmpty(filter));
36+
//TODO: Re-enable
37+
// IJeiRuntime runtime = JeiPlugin.getJeiRuntime();
38+
// if (runtime != null)
39+
// runtime.getIngredientFilter().setFilterText(Strings.nullToEmpty(filter));
4040
}
4141
}

‎src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiPlugin.java

+87-121
Original file line numberDiff line numberDiff line change
@@ -22,124 +22,90 @@
2222

2323
package com.github.klikli_dev.occultism.integration.jei;
2424

25-
import com.github.klikli_dev.occultism.Occultism;
26-
import com.github.klikli_dev.occultism.common.container.storage.StableWormholeContainer;
27-
import com.github.klikli_dev.occultism.common.container.storage.StorageControllerContainer;
28-
import com.github.klikli_dev.occultism.common.container.storage.StorageRemoteContainer;
29-
import com.github.klikli_dev.occultism.crafting.recipe.CrushingRecipe;
30-
import com.github.klikli_dev.occultism.crafting.recipe.MinerRecipe;
31-
import com.github.klikli_dev.occultism.crafting.recipe.RitualRecipe;
32-
import com.github.klikli_dev.occultism.crafting.recipe.SpiritFireRecipe;
33-
import com.github.klikli_dev.occultism.integration.jei.recipes.CrushingRecipeCategory;
34-
import com.github.klikli_dev.occultism.integration.jei.recipes.MinerRecipeCategory;
35-
import com.github.klikli_dev.occultism.integration.jei.recipes.RitualRecipeCategory;
36-
import com.github.klikli_dev.occultism.integration.jei.recipes.SpiritFireRecipeCategory;
37-
import com.github.klikli_dev.occultism.registry.OccultismBlocks;
38-
import com.github.klikli_dev.occultism.registry.OccultismItems;
39-
import com.github.klikli_dev.occultism.registry.OccultismRecipes;
40-
import mezz.jei.api.IModPlugin;
41-
import mezz.jei.api.constants.VanillaTypes;
42-
import mezz.jei.api.helpers.IStackHelper;
43-
import mezz.jei.api.recipe.transfer.IRecipeTransferHandlerHelper;
44-
import mezz.jei.api.registration.IRecipeCatalystRegistration;
45-
import mezz.jei.api.registration.IRecipeCategoryRegistration;
46-
import mezz.jei.api.registration.IRecipeRegistration;
47-
import mezz.jei.api.registration.IRecipeTransferRegistration;
48-
import mezz.jei.api.runtime.IJeiRuntime;
49-
import net.minecraft.client.Minecraft;
50-
import net.minecraft.client.multiplayer.ClientLevel;
51-
import net.minecraft.network.chat.Component;
52-
import net.minecraft.resources.ResourceLocation;
53-
import net.minecraft.world.item.ItemStack;
54-
import net.minecraft.world.item.crafting.RecipeManager;
55-
import net.minecraft.world.level.ItemLike;
56-
import net.minecraftforge.registries.ForgeRegistries;
57-
58-
import java.util.List;
59-
60-
@mezz.jei.api.JeiPlugin
61-
public class JeiPlugin implements IModPlugin {
62-
63-
protected static IJeiRuntime runtime;
64-
65-
public static IJeiRuntime getJeiRuntime() {
66-
return runtime;
67-
}
68-
69-
@Override
70-
public ResourceLocation getPluginUid() {
71-
return new ResourceLocation(Occultism.MODID, "jei");
72-
}
73-
74-
@Override
75-
public void registerCategories(IRecipeCategoryRegistration registration) {
76-
registration.addRecipeCategories(new SpiritFireRecipeCategory(registration.getJeiHelpers().getGuiHelper()));
77-
registration.addRecipeCategories(new CrushingRecipeCategory(registration.getJeiHelpers().getGuiHelper()));
78-
registration.addRecipeCategories(new MinerRecipeCategory(registration.getJeiHelpers().getGuiHelper()));
79-
registration.addRecipeCategories(new RitualRecipeCategory(registration.getJeiHelpers().getGuiHelper()));
80-
}
81-
82-
@Override
83-
public void registerRecipes(IRecipeRegistration registration) {
84-
ClientLevel level = Minecraft.getInstance().level;
85-
RecipeManager recipeManager = level.getRecipeManager();
86-
87-
List<SpiritFireRecipe> spiritFireRecipes = recipeManager.getAllRecipesFor(OccultismRecipes.SPIRIT_FIRE_TYPE.get());
88-
registration.addRecipes(JeiRecipeTypes.SPIRIT_FIRE, spiritFireRecipes);
89-
90-
List<CrushingRecipe> crushingRecipes = recipeManager.getAllRecipesFor(OccultismRecipes.CRUSHING_TYPE.get());
91-
registration.addRecipes(JeiRecipeTypes.CRUSHING, crushingRecipes);
92-
93-
List<MinerRecipe> minerRecipes = recipeManager.getAllRecipesFor(OccultismRecipes.MINER_TYPE.get());
94-
registration.addRecipes(JeiRecipeTypes.MINER, minerRecipes);
95-
96-
List<RitualRecipe> ritualRecipes = recipeManager.getAllRecipesFor(OccultismRecipes.RITUAL_TYPE.get());
97-
registration.addRecipes(JeiRecipeTypes.RITUAL, ritualRecipes);
98-
99-
this.registerIngredientInfo(registration, OccultismItems.TALLOW.get());
100-
this.registerIngredientInfo(registration, OccultismBlocks.OTHERSTONE.get());
101-
this.registerIngredientInfo(registration, OccultismBlocks.OTHERWORLD_LOG.get());
102-
this.registerIngredientInfo(registration, OccultismBlocks.OTHERWORLD_LEAVES.get());
103-
this.registerIngredientInfo(registration, OccultismBlocks.OTHERWORLD_SAPLING.get());
104-
this.registerIngredientInfo(registration, OccultismBlocks.OTHERWORLD_SAPLING_NATURAL.get());
105-
this.registerIngredientInfo(registration, OccultismBlocks.IESNIUM_ORE.get());
106-
this.registerIngredientInfo(registration, OccultismBlocks.SPIRIT_FIRE.get());
107-
this.registerIngredientInfo(registration, OccultismItems.DATURA.get());
108-
}
109-
110-
@Override
111-
public void registerRecipeTransferHandlers(IRecipeTransferRegistration registration) {
112-
IStackHelper stackHelper = registration.getJeiHelpers().getStackHelper();
113-
IRecipeTransferHandlerHelper handlerHelper = registration.getTransferHelper();
114-
registration.addUniversalRecipeTransferHandler(new StorageControllerRecipeTransferHandler<>(
115-
StorageControllerContainer.class, handlerHelper));
116-
registration.addUniversalRecipeTransferHandler(new StorageControllerRecipeTransferHandler<>(
117-
StorageRemoteContainer.class, handlerHelper));
118-
registration.addUniversalRecipeTransferHandler(new StorageControllerRecipeTransferHandler<>(
119-
StableWormholeContainer.class, handlerHelper));
120-
}
121-
122-
@Override
123-
public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) {
124-
registration.addRecipeCatalyst(new ItemStack(OccultismBlocks.SPIRIT_FIRE.get()),
125-
JeiRecipeTypes.SPIRIT_FIRE);
126-
registration.addRecipeCatalyst(new ItemStack(OccultismBlocks.DIMENSIONAL_MINESHAFT.get()),
127-
JeiRecipeTypes.MINER);
128-
registration.addRecipeCatalyst(new ItemStack(OccultismBlocks.GOLDEN_SACRIFICIAL_BOWL.get()),
129-
JeiRecipeTypes.RITUAL);
130-
131-
registration.addRecipeCatalyst(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Occultism.MODID, "ritual_dummy/summon_marid_crusher"))),
132-
JeiRecipeTypes.CRUSHING);
133-
}
134-
135-
@Override
136-
public void onRuntimeAvailable(IJeiRuntime jeiRuntime) {
137-
JeiPlugin.runtime = jeiRuntime;
138-
JeiSettings.setJeiLoaded(true);
139-
}
140-
141-
public void registerIngredientInfo(IRecipeRegistration registration, ItemLike ingredient) {
142-
registration.addIngredientInfo(new ItemStack(ingredient.asItem()), VanillaTypes.ITEM_STACK,
143-
Component.translatable("jei." + Occultism.MODID + ".ingredient." + ForgeRegistries.ITEMS.getKey(ingredient.asItem()).getPath() + ".description"));
144-
}
145-
}
25+
//TODO: Re-enable
26+
//@mezz.jei.api.JeiPlugin
27+
//public class JeiPlugin implements IModPlugin {
28+
//
29+
// protected static IJeiRuntime runtime;
30+
//
31+
// public static IJeiRuntime getJeiRuntime() {
32+
// return runtime;
33+
// }
34+
//
35+
// @Override
36+
// public ResourceLocation getPluginUid() {
37+
// return new ResourceLocation(Occultism.MODID, "jei");
38+
// }
39+
//
40+
// @Override
41+
// public void registerCategories(IRecipeCategoryRegistration registration) {
42+
// registration.addRecipeCategories(new SpiritFireRecipeCategory(registration.getJeiHelpers().getGuiHelper()));
43+
// registration.addRecipeCategories(new CrushingRecipeCategory(registration.getJeiHelpers().getGuiHelper()));
44+
// registration.addRecipeCategories(new MinerRecipeCategory(registration.getJeiHelpers().getGuiHelper()));
45+
// registration.addRecipeCategories(new RitualRecipeCategory(registration.getJeiHelpers().getGuiHelper()));
46+
// }
47+
//
48+
// @Override
49+
// public void registerRecipes(IRecipeRegistration registration) {
50+
// ClientLevel level = Minecraft.getInstance().level;
51+
// RecipeManager recipeManager = level.getRecipeManager();
52+
//
53+
// List<SpiritFireRecipe> spiritFireRecipes = recipeManager.getAllRecipesFor(OccultismRecipes.SPIRIT_FIRE_TYPE.get());
54+
// registration.addRecipes(JeiRecipeTypes.SPIRIT_FIRE, spiritFireRecipes);
55+
//
56+
// List<CrushingRecipe> crushingRecipes = recipeManager.getAllRecipesFor(OccultismRecipes.CRUSHING_TYPE.get());
57+
// registration.addRecipes(JeiRecipeTypes.CRUSHING, crushingRecipes);
58+
//
59+
// List<MinerRecipe> minerRecipes = recipeManager.getAllRecipesFor(OccultismRecipes.MINER_TYPE.get());
60+
// registration.addRecipes(JeiRecipeTypes.MINER, minerRecipes);
61+
//
62+
// List<RitualRecipe> ritualRecipes = recipeManager.getAllRecipesFor(OccultismRecipes.RITUAL_TYPE.get());
63+
// registration.addRecipes(JeiRecipeTypes.RITUAL, ritualRecipes);
64+
//
65+
// this.registerIngredientInfo(registration, OccultismItems.TALLOW.get());
66+
// this.registerIngredientInfo(registration, OccultismBlocks.OTHERSTONE.get());
67+
// this.registerIngredientInfo(registration, OccultismBlocks.OTHERWORLD_LOG.get());
68+
// this.registerIngredientInfo(registration, OccultismBlocks.OTHERWORLD_LEAVES.get());
69+
// this.registerIngredientInfo(registration, OccultismBlocks.OTHERWORLD_SAPLING.get());
70+
// this.registerIngredientInfo(registration, OccultismBlocks.OTHERWORLD_SAPLING_NATURAL.get());
71+
// this.registerIngredientInfo(registration, OccultismBlocks.IESNIUM_ORE.get());
72+
// this.registerIngredientInfo(registration, OccultismBlocks.SPIRIT_FIRE.get());
73+
// this.registerIngredientInfo(registration, OccultismItems.DATURA.get());
74+
// }
75+
//
76+
// @Override
77+
// public void registerRecipeTransferHandlers(IRecipeTransferRegistration registration) {
78+
// IStackHelper stackHelper = registration.getJeiHelpers().getStackHelper();
79+
// IRecipeTransferHandlerHelper handlerHelper = registration.getTransferHelper();
80+
// registration.addUniversalRecipeTransferHandler(new StorageControllerRecipeTransferHandler<>(
81+
// StorageControllerContainer.class, handlerHelper));
82+
// registration.addUniversalRecipeTransferHandler(new StorageControllerRecipeTransferHandler<>(
83+
// StorageRemoteContainer.class, handlerHelper));
84+
// registration.addUniversalRecipeTransferHandler(new StorageControllerRecipeTransferHandler<>(
85+
// StableWormholeContainer.class, handlerHelper));
86+
// }
87+
//
88+
// @Override
89+
// public void registerRecipeCatalysts(IRecipeCatalystRegistration registration) {
90+
// registration.addRecipeCatalyst(new ItemStack(OccultismBlocks.SPIRIT_FIRE.get()),
91+
// JeiRecipeTypes.SPIRIT_FIRE);
92+
// registration.addRecipeCatalyst(new ItemStack(OccultismBlocks.DIMENSIONAL_MINESHAFT.get()),
93+
// JeiRecipeTypes.MINER);
94+
// registration.addRecipeCatalyst(new ItemStack(OccultismBlocks.GOLDEN_SACRIFICIAL_BOWL.get()),
95+
// JeiRecipeTypes.RITUAL);
96+
//
97+
// registration.addRecipeCatalyst(new ItemStack(ForgeRegistries.ITEMS.getValue(new ResourceLocation(Occultism.MODID, "ritual_dummy/summon_marid_crusher"))),
98+
// JeiRecipeTypes.CRUSHING);
99+
// }
100+
//
101+
// @Override
102+
// public void onRuntimeAvailable(IJeiRuntime jeiRuntime) {
103+
// JeiPlugin.runtime = jeiRuntime;
104+
// JeiSettings.setJeiLoaded(true);
105+
// }
106+
//
107+
// public void registerIngredientInfo(IRecipeRegistration registration, ItemLike ingredient) {
108+
// registration.addIngredientInfo(new ItemStack(ingredient.asItem()), VanillaTypes.ITEM_STACK,
109+
// Component.translatable("jei." + Occultism.MODID + ".ingredient." + ForgeRegistries.ITEMS.getKey(ingredient.asItem()).getPath() + ".description"));
110+
// }
111+
//}

‎src/main/java/com/github/klikli_dev/occultism/integration/jei/JeiRecipeTypes.java

+12-14
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,17 @@
2222

2323
package com.github.klikli_dev.occultism.integration.jei;
2424

25-
import com.github.klikli_dev.occultism.Occultism;
26-
import com.github.klikli_dev.occultism.crafting.recipe.*;
27-
import mezz.jei.api.recipe.RecipeType;
28-
2925
public class JeiRecipeTypes {
30-
public static final RecipeType<SpiritTradeRecipe> SPIRIT_TRADE =
31-
RecipeType.create(Occultism.MODID, "spirit_trade", SpiritTradeRecipe.class);
32-
public static final RecipeType<SpiritFireRecipe> SPIRIT_FIRE =
33-
RecipeType.create(Occultism.MODID, "spirit_fire", SpiritFireRecipe.class);
34-
public static final RecipeType<CrushingRecipe> CRUSHING =
35-
RecipeType.create(Occultism.MODID, "crushing", CrushingRecipe.class);
36-
public static final RecipeType<MinerRecipe> MINER =
37-
RecipeType.create(Occultism.MODID, "miner", MinerRecipe.class);
38-
public static final RecipeType<RitualRecipe> RITUAL =
39-
RecipeType.create(Occultism.MODID, "ritual", RitualRecipe.class);
26+
27+
//TODO: Re-enable
28+
// public static final RecipeType<SpiritTradeRecipe> SPIRIT_TRADE =
29+
// RecipeType.create(Occultism.MODID, "spirit_trade", SpiritTradeRecipe.class);
30+
// public static final RecipeType<SpiritFireRecipe> SPIRIT_FIRE =
31+
// RecipeType.create(Occultism.MODID, "spirit_fire", SpiritFireRecipe.class);
32+
// public static final RecipeType<CrushingRecipe> CRUSHING =
33+
// RecipeType.create(Occultism.MODID, "crushing", CrushingRecipe.class);
34+
// public static final RecipeType<MinerRecipe> MINER =
35+
// RecipeType.create(Occultism.MODID, "miner", MinerRecipe.class);
36+
// public static final RecipeType<RitualRecipe> RITUAL =
37+
// RecipeType.create(Occultism.MODID, "ritual", RitualRecipe.class);
4038
}

0 commit comments

Comments
 (0)