From 1e61ca9b9ec1131d4bf4d6c12f73135fc142d7bb Mon Sep 17 00:00:00 2001 From: ninjaguardian <110734253+ninjaguardian@users.noreply.github.com> Date: Mon, 10 Aug 2026 21:34:23 -0500 Subject: [PATCH 1/4] Initial port to 1.21.1 Neoforge --- .gitignore | 2 + build.gradle.kts | 236 +++++--------- buildSrc/build.gradle.kts | 16 - gradle.properties | 28 +- gradle/wrapper/gradle-wrapper.jar | Bin 54708 -> 47505 bytes gradle/wrapper/gradle-wrapper.properties | 6 +- gradlew | 302 +++++++++++------- gradlew.bat | 100 +++--- settings.gradle.kts | 13 + .../4dbcee293b56fe1b43bba8f6b6dafcdecc485daa | 7 - .../59eb3dbb5f86130e09b3c62d89b9525ee01cf52d | 16 - .../bbda727dc13484b6b22308bd3b163b53737b0ae5 | 3 - .../bfc7c06436dea6b5bd0995629362145d44ff6afe | 24 -- .../c622617f6fabf890a00b9275cd5f643584a8a2c8 | 2 - .../e5060f9a9bf6cfbb6c72c5413383fcbbd2a9d690 | 5 - .../assets/dtecologics/lang/en_us.json | 4 +- .../assets/minecraft/atlases/blocks.json | 28 ++ .../blocks/coconut.json | 0 .../loot_table/blocks/coconut_leaves.json | 138 ++++++++ .../blocks/prickly_pear.json | 0 .../blocks/walnut.json | 0 .../blocks/walnut_leaves.json | 40 +-- .../trees/branches/azalea.json | 0 .../trees/branches/coconut.json | 0 .../trees/branches/stripped_azalea.json | 0 .../trees/branches/stripped_coconut.json | 0 .../trees/branches/stripped_walnut.json | 0 .../trees/branches/walnut.json | 0 .../loot_table/trees/leaves/coconut.json | 70 ++++ .../trees/leaves/walnut.json | 0 .../trees/voluntary/coconut.json | 0 .../trees/voluntary/walnut.json | 0 .../loot_tables/blocks/coconut_leaves.json | 70 ---- .../loot_tables/trees/leaves/coconut.json | 33 -- .../{blocks => block}/branches_that_burn.json | 0 .../tags/{blocks => block}/leaves.json | 0 .../tags/{blocks => block}/saplings.json | 5 +- .../stripped_branches_that_burn.json | 0 .../{items => item}/branches_that_burn.json | 0 .../tags/{items => item}/seeds.json | 5 +- .../dtecologics/DynamicTreesEcologics.java | 87 +++-- .../cactus/PricklyPearCactusSpecies.java | 15 +- .../coconut/FallingCoconutBlock.java | 142 ++++++++ .../coconut/FallingCoconutPod.java | 23 ++ .../init/EcologicsEventRegistries.java | 39 +++ .../init/EcologicsModRegistries.java | 21 ++ .../dtecologics/init/PlusModRegistries.java | 19 ++ .../dtecologics/init/PlusRegistries.java | 16 - .../mixin/EcologicsNeoForgeMixin.java | 86 +++++ .../dtecologics/mixin/EntityMixin.java | 37 +++ .../mixin/FallingBlockEntityMixin.java | 69 ++++ .../resources/META-INF/accesstransformer.cfg | 1 + src/main/resources/META-INF/mods.toml | 59 ---- .../resources/META-INF/neoforge.mods.toml | 62 ++++ .../models/block/fruit/coconut_age0.json | 1 + .../models/block/fruit/coconut_age1.json | 1 + .../models/block/fruit/coconut_age2.json | 1 + .../models/block/fruit/coconut_age3.json | 1 + .../models/block/fruit/prickly_pear_age0.json | 3 +- .../models/block/fruit/prickly_pear_age1.json | 3 +- .../models/block/fruit/prickly_pear_age2.json | 3 +- .../models/block/fruit/prickly_pear_age3.json | 3 +- .../block/fruit/prickly_pear_offset_age0.json | 1 + .../block/fruit/prickly_pear_offset_age1.json | 1 + .../block/fruit/prickly_pear_offset_age2.json | 1 + .../block/fruit/prickly_pear_offset_age3.json | 1 + .../models/block/fruit/walnut_age0.json | 1 + .../models/block/fruit/walnut_age1.json | 1 + .../models/block/fruit/walnut_age2.json | 1 + .../models/block/fruit/walnut_age3.json | 1 + .../block/prickly_pear_cactus_sapling.json | 1 + .../damage_type/falling_fruit/coconut.json | 2 +- src/main/resources/dtecologics.mixins.json | 14 + src/main/resources/pack.mcmeta | 2 +- .../trees/dtecologics/families/coconut.json | 1 + .../dtecologics/fruits/prickly_pear.json | 8 +- .../trees/dtecologics/fruits/walnut.json | 8 +- .../trees/dtecologics/pods/coconut.json | 26 +- .../trees/dtecologics/world_gen/default.json | 4 +- 79 files changed, 1236 insertions(+), 683 deletions(-) delete mode 100644 buildSrc/build.gradle.kts mode change 100755 => 100644 gradlew delete mode 100644 src/generated/resources/.cache/4dbcee293b56fe1b43bba8f6b6dafcdecc485daa delete mode 100644 src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d delete mode 100644 src/generated/resources/.cache/bbda727dc13484b6b22308bd3b163b53737b0ae5 delete mode 100644 src/generated/resources/.cache/bfc7c06436dea6b5bd0995629362145d44ff6afe delete mode 100644 src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 delete mode 100644 src/generated/resources/.cache/e5060f9a9bf6cfbb6c72c5413383fcbbd2a9d690 create mode 100644 src/generated/resources/assets/minecraft/atlases/blocks.json rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/blocks/coconut.json (100%) create mode 100644 src/generated/resources/data/dtecologics/loot_table/blocks/coconut_leaves.json rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/blocks/prickly_pear.json (100%) rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/blocks/walnut.json (100%) rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/blocks/walnut_leaves.json (79%) rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/trees/branches/azalea.json (100%) rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/trees/branches/coconut.json (100%) rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/trees/branches/stripped_azalea.json (100%) rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/trees/branches/stripped_coconut.json (100%) rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/trees/branches/stripped_walnut.json (100%) rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/trees/branches/walnut.json (100%) create mode 100644 src/generated/resources/data/dtecologics/loot_table/trees/leaves/coconut.json rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/trees/leaves/walnut.json (100%) rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/trees/voluntary/coconut.json (100%) rename src/generated/resources/data/dtecologics/{loot_tables => loot_table}/trees/voluntary/walnut.json (100%) delete mode 100644 src/generated/resources/data/dtecologics/loot_tables/blocks/coconut_leaves.json delete mode 100644 src/generated/resources/data/dtecologics/loot_tables/trees/leaves/coconut.json rename src/generated/resources/data/dynamictrees/tags/{blocks => block}/branches_that_burn.json (100%) rename src/generated/resources/data/dynamictrees/tags/{blocks => block}/leaves.json (100%) rename src/generated/resources/data/dynamictrees/tags/{blocks => block}/saplings.json (70%) rename src/generated/resources/data/dynamictrees/tags/{blocks => block}/stripped_branches_that_burn.json (100%) rename src/generated/resources/data/dynamictrees/tags/{items => item}/branches_that_burn.json (100%) rename src/generated/resources/data/dynamictrees/tags/{items => item}/seeds.json (70%) create mode 100644 src/main/java/maxhyper/dtecologics/coconut/FallingCoconutBlock.java create mode 100644 src/main/java/maxhyper/dtecologics/coconut/FallingCoconutPod.java create mode 100644 src/main/java/maxhyper/dtecologics/init/EcologicsEventRegistries.java create mode 100644 src/main/java/maxhyper/dtecologics/init/EcologicsModRegistries.java create mode 100644 src/main/java/maxhyper/dtecologics/init/PlusModRegistries.java delete mode 100644 src/main/java/maxhyper/dtecologics/init/PlusRegistries.java create mode 100644 src/main/java/maxhyper/dtecologics/mixin/EcologicsNeoForgeMixin.java create mode 100644 src/main/java/maxhyper/dtecologics/mixin/EntityMixin.java create mode 100644 src/main/java/maxhyper/dtecologics/mixin/FallingBlockEntityMixin.java create mode 100644 src/main/resources/META-INF/accesstransformer.cfg delete mode 100644 src/main/resources/META-INF/mods.toml create mode 100644 src/main/resources/META-INF/neoforge.mods.toml create mode 100644 src/main/resources/dtecologics.mixins.json diff --git a/.gitignore b/.gitignore index 45b9159..625ddfc 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,5 @@ build eclipse run libs + +src/generated/**/.cache/ diff --git a/build.gradle.kts b/build.gradle.kts index 89d01cc..048ab3c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,201 +1,131 @@ -import com.matthewprenger.cursegradle.CurseArtifact -import com.matthewprenger.cursegradle.CurseExtension -import com.matthewprenger.cursegradle.CurseProject -import com.matthewprenger.cursegradle.CurseRelation -import net.minecraftforge.gradle.common.util.RunConfig -import java.time.Instant -import java.time.format.DateTimeFormatter - -fun property(key: String) = project.findProperty(key).toString() - -apply(from = "https://gist.githubusercontent.com/Harleyoc1/4d23d4e991e868d98d548ac55832381e/raw/applesiliconfg.gradle") - plugins { - id("java") - id("net.minecraftforge.gradle") - id("org.parchmentmc.librarian.forgegradle") - id("idea") - id("maven-publish") - id("com.matthewprenger.cursegradle") version "1.4.0" - id("com.modrinth.minotaur") version "2.+" - id("com.harleyoconnor.autoupdatetool") version "1.0.7" + id("net.neoforged.moddev") version "2.0.143" } -repositories { - maven("https://ldtteam.jfrog.io/ldtteam/modding/") - maven("https://www.cursemaven.com") { - content { - includeGroup("curse.maven") - } - } - maven("https://harleyoconnor.com/maven") - maven("https://squiddev.cc/maven/") - mavenLocal() - flatDir { - dirs("libs") - } +val mcVersion = providers.gradleProperty("mcVersion") +val neoVersion = providers.gradleProperty("neoVersion") +val modName = providers.gradleProperty("modName") +val modId = providers.gradleProperty("modId") +val modVersion = providers.gradleProperty("modVersion") +val modGroup = providers.gradleProperty("group") +val dynamicTreesVersion = providers.gradleProperty("dynamicTreesVersion") +val dynamicTreesPlusVersion = providers.gradleProperty("dynamicTreesPlusVersion") +val dynamicTreesAddonLibVersion = providers.gradleProperty("dynamicTreesAddonLibVersion") +val ecologicsVersion = providers.gradleProperty("ecologicsVersion") + +version = "${mcVersion.get()}-${modVersion.get()}" +group = modGroup.get() + +base { + archivesName.set(modName) } -val modName = property("modName") -val modId = property("modId") -val modVersion = property("modVersion") -val mcVersion = property("mcVersion") +java { + withSourcesJar() -version = "$mcVersion-$modVersion" -group = property("group") + toolchain { + languageVersion.set(JavaLanguageVersion.of(21)) + } +} -minecraft { - mappings("parchment", "${property("mappingsVersion")}-$mcVersion") +neoForge { + version = neoVersion.get() runs { create("client") { - applyDefaultConfiguration() - - if (project.hasProperty("mcUuid")) { - args("--uuid", property("mcUuid")) - } - if (project.hasProperty("mcUsername")) { - args("--username", property("mcUsername")) - } - if (project.hasProperty("mcAccessToken")) { - args("--accessToken", property("mcAccessToken")) - } + client() } create("server") { - applyDefaultConfiguration("run-server") + server() } create("data") { - applyDefaultConfiguration() + data() - args( - "--mod", modId, + programArguments.addAll( "--all", - "--output", file("src/generated/resources/"), - "--existing", file("src/main/resources"), + "--existing", file("src/main/resources").absolutePath, + "--output", file("src/generated/resources/").absolutePath, + "--mod", modId.get(), "--existing-mod", "dynamictrees", "--existing-mod", "dynamictreesplus", "--existing-mod", "ecologics" ) } } -} - -sourceSets.main.get().resources { - srcDir("src/generated/resources") -} -dependencies { - // Forge - minecraft("net.minecraftforge:forge:$mcVersion-${property("forgeVersion")}") - - // DynamicTrees - implementation(fg.deobf("com.ferreusveritas.dynamictrees:DynamicTrees-$mcVersion:${property("dynamicTreesVersion")}")) - implementation(fg.deobf("com.ferreusveritas.dynamictreesplus:DynamicTreesPlus-$mcVersion:${property("dynamicTreesPlusVersion")}")) - implementation(fg.deobf("curse.maven:dynamic-trees-addon-lib-1404692:8289347")) - - // DynmaicTrees Tools/Utilities - runtimeOnly(fg.deobf("curse.maven:jade-324717:5072729")) - runtimeOnly(fg.deobf("curse.maven:jei-238222:5101366")) - runtimeOnly(fg.deobf("curse.maven:cc-tweaked-282001:5118388")) - runtimeOnly(fg.deobf("curse.maven:suggestion-provider-fix-469647:4591193")) - runtimeOnly(fg.deobf("vazkii.patchouli:Patchouli:${property("patchouliVersion")}")) - - //Other - implementation(fg.deobf("curse.maven:ecologics-570463:4857272")) -} - -tasks.jar { - manifest.attributes( - "Specification-Title" to project.name, - "Specification-Vendor" to "Max Hyper", - "Specification-Version" to "1", - "Implementation-Title" to project.name, - "Implementation-Version" to project.version, - "Implementation-Vendor" to "Max Hyper", - "Implementation-Timestamp" to DateTimeFormatter.ISO_INSTANT.format(Instant.now()) - ) + mods { + create(modId.get()) { + sourceSet(sourceSets.main.get()) + } + } - archiveBaseName.set(modName) - finalizedBy("reobfJar") + parchment { + minecraftVersion.set(mcVersion) + } } -java { - withSourcesJar() - - toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) +sourceSets { + main { + resources { + srcDir("src/generated/resources") + } } } -curseforge { - if (project.hasProperty("curseApiKey") && project.hasProperty("curseFileType")) { - apiKey = property("curseApiKey") - - project { - id = property("curseProjectId") - - addGameVersion(mcVersion) - - changelog = file("build/changelog.txt") - changelogType = "markdown" - releaseType = property("curseFileType") - - addArtifact(tasks.findByName("sourcesJar")) - - mainArtifact(tasks.findByName("jar")) { - relations { - requiredDependency("dynamictrees") - optionalDependency("dynamictreesplus") - requiredDependency("ecologics") - } +repositories { + maven("https://ldtteam.jfrog.io/ldtteam/modding/") + exclusiveContent { + forRepository { + maven("https://api.modrinth.com/maven") { + name = "Modrinth" } } - } else { - project.logger.log(LogLevel.WARN, "API Key and file type for CurseForge not detected; uploading will be disabled.") + filter { + includeGroup("maven.modrinth") + } + } + maven("https://www.cursemaven.com") { + content { + includeGroup("curse.maven") + } } } -tasks.withType { - enabled = false -} +dependencies { + implementation("com.dtteam.dynamictrees:dynamictrees-neoforge-${mcVersion.get()}:${dynamicTreesVersion.get()}") + implementation("com.dtteam.dynamictreesplus:DynamicTreesPlus:${dynamicTreesPlusVersion.get()}") + implementation("maven.modrinth:dynamic-trees-addon-lib:${dynamicTreesAddonLibVersion.get()}") -publishing { - publications { - create("mavenJava") { - from(components["java"]) - } - } - repositories { - maven("file:///${project.projectDir}/mcmodsrepo") - } + implementation("maven.modrinth:ecologics:${ecologicsVersion.get()}-NeoForge") } -fun RunConfig.applyDefaultConfiguration(runDirectory: String = "run") { - workingDirectory = file(runDirectory).absolutePath +tasks.processResources { + val replaceProperties = mapOf( + "mcVersion" to mcVersion, + "neoVersion" to neoVersion, + "modId" to modId, + "modVersion" to modVersion, + "dynamicTreesVersion" to dynamicTreesVersion, + "dynamicTreesPlusVersion" to dynamicTreesPlusVersion, + "dynamicTreesAddonLibVersion" to dynamicTreesAddonLibVersion, + "ecologicsVersion" to ecologicsVersion + ) - property("forge.logging.markers", "SCAN,REGISTRIES,REGISTRYDUMP") - property("forge.logging.console.level", "debug") + inputs.properties(replaceProperties) - property("mixin.env.remapRefMap", "true") - property("mixin.env.refMapRemappingFile", "${buildDir}/createSrgToMcp/output.srg") + filteringCharset = "UTF-8" - mods { - create(modId) { - source(sourceSets.main.get()) - } + filesMatching("META-INF/neoforge.mods.toml") { + expand(replaceProperties.mapValues { it.value.get() }) } } -fun CurseExtension.project(action: CurseProject.() -> Unit) { - this.project(closureOf(action)) +tasks.withType().configureEach { + options.encoding = "UTF-8" } -fun CurseProject.mainArtifact(artifact: Task?, action: CurseArtifact.() -> Unit) { - this.mainArtifact(artifact, closureOf(action)) -} - -fun CurseArtifact.relations(action: CurseRelation.() -> Unit) { - this.relations(closureOf(action)) +tasks.jar { + from("LICENSE") } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts deleted file mode 100644 index e92ccf5..0000000 --- a/buildSrc/build.gradle.kts +++ /dev/null @@ -1,16 +0,0 @@ -plugins { - `kotlin-dsl` - `java-library` -} - -repositories { - mavenCentral() - maven("https://files.minecraftforge.net/maven") - maven("https://maven.parchmentmc.org") -} - -dependencies { - implementation("com.google.code.gson:gson:2.8.7") - implementation("net.minecraftforge.gradle:ForgeGradle:5.1.+") - implementation("org.parchmentmc:librarian:1.+") -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a490bf7..f41184c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,20 +1,18 @@ +org.gradle.jvmargs=-Xmx2G +org.gradle.daemon=true +org.gradle.parallel=true +org.gradle.caching=true +org.gradle.configuration-cache=true + +mcVersion=1.21.1 +neoVersion=21.1.248 +neoForge.parchment.mappingsVersion=2024.11.17 modName=DynamicTreesEcologics modId=dtecologics modVersion=1.1.1 group=com.maxhyper.dtecologics -mcVersion=1.20.1 -forgeVersion=47.4.3 -mappingsVersion=2023.09.03 - -dynamicTreesVersion=1.4.10 -dynamicTreesPlusVersion=1.2.2 -patchouliVersion=1.20.1-84-FORGE -ccVersion=1.111.0 -suggestionProviderFixVersion=1.0.0 - -curseFileType=release -curseProjectId=871323 - -org.gradle.jvmargs=-Xmx3G -org.gradle.daemon=false +dynamicTreesVersion=1.7.2 +dynamicTreesPlusVersion=1.3.2 +dynamicTreesAddonLibVersion=0.2.0-BETA03 +ecologicsVersion=2.3.7 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7a3265ee94c0ab25cf079ac8ccdf87f41d455d42..eddabd2eef8d94a5437d6168ff9c87a78ff725b3 100644 GIT binary patch literal 47505 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

_x$+l{{cH8$W#CT diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ceccc3a..69dd0d0 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip +networkTimeout=10000 +retries=0 +retryBackOffMs=500 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/gradlew b/gradlew old mode 100755 new mode 100644 index cccdd3d..249efbb --- a/gradlew +++ b/gradlew @@ -1,78 +1,128 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# gradlew start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh gradlew +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# This is normally unused +# 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 -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,92 +131,118 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index f955316..a51ec4f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,84 +1,82 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@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 ########################################################################## @rem -@rem Gradle startup script for Windows +@rem gradlew startup script for Windows @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 -goto fail +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 -:mainEnd -if "%OS%"=="Windows_NT" endlocal +@rem Execute gradlew +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -:omega +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/settings.gradle.kts b/settings.gradle.kts index e90df4a..6742365 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1,14 @@ +pluginManagement { + repositories { + gradlePluginPortal() + mavenCentral() + + maven("https://maven.neoforged.net/releases") { name = "Neoforged" } + } +} + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" +} + rootProject.name = "DT Ecologics" \ No newline at end of file diff --git a/src/generated/resources/.cache/4dbcee293b56fe1b43bba8f6b6dafcdecc485daa b/src/generated/resources/.cache/4dbcee293b56fe1b43bba8f6b6dafcdecc485daa deleted file mode 100644 index 722271d..0000000 --- a/src/generated/resources/.cache/4dbcee293b56fe1b43bba8f6b6dafcdecc485daa +++ /dev/null @@ -1,7 +0,0 @@ -// 1.20.1 2024-07-17T10:43:01.2063322 Item Models: dtecologics -bbc20f4b78d582354a6724e1312e83af454c4f53 assets/dtecologics/models/item/azalea_branch.json -8403401337b96eaaf139d984cb9cd205b6a5ba9a assets/dtecologics/models/item/coconut_branch.json -4d2e1735388a190f16514af799f7d740f5b319ba assets/dtecologics/models/item/coconut_seed.json -979d9065a39701308caab9ce64a97568af75bbf9 assets/dtecologics/models/item/prickly_pear_cactus_seed.json -1897e127255ab164357db0068e35d950ec62593f assets/dtecologics/models/item/walnut_branch.json -6d4e643a42274da65cef136e5c8371793063201a assets/dtecologics/models/item/walnut_seed.json diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d deleted file mode 100644 index a3a75d9..0000000 --- a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d +++ /dev/null @@ -1,16 +0,0 @@ -// 1.20.1 2024-07-17T10:43:01.1998107 Loot Tables -44a884c04dabda24539fa6a48ab6cc87211d9134 data/dtecologics/loot_tables/blocks/coconut.json -779af76666f534fb627ca3673150d9f554a816f9 data/dtecologics/loot_tables/blocks/coconut_leaves.json -3b0b042fcf036670d1452f47602ffe86444fda34 data/dtecologics/loot_tables/blocks/prickly_pear.json -70224dae4bb848a6880c3be1b2e0e6705777e791 data/dtecologics/loot_tables/blocks/walnut.json -6a77d0996ed5418dd30285c3c9d732a3ecdfd925 data/dtecologics/loot_tables/blocks/walnut_leaves.json -e01d09d105dbf28cb0a44dd855d3a80a61d909b3 data/dtecologics/loot_tables/trees/branches/azalea.json -8d63ff8f615f4a941ffae69de1f300ab987ae829 data/dtecologics/loot_tables/trees/branches/coconut.json -74ace6ee24b0f132120717ffc7f73c6d4a53c829 data/dtecologics/loot_tables/trees/branches/stripped_azalea.json -22c2d1f6b9c982d0b65633bda3ad301389a210db data/dtecologics/loot_tables/trees/branches/stripped_coconut.json -722307935a9895dd30e587ee99c0a3fea7eff3b6 data/dtecologics/loot_tables/trees/branches/stripped_walnut.json -dc7b7eee66e3dc693f40837df7714ac11dbb9170 data/dtecologics/loot_tables/trees/branches/walnut.json -6f0a2de540706bb07592c109516b573287b4ab5b data/dtecologics/loot_tables/trees/leaves/coconut.json -158eb5803cdea81475d1f92a9250acc18a7aa1cf data/dtecologics/loot_tables/trees/leaves/walnut.json -059fbd5d2010ed22af5bd9f3cad8e834069f3fd4 data/dtecologics/loot_tables/trees/voluntary/coconut.json -52e0d3cf9aac673bed748737a49ef1f3b117c87a data/dtecologics/loot_tables/trees/voluntary/walnut.json diff --git a/src/generated/resources/.cache/bbda727dc13484b6b22308bd3b163b53737b0ae5 b/src/generated/resources/.cache/bbda727dc13484b6b22308bd3b163b53737b0ae5 deleted file mode 100644 index 789e2fc..0000000 --- a/src/generated/resources/.cache/bbda727dc13484b6b22308bd3b163b53737b0ae5 +++ /dev/null @@ -1,3 +0,0 @@ -// 1.20.1 2024-07-17T10:43:01.2018431 dtecologics DT Item Tags -b0b266d56494f114af9429e3674d8a2eea74e915 data/dynamictrees/tags/items/branches_that_burn.json -5277ba1fbceb375336d713618a191ee009998433 data/dynamictrees/tags/items/seeds.json diff --git a/src/generated/resources/.cache/bfc7c06436dea6b5bd0995629362145d44ff6afe b/src/generated/resources/.cache/bfc7c06436dea6b5bd0995629362145d44ff6afe deleted file mode 100644 index 3b5afdd..0000000 --- a/src/generated/resources/.cache/bfc7c06436dea6b5bd0995629362145d44ff6afe +++ /dev/null @@ -1,24 +0,0 @@ -// 1.20.1 2024-07-17T10:43:01.1963464 Block States: dtecologics -167a01d3590e2e1b9c082809b7bdd12f1eeda00f assets/dtecologics/blockstates/azalea_branch.json -c0cc5150c5788a0c7487c6afb64cd97f2eba991a assets/dtecologics/blockstates/coconut_branch.json -19092201261688ae991b9491c513397b821aaf63 assets/dtecologics/blockstates/coconut_leaves.json -10882d7f42bbd5a39a32b832391b1924b4e64cfa assets/dtecologics/blockstates/coconut_sapling.json -9768e0f1ae27819aabb217611e58c207bc1ae725 assets/dtecologics/blockstates/prickly_pear_cactus_sapling.json -40f072c7188a251cdf694889db65e06a544fb0af assets/dtecologics/blockstates/stripped_azalea_branch.json -e2e7fa23d5d2fa133c51f0666a71adfd95d43564 assets/dtecologics/blockstates/stripped_coconut_branch.json -bd82d2e21d7392dd1c2a8dd66a538fe6fc9dc5c9 assets/dtecologics/blockstates/stripped_walnut_branch.json -56e8c58864eaa259a9fd9692ef2f24a01c8fb08c assets/dtecologics/blockstates/walnut_branch.json -3f31e5d253fb03aa10a912e2d37553547dd39888 assets/dtecologics/blockstates/walnut_leaves.json -17194ad4372aa62b74e895c04ca5a3b75b609b05 assets/dtecologics/blockstates/walnut_sapling.json -31a78f7944a9002dd3f373d56126fd6886aa5ab5 assets/dtecologics/models/block/azalea_branch.json -d2a79560a3442eeb3dcd278db9539b488a37fdc4 assets/dtecologics/models/block/coconut_branch.json -270b4a89a9f25712e57d717717b5de6567acee39 assets/dtecologics/models/block/palm_leaves/coconut_core_bottom.json -445b94689bbb533d466dd6ca7bd50b176332f044 assets/dtecologics/models/block/palm_leaves/coconut_core_top.json -afbd6639a266eecd8d5fee76b06d89c5170f383c assets/dtecologics/models/block/palm_leaves/coconut_frond.json -be129141408eb4d87a718356686d44a61b981351 assets/dtecologics/models/block/saplings/coconut.json -85c98b7398420f52b51f14b5c96e0430a96e5ed3 assets/dtecologics/models/block/saplings/prickly_pear_cactus.json -09df350f4c80d5ce392df789148725645d7018bf assets/dtecologics/models/block/saplings/walnut.json -d9588e6bbc97de09a224edd86d844a7c584e264a assets/dtecologics/models/block/stripped_azalea_branch.json -2c9d5c2a61afac4c39568631eefd50424abc40d5 assets/dtecologics/models/block/stripped_coconut_branch.json -03232185ec2d077dc91e29b8aacc4f8be8affbdd assets/dtecologics/models/block/stripped_walnut_branch.json -efe8c55ef2cb0be570d0785e8f30162841c96973 assets/dtecologics/models/block/walnut_branch.json diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 deleted file mode 100644 index 9ce7ca4..0000000 --- a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 +++ /dev/null @@ -1,2 +0,0 @@ -// 1.20.1 2024-07-17T10:57:09.5515775 Languages: en_us -7d05285e9582e840df9fc9ca19deb9394b8e27a9 assets/dtecologics/lang/en_us.json diff --git a/src/generated/resources/.cache/e5060f9a9bf6cfbb6c72c5413383fcbbd2a9d690 b/src/generated/resources/.cache/e5060f9a9bf6cfbb6c72c5413383fcbbd2a9d690 deleted file mode 100644 index 830d8c8..0000000 --- a/src/generated/resources/.cache/e5060f9a9bf6cfbb6c72c5413383fcbbd2a9d690 +++ /dev/null @@ -1,5 +0,0 @@ -// 1.20.1 2024-07-17T10:43:01.2053172 dtecologics DT Block Tags -b0b266d56494f114af9429e3674d8a2eea74e915 data/dynamictrees/tags/blocks/branches_that_burn.json -5982b5091ec12b6fe8cf416dd1d987d584e95ccc data/dynamictrees/tags/blocks/leaves.json -2f196b8558172907d47cfa22838f908911e2a97f data/dynamictrees/tags/blocks/saplings.json -302fae0eeaca63b078a6a91f9c5dc27c89891b09 data/dynamictrees/tags/blocks/stripped_branches_that_burn.json diff --git a/src/generated/resources/assets/dtecologics/lang/en_us.json b/src/generated/resources/assets/dtecologics/lang/en_us.json index ef36410..ff9bb94 100644 --- a/src/generated/resources/assets/dtecologics/lang/en_us.json +++ b/src/generated/resources/assets/dtecologics/lang/en_us.json @@ -7,7 +7,5 @@ "item.dtecologics.walnut_seed": "Germinated Walnut", "species.dtecologics.coconut": "Coconut", "species.dtecologics.prickly_pear_cactus": "Prickly Pear Cactus", - "species.dtecologics.walnut": "Walnut", - "death.attack.dtecologics.falling_fruit.coconut": "%1$s was bonked in the head by a falling Coconut", - "subtitle.dtecologics.falling_fruit.bonk": "Player bonked by fruit" + "species.dtecologics.walnut": "Walnut" } \ No newline at end of file diff --git a/src/generated/resources/assets/minecraft/atlases/blocks.json b/src/generated/resources/assets/minecraft/atlases/blocks.json new file mode 100644 index 0000000..e5f3208 --- /dev/null +++ b/src/generated/resources/assets/minecraft/atlases/blocks.json @@ -0,0 +1,28 @@ +{ + "sources": [ + { + "type": "dynamictrees:thick_branch_rings", + "resource": "ecologics:block/azalea_log_top" + }, + { + "type": "dynamictrees:thick_branch_rings", + "resource": "ecologics:block/stripped_azalea_log_top" + }, + { + "type": "dynamictrees:thick_branch_rings", + "resource": "ecologics:block/coconut_log_top" + }, + { + "type": "dynamictrees:thick_branch_rings", + "resource": "ecologics:block/stripped_coconut_log_top" + }, + { + "type": "dynamictrees:thick_branch_rings", + "resource": "ecologics:block/walnut_log_top" + }, + { + "type": "dynamictrees:thick_branch_rings", + "resource": "ecologics:block/stripped_walnut_log_top" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/dtecologics/loot_tables/blocks/coconut.json b/src/generated/resources/data/dtecologics/loot_table/blocks/coconut.json similarity index 100% rename from src/generated/resources/data/dtecologics/loot_tables/blocks/coconut.json rename to src/generated/resources/data/dtecologics/loot_table/blocks/coconut.json diff --git a/src/generated/resources/data/dtecologics/loot_table/blocks/coconut_leaves.json b/src/generated/resources/data/dtecologics/loot_table/blocks/coconut_leaves.json new file mode 100644 index 0000000..45fb347 --- /dev/null +++ b/src/generated/resources/data/dtecologics/loot_table/blocks/coconut_leaves.json @@ -0,0 +1,138 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:alternatives", + "children": [ + { + "type": "minecraft:item", + "conditions": [ + { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + ], + "name": "ecologics:coconut_leaves" + }, + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:inverted", + "term": { + "condition": "minecraft:any_of", + "terms": [ + { + "condition": "minecraft:match_tool", + "predicate": { + "items": "minecraft:shears" + } + }, + { + "condition": "minecraft:match_tool", + "predicate": { + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } + } + ] + } + } + } + ] + } + } + ], + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtecologics:blocks/coconut_leaves" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtecologics/loot_tables/blocks/prickly_pear.json b/src/generated/resources/data/dtecologics/loot_table/blocks/prickly_pear.json similarity index 100% rename from src/generated/resources/data/dtecologics/loot_tables/blocks/prickly_pear.json rename to src/generated/resources/data/dtecologics/loot_table/blocks/prickly_pear.json diff --git a/src/generated/resources/data/dtecologics/loot_tables/blocks/walnut.json b/src/generated/resources/data/dtecologics/loot_table/blocks/walnut.json similarity index 100% rename from src/generated/resources/data/dtecologics/loot_tables/blocks/walnut.json rename to src/generated/resources/data/dtecologics/loot_table/blocks/walnut.json diff --git a/src/generated/resources/data/dtecologics/loot_tables/blocks/walnut_leaves.json b/src/generated/resources/data/dtecologics/loot_table/blocks/walnut_leaves.json similarity index 79% rename from src/generated/resources/data/dtecologics/loot_tables/blocks/walnut_leaves.json rename to src/generated/resources/data/dtecologics/loot_table/blocks/walnut_leaves.json index 6d2649e..6645db5 100644 --- a/src/generated/resources/data/dtecologics/loot_tables/blocks/walnut_leaves.json +++ b/src/generated/resources/data/dtecologics/loot_table/blocks/walnut_leaves.json @@ -16,22 +16,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] @@ -76,22 +76,22 @@ { "condition": "minecraft:match_tool", "predicate": { - "items": [ - "minecraft:shears" - ] + "items": "minecraft:shears" } }, { "condition": "minecraft:match_tool", "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 + "predicates": { + "minecraft:enchantments": [ + { + "enchantments": "minecraft:silk_touch", + "levels": { + "min": 1 + } } - } - ] + ] + } } } ] diff --git a/src/generated/resources/data/dtecologics/loot_tables/trees/branches/azalea.json b/src/generated/resources/data/dtecologics/loot_table/trees/branches/azalea.json similarity index 100% rename from src/generated/resources/data/dtecologics/loot_tables/trees/branches/azalea.json rename to src/generated/resources/data/dtecologics/loot_table/trees/branches/azalea.json diff --git a/src/generated/resources/data/dtecologics/loot_tables/trees/branches/coconut.json b/src/generated/resources/data/dtecologics/loot_table/trees/branches/coconut.json similarity index 100% rename from src/generated/resources/data/dtecologics/loot_tables/trees/branches/coconut.json rename to src/generated/resources/data/dtecologics/loot_table/trees/branches/coconut.json diff --git a/src/generated/resources/data/dtecologics/loot_tables/trees/branches/stripped_azalea.json b/src/generated/resources/data/dtecologics/loot_table/trees/branches/stripped_azalea.json similarity index 100% rename from src/generated/resources/data/dtecologics/loot_tables/trees/branches/stripped_azalea.json rename to src/generated/resources/data/dtecologics/loot_table/trees/branches/stripped_azalea.json diff --git a/src/generated/resources/data/dtecologics/loot_tables/trees/branches/stripped_coconut.json b/src/generated/resources/data/dtecologics/loot_table/trees/branches/stripped_coconut.json similarity index 100% rename from src/generated/resources/data/dtecologics/loot_tables/trees/branches/stripped_coconut.json rename to src/generated/resources/data/dtecologics/loot_table/trees/branches/stripped_coconut.json diff --git a/src/generated/resources/data/dtecologics/loot_tables/trees/branches/stripped_walnut.json b/src/generated/resources/data/dtecologics/loot_table/trees/branches/stripped_walnut.json similarity index 100% rename from src/generated/resources/data/dtecologics/loot_tables/trees/branches/stripped_walnut.json rename to src/generated/resources/data/dtecologics/loot_table/trees/branches/stripped_walnut.json diff --git a/src/generated/resources/data/dtecologics/loot_tables/trees/branches/walnut.json b/src/generated/resources/data/dtecologics/loot_table/trees/branches/walnut.json similarity index 100% rename from src/generated/resources/data/dtecologics/loot_tables/trees/branches/walnut.json rename to src/generated/resources/data/dtecologics/loot_table/trees/branches/walnut.json diff --git a/src/generated/resources/data/dtecologics/loot_table/trees/leaves/coconut.json b/src/generated/resources/data/dtecologics/loot_table/trees/leaves/coconut.json new file mode 100644 index 0000000..663e39d --- /dev/null +++ b/src/generated/resources/data/dtecologics/loot_table/trees/leaves/coconut.json @@ -0,0 +1,70 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "dynamictrees:seed_item", + "conditions": [ + { + "condition": "minecraft:survives_explosion" + }, + { + "chances": [ + 0.015625, + 0.03125, + 0.046875, + 0.0625 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + }, + { + "condition": "dynamictrees:seasonal_seed_drop_chance" + } + ] + } + ], + "rolls": 1.0 + }, + { + "bonus_rolls": 0.0, + "entries": [ + { + "type": "minecraft:item", + "conditions": [ + { + "chances": [ + 0.02, + 0.022222223, + 0.025, + 0.033333335, + 0.1 + ], + "condition": "minecraft:table_bonus", + "enchantment": "minecraft:fortune" + } + ], + "functions": [ + { + "add": false, + "count": { + "type": "minecraft:uniform", + "max": 2.0, + "min": 1.0 + }, + "function": "minecraft:set_count" + }, + { + "function": "minecraft:explosion_decay" + } + ], + "name": "minecraft:stick" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "dtecologics:trees/leaves/coconut" +} \ No newline at end of file diff --git a/src/generated/resources/data/dtecologics/loot_tables/trees/leaves/walnut.json b/src/generated/resources/data/dtecologics/loot_table/trees/leaves/walnut.json similarity index 100% rename from src/generated/resources/data/dtecologics/loot_tables/trees/leaves/walnut.json rename to src/generated/resources/data/dtecologics/loot_table/trees/leaves/walnut.json diff --git a/src/generated/resources/data/dtecologics/loot_tables/trees/voluntary/coconut.json b/src/generated/resources/data/dtecologics/loot_table/trees/voluntary/coconut.json similarity index 100% rename from src/generated/resources/data/dtecologics/loot_tables/trees/voluntary/coconut.json rename to src/generated/resources/data/dtecologics/loot_table/trees/voluntary/coconut.json diff --git a/src/generated/resources/data/dtecologics/loot_tables/trees/voluntary/walnut.json b/src/generated/resources/data/dtecologics/loot_table/trees/voluntary/walnut.json similarity index 100% rename from src/generated/resources/data/dtecologics/loot_tables/trees/voluntary/walnut.json rename to src/generated/resources/data/dtecologics/loot_table/trees/voluntary/walnut.json diff --git a/src/generated/resources/data/dtecologics/loot_tables/blocks/coconut_leaves.json b/src/generated/resources/data/dtecologics/loot_tables/blocks/coconut_leaves.json deleted file mode 100644 index 766d2d5..0000000 --- a/src/generated/resources/data/dtecologics/loot_tables/blocks/coconut_leaves.json +++ /dev/null @@ -1,70 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "minecraft:alternatives", - "children": [ - { - "type": "minecraft:item", - "conditions": [ - { - "condition": "minecraft:any_of", - "terms": [ - { - "condition": "minecraft:match_tool", - "predicate": { - "items": [ - "minecraft:shears" - ] - } - }, - { - "condition": "minecraft:match_tool", - "predicate": { - "enchantments": [ - { - "enchantment": "minecraft:silk_touch", - "levels": { - "min": 1 - } - } - ] - } - } - ] - } - ], - "name": "ecologics:coconut_leaves" - }, - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ] - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "dtecologics:blocks/coconut_leaves" -} \ No newline at end of file diff --git a/src/generated/resources/data/dtecologics/loot_tables/trees/leaves/coconut.json b/src/generated/resources/data/dtecologics/loot_tables/trees/leaves/coconut.json deleted file mode 100644 index b67d09b..0000000 --- a/src/generated/resources/data/dtecologics/loot_tables/trees/leaves/coconut.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "type": "minecraft:block", - "pools": [ - { - "bonus_rolls": 0.0, - "entries": [ - { - "type": "dynamictrees:seed_item", - "conditions": [ - { - "condition": "minecraft:survives_explosion" - }, - { - "chances": [ - 0.015625, - 0.03125, - 0.046875, - 0.0625 - ], - "condition": "minecraft:table_bonus", - "enchantment": "minecraft:fortune" - }, - { - "condition": "dynamictrees:seasonal_seed_drop_chance" - } - ] - } - ], - "rolls": 1.0 - } - ], - "random_sequence": "dtecologics:trees/leaves/coconut" -} \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/branches_that_burn.json b/src/generated/resources/data/dynamictrees/tags/block/branches_that_burn.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/blocks/branches_that_burn.json rename to src/generated/resources/data/dynamictrees/tags/block/branches_that_burn.json diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/leaves.json b/src/generated/resources/data/dynamictrees/tags/block/leaves.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/blocks/leaves.json rename to src/generated/resources/data/dynamictrees/tags/block/leaves.json diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/saplings.json b/src/generated/resources/data/dynamictrees/tags/block/saplings.json similarity index 70% rename from src/generated/resources/data/dynamictrees/tags/blocks/saplings.json rename to src/generated/resources/data/dynamictrees/tags/block/saplings.json index f73fef5..403ecc7 100644 --- a/src/generated/resources/data/dynamictrees/tags/blocks/saplings.json +++ b/src/generated/resources/data/dynamictrees/tags/block/saplings.json @@ -1,11 +1,10 @@ { - "replace": false, "values": [ "dtecologics:coconut_sapling", - "dtecologics:walnut_sapling", { "id": "dtecologics:prickly_pear_cactus_sapling", "required": false - } + }, + "dtecologics:walnut_sapling" ] } \ No newline at end of file diff --git a/src/generated/resources/data/dynamictrees/tags/blocks/stripped_branches_that_burn.json b/src/generated/resources/data/dynamictrees/tags/block/stripped_branches_that_burn.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/blocks/stripped_branches_that_burn.json rename to src/generated/resources/data/dynamictrees/tags/block/stripped_branches_that_burn.json diff --git a/src/generated/resources/data/dynamictrees/tags/items/branches_that_burn.json b/src/generated/resources/data/dynamictrees/tags/item/branches_that_burn.json similarity index 100% rename from src/generated/resources/data/dynamictrees/tags/items/branches_that_burn.json rename to src/generated/resources/data/dynamictrees/tags/item/branches_that_burn.json diff --git a/src/generated/resources/data/dynamictrees/tags/items/seeds.json b/src/generated/resources/data/dynamictrees/tags/item/seeds.json similarity index 70% rename from src/generated/resources/data/dynamictrees/tags/items/seeds.json rename to src/generated/resources/data/dynamictrees/tags/item/seeds.json index 7063d2a..f487b5e 100644 --- a/src/generated/resources/data/dynamictrees/tags/items/seeds.json +++ b/src/generated/resources/data/dynamictrees/tags/item/seeds.json @@ -1,11 +1,10 @@ { - "replace": false, "values": [ "dtecologics:coconut_seed", - "dtecologics:walnut_seed", { "id": "dtecologics:prickly_pear_cactus_seed", "required": false - } + }, + "dtecologics:walnut_seed" ] } \ No newline at end of file diff --git a/src/main/java/maxhyper/dtecologics/DynamicTreesEcologics.java b/src/main/java/maxhyper/dtecologics/DynamicTreesEcologics.java index b803f32..7576088 100644 --- a/src/main/java/maxhyper/dtecologics/DynamicTreesEcologics.java +++ b/src/main/java/maxhyper/dtecologics/DynamicTreesEcologics.java @@ -1,46 +1,38 @@ package maxhyper.dtecologics; -import com.ferreusveritas.dynamictrees.api.GatherDataHelper; -import com.ferreusveritas.dynamictrees.api.registry.RegistryHandler; -import com.ferreusveritas.dynamictrees.block.leaves.LeavesProperties; -import com.ferreusveritas.dynamictrees.block.rooty.SoilProperties; -import com.ferreusveritas.dynamictrees.systems.fruit.Fruit; -import com.ferreusveritas.dynamictrees.systems.pod.Pod; -import com.ferreusveritas.dynamictrees.tree.family.Family; -import com.ferreusveritas.dynamictrees.tree.species.Species; -import maxhyper.dtecologics.init.PlusRegistries; +import com.dtteam.dynamictrees.block.fruit.Fruit; +import com.dtteam.dynamictrees.block.leaves.LeavesProperties; +import com.dtteam.dynamictrees.block.pod.Pod; +import com.dtteam.dynamictrees.block.soil.SoilProperties; +import com.dtteam.dynamictrees.data.GatherDataHelper; +import com.dtteam.dynamictrees.registry.NeoForgeRegistryHandler; +import com.dtteam.dynamictrees.tree.family.Family; +import com.dtteam.dynamictrees.tree.species.Species; +import maxhyper.dtecologics.init.PlusModRegistries; import net.minecraft.resources.ResourceLocation; -import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.eventbus.api.IEventBus; -import net.minecraftforge.fml.ModList; -import net.minecraftforge.fml.common.Mod; -import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; -import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; -import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; - -// The value here should match an entry in the META-INF/mods.toml file +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.Property; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModList; +import net.neoforged.fml.common.Mod; +import net.neoforged.neoforge.data.event.GatherDataEvent; +import org.jetbrains.annotations.Contract; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + @Mod(DynamicTreesEcologics.MOD_ID) public class DynamicTreesEcologics { public static final String MOD_ID = "dtecologics"; - public DynamicTreesEcologics() { - IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); - - modEventBus.addListener(this::clientSetup); - modEventBus.addListener(this::commonSetup); - modEventBus.addListener(this::gatherData); + public DynamicTreesEcologics(@NotNull IEventBus modBus) { + modBus.addListener(this::gatherData); - if (ModList.get().isLoaded("dynamictreesplus")){ - modEventBus.register(PlusRegistries.class); + if (ModList.get().isLoaded("dynamictreesplus")) { + modBus.register(PlusModRegistries.class); } - RegistryHandler.setup(MOD_ID); - } - - private void clientSetup(final FMLClientSetupEvent event) { - } - - private void commonSetup(final FMLCommonSetupEvent event) { + NeoForgeRegistryHandler.setup(MOD_ID, modBus); } private void gatherData(final GatherDataEvent event) { @@ -50,11 +42,36 @@ private void gatherData(final GatherDataEvent event) { Species.REGISTRY, Fruit.REGISTRY, Pod.REGISTRY, - LeavesProperties.REGISTRY); + LeavesProperties.REGISTRY + ); } + @NotNull + @Contract("_ -> new") public static ResourceLocation location(final String path) { - return new ResourceLocation(MOD_ID, path); + return ResourceLocation.fromNamespaceAndPath(MOD_ID, path); + } + + @Nullable + public static LeavesProperties getDynamicLeaves(Block block) { + for (LeavesProperties properties : LeavesProperties.REGISTRY) { + @Nullable BlockState state = properties.getPrimitiveLeaves(); + + //noinspection ConstantValue + if (state != null && state.is(block)) { + return properties; + } + } + return null; + } + + @NotNull + public static > BlockState copyProperty( + @NotNull BlockState from, + @NotNull BlockState to, + Property property + ) { + return to.setValue(property, from.getValue(property)); } } diff --git a/src/main/java/maxhyper/dtecologics/cactus/PricklyPearCactusSpecies.java b/src/main/java/maxhyper/dtecologics/cactus/PricklyPearCactusSpecies.java index 1c966b6..88870cb 100644 --- a/src/main/java/maxhyper/dtecologics/cactus/PricklyPearCactusSpecies.java +++ b/src/main/java/maxhyper/dtecologics/cactus/PricklyPearCactusSpecies.java @@ -1,18 +1,20 @@ package maxhyper.dtecologics.cactus; -import com.ferreusveritas.dynamictrees.api.registry.TypedRegistry; -import com.ferreusveritas.dynamictrees.block.leaves.LeavesProperties; -import com.ferreusveritas.dynamictrees.growthlogic.GrowthLogicKit; -import com.ferreusveritas.dynamictrees.tree.family.Family; -import com.ferreusveritas.dynamictrees.tree.species.Species; -import com.ferreusveritas.dynamictreesplus.tree.CactusSpecies; +import com.dtteam.dynamictrees.api.registry.TypedRegistry; +import com.dtteam.dynamictrees.block.leaves.LeavesProperties; +import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKit; +import com.dtteam.dynamictrees.tree.family.Family; +import com.dtteam.dynamictrees.tree.species.Species; +import com.dtteam.dynamictreesplus.tree.CactusSpecies; import maxhyper.dtecologics.DynamicTreesEcologics; import net.minecraft.resources.ResourceLocation; +import org.jetbrains.annotations.NotNull; public class PricklyPearCactusSpecies extends CactusSpecies { public static final TypedRegistry.EntryType TYPE = createDefaultType(PricklyPearCactusSpecies::new); + @NotNull @Override public Species setPreReloadDefaults() { return super.setPreReloadDefaults().setGrowthLogicKit(GrowthLogicKit.DEFAULT); @@ -27,6 +29,7 @@ public int getProbabilityForCurrentDir() { return 2; } + @NotNull @Override public ResourceLocation getSaplingSmartModelLocation() { return DynamicTreesEcologics.location("block/"+this.getRegistryName().getPath()+"_sapling"); diff --git a/src/main/java/maxhyper/dtecologics/coconut/FallingCoconutBlock.java b/src/main/java/maxhyper/dtecologics/coconut/FallingCoconutBlock.java new file mode 100644 index 0000000..1729e79 --- /dev/null +++ b/src/main/java/maxhyper/dtecologics/coconut/FallingCoconutBlock.java @@ -0,0 +1,142 @@ +package maxhyper.dtecologics.coconut; + +import com.dtteam.dtaddon_lib.blocks.fruit.FallingPodBlock; +import com.dtteam.dtaddon_lib.blocks.fruit.IFallingFruit; +import com.dtteam.dtaddon_lib.init.DTAddonLibRegistries; +import com.dtteam.dynamictrees.block.pod.Pod; +import net.minecraft.core.BlockPos; +import net.minecraft.sounds.SoundSource; +import net.minecraft.world.damagesource.DamageSource; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.LivingEntity; +import net.minecraft.world.entity.item.FallingBlockEntity; +import net.minecraft.world.entity.item.ItemEntity; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Fallable; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.AABB; +import net.minecraft.world.phys.shapes.VoxelShape; +import org.jetbrains.annotations.NotNull; +import samebutdifferent.ecologics.entity.CoconutCrab; +import samebutdifferent.ecologics.platform.ConfigPlatformHelper; +import samebutdifferent.ecologics.registry.ModEntityTypes; +import samebutdifferent.ecologics.registry.ModSoundEvents; + +public class FallingCoconutBlock extends FallingPodBlock implements Fallable { + + public FallingCoconutBlock(Properties properties, Pod pod) { + super(properties, pod); + } + + @NotNull + public VoxelShape getShape(@NotNull BlockState state) { + return pod.getBlockShape(state.getValue(FACING), getAge(state)); + } + + @NotNull + public AABB getBoundingBox(@NotNull FallingBlockEntity fallingBlockEntity) { + return getShape(fallingBlockEntity.getBlockState()) + .bounds() + .move( + fallingBlockEntity.getX() - 0.5, + fallingBlockEntity.getY(), + fallingBlockEntity.getZ() - 0.5 + ); + } + + @Override + public FallingBlockEntity getFallingEntity(Level level, BlockPos pos, BlockState state) { + if (getAge(state) != getMaxAge() || level.random.nextDouble() > ConfigPlatformHelper.coconutCrabSpawnChance()) { + return super.getFallingEntity(level, pos, state); + } + + return new FallingBlockEntity(level, pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, state) { + + @Override + public boolean causeFallDamage(float pFallDistance, float pMultiplier, @NotNull DamageSource pSource) { + int i = (int)Math.ceil(pFallDistance - 1.0F); + if (i <= 0) { + return false; + } + + Level level = level(); + + for (Entity entity : level.getEntities(this, this.getBoundingBox())) { + if (!(entity instanceof LivingEntity)) { + continue; + } + + entity.hurt( + getDamageSource(level), + (float)Math.min(Math.floor(i * IFallingFruit.fallDamageAmount), IFallingFruit.fallDamageMax) * pMultiplier + ); + level.playSound( + null, getX(), getY(), getZ(), + DTAddonLibRegistries.FRUIT_BONK.get(), + SoundSource.BLOCKS, + 1.0F, 1.0F + ); + } + + return false; + } + + @Override + public ItemEntity spawnAtLocation(@NotNull ItemStack pStack, float pOffsetY) { + return null; + } + + @Override + public void callOnBrokenAfterFall(@NotNull Block block, @NotNull BlockPos pos) { + super.callOnBrokenAfterFall(block, pos); + + Level level = level(); + + CoconutCrab coconutCrab = ModEntityTypes.COCONUT_CRAB.create(level); + if (coconutCrab == null) { + return; + } + + AABB bb = getBoundingBox(); + + double x = (bb.minX + bb.maxX) / 2.0; + double z = (bb.minZ + bb.maxZ) / 2.0; + + switch (getBlockState().getValue(FACING)) { + case NORTH -> z = bb.maxZ; + case SOUTH -> z = bb.minZ; + case WEST -> x = bb.maxX; + case EAST -> x = bb.minX; + } + + coconutCrab.setPos(x, bb.minY, z); + level.addFreshEntity(coconutCrab); + } + + }; + } + + @Override + public void onBrokenAfterFall( + @NotNull Level level, + @NotNull BlockPos pos, + @NotNull FallingBlockEntity fallingBlock + ) { + level.playSound( + null, pos, + ModSoundEvents.COCONUT_SMASH, + SoundSource.BLOCKS, + 0.7f, + 0.9f + level.getRandom().nextFloat() * 0.2f + ); + } + + @NotNull + @Override + public DamageSource getFallDamageSource(@NotNull Entity entity) { + return getDamageSource(entity.level()); + } + +} diff --git a/src/main/java/maxhyper/dtecologics/coconut/FallingCoconutPod.java b/src/main/java/maxhyper/dtecologics/coconut/FallingCoconutPod.java new file mode 100644 index 0000000..bc60eaf --- /dev/null +++ b/src/main/java/maxhyper/dtecologics/coconut/FallingCoconutPod.java @@ -0,0 +1,23 @@ +package maxhyper.dtecologics.coconut; + +import com.dtteam.dtaddon_lib.fruits.FallingPalmPod; +import com.dtteam.dynamictrees.api.registry.TypedRegistry; +import com.dtteam.dynamictrees.block.pod.Pod; +import com.dtteam.dynamictrees.block.pod.PodBlock; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.world.level.block.Block; + +public class FallingCoconutPod extends FallingPalmPod { + + public static final TypedRegistry.EntryType TYPE = TypedRegistry.newType(FallingCoconutPod::new); + + public FallingCoconutPod(ResourceLocation registryName) { + super(registryName); + } + + @Override + protected PodBlock createBlock(Block.Properties properties) { + return new FallingCoconutBlock(properties, this); + } + +} diff --git a/src/main/java/maxhyper/dtecologics/init/EcologicsEventRegistries.java b/src/main/java/maxhyper/dtecologics/init/EcologicsEventRegistries.java new file mode 100644 index 0000000..b72f157 --- /dev/null +++ b/src/main/java/maxhyper/dtecologics/init/EcologicsEventRegistries.java @@ -0,0 +1,39 @@ +package maxhyper.dtecologics.init; + +import maxhyper.dtecologics.DynamicTreesEcologics; +import maxhyper.dtecologics.coconut.FallingCoconutBlock; +import net.minecraft.world.entity.EntityDimensions; +import net.minecraft.world.entity.item.FallingBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.AABB; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.event.entity.EntityEvent; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; + +@EventBusSubscriber(modid = DynamicTreesEcologics.MOD_ID) +public class EcologicsEventRegistries { + + @SubscribeEvent + public static void onEntitySize(@NotNull final EntityEvent.Size event) { + if (!(event.getEntity() instanceof FallingBlockEntity fallingBlock)) { + return; + } + + @Nullable BlockState blockState = fallingBlock.getBlockState(); + + //noinspection ConstantValue + if (blockState == null || !(blockState.getBlock() instanceof FallingCoconutBlock coconutBlock)) { + return; + } + + AABB bounds = coconutBlock.getShape(blockState).bounds(); + + event.setNewSize(EntityDimensions.fixed( + (float) Math.max(bounds.getXsize(), bounds.getZsize()), + (float) bounds.getYsize() + )); + } + +} diff --git a/src/main/java/maxhyper/dtecologics/init/EcologicsModRegistries.java b/src/main/java/maxhyper/dtecologics/init/EcologicsModRegistries.java new file mode 100644 index 0000000..3e35f54 --- /dev/null +++ b/src/main/java/maxhyper/dtecologics/init/EcologicsModRegistries.java @@ -0,0 +1,21 @@ +package maxhyper.dtecologics.init; + +import com.dtteam.dynamictrees.block.pod.Pod; +import com.dtteam.dynamictrees.event.TypeRegistryEvent; +import maxhyper.dtecologics.DynamicTreesEcologics; +import maxhyper.dtecologics.coconut.FallingCoconutPod; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import org.jetbrains.annotations.NotNull; + +@EventBusSubscriber(modid = DynamicTreesEcologics.MOD_ID) +public class EcologicsModRegistries { + + @SubscribeEvent + public static void registerPodType(@NotNull final TypeRegistryEvent event) { + if (event.isEntryOfType(Pod.class)) { + event.registerType(DynamicTreesEcologics.location("falling_coconut"), FallingCoconutPod.TYPE); + } + } + +} diff --git a/src/main/java/maxhyper/dtecologics/init/PlusModRegistries.java b/src/main/java/maxhyper/dtecologics/init/PlusModRegistries.java new file mode 100644 index 0000000..1f489fe --- /dev/null +++ b/src/main/java/maxhyper/dtecologics/init/PlusModRegistries.java @@ -0,0 +1,19 @@ +package maxhyper.dtecologics.init; + +import com.dtteam.dynamictrees.event.TypeRegistryEvent; +import com.dtteam.dynamictrees.tree.species.Species; +import maxhyper.dtecologics.DynamicTreesEcologics; +import maxhyper.dtecologics.cactus.PricklyPearCactusSpecies; +import net.neoforged.bus.api.SubscribeEvent; +import org.jetbrains.annotations.NotNull; + +public class PlusModRegistries { + + @SubscribeEvent + public static void registerSpeciesType(@NotNull final TypeRegistryEvent event) { + if (event.isEntryOfType(Species.class)) { + event.registerType(DynamicTreesEcologics.location("prickly_pear_cactus"), PricklyPearCactusSpecies.TYPE); + } + } + +} diff --git a/src/main/java/maxhyper/dtecologics/init/PlusRegistries.java b/src/main/java/maxhyper/dtecologics/init/PlusRegistries.java deleted file mode 100644 index 56da129..0000000 --- a/src/main/java/maxhyper/dtecologics/init/PlusRegistries.java +++ /dev/null @@ -1,16 +0,0 @@ -package maxhyper.dtecologics.init; - -import com.ferreusveritas.dynamictrees.api.registry.TypeRegistryEvent; -import com.ferreusveritas.dynamictrees.tree.species.Species; -import maxhyper.dtecologics.DynamicTreesEcologics; -import maxhyper.dtecologics.cactus.PricklyPearCactusSpecies; -import net.minecraftforge.eventbus.api.SubscribeEvent; - -public class PlusRegistries { - - @SubscribeEvent - public static void registerSpeciesType(final TypeRegistryEvent event) { - event.registerType(DynamicTreesEcologics.location("prickly_pear_cactus"), PricklyPearCactusSpecies.TYPE); - } - -} diff --git a/src/main/java/maxhyper/dtecologics/mixin/EcologicsNeoForgeMixin.java b/src/main/java/maxhyper/dtecologics/mixin/EcologicsNeoForgeMixin.java new file mode 100644 index 0000000..ca9633c --- /dev/null +++ b/src/main/java/maxhyper/dtecologics/mixin/EcologicsNeoForgeMixin.java @@ -0,0 +1,86 @@ +package maxhyper.dtecologics.mixin; + +import com.dtteam.dynamictrees.block.leaves.DynamicLeavesBlock; +import com.dtteam.dynamictrees.block.leaves.LeavesProperties; +import com.llamalad7.mixinextras.sugar.Local; +import maxhyper.dtecologics.DynamicTreesEcologics; +import net.minecraft.core.Direction; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.state.properties.Property; +import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.Slice; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; +import samebutdifferent.ecologics.block.FloweringAzaleaLogBlock; +import samebutdifferent.ecologics.neoforge.EcologicsNeoForge; + +@Mixin(EcologicsNeoForge.class) +public abstract class EcologicsNeoForgeMixin { + + @Inject( + method = "onRightClick", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/level/block/state/BlockState;is(Lnet/minecraft/world/level/block/Block;)Z", + ordinal = 0 + ), + slice = @Slice( + from = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/item/ItemStack;is(Lnet/minecraft/world/item/Item;)Z" + ) + ) + ) + private static void onRightClick( + PlayerInteractEvent.RightClickBlock event, + CallbackInfo ci, + @Local(name = "state") @NotNull BlockState state, + @Local(name = "direction") Direction direction + ) { + if (!(state.getBlock() instanceof DynamicLeavesBlock dynamicLeavesBlock)) { + return; + } + + @Nullable BlockState primitiveState = dynamicLeavesBlock.getLeavesProperties().getPrimitiveLeaves(); + + //noinspection ConstantValue + if (primitiveState == null || !primitiveState.is(Blocks.FLOWERING_AZALEA_LEAVES)) { + return; + } + + @Nullable LeavesProperties leavesProperties = DynamicTreesEcologics.getDynamicLeaves(Blocks.AZALEA_LEAVES); + if (leavesProperties == null) { + return; + } + + BlockState dynamicState = leavesProperties.getDynamicLeavesState(state.getValue(DynamicLeavesBlock.DISTANCE)); + + for (Property property : state.getProperties()) { + if (dynamicState.hasProperty(property)) { + dynamicState = DynamicTreesEcologics.copyProperty(state, dynamicState, property); + } + } + + Player player = event.getEntity(); + InteractionHand hand = event.getHand(); + + FloweringAzaleaLogBlock.shearAzalea( + event.getLevel(), + player, + event.getPos(), + event.getItemStack(), + hand, + direction, + dynamicState + ); + player.swing(hand, true); + } + +} diff --git a/src/main/java/maxhyper/dtecologics/mixin/EntityMixin.java b/src/main/java/maxhyper/dtecologics/mixin/EntityMixin.java new file mode 100644 index 0000000..cd4d34e --- /dev/null +++ b/src/main/java/maxhyper/dtecologics/mixin/EntityMixin.java @@ -0,0 +1,37 @@ +package maxhyper.dtecologics.mixin; + +import maxhyper.dtecologics.coconut.FallingCoconutBlock; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.item.FallingBlockEntity; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.phys.AABB; +import org.jetbrains.annotations.Nullable; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; + +@Mixin(Entity.class) +public abstract class EntityMixin { + + @Inject( + method = "makeBoundingBox", + at = @At("HEAD"), + cancellable = true + ) + protected void makeBoundingBox(CallbackInfoReturnable cir) { + if (!((Entity) (Object) this instanceof FallingBlockEntity fallingBlock)) { + return; + } + + @Nullable BlockState blockState = fallingBlock.getBlockState(); + + if (blockState == null || !(blockState.getBlock() instanceof FallingCoconutBlock coconutBlock)) { + return; + } + + cir.setReturnValue(coconutBlock.getBoundingBox(fallingBlock)); + cir.cancel(); + } + +} diff --git a/src/main/java/maxhyper/dtecologics/mixin/FallingBlockEntityMixin.java b/src/main/java/maxhyper/dtecologics/mixin/FallingBlockEntityMixin.java new file mode 100644 index 0000000..ca34417 --- /dev/null +++ b/src/main/java/maxhyper/dtecologics/mixin/FallingBlockEntityMixin.java @@ -0,0 +1,69 @@ +package maxhyper.dtecologics.mixin; + +import maxhyper.dtecologics.coconut.FallingCoconutBlock; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.network.protocol.game.ClientboundAddEntityPacket; +import net.minecraft.world.entity.item.FallingBlockEntity; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.block.state.BlockState; +import org.jetbrains.annotations.NotNull; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(FallingBlockEntity.class) +public abstract class FallingBlockEntityMixin { + + @Inject( + method = "(Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/entity/item/FallingBlockEntity;setPos(DDD)V" + ) + ) + private void init( + Level level, + double x, double y, double z, + @NotNull BlockState state, + CallbackInfo ci + ) { + if (state.getBlock() instanceof FallingCoconutBlock) { + FallingBlockEntity self = (FallingBlockEntity) (Object) this; + self.refreshDimensions(); + } + } + + @Inject( + method = "recreateFromPacket", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/world/entity/item/FallingBlockEntity;setPos(DDD)V" + ) + ) + private void recreateFromPacket( + ClientboundAddEntityPacket packet, + CallbackInfo ci + ) { + FallingBlockEntity self = (FallingBlockEntity) (Object) this; + if (self.getBlockState().getBlock() instanceof FallingCoconutBlock) { + self.refreshDimensions(); + } + } + + @Inject( + method = "readAdditionalSaveData", + at = @At("RETURN") + ) + private void readAdditionalSaveData( + CompoundTag compound, + CallbackInfo ci + ) { + FallingBlockEntity self = (FallingBlockEntity) (Object) this; + if (self.getBlockState().getBlock() instanceof FallingCoconutBlock coconutBlock) { + self.refreshDimensions(); + self.setBoundingBox(coconutBlock.getBoundingBox(self)); + } + } + +} diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg new file mode 100644 index 0000000..5e1839f --- /dev/null +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -0,0 +1 @@ +public net.minecraft.world.entity.item.FallingBlockEntity (Lnet/minecraft/world/level/Level;DDDLnet/minecraft/world/level/block/state/BlockState;)V diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml deleted file mode 100644 index 3f9a42b..0000000 --- a/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,59 +0,0 @@ -modLoader="javafml" -loaderVersion = "[47,)" -license="MIT" -issueTrackerURL="https://github.com/DynamicTreesTeam/DynamicTrees-Ecologics/issues" - -[[mods]] -modId="dtecologics" -version="${file.jarVersion}" -displayName="Dynamic Trees for Ecologics" - -updateJSONURL="https://github.com/DynamicTreesTeam/DynamicTreesVersionInfo/blob/master/Add-ons/Ecologics.json?raw=true" -displayURL="https://www.curseforge.com/minecraft/mc-mods/dynamic-trees-ecologics" - -authors="Max Hyper" -description=''' -Compatibility Mod between Dynamic trees and Ecologics -''' - -[[dependencies.dtecologics]] - modId="forge" - mandatory=true - versionRange="[47,)" - ordering="NONE" - side="BOTH" - -[[dependencies.dtecologics]] - modId="minecraft" - mandatory=true - versionRange="[1.20.1]" - ordering="NONE" - side="BOTH" - -[[dependencies.dtecologics]] - modId="dynamictrees" - mandatory=true - versionRange="[1.4.0,)" - ordering="AFTER" - side="BOTH" - -[[dependencies.dtecologics]] - modId="dtaddon_lib" - mandatory=true - versionRange="[0.1.0-BETA5,)" - ordering="AFTER" - side="BOTH" - -[[dependencies.dtecologics]] - modId="dynamictreesplus" - mandatory=false - versionRange="[1.2.0,)" - ordering="AFTER" - side="BOTH" - -[[dependencies.dtecologics]] - modId="ecologics" - mandatory=true - versionRange="[2.2.0,)" - ordering="AFTER" - side="BOTH" diff --git a/src/main/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/neoforge.mods.toml new file mode 100644 index 0000000..1c29f99 --- /dev/null +++ b/src/main/resources/META-INF/neoforge.mods.toml @@ -0,0 +1,62 @@ +modLoader = "javafml" +loaderVersion = "[4,)" +license = "MIT" +issueTrackerURL = "https://github.com/DynamicTreesTeam/DynamicTrees-Ecologics/issues" + +[[mods]] +modId = "${modId}" +version = "${modVersion}" +displayName = "Dynamic Trees for Ecologics" + +updateJSONURL = "https://github.com/DynamicTreesTeam/DynamicTreesVersionInfo/blob/master/Add-ons/Ecologics.json?raw=true" +displayURL = "https://www.curseforge.com/minecraft/mc-mods/dynamic-trees-ecologics" + +authors = "Max Hyper" +description = ''' +Compatibility Mod between Dynamic trees and Ecologics +''' + +[[mixins]] +config = "${modId}.mixins.json" + +[[dependencies."${modId}"]] +modId = "neoforge" +type = "required" +versionRange = "[${neoVersion},)" +ordering = "NONE" +side = "BOTH" + +[[dependencies."${modId}"]] +modId = "minecraft" +type = "required" +versionRange = "[${mcVersion}]" +ordering = "NONE" +side = "BOTH" + +[[dependencies."${modId}"]] +modId = "dynamictrees" +type = "required" +versionRange = "[${dynamicTreesVersion},)" +ordering = "AFTER" +side = "BOTH" + +[[dependencies."${modId}"]] +modId = "dynamictreesplus" +type = "optional" +versionRange = "[${dynamicTreesPlusVersion},)" +ordering = "AFTER" +side = "BOTH" + +[[dependencies."${modId}"]] +modId = "dtaddon_lib" +type = "required" +versionRange = "[${dynamicTreesAddonLibVersion},)" +ordering = "AFTER" +side = "BOTH" + +[[dependencies."${modId}"]] +modId = "ecologics" +type = "required" +versionRange = "[${ecologicsVersion},)" +ordering = "AFTER" +side = "BOTH" diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age0.json b/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age0.json index 9ac6914..0924b02 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age0.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age0.json @@ -1,5 +1,6 @@ { "credit": "Made with Blockbench", + "render_type": "minecraft:cutout", "texture_size": [32, 32], "textures": { "particle": "dtecologics:block/coconut", diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age1.json b/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age1.json index e91c190..e26b8bb 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age1.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age1.json @@ -1,5 +1,6 @@ { "credit": "Made with Blockbench", + "render_type": "minecraft:cutout", "texture_size": [32, 32], "textures": { "particle": "dtecologics:block/coconut", diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age2.json b/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age2.json index 89ec7a0..04b2a77 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age2.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age2.json @@ -1,5 +1,6 @@ { "credit": "Made with Blockbench", + "render_type": "minecraft:cutout", "texture_size": [32, 32], "textures": { "particle": "dtecologics:block/coconut", diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age3.json b/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age3.json index 67aa83a..23b8a1c 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age3.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/coconut_age3.json @@ -1,5 +1,6 @@ { "credit": "Made with Blockbench", + "render_type": "minecraft:cutout", "texture_size": [32, 32], "textures": { "particle": "dtecologics:block/coconut", diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age0.json b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age0.json index b7aad16..e73a3c8 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age0.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age0.json @@ -1,3 +1,4 @@ { - "parent": "ecologics:block/prickly_pear_stage0" + "parent": "ecologics:block/prickly_pear_stage0", + "render_type": "minecraft:cutout" } \ No newline at end of file diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age1.json b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age1.json index 64399f5..337c054 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age1.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age1.json @@ -1,3 +1,4 @@ { - "parent": "ecologics:block/prickly_pear_stage1" + "parent": "ecologics:block/prickly_pear_stage1", + "render_type": "minecraft:cutout" } \ No newline at end of file diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age2.json b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age2.json index 955d409..d4ad047 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age2.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age2.json @@ -1,3 +1,4 @@ { - "parent": "ecologics:block/prickly_pear_stage2" + "parent": "ecologics:block/prickly_pear_stage2", + "render_type": "minecraft:cutout" } \ No newline at end of file diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age3.json b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age3.json index 8ff96dd..90a3186 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age3.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_age3.json @@ -1,3 +1,4 @@ { - "parent": "ecologics:block/prickly_pear_stage3" + "parent": "ecologics:block/prickly_pear_stage3", + "render_type": "minecraft:cutout" } \ No newline at end of file diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age0.json b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age0.json index 56b78c5..ee70b85 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age0.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age0.json @@ -1,5 +1,6 @@ { "credit": "Made with Blockbench, copy from Ecologics", + "render_type": "minecraft:cutout", "ambientocclusion": false, "textures": { "0": "ecologics:block/prickly_pear_stage0", diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age1.json b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age1.json index 9f102ea..e6de4ce 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age1.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age1.json @@ -1,5 +1,6 @@ { "credit": "Made with Blockbench, copy from Ecologics", + "render_type": "minecraft:cutout", "ambientocclusion": false, "textures": { "0": "ecologics:block/prickly_pear_stage1", diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age2.json b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age2.json index e0cbfba..563a139 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age2.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age2.json @@ -1,5 +1,6 @@ { "credit": "Made with Blockbench, copy from Ecologics", + "render_type": "minecraft:cutout", "ambientocclusion": false, "texture_size": [32, 32], "textures": { diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age3.json b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age3.json index 27dcb44..f00fb1e 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age3.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/prickly_pear_offset_age3.json @@ -1,5 +1,6 @@ { "credit": "Made with Blockbench, copy from Ecologics", + "render_type": "minecraft:cutout", "ambientocclusion": false, "texture_size": [32, 32], "textures": { diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age0.json b/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age0.json index f6c0e24..7d576ee 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age0.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age0.json @@ -1,5 +1,6 @@ { "credit": "Made with Blockbench", + "render_type": "minecraft:cutout", "ambientocclusion": false, "textures": { "particle": "dtecologics:block/walnut", diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age1.json b/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age1.json index 9982efb..3221659 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age1.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age1.json @@ -1,4 +1,5 @@ { + "render_type": "minecraft:cutout", "ambientocclusion": false, "textures": { "particle": "dtecologics:block/walnut", diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age2.json b/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age2.json index 1d9de1c..701e883 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age2.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age2.json @@ -1,4 +1,5 @@ { + "render_type": "minecraft:cutout", "ambientocclusion": false, "textures": { "particle": "dtecologics:block/walnut", diff --git a/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age3.json b/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age3.json index b9f0f8e..e7a201f 100644 --- a/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age3.json +++ b/src/main/resources/assets/dtecologics/models/block/fruit/walnut_age3.json @@ -1,5 +1,6 @@ { "credit": "Made with Blockbench", + "render_type": "minecraft:cutout", "ambientocclusion": false, "textures": { "particle": "dtecologics:block/walnut", diff --git a/src/main/resources/assets/dtecologics/models/block/prickly_pear_cactus_sapling.json b/src/main/resources/assets/dtecologics/models/block/prickly_pear_cactus_sapling.json index 4a4e51c..c87785c 100644 --- a/src/main/resources/assets/dtecologics/models/block/prickly_pear_cactus_sapling.json +++ b/src/main/resources/assets/dtecologics/models/block/prickly_pear_cactus_sapling.json @@ -1,6 +1,7 @@ { "credit": "Made with Blockbench", "parent": "block/block", + "ambientocclusion": false, "textures": { "particle": "#side", "fruit": "ecologics:item/prickly_pear" diff --git a/src/main/resources/data/dtecologics/damage_type/falling_fruit/coconut.json b/src/main/resources/data/dtecologics/damage_type/falling_fruit/coconut.json index 93c5d3d..9568dff 100644 --- a/src/main/resources/data/dtecologics/damage_type/falling_fruit/coconut.json +++ b/src/main/resources/data/dtecologics/damage_type/falling_fruit/coconut.json @@ -1,5 +1,5 @@ { - "message_id": "dtecologics.falling_fruit.coconut", + "message_id": "coconut", "scaling": "when_caused_by_living_non_player", "exhaustion": 1.0, "effects": "hurt", diff --git a/src/main/resources/dtecologics.mixins.json b/src/main/resources/dtecologics.mixins.json new file mode 100644 index 0000000..6e5b997 --- /dev/null +++ b/src/main/resources/dtecologics.mixins.json @@ -0,0 +1,14 @@ +{ + "required": true, + "minVersion": "0.8", + "package": "maxhyper.dtecologics.mixin", + "compatibilityLevel": "JAVA_21", + "mixins": [ + "EcologicsNeoForgeMixin", + "EntityMixin", + "FallingBlockEntityMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta index 342792f..7c48ae9 100644 --- a/src/main/resources/pack.mcmeta +++ b/src/main/resources/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { "description": "Dynamic Trees for Ecologics", - "pack_format": 15 + "pack_format": 34 } } diff --git a/src/main/resources/trees/dtecologics/families/coconut.json b/src/main/resources/trees/dtecologics/families/coconut.json index 293471e..760845f 100644 --- a/src/main/resources/trees/dtecologics/families/coconut.json +++ b/src/main/resources/trees/dtecologics/families/coconut.json @@ -1,4 +1,5 @@ { + "type": "palm", "common_leaves": "dtecologics:coconut", "common_species": "dtecologics:coconut", "primitive_log": "ecologics:coconut_log", diff --git a/src/main/resources/trees/dtecologics/fruits/prickly_pear.json b/src/main/resources/trees/dtecologics/fruits/prickly_pear.json index ac1aa2e..4acb1bc 100644 --- a/src/main/resources/trees/dtecologics/fruits/prickly_pear.json +++ b/src/main/resources/trees/dtecologics/fruits/prickly_pear.json @@ -3,9 +3,9 @@ "type": "dynamictreesplus:cactus_fruit", "item_stack": "ecologics:prickly_pear", "block_shapes": [ - { "function": "fruit", "parameters": { "radius": 4, "height": 5, "stem_length": 11, "fraction": 16 } }, - { "function": "fruit", "parameters": { "radius": 3, "height": 4, "stem_length": 12, "fraction": 16 } }, - { "function": "fruit", "parameters": { "radius": 3, "height": 7, "stem_length": 9, "fraction": 16 } }, - { "function": "fruit", "parameters": { "radius": 4, "height": 8, "stem_length": 8, "fraction": 16 } } + { "function": "fruit", "parameters": { "width": 8, "height": 5, "stem_length": 11, "fraction": 16 } }, + { "function": "fruit", "parameters": { "width": 6, "height": 4, "stem_length": 12, "fraction": 16 } }, + { "function": "fruit", "parameters": { "width": 6, "height": 7, "stem_length": 9, "fraction": 16 } }, + { "function": "fruit", "parameters": { "width": 8, "height": 8, "stem_length": 8, "fraction": 16 } } ] } \ No newline at end of file diff --git a/src/main/resources/trees/dtecologics/fruits/walnut.json b/src/main/resources/trees/dtecologics/fruits/walnut.json index a9006ab..b97a6af 100644 --- a/src/main/resources/trees/dtecologics/fruits/walnut.json +++ b/src/main/resources/trees/dtecologics/fruits/walnut.json @@ -1,9 +1,9 @@ { "item_stack": "ecologics:walnut", "block_shapes": [ - { "function": "fruit", "parameters": { "radius": 1, "height": 1, "stem_length": 0, "fraction": 16 } }, - { "function": "fruit", "parameters": { "radius": 1, "height": 2, "stem_length": 0, "fraction": 16 } }, - { "function": "fruit", "parameters": { "radius": 2, "height": 5, "stem_length": 0 } }, - { "function": "fruit", "parameters": { "radius": 2.5, "height": 5, "stem_length": 1.25 } } + { "function": "fruit", "parameters": { "width": 2, "height": 1, "stem_length": 0, "fraction": 16 } }, + { "function": "fruit", "parameters": { "width": 2, "height": 2, "stem_length": 0, "fraction": 16 } }, + { "function": "fruit", "parameters": { "width": 4, "height": 5, "stem_length": 0 } }, + { "function": "fruit", "parameters": { "width": 5, "height": 5, "stem_length": 1.25 } } ] } \ No newline at end of file diff --git a/src/main/resources/trees/dtecologics/pods/coconut.json b/src/main/resources/trees/dtecologics/pods/coconut.json index 0b2ad6b..edf15b9 100644 --- a/src/main/resources/trees/dtecologics/pods/coconut.json +++ b/src/main/resources/trees/dtecologics/pods/coconut.json @@ -1,31 +1,31 @@ { - "type": "dtaddon_lib:falling_palm", + "type": "dtecologics:falling_coconut", "item_stack": "dtecologics:coconut_seed", "max_age": 3, "block_shapes": { "east": [ [0.45, 0.7, 0.35, 0.9, 1, 0.65], - { "function": "pod", "parameters": { "radius": 3.5, "height": 7, "stem_length": 2, "side_offset": 6.5, "side": "east", "fraction": 20 } }, - { "function": "pod", "parameters": { "radius": 4.5, "height": 9, "stem_length": 3, "side_offset": 5.5, "side": "east", "fraction": 20 } }, - { "function": "pod", "parameters": { "radius": 5, "height": 10, "stem_length": 4, "side_offset": 5, "side": "east", "fraction": 20 } } + { "function": "pod", "parameters": { "width": 7, "height": 7, "stem_length": 2, "side_offset": 6.5, "side": "east", "fraction": 20 } }, + { "function": "pod", "parameters": { "width": 9, "height": 9, "stem_length": 3, "side_offset": 5.5, "side": "east", "fraction": 20 } }, + { "function": "pod", "parameters": { "width": 10, "height": 10, "stem_length": 4, "side_offset": 5, "side": "east", "fraction": 20 } } ], "west": [ [0.1, 0.7, 0.35, 0.55, 1, 0.65], - { "function": "pod", "parameters": { "radius": 3.5, "height": 7, "stem_length": 2, "side_offset": 6.5, "side": "west", "fraction": 20 } }, - { "function": "pod", "parameters": { "radius": 4.5, "height": 9, "stem_length": 3, "side_offset": 5.5, "side": "west", "fraction": 20 } }, - { "function": "pod", "parameters": { "radius": 5, "height": 10, "stem_length": 4, "side_offset": 5, "side": "west", "fraction": 20 } } + { "function": "pod", "parameters": { "width": 7, "height": 7, "stem_length": 2, "side_offset": 6.5, "side": "west", "fraction": 20 } }, + { "function": "pod", "parameters": { "width": 9, "height": 9, "stem_length": 3, "side_offset": 5.5, "side": "west", "fraction": 20 } }, + { "function": "pod", "parameters": { "width": 10, "height": 10, "stem_length": 4, "side_offset": 5, "side": "west", "fraction": 20 } } ], "north": [ [0.35, 0.7, 0.1, 0.65, 1, 0.55], - { "function": "pod", "parameters": { "radius": 3.5, "height": 7, "stem_length": 2, "side_offset": 6.5, "side": "north", "fraction": 20 } }, - { "function": "pod", "parameters": { "radius": 4.5, "height": 9, "stem_length": 3, "side_offset": 5.5, "side": "north", "fraction": 20 } }, - { "function": "pod", "parameters": { "radius": 5, "height": 10, "stem_length": 4, "side_offset": 5, "side": "north", "fraction": 20 } } + { "function": "pod", "parameters": { "width": 7, "height": 7, "stem_length": 2, "side_offset": 6.5, "side": "north", "fraction": 20 } }, + { "function": "pod", "parameters": { "width": 9, "height": 9, "stem_length": 3, "side_offset": 5.5, "side": "north", "fraction": 20 } }, + { "function": "pod", "parameters": { "width": 10, "height": 10, "stem_length": 4, "side_offset": 5, "side": "north", "fraction": 20 } } ], "south": [ [0.35, 0.7, 0.45, 0.65, 1, 0.9], - { "function": "pod", "parameters": { "radius": 3.5, "height": 7, "stem_length": 2, "side_offset": 6.5, "side": "south", "fraction": 20 } }, - { "function": "pod", "parameters": { "radius": 4.5, "height": 9, "stem_length": 3, "side_offset": 5.5, "side": "south", "fraction": 20 } }, - { "function": "pod", "parameters": { "radius": 5, "height": 10, "stem_length": 4, "side_offset": 5, "side": "south", "fraction": 20 } } + { "function": "pod", "parameters": { "width": 7, "height": 7, "stem_length": 2, "side_offset": 6.5, "side": "south", "fraction": 20 } }, + { "function": "pod", "parameters": { "width": 9, "height": 9, "stem_length": 3, "side_offset": 5.5, "side": "south", "fraction": 20 } }, + { "function": "pod", "parameters": { "width": 10, "height": 10, "stem_length": 4, "side_offset": 5, "side": "south", "fraction": 20 } } ] } } diff --git a/src/main/resources/trees/dtecologics/world_gen/default.json b/src/main/resources/trees/dtecologics/world_gen/default.json index c03873f..a5e9b5a 100644 --- a/src/main/resources/trees/dtecologics/world_gen/default.json +++ b/src/main/resources/trees/dtecologics/world_gen/default.json @@ -1,6 +1,6 @@ [ { - "select": { "tags" : [ "#minecraft:is_beach", "!#forge:is_snowy" ] }, + "select": { "tags" : [ "#minecraft:is_beach", "!#c:is_snowy" ] }, "apply": { "species" : { "method" : "splice_before", @@ -26,7 +26,7 @@ }, { "only_if_loaded": "dynamictreesplus", - "select": { "tags" : [ "#forge:is_desert", "!#minecraft:is_badlands" ] }, + "select": { "tags" : [ "#c:is_desert", "!#minecraft:is_badlands" ] }, "apply": { "species" : { "method" : "splice_before", From de738a46bb54941fadbbc1aedd432b496669facc Mon Sep 17 00:00:00 2001 From: ninjaguardian <110734253+ninjaguardian@users.noreply.github.com> Date: Tue, 11 Aug 2026 14:04:46 -0500 Subject: [PATCH 2/4] (WIP) Update cactus worldgen --- .../cactus/PricklyPearCactusSpecies.java | 4 ++-- .../models/block/prickly_pear_cactus_sapling.json | 2 +- .../dtecologics/species/prickly_pear_cactus.json | 14 +++++++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/maxhyper/dtecologics/cactus/PricklyPearCactusSpecies.java b/src/main/java/maxhyper/dtecologics/cactus/PricklyPearCactusSpecies.java index 88870cb..7d938b7 100644 --- a/src/main/java/maxhyper/dtecologics/cactus/PricklyPearCactusSpecies.java +++ b/src/main/java/maxhyper/dtecologics/cactus/PricklyPearCactusSpecies.java @@ -1,8 +1,8 @@ package maxhyper.dtecologics.cactus; +import com.dtteam.dtaddon_lib.growthlogic.DTAddonLibGrowthLogicKits; import com.dtteam.dynamictrees.api.registry.TypedRegistry; import com.dtteam.dynamictrees.block.leaves.LeavesProperties; -import com.dtteam.dynamictrees.systems.growthlogic.GrowthLogicKit; import com.dtteam.dynamictrees.tree.family.Family; import com.dtteam.dynamictrees.tree.species.Species; import com.dtteam.dynamictreesplus.tree.CactusSpecies; @@ -17,7 +17,7 @@ public class PricklyPearCactusSpecies extends CactusSpecies { @NotNull @Override public Species setPreReloadDefaults() { - return super.setPreReloadDefaults().setGrowthLogicKit(GrowthLogicKit.DEFAULT); + return super.setPreReloadDefaults().setGrowthLogicKit(DTAddonLibGrowthLogicKits.PRICKLY_PEAR); } public PricklyPearCactusSpecies(ResourceLocation name, Family family, LeavesProperties leavesProperties) { diff --git a/src/main/resources/assets/dtecologics/models/block/prickly_pear_cactus_sapling.json b/src/main/resources/assets/dtecologics/models/block/prickly_pear_cactus_sapling.json index c87785c..75487c7 100644 --- a/src/main/resources/assets/dtecologics/models/block/prickly_pear_cactus_sapling.json +++ b/src/main/resources/assets/dtecologics/models/block/prickly_pear_cactus_sapling.json @@ -1,7 +1,7 @@ { "credit": "Made with Blockbench", "parent": "block/block", - "ambientocclusion": false, + "render_type": "minecraft:cutout", "textures": { "particle": "#side", "fruit": "ecologics:item/prickly_pear" diff --git a/src/main/resources/trees/dtecologics/species/prickly_pear_cactus.json b/src/main/resources/trees/dtecologics/species/prickly_pear_cactus.json index bd6ead6..e927e68 100644 --- a/src/main/resources/trees/dtecologics/species/prickly_pear_cactus.json +++ b/src/main/resources/trees/dtecologics/species/prickly_pear_cactus.json @@ -7,6 +7,9 @@ "lowest_branch_height": 0, "growth_rate": 1, "soil_longevity": 2, + "growth_logic_kit": { + "name": "dtaddon_lib:prickly_pear" + }, "always_show_on_waila": true, "drop_seeds": false, "generate_seed": true, @@ -34,5 +37,14 @@ ], "lang_overrides": { "seed": "Prickly Pear Seeds" - } + }, + + "preferred_climate": "arid", + "climate_tolerance": 0.0, + "seasonal_offsets": { + "fruiting": { + "arid": 2 + } + }, + "mega_species": "dynamictreesplus:mega_cactus" } From 3275c4a0c3582e04cca5a6a81dd64d831858f084 Mon Sep 17 00:00:00 2001 From: ninjaguardian <110734253+ninjaguardian@users.noreply.github.com> Date: Tue, 11 Aug 2026 16:07:35 -0500 Subject: [PATCH 3/4] Add publishing --- build.gradle.kts | 56 +++++++++++++++++++++++++++++++++++++++++++++++ gradle.properties | 4 ++++ 2 files changed, 60 insertions(+) diff --git a/build.gradle.kts b/build.gradle.kts index 048ab3c..3e78fe0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,11 @@ +import me.modmuss50.mpp.ReleaseType +import org.gradle.api.publish.maven.MavenPublication + plugins { + id("java-library") + id("maven-publish") id("net.neoforged.moddev") version "2.0.143" + id("me.modmuss50.mod-publish-plugin") version "2.+" } val mcVersion = providers.gradleProperty("mcVersion") @@ -12,6 +18,9 @@ val dynamicTreesVersion = providers.gradleProperty("dynamicTreesVersion") val dynamicTreesPlusVersion = providers.gradleProperty("dynamicTreesPlusVersion") val dynamicTreesAddonLibVersion = providers.gradleProperty("dynamicTreesAddonLibVersion") val ecologicsVersion = providers.gradleProperty("ecologicsVersion") +val versionType = providers.gradleProperty("versionType") +val curseProjectId = providers.gradleProperty("curseProjectId") +val rinthProjectId = providers.gradleProperty("rinthProjectId") version = "${mcVersion.get()}-${modVersion.get()}" group = modGroup.get() @@ -91,6 +100,10 @@ repositories { includeGroup("curse.maven") } } + flatDir { + dir("libs") + } + mavenLocal() } dependencies { @@ -129,3 +142,46 @@ tasks.withType().configureEach { tasks.jar { from("LICENSE") } + +publishing { + publications { + register("mavenJava") { + from(components["java"]) + } + } + repositories { + maven("file://${project.projectDir}/repo") + } +} + +publishMods { + file.set(tasks.jar.flatMap { it.archiveFile }) + additionalFiles.from(tasks.named("sourcesJar")) + displayName.set("${modName.get()}-NeoForge-${project.version}") + val changelogFile = file("build/changelog.md") + if (changelogFile.exists()) { + changelog.set(changelogFile.readText()) + } + type.set(versionType.map(String::uppercase).map(ReleaseType::of)) + modLoaders.add("neoforge") + + curseforge { + projectId.set(curseProjectId) + projectSlug.set("dynamic-trees-ecologics") + accessToken.set(System.getenv("CURSEFORGE_API_KEY")) + minecraftVersions.add(mcVersion) + requires("dynamictrees") + optional("dynamictreesplus") + requires("dynamic-trees-addon-lib") + requires("ecologics") + } + modrinth { + projectId.set(rinthProjectId) + accessToken.set(System.getenv("MODRINTH_TOKEN")) + minecraftVersions.add(mcVersion) + requires("vdjF5PL5") //dt + optional("qaO9Dqpu") //dt+ + requires("ju42L8G7") //dynamic-trees-addon-lib + requires("NCKpPR0Z") //ecologics + } +} diff --git a/gradle.properties b/gradle.properties index f41184c..d29dedc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,3 +16,7 @@ dynamicTreesVersion=1.7.2 dynamicTreesPlusVersion=1.3.2 dynamicTreesAddonLibVersion=0.2.0-BETA03 ecologicsVersion=2.3.7 + +versionType=release +curseProjectId=871323 +rinthProjectId=2H9XSQjq From 6f414078e332301d9f64573c29bc89c0777cff1f Mon Sep 17 00:00:00 2001 From: ninjaguardian <110734253+ninjaguardian@users.noreply.github.com> Date: Tue, 11 Aug 2026 19:29:11 -0500 Subject: [PATCH 4/4] Optimize shearing --- .../dtecologics/DynamicTreesEcologics.java | 26 ++++++++++++++----- .../mixin/AbstractRegistryMixin.java | 25 ++++++++++++++++++ .../mixin/EcologicsNeoForgeMixin.java | 2 +- src/main/resources/dtecologics.mixins.json | 1 + 4 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 src/main/java/maxhyper/dtecologics/mixin/AbstractRegistryMixin.java diff --git a/src/main/java/maxhyper/dtecologics/DynamicTreesEcologics.java b/src/main/java/maxhyper/dtecologics/DynamicTreesEcologics.java index 7576088..292679b 100644 --- a/src/main/java/maxhyper/dtecologics/DynamicTreesEcologics.java +++ b/src/main/java/maxhyper/dtecologics/DynamicTreesEcologics.java @@ -1,5 +1,6 @@ package maxhyper.dtecologics; +import com.dtteam.dynamictrees.api.registry.TypedRegistry; import com.dtteam.dynamictrees.block.fruit.Fruit; import com.dtteam.dynamictrees.block.leaves.LeavesProperties; import com.dtteam.dynamictrees.block.pod.Pod; @@ -10,7 +11,7 @@ import com.dtteam.dynamictrees.tree.species.Species; import maxhyper.dtecologics.init.PlusModRegistries; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.properties.Property; import net.neoforged.bus.api.IEventBus; @@ -24,6 +25,7 @@ @Mod(DynamicTreesEcologics.MOD_ID) public class DynamicTreesEcologics { public static final String MOD_ID = "dtecologics"; + private static LeavesProperties azaleaProperties; public DynamicTreesEcologics(@NotNull IEventBus modBus) { modBus.addListener(this::gatherData); @@ -52,17 +54,27 @@ public static ResourceLocation location(final String path) { return ResourceLocation.fromNamespaceAndPath(MOD_ID, path); } - @Nullable - public static LeavesProperties getDynamicLeaves(Block block) { - for (LeavesProperties properties : LeavesProperties.REGISTRY) { + public static void updateAzaleaProperties() { + TypedRegistry registry = LeavesProperties.REGISTRY; + if (!registry.isLocked()) + return; + + for (LeavesProperties properties : registry) { @Nullable BlockState state = properties.getPrimitiveLeaves(); //noinspection ConstantValue - if (state != null && state.is(block)) { - return properties; + if (state != null && state.is(Blocks.AZALEA_LEAVES)) { + azaleaProperties = properties; + return; } } - return null; + } + + @Nullable + public static LeavesProperties getAzaleaProperties() { + if (azaleaProperties == null) + updateAzaleaProperties(); + return azaleaProperties; } @NotNull diff --git a/src/main/java/maxhyper/dtecologics/mixin/AbstractRegistryMixin.java b/src/main/java/maxhyper/dtecologics/mixin/AbstractRegistryMixin.java new file mode 100644 index 0000000..34e6072 --- /dev/null +++ b/src/main/java/maxhyper/dtecologics/mixin/AbstractRegistryMixin.java @@ -0,0 +1,25 @@ +package maxhyper.dtecologics.mixin; + +import com.dtteam.dynamictrees.api.registry.AbstractRegistry; +import com.dtteam.dynamictrees.block.leaves.LeavesProperties; +import maxhyper.dtecologics.DynamicTreesEcologics; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Inject; +import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; + +@Mixin(AbstractRegistry.class) +public abstract class AbstractRegistryMixin { + + @Inject( + method = "lock", + at = @At("RETURN") + ) + private void afterLock(CallbackInfo ci) { + //noinspection ConstantValue + if ((Object) this == LeavesProperties.REGISTRY) { + DynamicTreesEcologics.updateAzaleaProperties(); + } + } + +} diff --git a/src/main/java/maxhyper/dtecologics/mixin/EcologicsNeoForgeMixin.java b/src/main/java/maxhyper/dtecologics/mixin/EcologicsNeoForgeMixin.java index ca9633c..84cb2ce 100644 --- a/src/main/java/maxhyper/dtecologics/mixin/EcologicsNeoForgeMixin.java +++ b/src/main/java/maxhyper/dtecologics/mixin/EcologicsNeoForgeMixin.java @@ -55,7 +55,7 @@ private static void onRightClick( return; } - @Nullable LeavesProperties leavesProperties = DynamicTreesEcologics.getDynamicLeaves(Blocks.AZALEA_LEAVES); + @Nullable LeavesProperties leavesProperties = DynamicTreesEcologics.getAzaleaProperties(); if (leavesProperties == null) { return; } diff --git a/src/main/resources/dtecologics.mixins.json b/src/main/resources/dtecologics.mixins.json index 6e5b997..0e853c7 100644 --- a/src/main/resources/dtecologics.mixins.json +++ b/src/main/resources/dtecologics.mixins.json @@ -4,6 +4,7 @@ "package": "maxhyper.dtecologics.mixin", "compatibilityLevel": "JAVA_21", "mixins": [ + "AbstractRegistryMixin", "EcologicsNeoForgeMixin", "EntityMixin", "FallingBlockEntityMixin"