diff --git a/gradle.properties b/gradle.properties index 77184a8..5667ba1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -76,6 +76,11 @@ accessTransformersFile = # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! usesMixins = false +# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main. +# This can speed up compile times thanks to not running the mixin annotation processor on all input sources. +# Mixin classes will have access to "main" classes, but not the other way around. +separateMixinSourceSet = + # Adds some debug arguments like verbose output and class export. usesMixinDebug = false @@ -108,9 +113,15 @@ minimizeShadowedDependencies = false # If disabled, won't rename the shadowed classes. relocateShadowedDependencies = true -# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. +# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. includeWellKnownRepositories = true +# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated +# list of strings, with the acceptable keys being(case does not matter): +# cursemaven +# modrinth +excludeWellKnownRepositories = + # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven. # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables. # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..09523c0 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.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 1b1ee64..0cfd055 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,5 +17,5 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.25' } diff --git a/src/main/java/com/gtnewhorizons/mutecore/api/item/MultiTileEntityItem.java b/src/main/java/com/gtnewhorizons/mutecore/api/item/MultiTileEntityItem.java index 80eb9dc..63b2b6b 100644 --- a/src/main/java/com/gtnewhorizons/mutecore/api/item/MultiTileEntityItem.java +++ b/src/main/java/com/gtnewhorizons/mutecore/api/item/MultiTileEntityItem.java @@ -37,10 +37,10 @@ public MultiTileEntityItem(Block block) { public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean f3h) { super.addInformation(itemStack, player, tooltip, f3h); MultiTileContainer container = block.getRegistry().getMultiTileContainer(itemStack.getItemDamage()); - Class toolTipClass = container.getTooltipClass(); + Class toolTipClass = container.getTooltipClass(); if (toolTipClass == null) return; Entity entity = container.getOriginalEntity(); - TooltipData tooltipData = entity.get(toolTipClass); + TooltipAssigner tooltipData = entity.get(toolTipClass); tooltipData.assignTooltip(tooltip); } diff --git a/src/main/java/com/gtnewhorizons/mutecore/api/item/TooltipData.java b/src/main/java/com/gtnewhorizons/mutecore/api/item/TooltipAssigner.java similarity index 77% rename from src/main/java/com/gtnewhorizons/mutecore/api/item/TooltipData.java rename to src/main/java/com/gtnewhorizons/mutecore/api/item/TooltipAssigner.java index 6fac1cd..2ff8015 100644 --- a/src/main/java/com/gtnewhorizons/mutecore/api/item/TooltipData.java +++ b/src/main/java/com/gtnewhorizons/mutecore/api/item/TooltipAssigner.java @@ -2,7 +2,7 @@ import java.util.List; -public interface TooltipData { +public interface TooltipAssigner { void assignTooltip(List tooltip); } diff --git a/src/main/java/com/gtnewhorizons/mutecore/api/registry/MultiTileContainer.java b/src/main/java/com/gtnewhorizons/mutecore/api/registry/MultiTileContainer.java index cd062e0..f3653ab 100644 --- a/src/main/java/com/gtnewhorizons/mutecore/api/registry/MultiTileContainer.java +++ b/src/main/java/com/gtnewhorizons/mutecore/api/registry/MultiTileContainer.java @@ -9,10 +9,9 @@ import com.gtnewhorizons.mutecore.MuTECore; import com.gtnewhorizons.mutecore.api.data.FirstTickEvent; -import com.gtnewhorizons.mutecore.api.data.TickData; import com.gtnewhorizons.mutecore.api.data.WorldStateValidator; import com.gtnewhorizons.mutecore.api.gui.MuTEGUI; -import com.gtnewhorizons.mutecore.api.item.TooltipData; +import com.gtnewhorizons.mutecore.api.item.TooltipAssigner; import com.gtnewhorizons.mutecore.api.tile.MultiTileEntity; import dev.dominion.ecs.api.Entity; @@ -23,7 +22,7 @@ public class MultiTileContainer { private final int id; private final @Nonnull WeakReference reg; private final @Nonnull Entity originalEntity; - private Class tooltipClass; + private Class tooltipClass; private @Nonnull MuTEGUI gui; private String unlocalizedName; @@ -52,7 +51,7 @@ public MultiTileContainer(@Nonnull MultiTileEntityRegistry reg, int id, return this; } - public @Nonnull MultiTileContainer tooltipClass(Class tooltipClass) { + public @Nonnull MultiTileContainer tooltipClass(Class tooltipClass) { this.tooltipClass = tooltipClass; return this; } @@ -97,7 +96,7 @@ public String getUnlocalizedName() { return unlocalizedName; } - public Class getTooltipClass() { + public Class getTooltipClass() { return tooltipClass; }