Add option to disable bountiful stones or copper ore/ingot without di…

…sabling subtypes

src/main/java/ganymedes01/etfuturum/ModBlocks.java

@@ -22,7 +22,7 @@
 import net.minecraft.item.ItemStack;
 
 public enum ModBlocks {
-	STONE(ConfigBlocksItems.enableStones, new BlockBountifulStone()),
+	STONE(ConfigBlocksItems.enableStones && !ConfigModCompat.disableBaseBountifulStonesOnly, new BlockBountifulStone()),
 	PRISMARINE_BLOCK(ConfigBlocksItems.enablePrismarine, new BaseSubtypesBlock(Material.rock, "prismarine", "prismarine_bricks", "dark_prismarine")
 			.setHardness(1.5F).setResistance(10.0F)),
 	SEA_LANTERN(ConfigBlocksItems.enablePrismarine, new BlockSeaLantern()),
@@ -69,7 +69,7 @@ public enum ModBlocks {
 			.setMapColorBaseBlock(Blocks.wool).setHardness(1.8F).setResistance(1.8F),
 			BaseItemBlock.class),
 	CONCRETE_POWDER(ConfigBlocksItems.enableConcrete, new BlockConcretePowder()),
-	COPPER_ORE(ConfigBlocksItems.enableCopper, new BlockCopperOre()),
+	COPPER_ORE(ConfigBlocksItems.enableCopper && !ConfigModCompat.disableCopperOreAndIngotOnly, new BlockCopperOre()),
 	DEEPSLATE_COPPER_ORE((ConfigBlocksItems.enableCopper || ConfigModCompat.moddedDeepslateOres) && ConfigBlocksItems.enableDeepslate && ConfigBlocksItems.enableDeepslateOres, new BlockDeepslateCopperOre()),
 	CORNFLOWER(ConfigBlocksItems.enableCornflower, new BaseFlower().setNames("cornflower")),
 	LILY_OF_THE_VALLEY(ConfigBlocksItems.enableLilyOfTheValley, new BaseFlower().setNames("lily_of_the_valley")),

src/main/java/ganymedes01/etfuturum/ModItems.java

@@ -52,7 +52,7 @@ public enum ModItems {
 	NETHERITE_SWORD(ConfigBlocksItems.enableNetherite, new ItemEFRSword(ModMaterials.NETHERITE_TOOL, ConfigBlocksItems.netheriteSwordDurability)),
 	TOTEM_OF_UNDYING(ConfigBlocksItems.enableTotemUndying, new BaseItem("totem_of_undying").setMaxStackSize(1)),
 	DYE(ConfigBlocksItems.enableNewDyes, new BaseSubtypesItem("white_dye", "blue_dye", "brown_dye", "black_dye").setNames("dye")),
-	COPPER_INGOT(ConfigBlocksItems.enableCopper, new BaseItem("copper_ingot")),
+	COPPER_INGOT(ConfigBlocksItems.enableCopper && !ConfigModCompat.disableCopperOreAndIngotOnly, new BaseItem("copper_ingot")),
 	SUSPICIOUS_STEW(ConfigBlocksItems.enableSuspiciousStew, new ItemSuspiciousStew()),
 	SWEET_BERRIES(ConfigBlocksItems.enableSweetBerryBushes, new ItemSweetBerries()),
 	SHULKER_SHELL(ConfigBlocksItems.enableShulkerBoxes, new BaseItem("shulker_shell")),

src/main/java/ganymedes01/etfuturum/configuration/configs/ConfigModCompat.java

@@ -16,6 +16,9 @@ public class ConfigModCompat extends ConfigBase {
 	public static boolean moddedDeepslateOres;
 	public static List<String> moddedDeepslateOresBlacklist;
 
+	public static boolean disableBaseBountifulStonesOnly;
+	public static boolean disableCopperOreAndIngotOnly;
+
 	static final String catMisc = "misc";
 
 	public ConfigModCompat(File file) {
@@ -39,6 +42,8 @@ protected void syncConfigOptions() {
 		moddedDeepslateOres = getBoolean("moddedDeepslateOres", catMisc, true, "Deepslate ores for modded ores. Adds a set of \"general\" deepslate ores for common metals like \"oreAluminium\", \"oreTin\", etc, as well as explicit support for numerous mods.");
 		moddedDeepslateOresBlacklist = Lists.newArrayList(getStringList("moddedDeepslateOresBlacklist", catMisc, new String[0], "List of modded deepslate ores to disable. Add a ModID or ore dictionary tag. For example adding \"oreTin\" disables deepslate tin, and adding \"SimpleOres\" would disable deepslate adamantium ore. CaSe-SeNsItIvE!" +
 				"\nEach entry is separated by a new line. This only disables deepslate ores added from Et Futurum's end and will not affect deepslate ores from other mods."));
-		System.out.println();
+
+		disableBaseBountifulStonesOnly = getBoolean("disableBaseBountifulStonesOnly", catMisc, true, "Disables just the andesite, granite, and diorite full blocks, but leaves their stairs and slabs, etc enabled.\nUseful if you have mods like Chisel or Botania which feature these same stones but not the stairs and other variants.");
+		disableCopperOreAndIngotOnly = getBoolean("disableCopperOreAndIngotOnly", catMisc, true, "Disables copper ingots and ores, but leaves the blocks and other stuff.\nUseful if you prefer another mod's copper, but want to use the oxidizing copper building blocks.");
 	}
 }