Skip to content

Commit e312321

Browse files
Add ItemBlockTank with tooltip for tank block and ItemPipe to display tooltips with color-coded text based on pipe type (#28)
Co-authored-by: Nikolay S. <nicksitnikov@gmail.com>
1 parent 87dc32b commit e312321

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+7336
-1089
lines changed

dependencies.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// Add your dependencies here
22

33
dependencies {
4+
runtimeOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.58-GTNH:dev')
45
api("curse.maven:cofh-lib-220333:2388748")
56
}

gradle.properties

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,37 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
3939
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
4040
developmentEnvironmentUserName = Developer
4141

42-
# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
43-
# See https://github.com/bsideup/jabel for details on how this works.
44-
enableModernJavaSyntax = false
42+
# Enables modern Java syntax support. Valid values:
43+
# - false: No modern syntax, Java 8 only
44+
# - jabel: Jabel syntax-only support, compiles to J8 bytecode
45+
# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
46+
# - modern: Native modern Java bytecode, no downgrading
47+
enableModernJavaSyntax = jabel
48+
49+
# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
50+
# and should *not* be used in most situations. -1 disables this.
51+
# forceToolchainVersion = -1
52+
53+
# Target JVM version for JVM Downgrader bytecode downgrading.
54+
# Only used when enableModernJavaSyntax = jvmDowngrader
55+
# downgradeTargetVersion = 8
56+
57+
# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
58+
# Classes will be available in META-INF/versions/N/ for each version N in this list.
59+
# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
60+
# jvmDowngraderMultiReleaseVersions = 21,25
61+
62+
# Specifies how JVM Downgrader API stubs are provided. Options:
63+
# - shade: Shade minimized stubs into the jar
64+
# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
65+
# - external: Another dependency provides stubs (no constraint, no warning)
66+
# - (empty): Warning reminding you to configure stubs
67+
# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
68+
# jvmDowngraderStubsProvider =
4569

4670
# Enables injecting missing generics into the decompiled source code for a better coding experience.
4771
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
48-
enableGenericInjection = false
72+
enableGenericInjection = true
4973

5074
# Generate a class with a String field for the mod version named as defined below.
5175
# If generateGradleTokenClass is empty or not missing, no such class will be generated.
@@ -209,3 +233,6 @@ customArchiveBaseName = buildcraft
209233
# This is meant to be set in $HOME/.gradle/gradle.properties.
210234
# ideaCheckSpotlessOnBuild = true
211235

236+
# Non-GTNH properties
237+
org.gradle.configuration-cache = true
238+
org.gradle.parallel = true
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#This file is generated by updateDaemonJvm
2+
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/40b4344c056b4284246d176d9701577f/redirect
3+
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/54001d0b636ad500b432d20ef3d580d0/redirect
4+
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73c462e34475aeb6509ab7ba3eda218f/redirect
5+
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/54001d0b636ad500b432d20ef3d580d0/redirect
6+
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/fdbe420d142244e86336bc2adfc312a2/redirect
7+
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/3ac7a5361c25c0b23d933f44bdb0abd9/redirect
8+
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/40b4344c056b4284246d176d9701577f/redirect
9+
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/54001d0b636ad500b432d20ef3d580d0/redirect
10+
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/28937bb8a7f83f57de92429a9a11c04e/redirect
11+
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/16008c489780dfb402c44316e612a16c/redirect
12+
toolchainVersion=25

gradle/wrapper/gradle-wrapper.jar

1.83 KB
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pluginManagement {
1717
}
1818

1919
plugins {
20-
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.48'
20+
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.18'
2121
}
2222

2323

src/main/java/buildcraft/BuildCraftFactory.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import buildcraft.factory.FactoryGuiHandler;
4242
import buildcraft.factory.FactoryProxy;
4343
import buildcraft.factory.FactoryProxyClient;
44+
import buildcraft.factory.ItemBlockTank;
4445
import buildcraft.factory.PumpDimensionList;
4546
import buildcraft.factory.TileAutoWorkbench;
4647
import buildcraft.factory.TileFloodGate;
@@ -190,7 +191,7 @@ public void initialize(FMLPreInitializationEvent evt) {
190191
BCRegistry.INSTANCE.registerBlock(autoWorkbenchBlock.setBlockName("autoWorkbenchBlock"), false);
191192

192193
tankBlock = (BlockTank) CompatHooks.INSTANCE.getBlock(BlockTank.class);
193-
BCRegistry.INSTANCE.registerBlock(tankBlock.setBlockName("tankBlock"), false);
194+
BCRegistry.INSTANCE.registerBlock(tankBlock.setBlockName("tankBlock"), ItemBlockTank.class, false);
194195

195196
pumpBlock = (BlockPump) CompatHooks.INSTANCE.getBlock(BlockPump.class);
196197
BCRegistry.INSTANCE.registerBlock(pumpBlock.setBlockName("pumpBlock"), false);

src/main/java/buildcraft/core/lib/commands/SubCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public List<String> getCommandAliases() {
7676
}
7777

7878
@Override
79-
public List<?> addTabCompletionOptions(ICommandSender sender, String[] text) {
79+
public List<String> addTabCompletionOptions(ICommandSender sender, String[] text) {
8080
return null;
8181
}
8282

0 commit comments

Comments
 (0)