Update to 1.20

.gitattributes

@@ -0,0 +1,15 @@
+* text eol=lf
+*.bat text eol=crlf
+*.patch text eol=lf
+*.java text eol=lf
+*.gradle text eol=crlf
+*.png binary
+*.gif binary
+*.exe binary
+*.dll binary
+*.jar binary
+*.lzma binary
+*.zip binary
+*.pyd binary
+*.cfg text eol=lf
+*.jks binary

.github/workflows/release.yml

@@ -0,0 +1,15 @@
+name: Release
+
+on:
+ push:
+ tags:
+ - "v*"
+
+jobs:
+ build:
+ if: |
+ !contains(github.event.head_commit.message, '[ciskip]')
+ uses: nanite/workflows/.github/workflows/standard-arch-release.yml@v1
+ secrets:
+ nanite-token: ${{ secrets.NANITE_DEPLOY }}
+ curse-token: ${{ secrets.CURSE_DEPLOY }}

.github/workflows/snapshot.yml

@@ -0,0 +1,17 @@
+name: Build & Release
+
+on:
+ push:
+ branches:
+ - "1.*"
+
+jobs:
+ build:
+ if: |
+ !contains(github.event.head_commit.message, '[ciskip]')
+ uses: nanite/workflows/.github/workflows/base-java.yml@v1
+ secrets:
+ nanite-token: ${{ secrets.NANITE_DEPLOY }}
+ with:
+ use-snapshots: true
+ gradle-tasks: build publish

.gitignore

@@ -1,35 +1,23 @@
-# gradle
-
-.gradle/
-build/
-out/
-classes/
-
 # eclipse
-
+bin
 *.launch
+.settings
+.metadata
+.classpath
+.project
 
 # idea
-
-.idea/
-*.iml
+out
 *.ipr
 *.iws
