From ef1851e1fb4f1b8fc7477325c80c45e55e6d0060 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Wed, 20 Sep 2023 20:44:51 +0200 Subject: [PATCH] Port fixups II --- gradle.properties | 2 +- .../simibubi/create/foundation/data/ChainedDataProvider.java | 1 + .../com/simibubi/create/infrastructure/data/CreateDatagen.java | 1 - .../data/GeneratedEntriesProvider.java | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename src/main/java/com/simibubi/create/{foundation => infrastructure}/data/GeneratedEntriesProvider.java (96%) diff --git a/gradle.properties b/gradle.properties index 185ae0a18..4d9e68698 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,7 +27,7 @@ flywheel_version = 0.6.10-7 jei_minecraft_version = 1.20.1 jei_version = 15.2.0.22 curios_minecraft_version = 1.20.1 -curios_version = 5.2.0-beta.3 +curios_version = 5.3.1 cc_tweaked_enable = true cc_tweaked_minecraft_version = 1.20.1 diff --git a/src/main/java/com/simibubi/create/foundation/data/ChainedDataProvider.java b/src/main/java/com/simibubi/create/foundation/data/ChainedDataProvider.java index 305025804..20275af25 100644 --- a/src/main/java/com/simibubi/create/foundation/data/ChainedDataProvider.java +++ b/src/main/java/com/simibubi/create/foundation/data/ChainedDataProvider.java @@ -5,6 +5,7 @@ import java.util.concurrent.CompletableFuture; import net.minecraft.data.CachedOutput; import net.minecraft.data.DataProvider; +@Deprecated(forRemoval = true) public class ChainedDataProvider implements DataProvider { private DataProvider mainProvider; diff --git a/src/main/java/com/simibubi/create/infrastructure/data/CreateDatagen.java b/src/main/java/com/simibubi/create/infrastructure/data/CreateDatagen.java index 32e466eee..01a13c2e6 100644 --- a/src/main/java/com/simibubi/create/infrastructure/data/CreateDatagen.java +++ b/src/main/java/com/simibubi/create/infrastructure/data/CreateDatagen.java @@ -10,7 +10,6 @@ import com.simibubi.create.AllSoundEvents; import com.simibubi.create.Create; import com.simibubi.create.foundation.advancement.AllAdvancements; import com.simibubi.create.foundation.data.DamageTypeTagGen; -import com.simibubi.create.foundation.data.GeneratedEntriesProvider; import com.simibubi.create.foundation.data.recipe.MechanicalCraftingRecipeGen; import com.simibubi.create.foundation.data.recipe.ProcessingRecipeGen; import com.simibubi.create.foundation.data.recipe.SequencedAssemblyRecipeGen; diff --git a/src/main/java/com/simibubi/create/foundation/data/GeneratedEntriesProvider.java b/src/main/java/com/simibubi/create/infrastructure/data/GeneratedEntriesProvider.java similarity index 96% rename from src/main/java/com/simibubi/create/foundation/data/GeneratedEntriesProvider.java rename to src/main/java/com/simibubi/create/infrastructure/data/GeneratedEntriesProvider.java index 69f1e1947..421b39be3 100644 --- a/src/main/java/com/simibubi/create/foundation/data/GeneratedEntriesProvider.java +++ b/src/main/java/com/simibubi/create/infrastructure/data/GeneratedEntriesProvider.java @@ -1,4 +1,4 @@ -package com.simibubi.create.foundation.data; +package com.simibubi.create.infrastructure.data; import java.util.Set; import java.util.concurrent.CompletableFuture;