Port new Changes

gradle.properties

@@ -28,8 +28,8 @@ curios_minecraft_version = 1.19.2
 curios_version = 5.1.1.0
 
 cc_tweaked_enable = true
-cc_tweaked_minecraft_version = 1.18.2
+cc_tweaked_minecraft_version = 1.19.2
-cc_tweaked_version = 1.100.10
+cc_tweaked_version = 1.101.2
 
 # curseforge information
 projectId = 328085

src/generated/resources/.cache/12afe0d97856fb2040b8407470e6d13529994eaa

@@ -1,4 +1,4 @@
-// 1.19.2	2023-05-08T18:06:22.2221491	Create's Sequenced Assembly Recipes
+// 1.19.2	2023-05-12T22:58:02.8585521	Create's Sequenced Assembly Recipes
 e6efd0d76dc451a44b663a453cef6e6656ad523f data/create/recipes/sequenced_assembly/precision_mechanism.json
 0cdbd4f583aa0a2aa8f3ca2827199bede1732722 data/create/recipes/sequenced_assembly/sturdy_sheet.json
 1274315b5c570722d6f5b2ed7f5e53fe01b6288a data/create/recipes/sequenced_assembly/track.json

src/generated/resources/.cache/455c485c9c8ef171bbc1ce4d435b3110ba1557ba

@@ -1,4 +1,4 @@
-// 1.19.2	2023-05-08T18:06:22.2241431	Create's Advancements
+// 1.19.2	2023-05-12T22:58:02.8136721	Create's Advancements
 2079ae09cf699108a8035ced7ca712fed4ab1577 data/create/advancements/andesite_alloy.json
 082d3987c5e074ed50be4a94a6fdc17120af241b data/create/advancements/andesite_casing.json
 4618109cfb4550fd8e19dc9d794ef24398b10a61 data/create/advancements/anvil_plough.json

src/generated/resources/.cache/6ec3b5a261c9ae3df674f7595dc66530ce54feb9

@@ -1,4 +1,4 @@
-// 1.19.2	2023-05-08T18:06:22.2251406	Create's Mechanical Crafting Recipes
+// 1.19.2	2023-05-12T22:58:02.8116781	Create's Mechanical Crafting Recipes
 f076d64d9f30709bed34775136c9241097b28aa9 data/create/recipes/mechanical_crafting/crushing_wheel.json
 694dca9dcff246bb7f560b3304fcc244c53217d5 data/create/recipes/mechanical_crafting/extendo_grip.json
 3b2837b08607c1ca466fa3eb418209b2e55da6ba data/create/recipes/mechanical_crafting/potato_cannon.json

src/generated/resources/.cache/82992cbf8f2794d83ac94034835eac0acd7915b9

@@ -1,4 +1,4 @@
-// 1.19.2	2023-05-08T18:06:22.2181597	Create's Standard Recipes
+// 1.19.2	2023-05-12T22:58:02.8515708	Create's Standard Recipes
 b397254b7cdb19d1c64ed1c30e1f6aa5c8af7270 data/create/advancements/recipes/building_blocks/blasting/ingot_aluminum_compat_immersiveengineering.json
 c14aec90afe9450b7dd472ff612e2f8013d09abf data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_immersiveengineering.json
 fd9a8eb94364c8424f23c510900ef9cd0904b53e data/create/advancements/recipes/building_blocks/blasting/ingot_lead_compat_mekanism.json

src/generated/resources/.cache/8e794e243511ea3d808ffb90a97ef5ee71d8d5f9

@@ -1,4 +1,4 @@
-// 1.19.2	2023-05-08T18:33:12.7571465	Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
+// 1.19.2	2023-05-12T22:58:02.8146697	Registrate Provider for create [Recipes, Advancements, Loot tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)]
 60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json
 6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json
 c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json
@@ -4169,13 +4169,15 @@ f1a03ac86925e26cbec6aeeada2eafb40008fc8e data/create/recipes/weathered_copper_ti
 c7ec0dbc18e9c1b58e568ed925287b89df11a136 data/create/tags/blocks/copycat_allow.json
 876eb9210f4a14898a2fe6d225699c66b5bdfeef data/create/tags/blocks/copycat_deny.json
 6858173c670bb593664ac3c62ded726d57d581f1 data/create/tags/blocks/fan_transparent.json
