Skip to content

Commit

Permalink
buildscript and changes
Browse files Browse the repository at this point in the history
  • Loading branch information
BlueWeabo committed Jul 28, 2024
1 parent 1c3d7e5 commit 1533cca
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 11 deletions.
13 changes: 12 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.25'
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ public MultiTileEntityItem(Block block) {
public void addInformation(ItemStack itemStack, EntityPlayer player, List<String> tooltip, boolean f3h) {
super.addInformation(itemStack, player, tooltip, f3h);
MultiTileContainer container = block.getRegistry().getMultiTileContainer(itemStack.getItemDamage());
Class<? extends TooltipData> toolTipClass = container.getTooltipClass();
Class<? extends TooltipAssigner> toolTipClass = container.getTooltipClass();
if (toolTipClass == null) return;
Entity entity = container.getOriginalEntity();
TooltipData tooltipData = entity.get(toolTipClass);
TooltipAssigner tooltipData = entity.get(toolTipClass);
tooltipData.assignTooltip(tooltip);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import java.util.List;

public interface TooltipData {
public interface TooltipAssigner {

void assignTooltip(List<String> tooltip);
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -23,7 +22,7 @@ public class MultiTileContainer {
private final int id;
private final @Nonnull WeakReference<MultiTileEntityRegistry> reg;
private final @Nonnull Entity originalEntity;
private Class<? extends TooltipData> tooltipClass;
private Class<? extends TooltipAssigner> tooltipClass;
private @Nonnull MuTEGUI gui;
private String unlocalizedName;

Expand Down Expand Up @@ -52,7 +51,7 @@ public MultiTileContainer(@Nonnull MultiTileEntityRegistry reg, int id,
return this;
}

public @Nonnull MultiTileContainer tooltipClass(Class<? extends TooltipData> tooltipClass) {
public @Nonnull MultiTileContainer tooltipClass(Class<? extends TooltipAssigner> tooltipClass) {
this.tooltipClass = tooltipClass;
return this;
}
Expand Down Expand Up @@ -97,7 +96,7 @@ public String getUnlocalizedName() {
return unlocalizedName;
}

public Class<? extends TooltipData> getTooltipClass() {
public Class<? extends TooltipAssigner> getTooltipClass() {
return tooltipClass;
}

Expand Down

0 comments on commit 1533cca

Please sign in to comment.