Skip to content

Commit

Permalink
fuck 1.17
Browse files Browse the repository at this point in the history
  • Loading branch information
ZimnyCat committed Aug 5, 2021
1 parent 4ed7ecd commit 42ef59e
Show file tree
Hide file tree
Showing 182 changed files with 1,592 additions and 1,217 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,11 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 16
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: '16'
java-version: '11'
distribution: 'adopt'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand All @@ -34,10 +35,11 @@ jobs:

steps:
- uses: actions/checkout@v2
- name: Set up JDK 16
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: '16'
java-version: '11'
distribution: 'adopt'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
Expand Down
72 changes: 36 additions & 36 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,31 +1,33 @@
plugins {
id 'fabric-loom' version '0.8-SNAPSHOT'
id 'fabric-loom' version '0.4-SNAPSHOT'
id 'maven-publish'
}

sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
allprojects {
repositories {
maven { url 'https://jitpack.io' }
}
}

sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8

archivesBaseName = project.archives_base_name
version = project.mod_version
group = project.maven_group

repositories {
// Add repositories to retrieve artifacts from in here.
// You should only use this when depending on other mods because
// Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
// See https://docs.gradle.org/current/userguide/declaring_repositories.html
// for more information about repositories.
}

dependencies {
// To change the versions see the gradle.properties file
//to change the versions see the gradle.properties file
minecraft "com.mojang:minecraft:${project.minecraft_version}"
mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"

// Fabric API. This is technically optional, but you probably want it anyway.
//modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
modImplementation "com.github.ZeroMemes:Alpine:1.9"
modImplementation 'com.github.Vatuu:discord-rpc:1.6.2'
include 'com.github.Vatuu:discord-rpc:1.6.2'
include 'com.github.ZeroMemes:Alpine:1.9'

// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
// You may need to force-disable transitiveness on them.
Expand All @@ -34,33 +36,33 @@ dependencies {
processResources {
inputs.property "version", project.version

filesMatching("fabric.mod.json") {
from(sourceSets.main.resources.srcDirs) {
include "fabric.mod.json"
expand "version": project.version
}
}

tasks.withType(JavaCompile).configureEach {
// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
// If Javadoc is generated, this must be specified in that task too.
it.options.encoding = "UTF-8"
from(sourceSets.main.resources.srcDirs) {
exclude "fabric.mod.json"
}
}

// Minecraft 1.17 (21w19a) upwards uses Java 16.
it.options.release = 16
// ensure that the encoding is set to UTF-8, no matter what the system default is
// this fixes some edge cases with special characters not displaying correctly
// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
tasks.withType(JavaCompile) {
options.encoding = "UTF-8"
}

java {
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this line, sources will not be generated.
withSourcesJar()
// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
// if it is present.
// If you remove this task, sources will not be generated.
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = "sources"
from sourceSets.main.allSource
}

jar {
from("LICENSE") {
rename { "${it}_${project.archivesBaseName}"}
}
from "LICENSE"
}

// configure the maven publication
Expand All @@ -77,11 +79,9 @@ publishing {
}
}

// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
// select the repositories you want to publish to
repositories {
// Add repositories to publish to here.
// Notice: This block does NOT have the same function as the block in the top level.
// The repositories here will be used for publishing your artifact, not for
// retrieving dependencies.
// uncomment to publish to the local maven
// mavenLocal()
}
}
}
8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ org.gradle.jvmargs=-Xmx3G

# Fabric Properties
# check these on https://fabricmc.net/use
minecraft_version=1.17.1
yarn_mappings=1.17.1+build.24
loader_version=0.11.6
minecraft_version=1.16.5
yarn_mappings=1.16.5+build.1
loader_version=0.11.1

# Mod Properties
mod_version = v7.1
Expand All @@ -14,4 +14,4 @@ org.gradle.jvmargs=-Xmx3G

# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
fabric_version=0.13.1+build.370-1.16
#fabric_version=0.13.1+build.370-1.16
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.0.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
13 changes: 4 additions & 9 deletions src/main/java/bleach/hack/BleachHack.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
*/
package bleach.hack;

import bleach.hack.bleacheventbus.BleachEventBus;
import bleach.hack.module.Module;
import bleach.hack.module.ModuleManager;
import bleach.hack.module.mods.ClickGui;
Expand All @@ -29,8 +28,6 @@
import bleach.hack.utils.file.BleachFileMang;
import com.google.common.eventbus.EventBus;
import net.fabricmc.api.ModInitializer;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

public class BleachHack implements ModInitializer {

Expand All @@ -40,9 +37,7 @@ public class BleachHack implements ModInitializer {

public static final String CLIENT = NAME + " " + VERSION;

public static Logger logger = LogManager.getFormatterLogger(NAME);

public static BleachEventBus bleachEventBus = new BleachEventBus(logger);
public static EventBus eventBus = new EventBus();

public static FriendManager friendMang;

Expand All @@ -62,9 +57,9 @@ public void onInitialize() {

for (Module m : ModuleManager.getModules()) m.init();

bleachEventBus.subscribe(new Rainbow());
bleachEventBus.subscribe(new ModuleManager());
bleachEventBus.subscribe(new UpdateCheck());
eventBus.register(new Rainbow());
eventBus.register(new ModuleManager());
eventBus.register(new UpdateCheck());

BleachFileMang.createFile("drawn.txt");

Expand Down
31 changes: 0 additions & 31 deletions src/main/java/bleach/hack/bleacheventbus/BleachEventBus.java

This file was deleted.

10 changes: 0 additions & 10 deletions src/main/java/bleach/hack/bleacheventbus/BleachSubscribe.java

This file was deleted.

96 changes: 0 additions & 96 deletions src/main/java/bleach/hack/bleacheventbus/BleachSubscriber.java

This file was deleted.

Loading

0 comments on commit 42ef59e

Please sign in to comment.