+2589b135c0e96ad29076569e144528fe32ea5b39 data/create/tags/blocks/girdable_tracks.json
 a1e21c22f32354fd1a82a1b0a59dd786c0deaba0 data/create/tags/blocks/movable_empty_collider.json
 4970078b49ddac1b1d500ed0469cedf42bdc3d35 data/create/tags/blocks/non_movable.json
 06e13efbb7b0d09ff7ecd1a7dc45a0760b91ad67 data/create/tags/blocks/ore_override_stone.json
 a5874f73c7dc0a3ae12999e6ae8abf45bc7fb9be data/create/tags/blocks/passive_boiler_heaters.json
-fcbbbcf25ccdc51889ec80825a9864e9e5a127cb data/create/tags/blocks/safe_nbt.json
+5944581660e37a1f6e83d600af6e920446124904 data/create/tags/blocks/safe_nbt.json
 79418bd729cef417b322cef9b491e7ae83317d61 data/create/tags/blocks/seats.json
 5def5088f7fd31b80e6f28c1c4ea146aa9d7d15b data/create/tags/blocks/toolboxes.json
+2589b135c0e96ad29076569e144528fe32ea5b39 data/create/tags/blocks/tracks.json
 1b6977d9a399cf6ee042e3f8f5e64e4d3cda5489 data/create/tags/blocks/tree_attachments.json
 da739ad2160e7df4e0e5cc89587670ce5e9450c3 data/create/tags/blocks/valve_handles.json
 72143286fb5cb372a0696550e2eac76ca50e6fbc data/create/tags/blocks/windmill_sails.json
@@ -4229,6 +4231,9 @@ bcd593714f43bc6a0aefbd714c24db3cf9e71250 data/forge/tags/blocks/storage_blocks/r
 8140415f1c16f09167f41eeee25c09706a944be0 data/forge/tags/fluids/chocolate.json
 0ccc9ff76001cdd7db1b79c1371f59d3283abe64 data/forge/tags/fluids/honey.json
 cca816b34ac2e9b7933df680aa9778ff2cfe9605 data/forge/tags/fluids/tea.json
+00c856dcfa4368cca671ee5d93c4900835991d68 data/forge/tags/items/armors/boots.json
+695d75b352fd190b303c724d1aaee9bb786a903b data/forge/tags/items/armors/chestplates.json
+3580dae058fc75b45fab4c4ebbd1b01573ba9e11 data/forge/tags/items/armors/helmets.json
 06ebf72e8f6c081862236d4b068b5dfb275a8385 data/forge/tags/items/buckets/honey.json
 801d097b0af7153e0c5c72a924d61f8afb4cf264 data/forge/tags/items/dough.json
 801d097b0af7153e0c5c72a924d61f8afb4cf264 data/forge/tags/items/dough/wheat.json

src/generated/resources/.cache/9b718366ce2ebddbc65bf65c103939e2cf56b4af

@@ -1,2 +1,2 @@
-// 1.19.2	2023-05-08T18:33:12.7561491	Create's lang merger
+// 1.19.2	2023-05-12T22:58:02.812675	Create's lang merger
-ea950145f523432317da10a40a1f761bcb10a8dd assets/create/lang/en_us.json
+820c6f8c791062e9f0f5c45d88a4b772aaed5402 assets/create/lang/en_us.json

src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034

@@ -1,4 +1,4 @@
-// 1.19.2	2023-05-08T18:06:22.2251406	Create's Processing Recipes
+// 1.19.2	2023-05-12T22:58:02.8475812	Create's Processing Recipes
 3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json
 8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json
 8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json

src/generated/resources/.cache/c24b4d2b8d15abff51c78bd94f4403d9eae6c139

@@ -1,2 +1,2 @@
-// 1.19.2	2023-05-08T18:06:22.2231462	Create's Custom Sounds
+// 1.19.2	2023-05-12T22:58:02.812675	Create's Custom Sounds
 043955db25ffe58e7debb9a4f11e41a9571376e6 assets/create/sounds.json

src/generated/resources/data/create/tags/blocks/girdable_tracks.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "create:track"
   ]

src/generated/resources/data/create/tags/blocks/tracks.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "create:track"
   ]

src/generated/resources/data/forge/tags/items/armors/boots.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "create:copper_diving_boots",
     "create:netherite_diving_boots"

src/generated/resources/data/forge/tags/items/armors/chestplates.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "create:copper_backtank",
     "create:netherite_backtank"

src/generated/resources/data/forge/tags/items/armors/helmets.json

