Skip to content

Commit

Permalink
Fix FAPI interface injection.
Browse files Browse the repository at this point in the history
This issue was caused by a mismatch in the resolved FAPI version for compile and runtime.  It should be fixed in Loom 0.10, but for now I just need to use a newer FAPI than Terraform API does.

* Update Gradle to 8.11.1
* Update FAPI to 0.114.1
  • Loading branch information
gniftygnome committed Jan 7, 2025
1 parent 49a9c2e commit bf366b1
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package com.terraformersmc.terrestria.init;

import com.terraformersmc.terrestria.Terrestria;
import net.fabricmc.fabric.api.event.registry.FabricRegistry;
import net.minecraft.registry.Registries;
import net.minecraft.util.Identifier;

Expand Down Expand Up @@ -51,8 +50,8 @@ public static void init() {
entry("basalt_wall", "volcanic_rock_wall"),
entry("basalt_sand", "volcanic_sand")
);
BLOCKS_ITEMS.forEach(((FabricRegistry) Registries.BLOCK)::addAlias);
BLOCKS_ITEMS.forEach(((FabricRegistry) Registries.ITEM)::addAlias);
BLOCKS_ITEMS.forEach(Registries.BLOCK::addAlias);
BLOCKS_ITEMS.forEach(Registries.ITEM::addAlias);
}

private static Map.Entry<Identifier, Identifier> entry(String oldName, String newName) {
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ maven_group=com.terraformersmc
archive_name=terrestria

minecraft_version=1.21.4
yarn_mappings=1.21.4+build.2
yarn_mappings=1.21.4+build.8
loader_version=0.16.9
fabric_version=0.113.0+1.21.4
fabric_version=0.114.1+1.21.4

# Terraform modules
terraform_biome_remapper_api_version=13.0.0-alpha.2
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
4 changes: 3 additions & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
# SPDX-License-Identifier: Apache-2.0
#

##############################################################################
#
Expand Down Expand Up @@ -84,7 +86,7 @@ done
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down
2 changes: 2 additions & 0 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@rem SPDX-License-Identifier: Apache-2.0
@rem

@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
Expand Down

0 comments on commit bf366b1

Please sign in to comment.