Skip to content
This repository has been archived by the owner on Sep 24, 2024. It is now read-only.

Commit

Permalink
1.20.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Nekiplay committed Aug 13, 2024
1 parent 7be664b commit 8272966
Show file tree
Hide file tree
Showing 36 changed files with 33 additions and 1,703 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/dev_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 18
java-version: 21
distribution: adopt
- name: Build
run: ./gradlew build
- name: Release
uses: marvinpinto/action-automatic-releases@latest
with:
repo_token: '${{ secrets.GITHUB_TOKEN }}'
automatic_release_tag: "1.20.4_1.0.9.0"
automatic_release_tag: "1.20.6_1.0.9.0"
prerelease: true
title: "1.20.4 | 1.0.9.0"
title: "1.20.6 | 1.0.9.0"
files: |
./build/libs/*.jar
2 changes: 1 addition & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
java-version: 18
java-version: 21
distribution: adopt
- name: Build
run: ./gradlew build
Expand Down
9 changes: 6 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
plugins {
id 'fabric-loom' version '0.12-SNAPSHOT'
id "fabric-loom" version "1.6-SNAPSHOT"
id "maven-publish"
}

sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = targetCompatibility = JavaVersion.VERSION_21

archivesBaseName = project.archives_base_name
version = project.mod_version
Expand Down Expand Up @@ -42,6 +43,8 @@ repositories {
name = "boze-maven"
url = "https://maven.boze.dev/releases"
}
mavenCentral()
gradlePluginPortal()
}

dependencies {
Expand All @@ -55,7 +58,7 @@ dependencies {

// Meteor Client
modImplementation files("libs\\baritone-unoptimized-fabric-1.10.1-11-g3ed49fd4.jar")
modImplementation files("libs\\meteor-client-0.5.6.jar")
modImplementation files("libs\\meteor-client-0.5.7.jar")

// Journey Map
modCompileOnlyApi group: 'info.journeymap', name: 'journeymap-api', version: project.journeymap_api_fabric_version, changing: true
Expand Down
12 changes: 6 additions & 6 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
org.gradle.jvmargs=-Xmx2G

# Fabric (https://fabricmc.net/versions.html)
minecraft_version=1.20.4
yarn_mappings=1.20.4+build.2
loader_version=0.15.1
minecraft_version=1.20.6
yarn_mappings=1.20.6+build.1
loader_version=0.15.11

# Mod Properties
mod_version=1.20.4_1.0.9.0
mod_version=1.20.6_1.0.9.0
maven_group=nekiplay.meteorplus
archives_base_name=meteor-plus

Expand All @@ -21,9 +21,9 @@ jm_fabric_version=1.20.4-5.9.20-fabric

# Xaero's Mods
# Xaero's World Map (https://modrinth.com/mod/xaeros-world-map/versions)
xwm_fabric_version=1.38.4_Fabric_1.20.4
xwm_fabric_version=1.38.8_Fabric_1.20.6
# Xaero's Minimap (https://modrinth.com/mod/xaeros-minimap/versions)
xmm_fabric_version=24.1.1_Fabric_1.20.4
xmm_fabric_version=24.2.0_Fabric_1.20.6

# Litematica (https://www.curseforge.com/minecraft/mc-mods/litematica/files/all?page=1&pageSize=20)
litematica_fileid=4946471
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Binary file removed libs/meteor-client-0.5.6-2061.jar
Binary file not shown.
Binary file not shown.
12 changes: 0 additions & 12 deletions src/main/java/nekiplay/Main.java
Original file line number Diff line number Diff line change
@@ -1,29 +1,17 @@
package nekiplay;

import nekiplay.bozeplus.BozePlusAddon;
import nekiplay.main.items.ModItems;
import net.fabricmc.api.ModInitializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

public class Main implements ModInitializer {
public static final Logger LOG = LoggerFactory.getLogger(Main.class);
public static final String BOZE_LOGPREFIX = "[Boze+]";
public static final String METEOR_LOGPREFIX = "[Meteor+]";
@Override
public void onInitialize() {
LOG.info(METEOR_LOGPREFIX + " Initializing items...");
ModItems.initializeMeteorPlus();
LOG.info(METEOR_LOGPREFIX + " Loaded items");

if (MixinPlugin.isBozeAPI && !MixinPlugin.isMeteorClient) {
LOG.info(METEOR_LOGPREFIX + " & " + BOZE_LOGPREFIX + " Initialization of Boze Client integration because Meteor Client is not found...");
BozePlusAddon bozePlusMain = new BozePlusAddon();
bozePlusMain.onInitialize();
LOG.info(METEOR_LOGPREFIX + " & " + BOZE_LOGPREFIX + " Loaded of Boze Client integration");
}
else if (MixinPlugin.isBozeAPI) {
LOG.info(METEOR_LOGPREFIX + " & " + BOZE_LOGPREFIX + " You have Meteor Client installed, integration with Boze Client is disabled");
}
}
}
5 changes: 0 additions & 5 deletions src/main/java/nekiplay/MixinPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,6 @@ else if (mixinClassName.startsWith(mixinPackageMeteorPlus + ".whereisit")) {
else if (mixinClassName.startsWith(mixinPackageMeteorPlus + ".minecraft")) {
return isMeteorClient;
}

else if (mixinClassName.startsWith(mixinPackageBozePlus + ".minecraft")) {
return isBozeAPI && !isMeteorClient;
}

return false;
}

Expand Down
114 changes: 0 additions & 114 deletions src/main/java/nekiplay/bozeplus/BozePlusAddon.java

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 8272966

Please sign in to comment.