config unbreak and merge conflicts

build.gradle

@@ -77,7 +77,6 @@ dependencies {
     implementation fg.deobf("top.theillusivec4.curios:curios-forge:${mc_version}-${curios_version}")
 
     implementation fg.deobf("com.blamejared.crafttweaker:CraftTweaker-forge-${mc_version}:${crafttweaker_version}")
-
 
     compileOnly fg.deobf("vazkii.botania:Botania:${mc_version}-${botania_version}-FORGE:api")
     runtimeOnly fg.deobf("vazkii.botania:Botania:${mc_version}-${botania_version}-FORGE")
@@ -86,24 +85,15 @@ dependencies {
     compileOnly fg.deobf("vazkii.patchouli:Patchouli:${mc_version}-${patchouli_version}:api")
     runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${mc_version}-${patchouli_version}")
 
-/*
 
-     implementation fg.deobf("curse.maven:yungs-api-421850:4428184")
-     implementation fg.deobf("curse.maven:yungs-better-strongholds-465575:3778231")
-     implementation fg.deobf("curse.maven:mekanism-268560:3875976")
-  
-//   implementation fg.deobf("curse.maven:absent-by-design-305840:3686851")
-*/
 
 
 }
 
 repositories {
 
   // If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
-  flatDir {
-    dir 'libs'
-  }
+  // flatDir {    dir 'libs'  }
   maven { // TOP
         name 'tterrag maven'
         url "https://maven.tterrag.com/"
@@ -117,7 +107,7 @@ repositories {
   maven { url 'https://maven.theillusivec4.top/'    }
   maven { url 'https://maven.blamejared.com' }    
   maven { url 'https://modmaven.dev'  }    
-  maven { url 'https://www.cursemaven.com'  }
+//  maven { url 'https://www.cursemaven.com'  }
 }
 // Example for how to get properties into the manifest for reading by the runtime..
 jar {

examples/config/cyclic.toml

@@ -280,6 +280,11 @@
 			#Range: 0 ~ 64000
 			energy_cost_xdim = 8000
 
+		[cyclic.blocks.sound]
+			#Sound Recorder - how far out does it listen to record sounds
+			#Range: 1 ~ 64
+			radius = 8
+
 		#battery settings
 		[cyclic.blocks.battery]
 			#RF/t charging rate for the battery item slot
@@ -490,11 +495,6 @@
 			#RECIPE IDS HERE.  Block these recipe ids from being reversed, but do not block all recipes for this output item
 			ignore_recipes = ["minecraft:white_dye_from_lily_of_the_valley", "minecraft:orange_dye_from_orange_tulip", "minecraft:magenta_dye_from_allium", "minecraft:magenta_dye_from_lilac", "minecraft:light_blue_dye_from_blue_orchid", "minecraft:yellow_dye_from_sunflower", "minecraft:yellow_dye_from_dandelion", "minecraft:pink_dye_from_peony", "minecraft:pink_dye_from_pink_tulip", "minecraft:light_gray_dye_from_oxeye_daisy", "minecraft:light_gray_dye_from_azure_bluet", "minecraft:light_gray_dye_from_white_tulip", "minecraft:blue_dye_from_cornflower", "minecraft:red_dye_from_poppy", "minecraft:red_dye_from_rose_bush", "minecraft:red_dye_from_tulip", "minecraft:black_dye_from_wither_rose", "minecraft:blue_dye", "minecraft:black_dye", "minecraft:brown_dye", "botania:cobweb", "minecraft:magma_cream", "minecraft:beacon", "minecraft:stick_from_bamboo_item", "minecraft:netherite_ingot_from_netherite_block", "mysticalagriculture:essence*", "mysticalagriculture:farmland_till", "refinedstorage:coloring_recipes*", "forcecraft:transmutation*", "cyclic:flower_purple_tulip", "cyclic:flower_absalon_tulip", "cyclic:flower_cyan", "cyclic:flower_lime_carnation", "cyclic:fireball", "cyclic:shapeless/spark"]
 
-		[cyclic.blocks.sound_recorder]
-			#Sound Recorder - how far out does it listen to record sounds
-			#Range: 1 ~ 64
-			radius = 8
-
 		[cyclic.blocks.anti_beacon]
 			#List of extra effects to clear. supports wildcard such as 'cyclic:*'. (This list is is used even if harmful_potions=false or true both)
 			potion_list = ["minecraft:poison", "minecraft:*_poison", "minecraft:wither", "cyclic:gravity", "minecraft:weakness", "minecraft:slowness"]

gradle.properties

@@ -11,6 +11,7 @@ mod_version=1.8.3
 mc_version=1.19.2
 forge_version=43.2.14
 
+
 # optional dependencies
 jei_version=11.4.0.285
 curios_version=5.1.1.0

src/main/java/com/lothrazar/cyclic/config/ConfigRegistry.java

@@ -407,7 +407,6 @@ private static void initConfig() {
         + "This affects blocks cyclic:wireless_energy, cyclic:wireless_item, cyclic:wireless_fluid, cyclic:wireless_transmitter; "
         + "If you change it to false it will only work if the target is in the same dimension.")
         .define("wireless_transfer_dimensional", true);
-    //buffer size for cables 
     TileAntiBeacon.HARMFUL_POTIONS = CFG.comment("If true, then all potions marked as harmful/negative will be used in addition to the 'anti_beacon.potion_list' for cures and immunities  (used by both sponge and artemisbeacon).")
         .define("harmful_potions", true);
     TileAntiBeacon.RADIUS = CFG.comment("Radius to protect players and entities from potion effects being applied (used by both sponge and artemisbeacon). ")
@@ -477,7 +476,7 @@ private static void initConfig() {
     CFG.push("anvil_void");
     TileAnvilVoid.FLUIDPAY = CFG.comment("Payment per void action, if not zero").defineInRange("fluid_cost", 25, 0, 16000);
     CFG.pop();
-    CFG.push("sound_recorder");
+    CFG.push("sound");
     RECORDER_RADIUS = CFG.comment("Sound Recorder - how far out does it listen to record sounds").defineInRange("radius", 8, 1, 64);
     CFG.pop();
     CFG.comment("Ender shelf settings").push("ender_shelf");

src/main/java/com/lothrazar/cyclic/event/ClientInputEvents.java

@@ -58,18 +58,11 @@ public void onScreenRender(ScreenEvent.Render.Pre event) {
     Minecraft mc = Minecraft.getInstance();
     Screen screen = mc.screen;
     if (screen instanceof AbstractContainerScreen<?> gui && !(screen instanceof CreativeModeInventoryScreen)) {
-      //      if (gui.getSlotUnderMouse() != null) { 
-      //        Slot slotHit = gui.getSlotUnderMouse();
-      //        ItemStack stackTarget = slotHit.getItem();
       ItemStack maybeFood = mc.player.containerMenu.getCarried();
       List<ItemStack> boxes = ItemBaseCyclic.findAmmos(mc.player, ItemRegistry.LUNCHBOX.get());
-      //        if (held.isEdible()) {
       for (ItemStack box : boxes) {
         ItemLunchbox.setHoldingEdible(box, maybeFood.isEdible());
-        //        if (maybeFood.isEdible())
-        //.println(maybeFood + "DrawScreenEvent set edible " + box.getTag());
       }
-      //      }
     }
   }
 

src/main/java/com/lothrazar/cyclic/item/lunchbox/ItemLunchbox.java

@@ -46,6 +46,7 @@
 
 public class ItemLunchbox extends ItemBaseCyclic {
 
+  private static final String HOLDING = "holding";
   public static final int SLOTS = 7;
 
   public ItemLunchbox(Properties prop) {
@@ -171,11 +172,11 @@ public ICapabilityProvider initCapabilities(ItemStack stack, CompoundTag nbt) {
   }
 
   public static void setHoldingEdible(ItemStack box, boolean edible) {
-    box.getOrCreateTag().putBoolean("holding", edible);
+    box.getOrCreateTag().putBoolean(HOLDING, edible);
   }
 
   public static int getColour(ItemStack stack) {
-    if (stack.hasTag() && stack.getTag().getBoolean("holding")) {
+    if (stack.hasTag() && stack.getTag().getBoolean(HOLDING)) {
       // green? return 0x00AAAAFF;
       return 0x000000FF; //  0xFFFF0011;
     }