agricarnation white list

VazkiiMods · Aug 27, 2023 · 986b8c0 · 986b8c0
1 parent fdec906
commit 986b8c0
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 1 deletion.
diff --git a/Fabric/src/main/java/vazkii/botania/fabric/FiberBotaniaConfig.java b/Fabric/src/main/java/vazkii/botania/fabric/FiberBotaniaConfig.java
@@ -275,6 +275,7 @@ private static class Common implements BotaniaConfig.ConfigAccess {
 		public final PropertyMirror<Integer> gogIslandScaleMultiplier = PropertyMirror.create(INTEGER);
 		public final PropertyMirror<List<String>> rannuncarpusItemBlacklist = PropertyMirror.create(ConfigTypes.makeList(STRING));
 		public final PropertyMirror<List<String>> rannuncarpusModBlacklist = PropertyMirror.create(ConfigTypes.makeList(STRING));
+		public final PropertyMirror<List<String>> agricarnationWhitelist = PropertyMirror.create(ConfigTypes.makeList(STRING));
 
 		public ConfigTree configure(ConfigTreeBuilder builder) {
 			builder.fork("blockBreakingParticles")
@@ -346,7 +347,11 @@ public ConfigTree configure(ConfigTreeBuilder builder) {
 					.beginValue("rannuncarpusModBlacklist", ConfigTypes.makeList(STRING), Collections.singletonList("storagedrawers"))
 					.withComment("List of mod names for rannuncarpuses to ignore.\n" +
 							"Ignores Storage Drawers by default due to crashes with placing drawer blocks without player involvement.")
-					.finishValue(rannuncarpusModBlacklist::mirror);
+					.finishValue(rannuncarpusModBlacklist::mirror)
+
+					.beginValue("agricarnationWhitelist", ConfigTypes.makeList(STRING), Collections.emptyList())
+					.withComment("List of item registry names that will be speeded up growth by agricarnations.")
+					.finishValue(agricarnationWhitelist::mirror);
 
 			return builder.build();
 		}
@@ -425,6 +430,11 @@ public List<String> rannuncarpusItemBlacklist() {
 		public List<String> rannuncarpusModBlacklist() {
 			return rannuncarpusModBlacklist.getValue();
 		}
+
+		@Override
+		public List<String> agricarnationWhitelist() {
+			return agricarnationWhitelist.getValue();
+		}
 	}
 
 	private static final Common COMMON = new Common();

diff --git a/Forge/src/main/java/vazkii/botania/forge/ForgeBotaniaConfig.java b/Forge/src/main/java/vazkii/botania/forge/ForgeBotaniaConfig.java
@@ -232,6 +232,8 @@ private static class Common implements BotaniaConfig.ConfigAccess {
 		public final ForgeConfigSpec.ConfigValue<List<? extends String>> rannuncarpusItemBlacklist;
 		public final ForgeConfigSpec.ConfigValue<List<? extends String>> rannuncarpusModBlacklist;
 
+		public final ForgeConfigSpec.ConfigValue<List<? extends String>> agricarnationWhitelist;
+
 		public Common(ForgeConfigSpec.Builder builder) {
 			builder.push("blockBreakingParticles");
 			blockBreakParticles = builder
@@ -302,6 +304,9 @@ public Common(ForgeConfigSpec.Builder builder) {
 					.comment("List of mod names for rannuncarpuses to ignore.\n" +
 							"Ignores Storage Drawers by default due to crashes with placing drawer blocks without player involvement.")
 					.defineList("rannuncarpus.modBlacklist", Collections.singletonList("storagedrawers"), o -> o instanceof String s && ResourceLocation.tryParse(s + ":test") != null);
+			agricarnationWhitelist = builder
+					.comment("List of item registry names that will be speeded up growth by agricarnations.")
+					.defineList("argicarnation.whiteList", Collections.emptyList(), o -> o instanceof String s && ResourceLocation.tryParse(s) != null);
 		}
 
 		@Override
@@ -380,6 +385,12 @@ public List<String> rannuncarpusItemBlacklist() {
 		public List<String> rannuncarpusModBlacklist() {
 			return (List<String>) rannuncarpusModBlacklist.get();
 		}
+
+		@SuppressWarnings("unchecked") // NightConfig's types are weird
+		@Override
+		public List<String> agricarnationWhitelist() {
+			return (List<String>) agricarnationWhitelist.get();
+		}
 	}
 
 	private static final Common COMMON;

diff --git a/...src/main/java/vazkii/botania/common/block/flower/functional/AgricarnationBlockEntity.java b/...src/main/java/vazkii/botania/common/block/flower/functional/AgricarnationBlockEntity.java
@@ -9,6 +9,8 @@
 package vazkii.botania.common.block.flower.functional;
 
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.level.block.*;
@@ -87,6 +89,10 @@ private boolean isPlant(BlockPos pos) {
 		BlockState state = getLevel().getBlockState(pos);
 		Block block = state.getBlock();
 
+		ResourceLocation id = BuiltInRegistries.BLOCK.getKey(block);
+		if (BotaniaConfig.common().agricarnationWhitelist().contains(id.toString()))
+			return true;
+
 		// Spreads when ticked
 		if (block instanceof SpreadingSnowyDirtBlock) {
 			return false;

diff --git a/Xplat/src/main/java/vazkii/botania/test/DelegatingConfigAccess.java b/Xplat/src/main/java/vazkii/botania/test/DelegatingConfigAccess.java
@@ -93,4 +93,7 @@ public List<String> rannuncarpusItemBlacklist() {
 	public List<String> rannuncarpusModBlacklist() {
 		return inner.rannuncarpusModBlacklist();
 	}
+
+	@Override
+	public List<String> agricarnationWhitelist() { return inner.agricarnationWhitelist(); }
 }
diff --git a/Xplat/src/main/java/vazkii/botania/xplat/BotaniaConfig.java b/Xplat/src/main/java/vazkii/botania/xplat/BotaniaConfig.java
@@ -22,6 +22,7 @@ public interface ConfigAccess {
 		int gogIslandScaleMultiplier();
 		List<String> rannuncarpusItemBlacklist();
 		List<String> rannuncarpusModBlacklist();
+		List<String> agricarnationWhitelist();
 	}
 
 	public interface ClientConfigAccess {