merge upstream including trunk/1.16

build.gradle

@@ -128,6 +128,7 @@ repositories {
   maven { url = 'https://modmaven.dev'  }     
   maven { url = 'https://www.cursemaven.com'  }
 
+
 }
 
 dependencies {

examples/config/cyclic.toml

@@ -156,6 +156,8 @@
 			enabled = true
 
 		[cyclic.enchantment.curse]
+			#Set list of effects for Gloom enchant (cyclic:curse) to ignore and not use these
+			ignored = ["minecraft:bad_omen", "minecraft:nausea", "botania:clear"]
 			#(Gloom) Set false to stop enchantment from working
 			enabled = true
 
@@ -208,6 +210,8 @@
 	# Block specific configs
 	#####################################################################################
 	[cyclic.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
 		#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).
 		harmful_potions = true
 
@@ -370,15 +374,25 @@
 			#Range: 0 ~ 1000
 			water = 5
 
+		#terra_glass settings
+		[cyclic.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.experience_pylon]
 			#Radius to pickup xp orbs
 			#Range: 1 ~ 64
 			radius = 16
 
+		#soundproofing settings
 		[cyclic.blocks.soundproofing]
-			#Radius to find and muffle sounds. 
-			#Range: 1 ~ 128
+			#Radius of sound proofing (distance from each block that it will listen)
+			#Range: 1 ~ 16
 			radius = 6
 
 		[cyclic.blocks.cables]
@@ -427,6 +441,7 @@
 			#Range: 0 ~ 64000
 			energy_cost = 10
 
+		#Ender shelf settings
 		[cyclic.blocks.ender_shelf]
 			#Controller Max distance to search (using manhattan distance)
 			#Range: 1 ~ 256
@@ -459,12 +474,15 @@
 			fluid_cost = 100
 
 		[cyclic.blocks.terra_preta]
-			#Growth interval in ticks (100 would be every 5 seconds). Also affects terra glass
+			#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.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

examples/scripts/crusher.zs

@@ -13,5 +13,3 @@ crusher.addRecipe("castlevania", <item:minecraft:diamond>,<item:minecraft:iron_n
 
 // no bonus, same as last number zero
 crusher.addRecipe("castlevania2", <item:minecraft:obsidian>,<item:minecraft:sand>*2, 500, 300);
-
-

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;

examples/scripts/generator_fluid.zs

@@ -4,15 +4,16 @@
 
 var generator = <recipetype:cyclic:generator_fluid>;
 
+
 // recipe IDS, not item ids
 // see datapack inside the jar file or see https://github.com/Lothrazar/Cyclic/tree/trunk/1.20/src/main/resources/data/cyclic/recipes/generator
 
 generator.removeRecipe("cyclic:generator/generate_xp","cyclic:generator/generate_lava");
 
 
 
+
 generator.addRecipe("zoldo", <fluid:minecraft:water>*250, 5, 10);
 
 generator.addRecipe("lava_tag", "minecraft:lava", 1000, 200, 500);
 
-

examples/scripts/melter.zs

@@ -7,5 +7,6 @@ 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);
 

examples/scripts/remove_by_modid.zs

@@ -0,0 +1,2 @@
+
+craftingTable.removeByModid("cyclic");

gradle.properties

@@ -7,7 +7,8 @@ org.gradle.daemon=false
 
 mod_id=cyclic
 curse_id=239286
-mod_version=1.12.7
+mod_version=1.12.8-SNAPSHOT
+
 
 # NEO FORGED
 forge_version=47.1.65
@@ -33,13 +34,20 @@ mc_version=1.20.1
 
 
 
-flib_version=0.0.10
+flib_version=0.0.11
 flib_file=4718037
 patchouli_version=81
 jei_version=15.0.0.12
 curios_version=5.2.0-beta.3+1.20.1
 crafttweaker_version=14.0.12
 
+
+
+botania_version=443
+crafttweaker_version=14.0.38
+# https://www.curseforge.com/minecraft/mc-mods/crafttweaker/files/5210437
+#https://www.curseforge.com/minecraft/mc-mods/botania/files/4557912
+
 # for eclipse.ini if needed
 #-vm
 #C:\Program Files\AdoptOpenJDK\jdk-16.0.1.9-hotspot\bin\javaw.exe

scripts/clean_config.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm run/config/cyclic.toml
+rm run/config/cyclic-client.toml
+
+echo "configs reset"

scripts/example_config.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cp run/config/cyclic.toml examples/config/cyclic.toml
+cp run/config/cyclic-client.toml examples/config/cyclic-client.toml

src/main/java/com/lothrazar/cyclic/block/BlockCyclic.java

@@ -85,7 +85,7 @@ public BlockState rotate(BlockState state, LevelAccessor world, BlockPos pos, Ro
 
   @Override
   public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
-    if (hasFluidInteract) {
+    if (hasFluidInteract && player.getItemInHand(hand).isEmpty()) {
       if (!world.isClientSide) {
         BlockEntity tankHere = world.getBlockEntity(pos);
         if (tankHere != null) {