diff --git a/build.gradle b/build.gradle index 4debd63286..0026d3ad66 100644 --- a/build.gradle +++ b/build.gradle @@ -39,11 +39,11 @@ fabricApi { dependencies { // jetbrains annotations - implementation("org.jetbrains:annotations:26.0.1") - implementation("org.jetbrains:annotations:24.0.1") + implementation("org.jetbrains:annotations:26.0.2") // graph api and its dependencies implementation include("org.jgrapht:jgrapht-core:1.5.2") + implementation include("org.apfloat:apfloat:1.14.0") implementation include("org.jheaps:jheaps:0.14") // Some other dependency is adding annotations, and it throws an error without this @@ -114,7 +114,8 @@ dependencies { // Datagen dependencies // TODO - Noaaan April 7th 2025: None of these are for 1.21.1 yet, lol - //modDatagenRuntimeOnly("curse.maven:gobber-427177:${project.gobber_version}") + // TODO - unilock May 6th 2025: AE2 will likely never be available for Fabric 1.21.1, lol + modDatagenRuntimeOnly("curse.maven:gobber-427177:${project.gobber_version}") //modDatagenRuntimeOnly("maven.modrinth:ae2:${project.ae2_version}") //modDatagenRuntimeOnly("maven.modrinth:botania:${project.botania_version}") //modDatagenRuntimeOnly("maven.modrinth:create-fabric:${project.create_version}") diff --git a/gradle.properties b/gradle.properties index d35c0efed4..b7835b2fcc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,19 +4,19 @@ org.gradle.parallel=true # Fabric Properties minecraft_version=1.21.1 yarn_mappings=1.21.1+build.3 -loader_version=0.16.13 +loader_version=0.16.14 # Mod Properties mod_version=1.8.5-alpha1 maven_group=de.dafuqs archives_base_name=spectrum # Dependencies # https://fabricmc.net/develop/ -fabric_api_version=0.115.6+1.21.1 +fabric_api_version=0.116.0+1.21.1 cloth_config_version=15.0.140 -modmenu_version=11.0.1 -rei_version=16.0.788 -emi_version=1.1.19+1.21.1 -architectury_version=13.0.2 +modmenu_version=11.0.3 +rei_version=16.0.799 +emi_version=1.1.22+1.21.1 +architectury_version=13.0.8 # https://cloudsmith.io/~klikli-dev/repos/mods/groups/ modonomicon_version=1.114.1 # https://maven.terraformersmc.com/releases/dev/emi/trinkets/ @@ -35,33 +35,33 @@ dimensional_reverb_version=1.0.0+1.21.1 # https://github.com/Terrails/colorful-heartsf colorful_hearts_version=10.3.8 # https://modrinth.com/mod/sodium -sodium_version=mc1.21.1-0.6.5-fabric +sodium_version=mc1.21.1-0.6.13-fabric # https://github.com/Patbox/common-protection-api cpa_version=1.0.0 # https://modrinth.com/mod/ears -ears_version=1.4.6 +ears_version=1.4.7 # https://modrinth.com/mod/travelersbackpack/ -travelers_backpack_version=AKX555Ed +travelers_backpack_version=Mse7s79Y # https://modrinth.com/mod/botania/ -botania_version=1.20.1-444-fabric +botania_version=1.20.1-448-fabric # https://modrinth.com/mod/auth-me/ -auth_me_version=8.0.0+1.21 +auth_me_version=D0QqKqZn # https://modrinth.com/mod/create-fabric -create_version=0.5.1-f-build.1417+mc1.20.1 +create_version=0.5.1-j-build.1631+mc1.20.1 # https://modrinth.com/mod/neepmeat -neepmeat_version=0.7.0-beta+1.20.1 +neepmeat_version=0.13.0-beta+1.20.1 # https://modrinth.com/mod/malum malum_version=1.20.1-1.6.3.0b-fabric # https://modrinth.com/mod/lodestonelib lodestone_version=1.20.1-1.6.2.3f -port_lib_version=2.3.4+1.20.1 +port_lib_version=2.3.8+1.20.1 port_lib_modules=lazy_registration # https://modrinth.com/mod/exclusions-lib exclusionslib_version=R2vQMUlU # https://modrinth.com/mod/vanity -vanityslots_version=1.2.9 +vanityslots_version=9oyPiBlw # What recipe viewer to use ('emi', 'rei', or 'disabled') recipe_viewer=emi # Datagen runtime mod versions gobber_version=5736976 -ae2_version=T1yX86cQ \ No newline at end of file +ae2_version=eDnBiYjR \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index a4b76b9530..1b33c55baa 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e18bc253b8..ca025c83a7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index f5feea6d6b..23d15a9367 100755 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -115,7 +114,7 @@ case "$( uname )" in #( NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar +CLASSPATH="\\\"\\\"" # Determine the Java command to use to start the JVM. @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. @@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \ -classpath "$CLASSPATH" \ - org.gradle.wrapper.GradleWrapperMain \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ "$@" # Stop when "xargs" is not available. diff --git a/gradlew.bat b/gradlew.bat index 9d21a21834..db3a6ac207 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -70,11 +70,11 @@ goto fail :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar +set CLASSPATH= @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* :end @rem End local scope for the variables with windows NT shell diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/GatedSpectrumEmiRecipe.java b/src/main/java/de/dafuqs/spectrum/compat/emi/GatedSpectrumEmiRecipe.java index d78fb36cfa..9437213349 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/GatedSpectrumEmiRecipe.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/GatedSpectrumEmiRecipe.java @@ -1,10 +1,10 @@ package de.dafuqs.spectrum.compat.emi; import de.dafuqs.spectrum.api.recipe.*; -import dev.emi.emi.*; import dev.emi.emi.api.recipe.*; import dev.emi.emi.api.stack.*; import dev.emi.emi.api.widget.*; +import net.minecraft.recipe.*; import net.minecraft.text.*; import org.jetbrains.annotations.*; @@ -19,11 +19,11 @@ public abstract class GatedSpectrumEmiRecipe> extends S public final T recipe; - public GatedSpectrumEmiRecipe(EmiRecipeCategory category, T recipe, int width, int height) { - super(category, recipe.getRecipeTypeUnlockIdentifier(), EmiPort.getId(recipe), width, height); - this.recipe = recipe; - this.outputs = List.of(EmiStack.of(recipe.getResult(getRegistryManager()))); - this.secretHintText = recipe.getSecretHintText(getId()); + public GatedSpectrumEmiRecipe(EmiRecipeCategory category, RecipeEntry entry, int width, int height) { + super(category, entry.value().getRecipeTypeUnlockIdentifier(), entry.id(), width, height); + this.recipe = entry.value(); + this.outputs = List.of(EmiStack.of(entry.value().getResult(getRegistryManager()))); + this.secretHintText = entry.value().getSecretHintText(getId()); } @Override diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/SpectrumEmiPlugin.java b/src/main/java/de/dafuqs/spectrum/compat/emi/SpectrumEmiPlugin.java index 8b4dd00043..ee085da2f0 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/SpectrumEmiPlugin.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/SpectrumEmiPlugin.java @@ -13,8 +13,7 @@ import dev.emi.emi.api.*; import dev.emi.emi.api.recipe.*; import dev.emi.emi.api.stack.*; -import dev.emi.emi.config.*; -import dev.emi.emi.runtime.*; +import net.fabricmc.loader.api.*; import net.minecraft.block.*; import net.minecraft.client.gui.screen.ingame.*; import net.minecraft.fluid.*; @@ -131,16 +130,16 @@ public void registerRecipes(EmiRegistry registry) { addAll(registry, SpectrumRecipeTypes.ANVIL_CRUSHING, AnvilCrushingEmiRecipeGated::new); addAll(registry, SpectrumRecipeTypes.PEDESTAL, PedestalCraftingEmiRecipeGated::new); addAll(registry, SpectrumRecipeTypes.FUSION_SHRINE, FusionShrineEmiRecipeGated::new); - addAll(registry, SpectrumRecipeTypes.ENCHANTER, r -> new EnchanterEmiRecipeGated(SpectrumEmiRecipeCategories.ENCHANTER, r)); - addAll(registry, SpectrumRecipeTypes.ENCHANTMENT_UPGRADE, r -> new EnchantmentUpgradeEmiRecipeGated(SpectrumEmiRecipeCategories.ENCHANTMENT_UPGRADE, r)); - addAll(registry, SpectrumRecipeTypes.POTION_WORKSHOP_BREWING, r -> new PotionWorkshopEmiRecipeGated(SpectrumEmiRecipeCategories.POTION_WORKSHOP_BREWING, r)); - addAll(registry, SpectrumRecipeTypes.POTION_WORKSHOP_CRAFTING, r -> new PotionWorkshopEmiRecipeGated(SpectrumEmiRecipeCategories.POTION_WORKSHOP_CRAFTING, r)); + addAll(registry, SpectrumRecipeTypes.ENCHANTER, (r) -> new EnchanterEmiRecipeGated(SpectrumEmiRecipeCategories.ENCHANTER, r)); + addAll(registry, SpectrumRecipeTypes.ENCHANTMENT_UPGRADE, (r) -> new EnchantmentUpgradeEmiRecipeGated(SpectrumEmiRecipeCategories.ENCHANTMENT_UPGRADE, r)); + addAll(registry, SpectrumRecipeTypes.POTION_WORKSHOP_BREWING, (r) -> new PotionWorkshopEmiRecipeGated<>(SpectrumEmiRecipeCategories.POTION_WORKSHOP_BREWING, r)); + addAll(registry, SpectrumRecipeTypes.POTION_WORKSHOP_CRAFTING, (r) -> new PotionWorkshopEmiRecipeGated<>(SpectrumEmiRecipeCategories.POTION_WORKSHOP_CRAFTING, r)); addAll(registry, SpectrumRecipeTypes.POTION_WORKSHOP_REACTING, PotionWorkshopReactingEmiRecipe::new); addAll(registry, SpectrumRecipeTypes.SPIRIT_INSTILLING, SpiritInstillingEmiRecipeGated::new); - addAll(registry, SpectrumRecipeTypes.GOO_CONVERTING, r -> new FluidConvertingEmiRecipeGated(SpectrumEmiRecipeCategories.GOO_CONVERTING, r)); - addAll(registry, SpectrumRecipeTypes.LIQUID_CRYSTAL_CONVERTING, r -> new FluidConvertingEmiRecipeGated(SpectrumEmiRecipeCategories.LIQUID_CRYSTAL_CONVERTING, r)); - addAll(registry, SpectrumRecipeTypes.MIDNIGHT_SOLUTION_CONVERTING, r -> new FluidConvertingEmiRecipeGated(SpectrumEmiRecipeCategories.MIDNIGHT_SOLUTION_CONVERTING, r)); - addAll(registry, SpectrumRecipeTypes.DRAGONROT_CONVERTING, r -> new FluidConvertingEmiRecipeGated(SpectrumEmiRecipeCategories.DRAGONROT_CONVERTING, r)); + addAll(registry, SpectrumRecipeTypes.GOO_CONVERTING, (r) -> new FluidConvertingEmiRecipeGated<>(SpectrumEmiRecipeCategories.GOO_CONVERTING, r)); + addAll(registry, SpectrumRecipeTypes.LIQUID_CRYSTAL_CONVERTING, (r) -> new FluidConvertingEmiRecipeGated<>(SpectrumEmiRecipeCategories.LIQUID_CRYSTAL_CONVERTING, r)); + addAll(registry, SpectrumRecipeTypes.MIDNIGHT_SOLUTION_CONVERTING, (r) -> new FluidConvertingEmiRecipeGated<>(SpectrumEmiRecipeCategories.MIDNIGHT_SOLUTION_CONVERTING, r)); + addAll(registry, SpectrumRecipeTypes.DRAGONROT_CONVERTING, (r) -> new FluidConvertingEmiRecipeGated<>(SpectrumEmiRecipeCategories.DRAGONROT_CONVERTING, r)); addAll(registry, SpectrumRecipeTypes.INK_CONVERTING, InkConvertingEmiRecipeGated::new); addAll(registry, SpectrumRecipeTypes.CRYSTALLARIEUM, CrystallarieumEmiRecipeGated::new); addAll(registry, SpectrumRecipeTypes.CINDERHEARTH, CinderhearthEmiRecipeGated::new); @@ -185,12 +184,13 @@ public void registerRecipes(EmiRegistry registry) { }); //WorldInteractionRecipe - EmiStack water = EmiStack.of(Fluids.WATER, FluidUnit.BUCKET); - EmiStack lava = EmiStack.of(Fluids.LAVA, FluidUnit.BUCKET); - EmiStack dragonrot = EmiStack.of(SpectrumFluids.DRAGONROT, FluidUnit.BUCKET); - EmiStack liquidCrystal = EmiStack.of(SpectrumFluids.LIQUID_CRYSTAL, FluidUnit.BUCKET); - EmiStack midnightSolution = EmiStack.of(SpectrumFluids.MIDNIGHT_SOLUTION, FluidUnit.BUCKET); - EmiStack mud = EmiStack.of(SpectrumFluids.GOO, FluidUnit.BUCKET); + long amount = FabricLoader.getInstance().isModLoaded("connector") ? 1000 : 81_000; + EmiStack water = EmiStack.of(Fluids.WATER, amount); + EmiStack lava = EmiStack.of(Fluids.LAVA, amount); + EmiStack dragonrot = EmiStack.of(SpectrumFluids.DRAGONROT, amount); + EmiStack liquidCrystal = EmiStack.of(SpectrumFluids.LIQUID_CRYSTAL, amount); + EmiStack midnightSolution = EmiStack.of(SpectrumFluids.MIDNIGHT_SOLUTION, amount); + EmiStack mud = EmiStack.of(SpectrumFluids.GOO, amount); EmiStack waterCatalyst = water.copy().setRemainder(water); EmiStack lavaCatalyst = lava.copy().setRemainder(lava); EmiStack dragonrotCatalyst = dragonrot.copy().setRemainder(dragonrot); @@ -307,10 +307,9 @@ public static Identifier syntheticId(String type, Block block) { return Identifier.of("spectrum:/" + type + "/" + blockId.getNamespace() + "/" + blockId.getPath()); } - public > void addAll(EmiRegistry registry, RecipeType type, Function constructor) { + public > void addAll(EmiRegistry registry, RecipeType type, Function, EmiRecipe> constructor) { for (RecipeEntry entry : registry.getRecipeManager().listAllOfType(type)) { - T recipe = entry.value(); - registry.addRecipe(constructor.apply(recipe)); + registry.addRecipe(constructor.apply(entry)); } } @@ -318,8 +317,7 @@ private static void addRecipeSafe(EmiRegistry registry, Supplier supp try { registry.addRecipe(supplier.get()); } catch (Throwable e) { - EmiReloadLog.warn("Exception thrown when parsing EMI recipe (no ID available)"); - EmiReloadLog.error(e); + SpectrumCommon.LOGGER.error("Exception thrown when parsing EMI recipe (no ID available)", e); } } diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/AnvilCrushingEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/AnvilCrushingEmiRecipeGated.java index 0baec62e39..f41c6b4ae2 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/AnvilCrushingEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/AnvilCrushingEmiRecipeGated.java @@ -8,14 +8,15 @@ import dev.emi.emi.api.widget.TextWidget.*; import dev.emi.emi.api.widget.*; import net.minecraft.item.*; +import net.minecraft.recipe.*; import net.minecraft.text.*; import net.minecraft.util.*; public class AnvilCrushingEmiRecipeGated extends GatedSpectrumEmiRecipe { private final static Identifier WALL_TEXTURE = SpectrumCommon.locate("textures/gui/container/anvil_crushing.png"); - public AnvilCrushingEmiRecipeGated(AnvilCrushingRecipe recipe) { - super(SpectrumEmiRecipeCategories.ANVIL_CRUSHING, recipe, 116, 64); + public AnvilCrushingEmiRecipeGated(RecipeEntry entry) { + super(SpectrumEmiRecipeCategories.ANVIL_CRUSHING, entry, 116, 64); this.inputs = recipe.getIngredients().stream().map(EmiIngredient::of).toList(); } diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/CinderhearthEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/CinderhearthEmiRecipeGated.java index b72377771d..dfe1df3228 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/CinderhearthEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/CinderhearthEmiRecipeGated.java @@ -6,11 +6,12 @@ import dev.emi.emi.api.stack.*; import dev.emi.emi.api.widget.TextWidget.*; import dev.emi.emi.api.widget.*; +import net.minecraft.recipe.*; public class CinderhearthEmiRecipeGated extends GatedSpectrumEmiRecipe { - public CinderhearthEmiRecipeGated(CinderhearthRecipe recipe) { - super(SpectrumEmiRecipeCategories.CINDERHEARTH, recipe, 136, 48); + public CinderhearthEmiRecipeGated(RecipeEntry entry) { + super(SpectrumEmiRecipeCategories.CINDERHEARTH, entry, 136, 48); this.inputs = recipe.getIngredientStacks().stream().map(s -> EmiIngredient.of(s.getMatchingStacks().stream().map(EmiStack::of).toList())).toList(); this.outputs = recipe.getResultsWithChance().stream().map(p -> EmiStack.of(p.getLeft()).setChance(p.getRight())).toList(); } diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/CrystallarieumEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/CrystallarieumEmiRecipeGated.java index 67bd4aa1af..ac2fe971fa 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/CrystallarieumEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/CrystallarieumEmiRecipeGated.java @@ -7,6 +7,7 @@ import dev.emi.emi.api.stack.*; import dev.emi.emi.api.widget.*; import net.fabricmc.fabric.api.transfer.v1.fluid.*; +import net.minecraft.recipe.*; import net.minecraft.text.*; import net.minecraft.util.*; @@ -16,8 +17,8 @@ public class CrystallarieumEmiRecipeGated extends GatedSpectrumEmiRecipe { private final static Identifier BACKGROUND_TEXTURE = SpectrumCommon.locate("textures/gui/modonomicon/crystallarieum.png"); - public CrystallarieumEmiRecipeGated(CrystallarieumRecipe recipe) { - super(SpectrumEmiRecipeCategories.CRYSTALLARIEUM, recipe, 124, 100); + public CrystallarieumEmiRecipeGated(RecipeEntry entry) { + super(SpectrumEmiRecipeCategories.CRYSTALLARIEUM, entry, 124, 100); inputs = List.of( EmiIngredient.of(recipe.getIngredientStack()), EmiStack.of(recipe.getGrowthStages().getFirst().getBlock()) diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/EnchanterEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/EnchanterEmiRecipeGated.java index 87fe07ef37..8c25ce4da1 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/EnchanterEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/EnchanterEmiRecipeGated.java @@ -4,25 +4,25 @@ import de.dafuqs.spectrum.*; import de.dafuqs.spectrum.compat.emi.*; import de.dafuqs.spectrum.items.magic_items.*; -import de.dafuqs.spectrum.recipe.*; import de.dafuqs.spectrum.recipe.enchanter.*; import de.dafuqs.spectrum.registries.*; import dev.emi.emi.api.recipe.*; import dev.emi.emi.api.render.*; import dev.emi.emi.api.stack.*; import dev.emi.emi.api.widget.*; +import net.minecraft.recipe.*; import net.minecraft.text.*; import net.minecraft.util.*; import java.util.stream.*; -public class EnchanterEmiRecipeGated extends GatedSpectrumEmiRecipe> { +public class EnchanterEmiRecipeGated extends GatedSpectrumEmiRecipe { private final static Identifier BACKGROUND_TEXTURE = SpectrumCommon.locate("textures/gui/container/enchanter.png"); private final Text description; private final int craftingTime; - public EnchanterEmiRecipeGated(EmiRecipeCategory category, EnchanterRecipe recipe) { - super(category, recipe, 132, 80); + public EnchanterEmiRecipeGated(EmiRecipeCategory category, RecipeEntry entry) { + super(category, entry, 132, 80); this.craftingTime = recipe.getCraftingTime(); this.description = getCraftingTimeText(craftingTime); diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/EnchantmentUpgradeEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/EnchantmentUpgradeEmiRecipeGated.java index 8c28141384..0be0a4dae1 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/EnchantmentUpgradeEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/EnchantmentUpgradeEmiRecipeGated.java @@ -18,12 +18,13 @@ import net.minecraft.component.*; import net.minecraft.component.type.*; import net.minecraft.item.*; +import net.minecraft.recipe.*; import net.minecraft.text.*; import net.minecraft.util.*; import java.util.*; -public class EnchantmentUpgradeEmiRecipeGated extends GatedSpectrumEmiRecipe> { +public class EnchantmentUpgradeEmiRecipeGated extends GatedSpectrumEmiRecipe { private static final Identifier BACKGROUND_TEXTURE = SpectrumCommon.locate("textures/gui/container/enchanter.png"); private static final int NORMAL_COLOR = 0x4d3655; @@ -40,8 +41,8 @@ public class EnchantmentUpgradeEmiRecipeGated extends GatedSpectrumEmiRecipe entry) { + super(category, entry, 132, 90); this.itemScaling = recipe.getItemScaling(); this.xpScaling = recipe.getXPScaling(); diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/FluidConvertingEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/FluidConvertingEmiRecipeGated.java index b7ff5d349a..69c69d7e99 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/FluidConvertingEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/FluidConvertingEmiRecipeGated.java @@ -6,11 +6,12 @@ import dev.emi.emi.api.render.*; import dev.emi.emi.api.stack.*; import dev.emi.emi.api.widget.*; +import net.minecraft.recipe.*; -public class FluidConvertingEmiRecipeGated extends GatedSpectrumEmiRecipe { +public class FluidConvertingEmiRecipeGated extends GatedSpectrumEmiRecipe { - public FluidConvertingEmiRecipeGated(EmiRecipeCategory category, FluidConvertingRecipe recipe) { - super(category, recipe, 78, 26); + public FluidConvertingEmiRecipeGated(EmiRecipeCategory category, RecipeEntry entry) { + super(category, entry, 78, 26); this.inputs = recipe.getIngredients().stream().map(EmiIngredient::of).toList(); } diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/FusionShrineEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/FusionShrineEmiRecipeGated.java index 5774c7f45d..5c3d5d3fb1 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/FusionShrineEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/FusionShrineEmiRecipeGated.java @@ -7,6 +7,7 @@ import dev.emi.emi.api.widget.TextWidget.*; import dev.emi.emi.api.widget.*; import net.minecraft.client.*; +import net.minecraft.recipe.*; import net.minecraft.text.*; import java.util.*; @@ -14,8 +15,8 @@ public class FusionShrineEmiRecipeGated extends GatedSpectrumEmiRecipe { private final List texts; - public FusionShrineEmiRecipeGated(FusionShrineRecipe recipe) { - super(SpectrumEmiRecipeCategories.FUSION_SHRINE, recipe, 138, 60); + public FusionShrineEmiRecipeGated(RecipeEntry entry) { + super(SpectrumEmiRecipeCategories.FUSION_SHRINE, entry, 138, 60); MinecraftClient client = MinecraftClient.getInstance(); if (recipe.getDescription().isPresent()) { texts = client.textRenderer.wrapLines(recipe.getDescription().get(), width); diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/InkConvertingEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/InkConvertingEmiRecipeGated.java index 5890c78ea4..6c3f39b780 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/InkConvertingEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/InkConvertingEmiRecipeGated.java @@ -5,12 +5,13 @@ import dev.emi.emi.api.render.*; import dev.emi.emi.api.stack.*; import dev.emi.emi.api.widget.*; +import net.minecraft.recipe.*; import net.minecraft.text.*; public class InkConvertingEmiRecipeGated extends GatedSpectrumEmiRecipe { - public InkConvertingEmiRecipeGated(InkConvertingRecipe recipe) { - super(SpectrumEmiRecipeCategories.INK_CONVERTING, recipe, 136, 20); + public InkConvertingEmiRecipeGated(RecipeEntry entry) { + super(SpectrumEmiRecipeCategories.INK_CONVERTING, entry, 136, 20); this.inputs = recipe.getIngredients().stream().map(EmiIngredient::of).toList(); } diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PedestalCraftingEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PedestalCraftingEmiRecipeGated.java index b846939d8c..a087977401 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PedestalCraftingEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PedestalCraftingEmiRecipeGated.java @@ -11,6 +11,7 @@ import dev.emi.emi.api.widget.TextWidget.*; import dev.emi.emi.api.widget.*; import net.minecraft.client.*; +import net.minecraft.recipe.*; import net.minecraft.util.*; import net.minecraft.util.collection.*; @@ -18,8 +19,8 @@ public class PedestalCraftingEmiRecipeGated extends GatedSpectrumEmiRecipe { - public PedestalCraftingEmiRecipeGated(PedestalRecipe recipe) { - super(SpectrumEmiRecipeCategories.PEDESTAL_CRAFTING, recipe, 124, 90); + public PedestalCraftingEmiRecipeGated(RecipeEntry entry) { + super(SpectrumEmiRecipeCategories.PEDESTAL_CRAFTING, entry, 124, 90); this.inputs = getIngredients(recipe); } diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PotionWorkshopEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PotionWorkshopEmiRecipeGated.java index 525202491f..806c1bd7b4 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PotionWorkshopEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PotionWorkshopEmiRecipeGated.java @@ -6,16 +6,17 @@ import dev.emi.emi.api.recipe.*; import dev.emi.emi.api.stack.*; import dev.emi.emi.api.widget.*; +import net.minecraft.recipe.*; import net.minecraft.text.*; import net.minecraft.util.*; -public class PotionWorkshopEmiRecipeGated extends GatedSpectrumEmiRecipe { +public class PotionWorkshopEmiRecipeGated extends GatedSpectrumEmiRecipe { private final static Identifier BACKGROUND_TEXTURE = SpectrumCommon.locate("textures/gui/container/potion_workshop_3_slots.png"); - public PotionWorkshopEmiRecipeGated(EmiRecipeCategory category, PotionWorkshopRecipe recipe) { - super(category, recipe, 112, 66); + public PotionWorkshopEmiRecipeGated(EmiRecipeCategory category, RecipeEntry entry) { + super(category, entry, 112, 66); - this.inputs = recipe.getIngredientStacks().stream().map(s -> EmiIngredient.of(s.getMatchingStacks().stream().map(EmiStack::of).toList())).toList(); + this.inputs = entry.value().getIngredientStacks().stream().map(s -> EmiIngredient.of(s.getMatchingStacks().stream().map(EmiStack::of).toList())).toList(); } @Override diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PotionWorkshopReactingEmiRecipe.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PotionWorkshopReactingEmiRecipe.java index 5d8e09f6d8..8f431b6136 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PotionWorkshopReactingEmiRecipe.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PotionWorkshopReactingEmiRecipe.java @@ -4,21 +4,21 @@ import de.dafuqs.spectrum.api.recipe.*; import de.dafuqs.spectrum.compat.emi.*; import de.dafuqs.spectrum.recipe.potion_workshop.*; -import dev.emi.emi.*; import dev.emi.emi.api.recipe.*; import dev.emi.emi.api.stack.*; import dev.emi.emi.api.widget.TextWidget.*; import dev.emi.emi.api.widget.*; import net.minecraft.client.*; +import net.minecraft.recipe.*; import java.util.*; public class PotionWorkshopReactingEmiRecipe extends EmiInfoRecipe { private final DescriptiveGatedRecipe recipe; - public PotionWorkshopReactingEmiRecipe(DescriptiveGatedRecipe recipe) { - super(List.of(EmiStack.of(recipe.getItem())), List.of(recipe.getDescription()), EmiPort.getId(recipe)); - this.recipe = recipe; + public > PotionWorkshopReactingEmiRecipe(RecipeEntry entry) { + super(List.of(EmiStack.of(entry.value().getItem())), List.of(entry.value().getDescription()), entry.id()); + this.recipe = entry.value(); } public boolean isUnlocked() { diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PrimordialFireBurningEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PrimordialFireBurningEmiRecipeGated.java index 9f801adff2..99a42723e2 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PrimordialFireBurningEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/PrimordialFireBurningEmiRecipeGated.java @@ -7,14 +7,15 @@ import dev.emi.emi.api.render.*; import dev.emi.emi.api.stack.*; import dev.emi.emi.api.widget.*; +import net.minecraft.recipe.*; import net.minecraft.util.*; public class PrimordialFireBurningEmiRecipeGated extends GatedSpectrumEmiRecipe { private final static Identifier FIRE_TEXTURE = SpectrumCommon.locate("textures/block/primordial_fire_0.png"); - public PrimordialFireBurningEmiRecipeGated(PrimordialFireBurningRecipe recipe) { - super(SpectrumEmiRecipeCategories.PRIMORDIAL_FIRE_BURNING, recipe, 80, 35); + public PrimordialFireBurningEmiRecipeGated(RecipeEntry entry) { + super(SpectrumEmiRecipeCategories.PRIMORDIAL_FIRE_BURNING, entry, 80, 35); this.inputs = recipe.getIngredients().stream().map(EmiIngredient::of).toList(); } diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/SpiritInstillingEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/SpiritInstillingEmiRecipeGated.java index 3daa0e489b..b6a9e164bb 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/SpiritInstillingEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/SpiritInstillingEmiRecipeGated.java @@ -8,13 +8,13 @@ import dev.emi.emi.api.stack.*; import dev.emi.emi.api.widget.*; import net.minecraft.item.*; - +import net.minecraft.recipe.*; import java.util.*; public class SpiritInstillingEmiRecipeGated extends GatedSpectrumEmiRecipe { - public SpiritInstillingEmiRecipeGated(SpiritInstillerRecipe recipe) { - super(SpectrumEmiRecipeCategories.SPIRIT_INSTILLER, recipe, 116, 48); + public SpiritInstillingEmiRecipeGated(RecipeEntry entry) { + super(SpectrumEmiRecipeCategories.SPIRIT_INSTILLER, entry, 116, 48); inputs = recipe.getIngredientStacks().stream().map(s -> EmiIngredient.of(s.getMatchingStacks().stream().map(EmiStack::of).toList())).toList(); if (recipe instanceof SpawnerChangeRecipe spawnerChangeRecipe) { diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/TitrationBarrelEmiRecipeGated.java b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/TitrationBarrelEmiRecipeGated.java index bbfd9b1612..74dcc7a5f2 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/TitrationBarrelEmiRecipeGated.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/recipes/TitrationBarrelEmiRecipeGated.java @@ -8,6 +8,7 @@ import dev.emi.emi.api.widget.*; import net.fabricmc.api.*; import net.minecraft.client.*; +import net.minecraft.recipe.*; import net.minecraft.text.*; import org.jetbrains.annotations.*; @@ -17,8 +18,8 @@ public class TitrationBarrelEmiRecipeGated extends GatedSpectrumEmiRecipe displayedStacks; - public TitrationBarrelEmiRecipeGated(ITitrationBarrelRecipe recipe) { - super(SpectrumEmiRecipeCategories.TITRATION_BARREL, recipe, 136, 50); + public TitrationBarrelEmiRecipeGated(RecipeEntry entry) { + super(SpectrumEmiRecipeCategories.TITRATION_BARREL, entry, 136, 50); inputs = new ArrayList<>(); if (recipe.getFluidInput() != FluidIngredient.EMPTY) { inputs.add(FluidIngredientEmi.into(recipe.getFluidInput())); diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/widgets/AnimatedTexturedWidget.java b/src/main/java/de/dafuqs/spectrum/compat/emi/widgets/AnimatedTexturedWidget.java index aefd0ae61c..6d27c32879 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/widgets/AnimatedTexturedWidget.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/widgets/AnimatedTexturedWidget.java @@ -2,9 +2,9 @@ import com.mojang.blaze3d.systems.*; import dev.emi.emi.api.widget.*; -import dev.emi.emi.runtime.*; import net.minecraft.client.gui.*; import net.minecraft.client.gui.tooltip.*; +import net.minecraft.client.render.*; import net.minecraft.util.*; import net.minecraft.util.math.*; @@ -53,15 +53,14 @@ public List getTooltip(int mouseX, int mouseY) { @Override public void render(DrawContext draw, int mouseX, int mouseY, float delta) { - EmiDrawContext context = EmiDrawContext.wrap(draw); - + RenderSystem.setShader(GameRenderer::getPositionTexProgram); RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F); if (animationDurationMS > 0) { int index = MathHelper.ceil((System.currentTimeMillis() / (animationDurationMS / animationCount) % animationCount)); - context.drawTexture(texture, x, y, 0, textureWidth, index * textureWidth, textureWidth, textureWidth, textureWidth, textureHeight); + draw.drawTexture(texture, x, y, 0, textureWidth, index * textureWidth, textureWidth, textureWidth, textureWidth, textureHeight); } else { - context.drawTexture(texture, x, y, 0, textureWidth, textureWidth, textureWidth, textureWidth, textureWidth, textureHeight); + draw.drawTexture(texture, x, y, 0, textureWidth, textureWidth, textureWidth, textureWidth, textureWidth, textureHeight); } } diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/widgets/DynamicTextWidget.java b/src/main/java/de/dafuqs/spectrum/compat/emi/widgets/DynamicTextWidget.java index 93c30c3133..3cd1521fc3 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/widgets/DynamicTextWidget.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/widgets/DynamicTextWidget.java @@ -1,7 +1,6 @@ package de.dafuqs.spectrum.compat.emi.widgets; import dev.emi.emi.api.widget.*; -import dev.emi.emi.runtime.*; import net.minecraft.client.*; import net.minecraft.client.gui.*; import net.minecraft.text.*; @@ -21,19 +20,18 @@ public DynamicTextWidget(Function> t @Override public void render(DrawContext draw, int mouseX, int mouseY, float delta) { - EmiDrawContext context = EmiDrawContext.wrap(draw); - context.push(); + draw.getMatrices().push(); int xOff = horizontalAlignment.offset(CLIENT.textRenderer.getWidth(text)); int yOff = verticalAlignment.offset(CLIENT.textRenderer.fontHeight); - context.matrices().translate(xOff, yOff, 300); + draw.getMatrices().translate(xOff, yOff, 300); var pair = textSupplier.apply(CLIENT); if (shadow) { - context.drawTextWithShadow(pair.getLeft(), x, y, pair.getRight()); + draw.drawTextWithShadow(MinecraftClient.getInstance().textRenderer, pair.getLeft(), x, y, pair.getRight()); } else { - context.drawText(pair.getLeft(), x, y, pair.getRight()); + draw.drawText(MinecraftClient.getInstance().textRenderer, pair.getLeft(), x, y, pair.getRight(), false); } - context.pop(); + draw.getMatrices().pop(); } } diff --git a/src/main/java/de/dafuqs/spectrum/compat/emi/widgets/SaneButtonWidget.java b/src/main/java/de/dafuqs/spectrum/compat/emi/widgets/SaneButtonWidget.java index 4e5ac6fc2e..60b3e27707 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/emi/widgets/SaneButtonWidget.java +++ b/src/main/java/de/dafuqs/spectrum/compat/emi/widgets/SaneButtonWidget.java @@ -1,9 +1,10 @@ package de.dafuqs.spectrum.compat.emi.widgets; +import com.mojang.blaze3d.systems.*; import dev.emi.emi.api.widget.*; -import dev.emi.emi.runtime.*; import net.minecraft.client.gui.*; import net.minecraft.client.gui.tooltip.*; +import net.minecraft.client.render.*; import net.minecraft.util.*; import java.util.*; @@ -19,8 +20,8 @@ public SaneButtonWidget(int x, int y, int width, int height, int u, int v, Ident @Override public void render(DrawContext draw, int mouseX, int mouseY, float delta) { - EmiDrawContext context = EmiDrawContext.wrap(draw); - context.drawTexture(texture, this.x, this.y, this.u, this.v, this.width, this.height); + RenderSystem.setShader(GameRenderer::getPositionTexProgram); + draw.drawTexture(texture, this.x, this.y, this.u, this.v, this.width, this.height); } @Override diff --git a/src/main/java/de/dafuqs/spectrum/compat/vanityslots/VanitySlotsCompat.java b/src/main/java/de/dafuqs/spectrum/compat/vanityslots/VanitySlotsCompat.java index 9ac2469169..9d479cf062 100644 --- a/src/main/java/de/dafuqs/spectrum/compat/vanityslots/VanitySlotsCompat.java +++ b/src/main/java/de/dafuqs/spectrum/compat/vanityslots/VanitySlotsCompat.java @@ -10,7 +10,7 @@ public class VanitySlotsCompat { public static ItemStack getEquippedStack(LivingEntity entity, EquipmentSlot slot) { if (VanitySlotsCompat.IS_VANITY_SLOTS_PRESENT) { - return VanitySlots.getEquippedStack(entity, slot); + return CommonClass.getEquippedStack(entity, slot); } else { return entity.getEquippedStack(slot); } diff --git a/src/main/java/de/dafuqs/spectrum/mixin/PlayerEntityMixin.java b/src/main/java/de/dafuqs/spectrum/mixin/PlayerEntityMixin.java index 707d98669f..89c8b5bbdf 100644 --- a/src/main/java/de/dafuqs/spectrum/mixin/PlayerEntityMixin.java +++ b/src/main/java/de/dafuqs/spectrum/mixin/PlayerEntityMixin.java @@ -293,12 +293,12 @@ public int addExperience(int experience) { return experience; } - @ModifyVariable(method = "getBlockBreakingSpeed", - slice = @Slice(from = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;hasStatusEffect(Lnet/minecraft/registry/entry/RegistryEntry;)Z"), + @ModifyConstant(method = "getBlockBreakingSpeed", + slice = @Slice( + from = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/PlayerEntity;hasStatusEffect(Lnet/minecraft/registry/entry/RegistryEntry;)Z"), to = @At("TAIL") ), - at = @At(value = "LOAD"), - ordinal = 1 + constant = {@Constant(floatValue = 0.3F), @Constant(floatValue = 0.09F), @Constant(floatValue = 0.0027F), @Constant(floatValue = 8.1E-4F)} ) public float applyInexorableEffects(float value) { if (isInexorableActive()) diff --git a/src/main/java/de/dafuqs/spectrum/mixin/client/InGameHudMixin.java b/src/main/java/de/dafuqs/spectrum/mixin/client/InGameHudMixin.java index 2a9146b1fc..3ca82df437 100644 --- a/src/main/java/de/dafuqs/spectrum/mixin/client/InGameHudMixin.java +++ b/src/main/java/de/dafuqs/spectrum/mixin/client/InGameHudMixin.java @@ -26,14 +26,14 @@ public abstract class InGameHudMixin { @Shadow public abstract void render(DrawContext context, RenderTickCounter tickerCounter); - @Inject(method = "renderStatusBars(Lnet/minecraft/client/gui/DrawContext;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V")) + @Inject(method = "renderStatusBars(Lnet/minecraft/client/gui/DrawContext;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/hud/InGameHud;renderHealthBar(Lnet/minecraft/client/gui/DrawContext;Lnet/minecraft/entity/player/PlayerEntity;IIIIFIIIZ)V", shift = At.Shift.AFTER)) private void spectrum$renderAzureDikeBar(DrawContext context, CallbackInfo ci, @Local PlayerEntity cameraPlayer, @Local(ordinal = 2) int x, @Local(ordinal = 4) int y, @Local(ordinal = 6) int heartRows, @Local(ordinal = 7) int rowHeight) { client.getProfiler().swap("spectrum:azure"); HudRenderers.renderAzureDike(context, cameraPlayer, x, y - (heartRows - 1) * rowHeight - 10); } @ModifyExpressionValue(method = "renderMiscOverlays", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/MinecraftClient;isFancyGraphicsOrBetter()Z")) - private boolean spectrum$disableVignietteInDimension(boolean original) { + private boolean spectrum$disableVignetteInDimension(boolean original) { var player = MinecraftClient.getInstance().player; var isInDim = player != null && SpectrumDimensions.DIMENSION_KEY.equals(player.getWorld().getRegistryKey()); return !isInDim && original; diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumRegistries.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumRegistries.java index 3f041723a7..129ea3f213 100644 --- a/src/main/java/de/dafuqs/spectrum/registries/SpectrumRegistries.java +++ b/src/main/java/de/dafuqs/spectrum/registries/SpectrumRegistries.java @@ -23,7 +23,7 @@ public class SpectrumRegistries { // TODO: do all these registries need to be synced? public static final SpectrumRegistry WORLD_EFFECT = register(SpectrumRegistryKeys.WORLD_EFFECT, false); - public static final SpectrumRegistry GEMSTONE_COLOR = register(SpectrumRegistryKeys.GEMSTONE_COLOR, false); + public static final SpectrumRegistry GEMSTONE_COLOR = register(SpectrumRegistryKeys.GEMSTONE_COLOR, true); public static final SpectrumRegistry GLASS_ARROW_VARIANT = register(SpectrumRegistryKeys.GLASS_ARROW_VARIANT, true); public static final SpectrumRegistry INK_COLOR = register(SpectrumRegistryKeys.INK_COLOR, true); public static final SpectrumRegistry KINDLING_VARIANT = register(SpectrumRegistryKeys.KINDLING_VARIANT, true); diff --git a/src/main/resources/assets/minecraft/textures/models/armor/bedrock_layer_1.png b/src/main/resources/assets/spectrum/textures/models/armor/bedrock_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/bedrock_layer_1.png rename to src/main/resources/assets/spectrum/textures/models/armor/bedrock_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/bedrock_layer_2.png b/src/main/resources/assets/spectrum/textures/models/armor/bedrock_layer_2.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/bedrock_layer_2.png rename to src/main/resources/assets/spectrum/textures/models/armor/bedrock_layer_2.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/gemstone_layer_1.png b/src/main/resources/assets/spectrum/textures/models/armor/gemstone_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/gemstone_layer_1.png rename to src/main/resources/assets/spectrum/textures/models/armor/gemstone_layer_1.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/gemstone_layer_2.png b/src/main/resources/assets/spectrum/textures/models/armor/gemstone_layer_2.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/gemstone_layer_2.png rename to src/main/resources/assets/spectrum/textures/models/armor/gemstone_layer_2.png diff --git a/src/main/resources/assets/minecraft/textures/models/armor/glow_vision_layer_1.png b/src/main/resources/assets/spectrum/textures/models/armor/glow_vision_layer_1.png similarity index 100% rename from src/main/resources/assets/minecraft/textures/models/armor/glow_vision_layer_1.png rename to src/main/resources/assets/spectrum/textures/models/armor/glow_vision_layer_1.png