Show proper name for GT tiles (#14)

* update bs

* get proper name for GT tiles

* update

---------

Co-authored-by: Martin Robertz <[email protected]>
This commit is contained in:
LyftandMartin Robertz authored and GitHub committed 2024-08-26 19:49:54 +02:00
1 parent 0dec5e3493
commit 4290347241
8 files changed
+38 -22

No files matched your search

+3 -4
View File
@@ -1,9 +1,8 @@
// Add your dependencies here
dependencies {
shadeCompile 'io.netty-opis:Netty-opis:4.0.23'
shadowCompile 'io.netty-opis:Netty-opis:4.0.23'
shadowCompile 'org.apache.commons:commons-math3:3.2'
shadeCompile 'org.jfree:jfreechart:1.0.17'
shadeCompile 'com.miglayout:miglayout-swing:4.2'
shadowCompile 'org.jfree:jfreechart:1.0.17'
shadowCompile 'com.miglayout:miglayout-swing:4.2'
}
+17 -5
View File
@@ -33,7 +33,7 @@ channel = stable
mappingsVersion = 12
# Defines other MCP mappings for dependency deobfuscation.
remoteMappings = https://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/conf/
# Select a default username for testing your mod. You can always override this per-run by running
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
@@ -61,6 +61,9 @@ gradleTokenModId =
# [DEPRECATED] Mod name replacement token.
gradleTokenModName =
# [DEPRECATED] Mod Group replacement token.
gradleTokenGroupName =
# [DEPRECATED]
# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
# public static final String VERSION = "GRADLETOKEN_VERSION";
@@ -82,6 +85,11 @@ accessTransformersFile = mobius_at.cfg
# 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
@@ -114,16 +122,22 @@ minimizeShadowedDependencies = false
# If disabled, won't rename the shadowed classes.
relocateShadowedDependencies = true
# Adds the GTNH maven, CurseMaven, IC2/Player maven, 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.
usesMavenPublishing = true
# Maven repository to publish the mod to.
# mavenPublishUrl = https://nexus.gtnewhorizons.com/repository/releases/
# mavenPublishUrl = https\://nexus.gtnewhorizons.com/repository/releases/
# Publishing to Modrinth requires you to set the MODRINTH_TOKEN environment variable to your current Modrinth API token.
#
@@ -187,5 +201,3 @@ curseForgeRelations =
# This is meant to be set in $HOME/.gradle/gradle.properties.
# ideaCheckSpotlessOnBuild = true
# Non-GTNH properties
gradleTokenGroupName =
Binary file not shown.
+1 -1
View File
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Vendored
+5 -2
View File
@@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#
##############################################################################
#
@@ -55,7 +57,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
' "$PWD" ) || exit
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Vendored
+2
View File
@@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
+1 -1
View File
@@ -17,7 +17,7 @@ pluginManagement {
}
plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.8'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.26'
}
@@ -18,17 +18,17 @@ import mcp.mobius.opis.data.profilers.ProfilerTileEntityUpdate;
public class DataBlockTileEntity implements ISerializable, Comparable<DataBlockTileEntity> {
public short id;
public short meta;
public int id;
public int meta;
public CoordinatesBlock pos;
public DataTiming update;
public DataBlockTileEntity fill(CoordinatesBlock coord) {
this.pos = coord;
World world = DimensionManager.getWorld(this.pos.dim);
this.id = (short) Block.getIdFromBlock(world.getBlock(this.pos.x, this.pos.y, this.pos.z));
this.meta = (short) world.getBlockMetadata(this.pos.x, this.pos.y, this.pos.z);
Block block = world.getBlock(this.pos.x, this.pos.y, this.pos.z);
this.id = Block.getIdFromBlock(block);
this.meta = block.getDamageValue(world, this.pos.x, this.pos.y, this.pos.z);
HashMap<CoordinatesBlock, DescriptiveStatistics> data = ((ProfilerTileEntityUpdate) (ProfilerSection.TILEENT_UPDATETIME
.getProfiler())).data;
@@ -39,16 +39,16 @@ public class DataBlockTileEntity implements ISerializable, Comparable<DataBlockT
@Override
public void writeToStream(ByteArrayDataOutput stream) {
stream.writeShort(this.id);
stream.writeShort(this.meta);
stream.writeInt(this.id);
stream.writeInt(this.meta);
this.pos.writeToStream(stream);
this.update.writeToStream(stream);
}
public static DataBlockTileEntity readFromStream(ByteArrayDataInput stream) {
DataBlockTileEntity retVal = new DataBlockTileEntity();
retVal.id = stream.readShort();
retVal.meta = stream.readShort();
retVal.id = stream.readInt();
retVal.meta = stream.readInt();
retVal.pos = CoordinatesBlock.readFromStream(stream);
retVal.update = DataTiming.readFromStream(stream);
return retVal;