+*.iml
+.idea/*
+!.idea/scopes
 
-# vscode
-
-.settings/
-.vscode/
-bin/
-.classpath
-.project
-
-# macos
-
-*.DS_Store
-
-# fabric
+# gradle
+build
+.gradle
 
-run/
-
-logs/
+# other
+eclipse
+run

CHANGELOG.md

@@ -0,0 +1,4 @@
+### 2.0.0
+
+- Port To Fabric
+- Update To Minecraft 1.20

Common/build.gradle

@@ -0,0 +1,47 @@
+plugins {
+ id 'java'
+ id 'org.spongepowered.gradle.vanilla' version '0.2.1-SNAPSHOT'
+ id 'maven-publish'
+}
+
+minecraft {
+ version(minecraft_version)
+}
+
+dependencies {
+ compileOnly group:'org.spongepowered', name:'mixin', version:'0.8.5'
+ implementation(("com.unrealdinnerbone:Trenzalore-Common:${trenzalore_version}+mc${minecraft_version}"))
+}
+
+processResources {
+
+ def buildProps = project.properties.clone()
+
+ filesMatching(['pack.mcmeta']) {
+
+ expand buildProps
+ }
+}
+
+publishing {
+ publications {
+ mavenJava(MavenPublication) {
+ groupId project.group
+ artifactId project.archivesBaseName
+ version project.version
+ from components.java
+ }
+ }
+
+ repositories {
+ if (ENV.NANITE_TOKEN) {
+ maven {
+ url "https://maven.nanite.dev/${SNAPSHOT ? "snapshots" : "releases"}"
+ credentials {
+ username = "nanite"
+ password = "${ENV.NANITE_TOKEN}"
+ }
+ }
+ }
+ }
+}

Common/src/main/java/com/unrealdinnerbone/ibicf/IBICF.java

@@ -0,0 +1,11 @@
+package com.unrealdinnerbone.ibicf;
+
+public class IBICF {
+ public static final String MOD_ID = "ibicf";
+
+ public static void init() {
+ //Load config on mod startup not on first render
+ IBICFConfig.CONFIG.get();
+ }
+
+}

Common/src/main/java/com/unrealdinnerbone/ibicf/IBICFConfig.java

@@ -0,0 +1,10 @@
+package com.unrealdinnerbone.ibicf;
+
+import com.google.common.base.Suppliers;
+import com.unrealdinnerbone.trenzalore.api.config.ConfigManger;
+
+import java.util.function.Supplier;
+
+public record IBICFConfig(float cloudLevel) {
+ public static Supplier<IBICFConfig> CONFIG = Suppliers.memoize(() -> ConfigManger.getOrCreateConfig(IBICF.MOD_ID, IBICFConfig.class, () -> new IBICFConfig(128)));
+}

src/main/java/com/unrealdinnerbone/ibicf/mixin/DimensionRenderInfoMixin.java → Common/src/main/java/com/unrealdinnerbone/ibicf/mixin/DimensionRenderInfoMixin.java

@@ -1,6 +1,6 @@
 package com.unrealdinnerbone.ibicf.mixin;
 
-import com.unrealdinnerbone.ibicf.IBICF;
+import com.unrealdinnerbone.ibicf.IBICFConfig;
 import net.minecraft.client.renderer.DimensionSpecialEffects;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,8 +15,8 @@ public class DimensionRenderInfoMixin {
 
  @Inject(at = @At("HEAD"), method = "getCloudHeight()F", cancellable = true)
  private void init(CallbackInfoReturnable<Float> info) {
- if(!Float.isNaN(cloudLevel) && IBICF.cloud != null) {
- info.setReturnValue(IBICF.cloud.get().floatValue());
+ if(!Float.isNaN(cloudLevel)) {
+ info.setReturnValue(IBICFConfig.CONFIG.get().cloudLevel());
  }
  }
 

src/main/resources/ibicf.mixins.json → Common/src/main/resources/ibicf.mixins.json

@@ -1,15 +1,14 @@
-{
- "required": true,
- "minVersion": "0.8",
- "package": "com.unrealdinnerbone.ibicf.mixin",
- "refmap": "ibicf.refmap.json",
- "compatibilityLevel": "JAVA_17",
- "mixins": [
- ],
- "client": [
- "DimensionRenderInfoMixin"
- ],
- "injectors": {
- "defaultRequire": 1
- }
-}
+{
+ "required": true,
+ "minVersion": "0.8",
+ "package": "com.unrealdinnerbone.ibicf.mixin",
+ "compatibilityLevel": "JAVA_17",
+ "refmap": "ibicf.refmap.json",
+ "mixins": [
+ "DimensionRenderInfoMixin"
+ ],
+ "injectors": {
+ "defaultRequire": 1
+ }
+}
+

Common/src/main/resources/pack.mcmeta

@@ -0,0 +1,6 @@
+{
+ "pack": {
+ "description": "${mod_name}",
+ "pack_format": 8
+ }
+}

Fabric/build.gradle

@@ -0,0 +1,89 @@
+plugins {
+ id 'fabric-loom' version '1.0-SNAPSHOT'
+ id 'maven-publish'
+ id 'idea'
+ id 'net.darkhax.curseforgegradle' version '1.0.14'
+}
+
+Project commonProject = parent == rootProject ? parent.project("Common") : parent.project("IBICF-Common")
+
+dependencies {
+ minecraft "com.mojang:minecraft:${minecraft_version}"
+ mappings loom.officialMojangMappings()
+ modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
+ modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
+ modImplementation(("com.unrealdinnerbone:Trenzalore-Fabric:${trenzalore_version}+mc${minecraft_version}"))
+ implementation commonProject
+}
+
+loom {
+ mixin {
+ defaultRefmapName = "${mod_id}.refmap.json"
+ }
+ runs {
+ client {
+ client()
+ setConfigName("Fabric Client")
+ ideConfigGenerated(true)
+ vmArg("-Dmixin.debug.export=true")
+ runDir("run_client")
+ }
+ server {
+ server()
+ setConfigName("Fabric Server")
+ ideConfigGenerated(true)
+ vmArg("-Dmixin.debug.export=true")
+ runDir("run_server")
+ }
+ }
+}
+
+
+processResources {
+ from commonProject.sourceSets.main.resources
+
+ def buildProps = project.properties.clone()
+ buildProps.put("version", project.version)
+ buildProps.put("trenzalore_version", parent.property("trenzalore_version"))
+ buildProps.put("minecraft_version", parent.property("minecraft_version"))
+ filesMatching("fabric.mod.json") {
+ expand buildProps
+ }
+}
+
+tasks.withType(JavaCompile) {
+ source(commonProject.sourceSets.main.allSource)
+}
+
+publishing {
+ publications {
+ mavenJava(MavenPublication) {
+ groupId project.group
+ artifactId project.archivesBaseName + "-" + project.name
+ version project.version
+ from components.java
+ }
+ }
+
+ repositories {
+ if (ENV.NANITE_TOKEN) {
+ maven {
+ url "https://maven.nanite.dev/${SNAPSHOT ? "snapshots" : "releases"}"
+ credentials {
+ username = "nanite"
+ password = "${ENV.NANITE_TOKEN}"
+ }
+ }
+ }
+ }
+}
+
+task curseforgePublish(type: net.darkhax.curseforgegradle.TaskPublishCurseForge) {
+
+ apiToken = ENV.CURSE_TOKEN
+ def mainFile = upload(findProperty('curse_id'), remapJar)
+ mainFile.changelog = file("../CHANGELOG.md")
+ mainFile.releaseType = "beta"
+ mainFile.changelogType = "markdown"
+ mainFile.addJavaVersion("Java 17")
+}

Fabric/run_client/config/fabric/indigo-renderer.properties

@@ -0,0 +1,8 @@
+#Indigo properties file
+#Thu Jun 08 10:15:28 CDT 2023
+debug-compare-lighting=auto
+fix-exterior-vertex-lighting=auto
+ambient-occlusion-mode=hybrid
+always-tesselate-blocks=auto
+fix-smooth-lighting-offset=auto
+fix-luminous-block-ambient-occlusion=auto

Fabric/run_client/config/ibicf.json

@@ -0,0 +1,3 @@
+{
+ "cloudLevel": 128.0
+}

Fabric/run_client/config/trenzalore.json

@@ -0,0 +1,5 @@
+{
+ "boatFix": true,
+ "fullBruteGoldArmor": true,
+ "poisonArrowsInJungleTemples": true
+}