Skip to content

Stops zinc gravel from showing as though it's a valid aluminium sub-soil. #214

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

Draft
C0bra5 wants to merge 12 commits into
base: master
Choose a base branch
from
Draft

Stops zinc gravel from showing as though it's a valid aluminium sub-soil. #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
afee65a
Clean up sub-soil requirement class and add blacklist functionality.
C0bra5 Jul 12, 2026
047d08c
add ability to know if the sub-soil predicates are being queried by nei
C0bra5 Jul 12, 2026
b5840c5
blacklist alu gravel as sub-soil from nei
C0bra5 Jul 12, 2026
7b97a0c
fix null checks
C0bra5 Jul 12, 2026
022bcd0
Merge branch 'master' into alu-gravel-b-gone
C0bra5 Jul 13, 2026
e879435
Merge branch 'master' into alu-gravel-b-gone
C0bra5 Jul 14, 2026
ede3921
Merge branch 'master' into alu-gravel-b-gone
Dream-Master Jul 14, 2026
e9d2850
Merge branch 'master' into alu-gravel-b-gone
C0bra5 Jul 20, 2026
754459c
Merge branch 'master' into alu-gravel-b-gone
C0bra5 Jul 23, 2026
9346504
Merge branch 'master' into alu-gravel-b-gone
C0bra5 Aug 7, 2026
e8d6b63
Merge branch 'master' into alu-gravel-b-gone
C0bra5 Aug 11, 2026
89d3e13
Merge branch 'master' into alu-gravel-b-gone
C0bra5 Aug 13, 2026
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
9 changes: 6 additions & 3 deletions src/main/java/com/gtnewhorizon/cropsnh/CropsNH.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import com.gtnewhorizon.cropsnh.compatibility.mclib.MCLibCompatHandler;
import com.gtnewhorizon.cropsnh.compatibility.waila.WailaRegistry;
import com.gtnewhorizon.cropsnh.farming.registries.MutationRegistry;
import com.gtnewhorizon.cropsnh.farming.requirements.SubSoilRequirement;
import com.gtnewhorizon.cropsnh.handler.ConfigurationHandler;
import com.gtnewhorizon.cropsnh.handler.CropsNHFurnaceFuelHandler;
import com.gtnewhorizon.cropsnh.handler.MigrationHandler;
Expand All @@ -22,7 +23,7 @@
import com.gtnewhorizon.cropsnh.loaders.MutationLoader;
import com.gtnewhorizon.cropsnh.loaders.OreDictLoader;
import com.gtnewhorizon.cropsnh.loaders.SoilLoader;
import com.gtnewhorizon.cropsnh.loaders.SubSoilRequirementLoader;
import com.gtnewhorizon.cropsnh.loaders.SubSoilLoader;
import com.gtnewhorizon.cropsnh.proxy.IProxy;
import com.gtnewhorizon.cropsnh.reference.Constants;
import com.gtnewhorizon.cropsnh.reference.Reference;
Expand Down Expand Up @@ -121,11 +122,11 @@ public static void postInit(FMLPostInitializationEvent event) {
LogHelper.debug("Starting Post-Initialization");
FertilizerLoader.postInit();
SoilLoader.postInit();
SubSoilRequirementLoader.postInit();
SubSoilLoader.postInit();
CropLoader.postInit();
MutationLoader.postInit();
AspectLoader.postInit();
GTRecipeLoader.PostInit();
GTRecipeLoader.postInit();
MigrationHandler.postInit();
ForestryCompatHandler.onPostInit();
ExUWateringCanHandler.postInit();
Expand All @@ -138,8 +139,10 @@ public static void postInit(FMLPostInitializationEvent event) {
@SuppressWarnings("unused")
public void onLoadComplete(FMLLoadCompleteEvent event) {
LogHelper.debug("Starting Load-Complete");
SubSoilRequirement.onLoadComplete();
CropLoader.loadComplete();
MigrationHandler.loadComplete();
GTRecipeLoader.loadComplete();
LogHelper.debug("Load-Complete Complete");
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/gtnewhorizon/cropsnh/compatibility/NEI/NEICropsNHCropHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ protected void loadUsageRecipesDo(ItemStack item) {
// register mutations for which this is a sub-soil.
for (IGrowthRequirement req : cropCard.getGrowthRequirements()) {
if (!(req instanceof SubSoilRequirement subSoilRequirement)) continue;
if (subSoilRequirement.canGrow(block, CropsNHUtils.getItemMeta(item), null)) {
if (subSoilRequirement.isValidSubSoil(block, CropsNHUtils.getItemMeta(item), null, true)) {
arecipes.add(new CachedCropRecipe(null, cropCard));
// crops shouldn't be getting registered more than once
continue outer;
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/gtnewhorizon/cropsnh/compatibility/NEI/NEICropsNHCropstickBreedingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ protected void loadUsageRecipesDo(ItemStack item) {
for (IBreedingRequirement req : mutation.getRequirements()) {
if (!(req instanceof SubSoilRequirement)) continue;
// The canBreed methods are more for machines and dim checks, canGrow fits our use-case better here.
if (((SubSoilRequirement) req).canGrow(block, CropsNHUtils.getItemMeta(item), null)) {
if (((SubSoilRequirement) req).isValidSubSoil(block, CropsNHUtils.getItemMeta(item), null, true)) {
arecipes.add(new CachedBreedingRecipe(mutation));
// mutations shouldn't be getting registered more than once
continue outer;
Expand Down
Loading