@@ -1,5 +1,4 @@
 {
-  "replace": false,
   "values": [
     "create:copper_diving_helmet",
     "create:netherite_diving_helmet"

src/main/java/com/simibubi/create/compat/computercraft/implementation/ComputerBehaviour.java

@@ -21,6 +21,7 @@ import net.minecraftforge.common.capabilities.CapabilityManager;
 import net.minecraftforge.common.capabilities.CapabilityToken;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.common.util.NonNullSupplier;
+import net.minecraftforge.registries.ForgeRegistries;
 
 public class ComputerBehaviour extends AbstractComputerBehaviour {
 
@@ -49,8 +50,8 @@ public class ComputerBehaviour extends AbstractComputerBehaviour {
 		if (te instanceof StationBlockEntity ste)
 			return () -> new StationPeripheral(ste);
 
-		throw new IllegalArgumentException("No peripheral available for " + te.getType()
+		throw new IllegalArgumentException(
-			.getRegistryName());
+			"No peripheral available for " + ForgeRegistries.BLOCK_ENTITY_TYPES.getKey(te.getType()));
 	}
 
 	@Override

src/main/java/com/simibubi/create/content/contraptions/fluids/actors/SpoutRenderer.java

@@ -39,8 +39,8 @@ public class SpoutRenderer extends SafeBlockEntityRenderer<SpoutBlockEntity> {
 
 		if (!fluidStack.isEmpty() && level != 0) {
 			boolean top = fluidStack.getFluid()
-					.getAttributes()
+				.getFluidType()
-					.isLighterThanAir();
+				.isLighterThanAir();
 
 			level = Math.max(level, 0.175f);
 			float min = 2.5f / 16f;

src/main/java/com/simibubi/create/foundation/mixin/TestCommandMixin.java

@@ -34,7 +34,7 @@ public class TestCommandMixin {
 	private static TestFunction create$getCorrectTestFunction(String testName,
 															  ServerLevel level, BlockPos pos, @Nullable MultipleTestTracker tracker) {
 		StructureBlockEntity be = (StructureBlockEntity) level.getBlockEntity(pos);
-		CompoundTag data = be.getTileData();
+		CompoundTag data = be.getPersistentData();
 		if (!data.contains("CreateTestFunction", Tag.TAG_STRING))
 			return GameTestRegistry.getTestFunction(testName);
 		String name = data.getString("CreateTestFunction");

src/main/java/com/simibubi/create/foundation/ponder/content/PonderIndex.java

@@ -333,8 +333,8 @@ public class PonderIndex {
 			.map((trackSupplier) -> new BlockEntry<TrackBlock>(
 				// note: these blocks probably WON'T be in the Create Registrate, but a simple
 				// code trace reveals the Entry's registrate isn't used
-				Create.REGISTRATE, RegistryObject.create(trackSupplier.get()
+				Create.REGISTRATE,
-					.getRegistryName(), ForgeRegistries.BLOCKS)))
+				RegistryObject.create(ForgeRegistries.BLOCKS.getKey(trackSupplier.get()), ForgeRegistries.BLOCKS)))
 			.toList())
 			.addStoryBoard("train_track/placement", TrackScenes::placement)
 			.addStoryBoard("train_track/portal", TrackScenes::portal)

src/main/java/com/simibubi/create/gametest/infrastructure/CreateTestFunction.java

@@ -116,7 +116,7 @@ public class CreateTestFunction extends TestFunction {
 	public void run(@NotNull GameTestHelper helper) {
 		// give structure block test info
 		StructureBlockEntity be = (StructureBlockEntity) helper.getBlockEntity(BlockPos.ZERO);
-		be.getTileData().putString("CreateTestFunction", fullName);
+		be.getPersistentData().putString("CreateTestFunction", fullName);
 		super.run(CreateGameTestHelper.of(helper));
 	}
 }

src/main/java/com/simibubi/create/gametest/tests/TestFluids.java

@@ -15,8 +15,8 @@ import net.minecraft.world.level.block.RedStoneWireBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.RedstoneSide;
 import net.minecraft.world.level.material.Fluids;
-import net.minecraftforge.fluids.FluidAttributes;
 import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.fluids.FluidType;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import net.minecraftforge.fluids.capability.IFluidHandler.FluidAction;
 
@@ -78,7 +78,7 @@ public class TestFluids {
 		BlockPos pumpPos = new BlockPos(3, 2, 2);
 		BlockPos basinPos = pumpPos.east();
 		BlockPos waterPos = pumpPos.west();
-		FluidStack expectedResult = new FluidStack(Fluids.WATER, FluidAttributes.BUCKET_VOLUME);
+		FluidStack expectedResult = new FluidStack(Fluids.WATER, FluidType.BUCKET_VOLUME);
 		helper.flipBlock(pumpPos);
 		helper.succeedWhen(() -> {
 			helper.assertBlockPresent(Blocks.AIR, waterPos);