resolve trunk/1.16 merge conflicts

Lothrazar · Apr 6, 2024 · 3b12e5a · 3b12e5a
2 parents 691103e + 25af3f6
commit 3b12e5a
Show file tree

Hide file tree

Showing 65 changed files with 953 additions and 497 deletions.
diff --git a/build.gradle b/build.gradle
@@ -80,11 +80,23 @@ dependencies {
     // optional compat: many items useable in curios slots
     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}:api")
+    runtimeOnly fg.deobf("vazkii.botania:Botania:${mc_version}-${botania_version}")
+
 	// optional compat: guidebook
     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")
 
 
@@ -108,7 +120,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 {

diff --git a/cyclic-client.toml → examples/config/cyclic-client.toml b/cyclic-client.toml → examples/config/cyclic-client.toml
diff --git a/cyclic.toml → examples/config/cyclic.toml b/cyclic.toml → examples/config/cyclic.toml
@@ -155,6 +155,10 @@
 			#Set false to disable enchantment
 			enabled = true
 
+		[cyclic.enchantment.gloom]
+			#Set list of effects for Gloom enchant (cyclic:curse) to ignore and not use these
+			ignored = ["minecraft:bad_omen", "minecraft:nausea", "botania:clear"]
+
 		[cyclic.enchantment.curse]
 			#(Gloom) Set false to disable enchantment
 			enabled = true
@@ -227,21 +231,6 @@
 			#Range: 1 ~ 512
 			height = 8
 
-		#Ender Anchor settings
-		[cyclic.blocks.eye_teleport]
-			#Maximum distance to activate
-			#Range: 2 ~ 256
-			range = 128
-			#Exp cost on teleport
-			#Range: 0 ~ 500
-			exp = 0
-			#Hunger cost on teleport
-			#Range: 0 ~ 20
-			hunger = 1
-			#Tick delay between checks, faster checks can consume server resources (1 means check every tick; 20 means only check once per second)
-			#Range: 1 ~ 20
-			frequency = 5
-
 		[cyclic.blocks.disenchanter]
 			#Power per use disenchanter
 			#Range: 0 ~ 64000
@@ -277,15 +266,121 @@
 			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
-			#Range: 1 ~ 6400000
-			charge = 8000
+			#####################################################################################
+			# Block specific configs
+			#####################################################################################
+			[cyclic.blocks.sound.blocks]
+				#  Allows the dimensional Transfer Nodes to cross dimensions (no chunk loading is done, you have to do that on your own); 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.
+				wireless_transfer_dimensional = true
+
+				#Ender Anchor settings
+				[cyclic.blocks.sound.blocks.eye_teleport]
+					#Maximum distance to activate
+					#Range: 2 ~ 256
+					range = 128
+					#Exp cost on teleport
+					#Range: 0 ~ 500
+					exp = 0
+					#Hunger cost on teleport
+					#Range: 0 ~ 20
+					hunger = 1
+					#Tick delay between checks, faster checks can consume server resources (1 means check every tick; 20 means only check once per second)
+					#Range: 1 ~ 20
+					frequency = 5
+
+				#Ender shelf settings
+				[cyclic.blocks.sound.blocks.sound]
+					#Sound Recorder - how far out does it listen to record sounds
+					#Range: 1 ~ 64
+					radius = 8
+
+				#battery settings
+				[cyclic.blocks.sound.blocks.battery]
+					#RF/t charging rate for the battery item slot
+					#Range: 1 ~ 6400000
+					charge = 8000
+
+				#fisher settings
+				[cyclic.blocks.sound.blocks.fisher]
+					#Chance to Fish from nearby water.  Smaller values is slower fish
+					#Range: 1.0E-6 ~ 0.999
+					chance = 0.06
+					#Radius to Fish from nearby water
+					#Range: 1 ~ 32
+					radius = 12
+
+				[cyclic.blocks.sound.blocks.ender_shelf]
+					#Controller Max distance to search (using manhattan distance)
+					#Range: 1 ~ 256
+					controller_distance = 64
+					#Each shelf has five rows.  Set the number of books stored per row here
+					#Range: 1 ~ 1024
+					books_per_row = 256
+
+				[cyclic.blocks.sound.blocks.terra_preta]
+					#Growth interval in ticks (100 would be every 5 seconds). 
+					#Range: 1 ~ 64000
+					growth_interval = 100
+					#Chance that the crop will grow after the interval
+					#Range: 0.0 ~ 1.0
+					growth_chance = 0.5
+					#growth height above the soil
+					#Range: 2 ~ 32
+					height = 8
+
+				[cyclic.blocks.sound.blocks.uncrafter]
+					#When searching for a recipe, does it ignore all NBT values (such as enchantments, RepairCost, Damage, etc).  For example, if false it will not uncraft damaged or enchanted items
+					nbt_ignored = false
+					#Ticks used for each uncraft
+					#Range: 1 ~ 9999
+					ticks = 60
+					#ITEM IDS HERE.  Block ALL recipes that output this item, no matter which recipe they use
+					ignore_list = ["minecraft:elytra", "minecraft:tipped_arrow", "minecraft:magma_block", "minecraft:stick", "spectrite:spectrite_arrow", "spectrite:spectrite_arrow_special", "techreborn:uumatter", "projecte:*"]
+					#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"]
+
+				#Ender Trigger settings
+				[cyclic.blocks.sound.blocks.eye_redstone]
+					#Maximum distance to activate
+					#Range: 2 ~ 256
+					range = 32
+					#Tick delay between checks, faster checks can consume server resources (1 means check every tick; 20 means only check once per second)
+					#Range: 1 ~ 20
+					frequency = 5
+
+				#Sprinkler settings
+				[cyclic.blocks.sound.blocks.sprinkler]
+					#Tick rate.  20 will fire one block per second
+					#Range: 1 ~ 20
+					ticks = 20
+					#Radius
+					#Range: 1 ~ 32
+					radius = 4
+					#Water consumption
+					#Range: 0 ~ 1000
+					water = 5
+
+				#terra_glass settings
+				[cyclic.blocks.sound.blocks.terra_glass]
+					#ticks between growth cycles
+					#Range: 1 ~ 10000
+					timer = 100
+					#growth height below the glass
+					#Range: 0 ~ 32
+					height = 8
+
+				#experience_pylon settings
+				[cyclic.blocks.sound.blocks.experience_pylon]
+					#Radius to pickup xp orbs
+					#Range: 1 ~ 64
+					radius = 16
+
+				#soundproofing settings
+				[cyclic.blocks.sound.blocks.soundproofing]
+					#Radius of sound proofing (distance from each block that it will listen)
+					#Range: 1 ~ 16
+					radius = 6
 
 		[cyclic.blocks.generator_fuel]
 			#RF energy per tick generated while burning furnace fuel in this machine.  Burn time in ticks is the same as furnace values, so 1 coal = 1600 ticks
@@ -302,15 +397,6 @@
 			#Range: 0 ~ 64000
 			energy_cost = 10
 
-		#fisher settings
-		[cyclic.blocks.fisher]
-			#Chance to Fish from nearby water.  Smaller values is slower fish
-			#Range: 1.0E-6 ~ 0.999
-			chance = 0.06
-			#Radius to Fish from nearby water
-			#Range: 1 ~ 32
-			radius = 12
-
 		[cyclic.blocks.harvester]
 			#Power per use harvester
 			#Range: 0 ~ 64000
@@ -336,15 +422,6 @@
 			#Range: 0 ~ 16000
 			fluid_cost = 25
 
-		#Ender Trigger settings
-		[cyclic.blocks.eye_redstone]
-			#Maximum distance to activate
-			#Range: 2 ~ 256
-			range = 32
-			#Tick delay between checks, faster checks can consume server resources (1 means check every tick; 20 means only check once per second)
-			#Range: 1 ~ 20
-			frequency = 5
-
 		[cyclic.blocks.peat]
 			#Chance that Peat Bog converts to Peat when wet (is multiplied by the number of surrounding water blocks)
 			#Range: 0.0010000000474974513 ~ 1.0
@@ -358,24 +435,6 @@
 			#Range: 0 ~ 512
 			height = 4
 
-		#Sprinkler settings
-		[cyclic.blocks.sprinkler]
-			#Tick rate.  20 will fire one block per second
-			#Range: 1 ~ 20
-			ticks = 20
-			#Radius
-			#Range: 1 ~ 32
-			radius = 4
-			#Water consumption
-			#Range: 0 ~ 1000
-			water = 5
-
-		#experience_pylon settings
-		[cyclic.blocks.experience_pylon]
-			#Radius to pickup xp orbs
-			#Range: 1 ~ 64
-			radius = 16
-
 		[cyclic.blocks.soundproofing]
 			#Radius to find and muffle sounds. 
 			#Range: 1 ~ 128
@@ -427,14 +486,6 @@
 			#Range: 0 ~ 64000
 			energy_cost = 10
 
-		[cyclic.blocks.ender_shelf]
-			#Controller Max distance to search (using manhattan distance)
-			#Range: 1 ~ 256
-			controller_distance = 64
-			#Each shelf has five rows.  Set the number of books stored per row here
-			#Range: 1 ~ 1024
-			books_per_row = 256
-
 		[cyclic.blocks.uncraft]
 			#Power per use uncraft
 			#Range: 0 ~ 64000
@@ -458,25 +509,6 @@
 			#Range: 1 ~ 64000
 			fluid_cost = 100
 
-		[cyclic.blocks.terra_preta]
-			#Growth interval in ticks (100 would be every 5 seconds). Also affects terra glass
-			#Range: 1 ~ 64000
-			growth_interval = 100
-			#Chance that the crop will grow after the interval
-			#Range: 0.0 ~ 1.0
-			growth_chance = 0.5
-
-		[cyclic.blocks.uncrafter]
-			#When searching for a recipe, does it ignore all NBT values (such as enchantments, RepairCost, Damage, etc).  For example, if false it will not uncraft damaged or enchanted items
-			nbt_ignored = false
-			#Ticks used for each uncraft
-			#Range: 1 ~ 9999
-			ticks = 60
-			#ITEM IDS HERE.  Block ALL recipes that output this item, no matter which recipe they use
-			ignore_list = ["minecraft:elytra", "minecraft:tipped_arrow", "minecraft:magma_block", "minecraft:stick", "spectrite:spectrite_arrow", "spectrite:spectrite_arrow_special", "techreborn:uumatter", "projecte:*"]
-			#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.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"]

diff --git a/examples/datapacks/cyclic_diable_emerald_stuff.zip b/examples/datapacks/cyclic_diable_emerald_stuff.zip
diff --git a/examples/scripts/crusher.zs b/examples/scripts/crusher.zs
@@ -0,0 +1,15 @@
+// https://docs.blamejared.com/
+// https://www.curseforge.com/minecraft/mc-mods/crafttweaker
+// use /ct dump fluids to see all fluid IDs
+
+var crusher = <recipetype:cyclic:crusher>;
+
+crusher.removeRecipe("cyclic:crusher/nylium_w");
+crusher.removeRecipe("cyclic:crusher/end_crystal", "cyclic:crusher/netherrack");
+
+// ID, input, output, RF per tick, ticks, bonus, percentage of bonus 
+crusher.addRecipe("castlevania", <item:minecraft:diamond>,<item:minecraft:iron_nugget>*2, 500, 3, <item:minecraft:dirt>*2, 50);
+
+
+// no bonus, same as last number zero
+crusher.addRecipe("castlevania2", <item:minecraft:obsidian>,<item:minecraft:sand>*2, 500, 300);
diff --git a/examples/scripts/durability.zs b/examples/scripts/durability.zs
@@ -0,0 +1,10 @@
+
+
+// change max damage aka durability aka number of tool uses like this
+
+val glove = <item:cyclic:glove_climb>;
+glove.maxDamage = 64;
+
+
+val wand = <item:cyclic:elevation_wand>;
+wand.maxDamage = 16;
diff --git a/examples/scripts/generator_fluid.zs b/examples/scripts/generator_fluid.zs
@@ -0,0 +1,14 @@
+// https://docs.blamejared.com/
+// https://www.curseforge.com/minecraft/mc-mods/crafttweaker
+// use /ct dump fluids to see all fluid IDs
+
+var generator = <recipetype:cyclic:generator_fluid>;
+
+generator.removeRecipe("cyclic:generator/generate_xp");
+generator.removeRecipe("cyclic:generator/generate_lava");
+
+
+
+generator.addRecipe("zoldo", <fluid:minecraft:water>*250, 5, 10);
+
+generator.addRecipe("lava_tag", "minecraft:lava", 1000, 200, 500);
diff --git a/examples/scripts/generator_item.zs b/examples/scripts/generator_item.zs
@@ -0,0 +1,12 @@
+// https://docs.blamejared.com/
+// https://www.curseforge.com/minecraft/mc-mods/crafttweaker
+// use /ct dump fluids to see all fluid IDs
+
+var generator = <recipetype:cyclic:generator_item>;
+
+// recipe IDS, not item ids
+generator.removeRecipe("cyclic:generator/generate_redstone");
+generator.removeRecipe("cyclic:generator/generate_star");
+
+// ID, input, output, RF per tick, ticks, bonus, percentage of bonus 
+generator.addRecipe("zelda", <item:minecraft:diamond_block>, 500, 120);
diff --git a/examples/scripts/melter.zs b/examples/scripts/melter.zs
@@ -0,0 +1,10 @@
+// https://docs.blamejared.com/
+// https://www.curseforge.com/minecraft/mc-mods/crafttweaker
+// use /ct dump fluids to see all fluid IDs
+
+var melter = <recipetype:cyclic:melter>;
+
+melter.removeRecipe("cyclic:melter/melter_snowwater");
+melter.removeRecipe("cyclic:melter/melter_expflesh", "cyclic:melter/melter_expblaze");
+
+melter.addRecipe("spruce_wayne", [<item:minecraft:sand>,<item:minecraft:spruce_trapdoor>], <fluid:cyclic:wax>*75, 500, 3);
diff --git a/examples/scripts/remove_by_modid.zs b/examples/scripts/remove_by_modid.zs
@@ -0,0 +1,2 @@
+
+craftingTable.removeByModid("cyclic");
diff --git a/examples/scripts/solidifier.zs b/examples/scripts/solidifier.zs
@@ -0,0 +1,21 @@
+// https://docs.blamejared.com/
+// https://www.curseforge.com/minecraft/mc-mods/crafttweaker
+// use /ct dump fluids to see all fluid IDs
+
+var solidifier = <recipetype:cyclic:solidifier>;
+
+solidifier.removeRecipe("cyclic:solidifier/candle_blue");
+solidifier.removeRecipe("cyclic:solidifier/candle_red", "cyclic:solidifier/candle_yellow");
+
+// this one is the exact fluid ID, not using tags
+solidifier.addRecipe("megaman1", [<item:minecraft:sand>,<item:minecraft:birch_trapdoor>,<item:minecraft:sand>], <fluid:cyclic:honey>*100, <item:minecraft:stone_hoe>, 200, 8);
+
+// next: string-tag format using strings instead of a fluid
+// run /ct dump tag 
+// to see all registered fluid tags
+
+solidifier.addRecipe("megaman2", [<item:minecraft:sand>,<item:minecraft:spruce_trapdoor>,<item:minecraft:sand>], "forge:wax", 100, <item:minecraft:iron_hoe>, 300, 100);
+
+solidifier.addRecipe("megaman3", [<item:minecraft:sand>,<item:minecraft:oak_trapdoor>,<item:minecraft:sand>], "minecraft:lava", 100, <item:minecraft:iron_sword>, 300, 100);
+
+solidifier.addRecipe("megaman4", [<item:minecraft:sand>,<item:minecraft:jungle_trapdoor>,<item:minecraft:sand>], "<fluid:minecraft:lava>", 5000, <item:minecraft:obsidian>, 300, 100);
diff --git a/gradle.properties b/gradle.properties
@@ -17,6 +17,8 @@ forge_version=40.2.17
 jei_version=10.2.1.1005
 patchouli_version=71.1
 curios_version=5.0.7.1
+botania_version=435
+crafttweaker_version=9.1.211
 
 # for eclipse.ini if needed
 #-vm