Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
// Add your dependencies here

dependencies {
api("com.github.GTNewHorizons:CodeChickenCore:1.4.3:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.5.4-GTNH:dev")
api("com.github.GTNewHorizons:ForgeMultipart:1.4.7:dev")
api("com.github.GTNewHorizons:waila:1.6.5:dev")
compileOnlyApi("com.github.GTNewHorizons:Botania:1.10.4-GTNH:dev")
compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.8.2:dev")
compileOnlyApi("com.github.GTNewHorizons:OpenComputers:1.10.6-GTNH:dev")
api("com.github.GTNewHorizons:CodeChickenCore:1.4.10:dev")
api("com.github.GTNewHorizons:NotEnoughItems:2.8.70-GTNH:dev")
api("com.github.GTNewHorizons:ForgeMultipart:1.7.2:dev")
api("com.github.GTNewHorizons:waila:1.19.22:dev")
compileOnlyApi("com.github.GTNewHorizons:Botania:1.13.14-GTNH:dev")
compileOnlyApi("com.github.GTNewHorizons:ForestryMC:4.11.6:dev")
compileOnlyApi("com.github.GTNewHorizons:OpenComputers:1.12.16-GTNH:dev")
compileOnlyApi("thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev") { transitive = false }
compileOnlyApi("com.github.GTNewHorizons:BloodMagic:1.5.0:dev")
compileOnlyApi("com.github.GTNewHorizons:BloodMagic:1.8.12:dev")
compileOnlyApi('curse.maven:minefactory-reloaded-66672:2366150') { transitive = false }
compileOnlyApi('curse.maven:computercraft-67504:2269339')
compileOnlyApi('curse.maven:HydCraft-223036:2279482')
compileOnlyApi('curse.maven:Ancient-Warfare-224602:2285132')
compileOnlyApi('curse.maven:ResourcefulCrops-232365:2268518')

compileOnly("com.github.GTNewHorizons:CraftTweaker:3.3.0:dev") {
compileOnly("com.github.GTNewHorizons:CraftTweaker:3.4.2:dev") {
transitive = false
}
compileOnly("com.github.GTNewHorizons:AppleCore:3.3.0:dev") {
compileOnly("com.github.GTNewHorizons:AppleCore:3.3.9:dev") {
transitive = false
}

Expand Down
81 changes: 64 additions & 17 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ modId = cropsnh
modGroup = com.gtnewhorizon.cropsnh

# Whether to use modGroup as the maven publishing group.
# Due to a history of using JitPack, the default is com.github.GTNewHorizons for all mods.
# When false, com.github.GTNewHorizons is used.
useModGroupForPublishing = false

# Updates your build.gradle and settings.gradle automatically whenever an update is available.
Expand All @@ -33,41 +33,68 @@ 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.
developmentEnvironmentUserName = Developer

# Enables using modern Java syntax (up to version 17) via Jabel, while still targeting JVM 8.
# See https://github.com/bsideup/jabel for details on how this works.
enableModernJavaSyntax = false
# Enables modern Java syntax support. Valid values:
# - false: No modern syntax, Java 8 only
# - jabel: Jabel syntax-only support, compiles to J8 bytecode
# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
# - modern: Native modern Java bytecode, no downgrading
enableModernJavaSyntax = jabel

# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
# and should *not* be used in most situations. -1 disables this.
# forceToolchainVersion = -1

# Target JVM version for JVM Downgrader bytecode downgrading.
# Only used when enableModernJavaSyntax = jvmDowngrader
# downgradeTargetVersion = 8

# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
# Classes will be available in META-INF/versions/N/ for each version N in this list.
# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
# jvmDowngraderMultiReleaseVersions = 21,25

# Specifies how JVM Downgrader API stubs are provided. Options:
# - shade: Shade minimized stubs into the jar
# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
# - external: Another dependency provides stubs (no constraint, no warning)
# - (empty): Warning reminding you to configure stubs
# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
# jvmDowngraderStubsProvider =

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

# Generate a class with a String field for the mod version named as defined below.
# If generateGradleTokenClass is empty or not missing, no such class will be generated.
# If gradleTokenVersion is empty or missing, the field will not be present in the class.
generateGradleTokenClass =
generateGradleTokenClass = com.gtnewhorizon.cropsnh.Tags

# Name of the token containing the project's current version to generate/replace.
gradleTokenVersion = GRADLETOKEN_VERSION
gradleTokenVersion = VERSION

# [DEPRECATED] Mod ID replacement token.
gradleTokenModId = GRADLETOKEN_MODID
gradleTokenModId =

# [DEPRECATED] Mod name replacement token.
gradleTokenModName = GRADLETOKEN_MODNAME
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";
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
# version in @Mod([...], version = VERSION, [...]).
# Leave these properties empty to skip individual token replacements.
replaceGradleTokenInFile = Reference.java
replaceGradleTokenInFile =

# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
# leave this property empty.
Expand All @@ -82,13 +109,20 @@ 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

# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
mixinPlugin =

# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
# Specify the package that contains all of your Mixins. The package must exist or
# the build will fail. If you have a package property defined in your mixins.<modid>.json,
# it must match with this or the build will fail.
mixinsPackage =

# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
Expand All @@ -114,16 +148,22 @@ minimizeShadowedDependencies = true
# 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.
#
Expand All @@ -137,7 +177,7 @@ modrinthProjectId =
# type can be one of [project, version],
# and the name is the Modrinth project or version slug/id of the other mod.
# Example: required-project:fplib;optional-project:gasstation;incompatible-project:gregtech
# Note: GTNH Mixins is automatically set as a required dependency if usesMixins = true
# Note: UniMixins is automatically set as a required dependency if usesMixins = true.
modrinthRelations =

# Publishing to CurseForge requires you to set the CURSEFORGE_TOKEN environment variable to one of your CurseForge API tokens.
Expand All @@ -158,11 +198,17 @@ curseForgeRelations =
# projects. New projects should not use this parameter.
# customArchiveBaseName =

# Optional parameter to customize the default working directory used by the runClient* tasks. Relative to the project directory.
# runClientWorkingDirectory = run/client

# Optional parameter to customize the default working directory used by the runServer* tasks. Relative to the project directory.
# runServerWorkingDirectory = run/server

# Optional parameter to have the build automatically fail if an illegal version is used.
# This can be useful if you e.g. only want to allow versions in the form of '1.1.xxx'.
# The check is ONLY performed if the version is a git tag.
# Note: the specified string must be escaped, so e.g. 1\\.1\\.\\d+ instead of 1\.1\.\d+
# versionPattern =
versionPattern = 1\\.7\\.10-\\d+\\.\\d+\\.\\d+(-pre|-snapshot)?

# Uncomment to prevent the source code from being published.
# noPublishedSources = true
Expand All @@ -188,4 +234,5 @@ disableSpotless = true
# ideaCheckSpotlessOnBuild = true

# Non-GTNH properties
gradleTokenGroupName = GRADLETOKEN_GROUPNAME
org.gradle.configuration-cache = true
org.gradle.parallel = true
12 changes: 12 additions & 0 deletions gradle/gradle-daemon-jvm.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73c462e34475aeb6509ab7ba3eda218f/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/9e87f9444e29ce8efb3f66e8435d94b4/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73c462e34475aeb6509ab7ba3eda218f/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/9e87f9444e29ce8efb3f66e8435d94b4/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1050b2216f8beaaecc1289b17d30b586/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/3ac7a5361c25c0b23d933f44bdb0abd9/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73c462e34475aeb6509ab7ba3eda218f/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/9e87f9444e29ce8efb3f66e8435d94b4/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/a86b70d151aa8c1a054e80f417232fa2/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/52fa104f4f641439587f75dd68b31bc2/redirect
toolchainVersion=25
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
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.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
15 changes: 7 additions & 8 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pluginManagement {
}

plugins {
id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.8'
id 'com.gtnewhorizons.gtnhsettingsconvention' version '2.0.20'
}


Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
import com.gtnewhorizon.cropsnh.tileentity.TileEntityCropsNH;
import com.gtnewhorizon.cropsnh.utility.LogHelper;
import com.gtnewhorizon.cropsnh.utility.multiblock.IMultiBlockComponent;
import com.gtnewhorizon.cropsnh.utility.multiblock.IMultiBlockManager;
import com.gtnewhorizon.cropsnh.utility.multiblock.IMultiBlockPartData;

import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.block.Block;
import net.minecraft.block.ITileEntityProvider;
Expand Down Expand Up @@ -84,7 +87,7 @@ public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase e
}
}
if(this.isMultiBlock() && !world.isRemote) {
IMultiBlockComponent component = (IMultiBlockComponent) world.getTileEntity(x, y, z);
IMultiBlockComponent<IMultiBlockManager<IMultiBlockPartData>, IMultiBlockPartData> component = (IMultiBlockComponent<IMultiBlockManager<IMultiBlockPartData>, IMultiBlockPartData>) world.getTileEntity(x, y, z);
component.getMultiBlockManager().onBlockPlaced(world, x, y, z, component);
}
}
Expand All @@ -94,7 +97,7 @@ public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase e
@SuppressWarnings("unchecked")
public void breakBlock(World world, int x, int y, int z, Block b, int meta) {
if(this.isMultiBlock() && !world.isRemote) {
IMultiBlockComponent component = (IMultiBlockComponent) world.getTileEntity(x, y, z);
IMultiBlockComponent<IMultiBlockManager<IMultiBlockPartData>, IMultiBlockPartData> component = (IMultiBlockComponent<IMultiBlockManager<IMultiBlockPartData>, IMultiBlockPartData>) world.getTileEntity(x, y, z);
if(component != null) {
component.getMultiBlockManager().onBlockBroken(world, x, y, z, component);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,7 @@ public ItemBlockWaterPad(Block block) {

@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean flag) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean flag) {
list.add(StatCollector.translateToLocal("cropsnh_tooltip.waterPadDry"));
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ public ItemBlockWaterPadFull(Block block) {

@Override
@SideOnly(Side.CLIENT)
@SuppressWarnings("unchecked")
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean flag) {
public void addInformation(ItemStack stack, EntityPlayer player, List<String> list, boolean flag) {
super.addInformation(stack, player, list, flag);
list.add(StatCollector.translateToLocal("cropsnh_tooltip.waterPadWet"));
}
Expand Down
Loading