merge 1.19.2 into 1.19.4

Lothrazar · Apr 6, 2024 · 9472cf0 · 9472cf0
2 parents d697eca + d135707
commit 9472cf0
Show file tree

Hide file tree

Showing 71 changed files with 868 additions and 465 deletions.
diff --git a/checkstyle.xml → .eclipse/checkstyle.xml b/checkstyle.xml → .eclipse/checkstyle.xml
diff --git a/build.gradle b/build.gradle
@@ -71,6 +71,8 @@ dependencies {
 //	runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-common:${jei_version}")
 	runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}-forge:${jei_version}")
 
+
+    // optional compat: many items useable in curios slots
 
     implementation fg.deobf("top.theillusivec4.curios:curios-forge:${mc_version}-${curios_version}")
 
@@ -79,23 +81,27 @@ dependencies {
     runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${mc_version}-${patchouli_version}-FORGE")
 
 
-    // mods that have optional/soft integration
-   // runtimeOnly fg.deobf("curse.maven:liquid-blocks-301999:3873025")
-   // runtimeOnly fg.deobf("curse.maven:just-enough-effect-descriptions-jeed-532286:3944903")
-  //  runtimeOnly fg.deobf("curse.maven:plain-grinder-452000:3653027")
-  //  runtimeOnly fg.deobf("curse.maven:crafttweaker-239197:4657532")
 
-  //  runtimeOnly fg.deobf("curse.maven:farmers-delight-398521:3834150")
+    implementation fg.deobf("com.blamejared.crafttweaker:CraftTweaker-forge-${mc_version}:${crafttweaker_version}")
+
+//doesnt exist in 1.19.4 specifically
+  //  compileOnly fg.deobf("vazkii.botania:Botania:${mc_version}-${botania_version}-FORGE:api")
+  //  runtimeOnly fg.deobf("vazkii.botania:Botania:${mc_version}-${botania_version}-FORGE")
+
+	// optional compat: guidebook
+  //  compileOnly fg.deobf("vazkii.patchouli:Patchouli:${mc_version}-${patchouli_version}:api")
+  //  runtimeOnly fg.deobf("vazkii.patchouli:Patchouli:${mc_version}-${patchouli_version}")
+
+
+
 
 
 }
 
 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/"
@@ -104,10 +110,11 @@ repositories {
     name = "mappings"
     url 'https://dogforce-games.com/maven'
   }
-  maven { url = "https://maven.theillusivec4.top/"    }
+
   maven { url 'https://dvs1.progwml6.com/files/maven/'  }
-  maven { url 'https://maven.blamejared.com' }   
-  maven { url = "https://modmaven.dev"  }    
+  maven { url 'https://maven.theillusivec4.top/'    }
+  maven { url 'https://maven.blamejared.com' }    
+  maven { url 'https://modmaven.dev'  }    
 //  maven { url 'https://www.cursemaven.com'  }
 }
 // Example for how to get properties into the manifest for reading by the runtime..
@@ -166,7 +173,6 @@ task signJar(type: SignJar, dependsOn: jar) {
 }
 
 
-
 task cleanJar {
   delete 'build/libs'
 }

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
@@ -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

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
@@ -5,17 +5,24 @@ org.gradle.daemon=false
 # org.gradle.java.home=C:\Program Files\AdoptOpenJDK\jdk-16.0.1.9-hotspot
 # as needed run/server.properties : online-mode=false
 
-curse_id=239286
-mod_version=1.10.2
+mod_version=1.10.3-SNAPSHOT
+
 
 mc_version=1.19.4
 forge_version=45.1.0
 
+
 # optional dependencies
 jei_version=13.1.0.11
 curios_version=5.1.5.3
 patchouli_version=79.1
 
+
+# botania_version=440
+crafttweaker_version=12.0.2
+# 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

diff --git a/scripts/clean_config.sh b/scripts/clean_config.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+rm run/config/cyclic.toml
+rm run/config/cyclic-client.toml
+
+echo "configs reset"
diff --git a/scripts/example_config.sh b/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
diff --git a/src/main/java/com/lothrazar/cyclic/block/BlockCyclic.java b/src/main/java/com/lothrazar/cyclic/block/BlockCyclic.java
@@ -97,7 +97,7 @@ public BlockState rotate(BlockState state, LevelAccessor world, BlockPos pos, Ro
   @SuppressWarnings("deprecation")
   @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) {