diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/build.gradle b/build.gradle old mode 100644 new mode 100755 index 8912264..37ce2fc --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ plugins { - id 'fabric-loom' version '0.5-SNAPSHOT' + id 'fabric-loom' version '0.8-SNAPSHOT' id 'maven-publish' } -sourceCompatibility = JavaVersion.VERSION_1_8 -targetCompatibility = JavaVersion.VERSION_1_8 +sourceCompatibility = JavaVersion.VERSION_16 +targetCompatibility = JavaVersion.VERSION_16 archivesBaseName = project.archives_base_name version = project.mod_version @@ -14,6 +14,7 @@ minecraft { } repositories { + maven { url "https://maven.terraformersmc.com/releases" } maven { url "https://jitpack.io" } } @@ -21,45 +22,43 @@ dependencies { //to change the versions see the gradle.properties file minecraft "com.mojang:minecraft:${project.minecraft_version}" mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modCompile "net.fabricmc:fabric-loader:${project.loader_version}" + modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" + modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - modImplementation ("io.github.prospector:modmenu:${project.mod_menu_version}"){ - exclude module: "fabric-api" - } + modImplementation ("com.terraformersmc:modmenu:${project.mod_menu_version}") } processResources { inputs.property "version", project.version - from(sourceSets.main.resources.srcDirs) { - include "fabric.mod.json" + filesMatching("fabric.mod.json") { expand "version": project.version } - - from(sourceSets.main.resources.srcDirs) { - exclude "fabric.mod.json" - } } -// 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" +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" + + // Minecraft 1.17 (21w19a) upwards uses Java 16. + it.options.release = 16 } -// 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 +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() } jar { - from "LICENSE" + from("LICENSE") { + rename { "${it}_${project.archivesBaseName}"} + } } // configure the maven publication @@ -76,9 +75,11 @@ publishing { } } - // select the repositories you want to publish to + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. repositories { - // uncomment to publish to the local maven - // mavenLocal() + // 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. } } diff --git a/gradle.properties b/gradle.properties old mode 100644 new mode 100755 index 08ab733..dffafbd --- a/gradle.properties +++ b/gradle.properties @@ -3,17 +3,16 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use - minecraft_version=1.16.5 - yarn_mappings=1.16.5+build.5 - loader_version=0.11.2 + minecraft_version=1.17-rc1 + yarn_mappings=1.17-rc1+build.5 + loader_version=0.11.3 # Mod Properties - mod_version = 2.1.0 + mod_version = 2.2.0 maven_group = eu.midnightdust archives_base_name = cullleaves # 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.31.0+1.16 - - mod_menu_version = 1.14.6+build.31 \ No newline at end of file + fabric_version=0.34.8+1.17 + mod_menu_version = 2.0.0-beta.7 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar old mode 100644 new mode 100755 index 5c2d1cf..e708b1c Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties old mode 100644 new mode 100755 index 4b7e1f3..e5338d3 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 index 8e25e6c..4f906e0 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ 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 @@ -125,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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 @@ -154,19 +156,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` 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" ;; + 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 @@ -175,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +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")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat old mode 100644 new mode 100755 index 9618d8d..107acd3 --- a/gradlew.bat +++ b/gradlew.bat @@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=. 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="-Xmx64m" "-Xms64m" @@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -51,7 +54,7 @@ goto fail 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% @@ -61,28 +64,14 @@ echo location of your Java installation. 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=%* - :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% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle b/settings.gradle old mode 100644 new mode 100755 diff --git a/src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java b/src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java old mode 100644 new mode 100755 index 763d087..b37ea06 --- a/src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java +++ b/src/main/java/eu/midnightdust/cullleaves/CullLeavesClient.java @@ -1,18 +1,20 @@ -package eu.midnightdust.cullleaves; - -import eu.midnightdust.cullleaves.config.CullLeavesConfig; -import net.fabricmc.api.ClientModInitializer; -import net.fabricmc.fabric.api.resource.ResourceManagerHelper; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.util.Identifier; - -public class CullLeavesClient implements ClientModInitializer { - - public void onInitializeClient() { - CullLeavesConfig.init("cullleaves", CullLeavesConfig.class); - - FabricLoader.getInstance().getModContainer("cullleaves").ifPresent(modContainer -> { - ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("cullleaves:smartleaves"), "resourcepacks/smartleaves", modContainer, true); - }); - } -} +package eu.midnightdust.cullleaves; + +import eu.midnightdust.cullleaves.config.CullLeavesConfig; +import net.fabricmc.api.ClientModInitializer; +import net.fabricmc.fabric.api.resource.ResourceManagerHelper; +import net.fabricmc.fabric.api.resource.ResourcePackActivationType; +import net.fabricmc.loader.ModContainer; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.util.Identifier; + +public class CullLeavesClient implements ClientModInitializer { + + public void onInitializeClient() { + CullLeavesConfig.init("cullleaves", CullLeavesConfig.class); + + FabricLoader.getInstance().getModContainer("cullleaves").ifPresent(modContainer -> { + ResourceManagerHelper.registerBuiltinResourcePack(new Identifier("cullleaves:smartleaves"), modContainer, ResourcePackActivationType.DEFAULT_ENABLED); + }); + } +} diff --git a/src/main/java/eu/midnightdust/cullleaves/config/CullLeavesConfig.java b/src/main/java/eu/midnightdust/cullleaves/config/CullLeavesConfig.java old mode 100644 new mode 100755 index 874be45..14786e9 --- a/src/main/java/eu/midnightdust/cullleaves/config/CullLeavesConfig.java +++ b/src/main/java/eu/midnightdust/cullleaves/config/CullLeavesConfig.java @@ -1,7 +1,8 @@ -package eu.midnightdust.cullleaves.config; - -public class CullLeavesConfig extends MidnightConfig { - - @Entry // Enable/Disable the mod. Requires Chunk Reload (F3 + A). - public static boolean enabled = true; -} +package eu.midnightdust.cullleaves.config; + +import eu.midnightdust.lib.config.MidnightConfig; + +public class CullLeavesConfig extends MidnightConfig { + @Entry // Enable/Disable the mod. Requires Chunk Reload (F3 + A). + public static boolean enabled = true; +} diff --git a/src/main/java/eu/midnightdust/cullleaves/config/MidnightConfig.java b/src/main/java/eu/midnightdust/cullleaves/config/MidnightConfig.java deleted file mode 100644 index 41bd2d3..0000000 --- a/src/main/java/eu/midnightdust/cullleaves/config/MidnightConfig.java +++ /dev/null @@ -1,288 +0,0 @@ -package eu.midnightdust.cullleaves.config; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import net.fabricmc.loader.api.FabricLoader; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.ScreenTexts; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.resource.language.I18n; -import net.minecraft.client.util.math.MatrixStack; -import net.minecraft.text.*; -import net.minecraft.util.Formatting; - -import java.lang.annotation.*; -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.*; -import java.util.function.BiFunction; -import java.util.function.Function; -import java.util.function.Predicate; -import java.util.regex.Pattern; - -// MidnightConfig v0.1.0 // - -/* Based on https://github.com/Minenash/TinyConfig - Credits to Minenash - CC0-1.0 - You can copy this class to get a standalone version of MidnightConfig */ - -@SuppressWarnings("rawtypes") -public class MidnightConfig { - - private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)"); - private static final Pattern DECIMAL_ONLY = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)"); - - private static final List entries = new ArrayList<>(); - - protected static class EntryInfo { - Field field; - Object widget; - int width; - Method dynamicTooltip; - Map.Entry error; - Object defaultValue; - Object value; - String tempValue; - boolean inLimits = true; - } - - private static Class configClass; - private static String translationPrefix; - private static Path path; - - private static final Gson gson = new GsonBuilder() - .excludeFieldsWithModifiers(Modifier.TRANSIENT) - .excludeFieldsWithModifiers(Modifier.PRIVATE) - .setPrettyPrinting() - .create(); - - public static void init(String modid, Class config) { - translationPrefix = modid + ".midnightconfig."; - path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json"); - configClass = config; - - for (Field field : config.getFields()) { - Class type = field.getType(); - EntryInfo info = new EntryInfo(); - - Entry e; - try { e = field.getAnnotation(Entry.class); } - catch (Exception ignored) { continue; } - - info.width = e.width(); - info.field = field; - - if (type == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true); - else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(),false); - else if (type == String.class) textField(info, String::length, null, Math.min(e.min(),0), Math.max(e.max(),1),true); - else if (type == boolean.class) { - Function func = value -> new LiteralText((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED); - info.widget = new AbstractMap.SimpleEntry>(button -> { - info.value = !(Boolean) info.value; - button.setMessage(func.apply(info.value)); - }, func); - } - else if (type.isEnum()) { - List values = Arrays.asList(field.getType().getEnumConstants()); - Function func = value -> new TranslatableText(translationPrefix + "enum." + type.getSimpleName() + "." + info.value.toString()); - info.widget = new AbstractMap.SimpleEntry>( button -> { - int index = values.indexOf(info.value) + 1; - info.value = values.get(index >= values.size()? 0 : index); - button.setMessage(func.apply(info.value)); - }, func); - } - else - continue; - - entries.add(info); - - try { info.defaultValue = field.get(null); } - catch (IllegalAccessException ignored) {} - - try { - info.dynamicTooltip = config.getMethod(e.dynamicTooltip()); - info.dynamicTooltip.setAccessible(true); - } catch (Exception ignored) {} - - } - - try { gson.fromJson(Files.newBufferedReader(path), config); } - catch (Exception e) { write(); } - - for (EntryInfo info : entries) { - try { - info.value = info.field.get(null); - info.tempValue = info.value.toString(); - } - catch (IllegalAccessException ignored) {} - } - - } - - private static void textField(EntryInfo info, Function f, Pattern pattern, double min, double max, boolean cast) { - boolean isNumber = pattern != null; - info.widget = (BiFunction>) (t, b) -> s -> { - s = s.trim(); - if (!(s.isEmpty() || !isNumber || pattern.matcher(s).matches())) - return false; - - Number value = 0; - boolean inLimits = false; - System.out.println(((isNumber ^ s.isEmpty()))); - System.out.println(!s.equals("-") && !s.equals(".")); - info.error = null; - if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".")) { - value = f.apply(s); - inLimits = value.doubleValue() >= min && value.doubleValue() <= max; - info.error = inLimits? null : new AbstractMap.SimpleEntry<>(t, new LiteralText(value.doubleValue() < min ? - "§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) : - "§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max))); - } - - info.tempValue = s; - t.setEditableColor(inLimits? 0xFFFFFFFF : 0xFFFF7777); - info.inLimits = inLimits; - b.active = entries.stream().allMatch(e -> e.inLimits); - - if (inLimits) - info.value = isNumber? value : s; - - return true; - }; - } - - public static void write() { - try { - if (!Files.exists(path)) Files.createFile(path); - Files.write(path, gson.toJson(configClass.newInstance()).getBytes()); - } catch (Exception e) { - e.printStackTrace(); - } - - } - - public Screen getScreen(Screen parent) { - return new TinyConfigScreen(parent); - } - - private static class TinyConfigScreen extends Screen { - protected TinyConfigScreen(Screen parent) { - super(new TranslatableText(MidnightConfig.translationPrefix + "title")); - this.parent = parent; - } - private final Screen parent; - - // Real Time config update // - @Override - public void tick() { - for (EntryInfo info : entries) - try { info.field.set(null, info.value); } - catch (IllegalAccessException ignore) {} - } - - @Override - protected void init() { - super.init(); - this.addButton(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> { - try { gson.fromJson(Files.newBufferedReader(path), configClass); } - catch (Exception e) { write(); } - - for (EntryInfo info : entries) { - try { - info.value = info.field.get(null); - info.tempValue = info.value.toString(); - } - catch (IllegalAccessException ignored) {} - } - Objects.requireNonNull(client).openScreen(parent); - })); - - ButtonWidget done = this.addButton(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> { - for (EntryInfo info : entries) - try { info.field.set(null, info.value); } - catch (IllegalAccessException ignore) {} - write(); - Objects.requireNonNull(client).openScreen(parent); - })); - - int y = 45; - for (EntryInfo info : entries) { - addButton(new ButtonWidget(width - 155, y, 40,20, new LiteralText("Reset").formatted(Formatting.RED), (button -> { - info.value = info.defaultValue; - info.tempValue = info.value.toString(); - Objects.requireNonNull(client).openScreen(this); - }))); - - if (info.widget instanceof Map.Entry) { - Map.Entry> widget = (Map.Entry>) info.widget; - addButton(new ButtonWidget(width-110,y,info.width,20, widget.getValue().apply(info.value), widget.getKey())); - } - else { - TextFieldWidget widget = addButton(new TextFieldWidget(textRenderer, width-110, y, info.width, 20, null)); - widget.setText(info.tempValue); - - Predicate processor = ((BiFunction>) info.widget).apply(widget,done); - widget.setTextPredicate(processor); - - children.add(widget); - } - y += 25; - } - - } - int aniX = this.width / 2; - @Override - public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { - this.renderBackground(matrices); - - if (aniX < this.width / 2) { - aniX = aniX +40; - } - - int stringWidth = (int) (title.getString().length() * 2.75f); - this.fillGradient(matrices, this.width / 2 - stringWidth, 10, this.width /2 + stringWidth, 29, -1072689136, -804253680); - this.fillGradient(matrices, this.width / 2 - aniX, 35, width/2 + aniX, this.height - 40, -1072689136, -804253680); - - super.render(matrices, mouseX, mouseY, delta); - drawCenteredText(matrices, textRenderer, title, width/2, 15, 0xFFFFFF); - - int y = 40; - for (EntryInfo info : entries) { - drawTextWithShadow(matrices, textRenderer, new TranslatableText(translationPrefix + info.field.getName()), 12, y + 10, 0xFFFFFF); - - if (info.error != null && info.error.getKey().isMouseOver(mouseX,mouseY)) - renderTooltip(matrices, info.error.getValue(), mouseX, mouseY); - else if (mouseY >= y && mouseY < (y + 25)) { - if (info.dynamicTooltip != null) { - try { - renderTooltip(matrices, (List) info.dynamicTooltip.invoke(null, entries), mouseX, mouseY); - y += 25; - continue; - } catch (Exception e) { e.printStackTrace(); } - } - String key = translationPrefix + info.field.getName() + ".tooltip"; - if (I18n.hasTranslation(key)) { - List list = new ArrayList<>(); - for (String str : I18n.translate(key).split("\n")) - list.add(new LiteralText(str)); - renderTooltip(matrices, list, mouseX, mouseY); - } - } - y += 25; - } - } - } - - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.FIELD) - public @interface Entry { - String dynamicTooltip() default ""; - int width() default 100; - double min() default Double.MIN_NORMAL; - double max() default Double.MAX_VALUE; - } -} \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/cullleaves/config/ModMenuIntegration.java b/src/main/java/eu/midnightdust/cullleaves/config/ModMenuIntegration.java old mode 100644 new mode 100755 index 3146d86..e618204 --- a/src/main/java/eu/midnightdust/cullleaves/config/ModMenuIntegration.java +++ b/src/main/java/eu/midnightdust/cullleaves/config/ModMenuIntegration.java @@ -1,15 +1,15 @@ -package eu.midnightdust.cullleaves.config; - -import io.github.prospector.modmenu.api.ConfigScreenFactory; -import io.github.prospector.modmenu.api.ModMenuApi; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; - -@Environment(EnvType.CLIENT) -public class ModMenuIntegration implements ModMenuApi { - - @Override - public ConfigScreenFactory getModConfigScreenFactory() { - return parent -> new CullLeavesConfig().getScreen(parent); - } +package eu.midnightdust.cullleaves.config; + +import io.github.prospector.modmenu.api.ConfigScreenFactory; +import io.github.prospector.modmenu.api.ModMenuApi; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; + +@Environment(EnvType.CLIENT) +public class ModMenuIntegration implements ModMenuApi { + + @Override + public ConfigScreenFactory getModConfigScreenFactory() { + return parent -> CullLeavesConfig.getScreen(parent, "cullleaves"); + } } \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/cullleaves/mixin/MixinLeavesBlock.java b/src/main/java/eu/midnightdust/cullleaves/mixin/MixinLeavesBlock.java old mode 100644 new mode 100755 index fe06a2f..9b3b0c7 --- a/src/main/java/eu/midnightdust/cullleaves/mixin/MixinLeavesBlock.java +++ b/src/main/java/eu/midnightdust/cullleaves/mixin/MixinLeavesBlock.java @@ -1,28 +1,28 @@ -package eu.midnightdust.cullleaves.mixin; - -import eu.midnightdust.cullleaves.config.CullLeavesConfig; -import net.fabricmc.api.EnvType; -import net.fabricmc.api.Environment; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.LeavesBlock; -import net.minecraft.util.math.Direction; -import org.spongepowered.asm.mixin.Mixin; - -@Mixin(LeavesBlock.class) -@Environment(EnvType.CLIENT) -public class MixinLeavesBlock extends Block { - - public MixinLeavesBlock(Settings settings) { - super(settings); - } - - @Override - @SuppressWarnings("deprecation") - public boolean isSideInvisible(BlockState state, BlockState neighborState, Direction offset) { - if (CullLeavesConfig.enabled) { - return neighborState.getBlock() instanceof LeavesBlock; - } - else return false; - } +package eu.midnightdust.cullleaves.mixin; + +import eu.midnightdust.cullleaves.config.CullLeavesConfig; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.minecraft.block.Block; +import net.minecraft.block.BlockState; +import net.minecraft.block.LeavesBlock; +import net.minecraft.util.math.Direction; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(LeavesBlock.class) +@Environment(EnvType.CLIENT) +public class MixinLeavesBlock extends Block { + + public MixinLeavesBlock(Settings settings) { + super(settings); + } + + @Override + @SuppressWarnings("deprecation") + public boolean isSideInvisible(BlockState state, BlockState neighborState, Direction offset) { + if (CullLeavesConfig.enabled) { + return neighborState.getBlock() instanceof LeavesBlock; + } + else return false; + } } \ No newline at end of file diff --git a/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java b/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java new file mode 100755 index 0000000..e922563 --- /dev/null +++ b/src/main/java/eu/midnightdust/lib/config/MidnightConfig.java @@ -0,0 +1,376 @@ +package eu.midnightdust.lib.config; + +import com.google.gson.ExclusionStrategy; +import com.google.gson.FieldAttributes; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import net.fabricmc.api.EnvType; +import net.fabricmc.api.Environment; +import net.fabricmc.loader.api.FabricLoader; +import net.minecraft.client.MinecraftClient; +import net.minecraft.client.font.TextRenderer; +import net.minecraft.client.gui.DrawableHelper; +import net.minecraft.client.gui.Element; +import net.minecraft.client.gui.Selectable; +import net.minecraft.client.gui.screen.Screen; +import net.minecraft.client.gui.screen.ScreenTexts; +import net.minecraft.client.gui.widget.*; +import net.minecraft.client.resource.language.I18n; +import net.minecraft.client.util.math.MatrixStack; +import net.minecraft.text.*; +import net.minecraft.util.Formatting; + +import java.lang.annotation.*; +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.*; +import java.util.function.BiFunction; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.regex.Pattern; + +// MidnightConfig v1.0.2 +// Single class config library - feel free to copy! +// Changelog: +// - 1.0.2: +// - Update to 21w20a +// - 1.0.1: +// - Fixed buttons not working in fullscreen +// - 1.0.0: +// - The config screen no longer shows the entries of all instances of MidnightConfig +// - Compatible with servers! +// - Scrollable! +// - Comment support! +// - Fresh New Design + +/** Based on https://github.com/Minenash/TinyConfig + * Credits to Minenash */ + +@SuppressWarnings("unchecked") +public class MidnightConfig { + public static boolean useTooltipForTitle = true; // Render title as tooltip or as simple text + + private static final Pattern INTEGER_ONLY = Pattern.compile("(-?[0-9]*)"); + private static final Pattern DECIMAL_ONLY = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)"); + + private static final List entries = new ArrayList<>(); + + protected static class EntryInfo { + Field field; + Object widget; + int width; + Map.Entry error; + Object defaultValue; + Object value; + String tempValue; + boolean inLimits = true; + String id; + } + + public static final Map> configClass = new HashMap<>(); + private static Path path; + + private static final Gson gson = new GsonBuilder().excludeFieldsWithModifiers(Modifier.TRANSIENT).excludeFieldsWithModifiers(Modifier.PRIVATE).addSerializationExclusionStrategy(new HiddenAnnotationExclusionStrategy()).setPrettyPrinting().create(); + + public static void init(String modid, Class config) { + path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json"); + configClass.put(modid, config); + + for (Field field : config.getFields()) { + EntryInfo info = new EntryInfo(); + if (field.isAnnotationPresent(Entry.class) || field.isAnnotationPresent(Comment.class)) + try { + initClient(modid, field, info); + } catch (Exception e) {continue;} + if (field.isAnnotationPresent(Entry.class)) + try { + info.defaultValue = field.get(null); + } catch (IllegalAccessException ignored) {} + } + try { gson.fromJson(Files.newBufferedReader(path), config); } + catch (Exception e) { write(modid); } + + for (EntryInfo info : entries) { + if (info.field.isAnnotationPresent(Entry.class)) + try { + info.value = info.field.get(null); + info.tempValue = info.value.toString(); + } catch (IllegalAccessException ignored) { + } + } + } + @Environment(EnvType.CLIENT) + public static void initClient(String modid, Field field, EntryInfo info) { + Class type = field.getType(); + Entry e = field.getAnnotation(Entry.class); + info.width = e != null ? e.width() : 0; + info.field = field; + info.id = modid; + + if (e != null) + if (type == int.class) textField(info, Integer::parseInt, INTEGER_ONLY, e.min(), e.max(), true); + else if (type == double.class) textField(info, Double::parseDouble, DECIMAL_ONLY, e.min(), e.max(),false); + else if (type == String.class) textField(info, String::length, null, Math.min(e.min(),0), Math.max(e.max(),1),true); + else if (type == boolean.class) { + Function func = value -> new LiteralText((Boolean) value ? "True" : "False").formatted((Boolean) value ? Formatting.GREEN : Formatting.RED); + info.widget = new AbstractMap.SimpleEntry>(button -> { + info.value = !(Boolean) info.value; + button.setMessage(func.apply(info.value)); + }, func); + } else if (type.isEnum()) { + List values = Arrays.asList(field.getType().getEnumConstants()); + Function func = value -> new TranslatableText(modid + ".midnightconfig." + "enum." + type.getSimpleName() + "." + info.value.toString()); + info.widget = new AbstractMap.SimpleEntry>( button -> { + int index = values.indexOf(info.value) + 1; + info.value = values.get(index >= values.size()? 0 : index); + button.setMessage(func.apply(info.value)); + }, func); + } + entries.add(info); + } + + private static void textField(EntryInfo info, Function f, Pattern pattern, double min, double max, boolean cast) { + boolean isNumber = pattern != null; + info.widget = (BiFunction>) (t, b) -> s -> { + s = s.trim(); + if (!(s.isEmpty() || !isNumber || pattern.matcher(s).matches())) return false; + + Number value = 0; + boolean inLimits = false; + System.out.println(((isNumber ^ s.isEmpty()))); + System.out.println(!s.equals("-") && !s.equals(".")); + info.error = null; + if (!(isNumber && s.isEmpty()) && !s.equals("-") && !s.equals(".")) { + value = f.apply(s); + inLimits = value.doubleValue() >= min && value.doubleValue() <= max; + info.error = inLimits? null : new AbstractMap.SimpleEntry<>(t, new LiteralText(value.doubleValue() < min ? + "§cMinimum " + (isNumber? "value" : "length") + (cast? " is " + (int)min : " is " + min) : + "§cMaximum " + (isNumber? "value" : "length") + (cast? " is " + (int)max : " is " + max))); + } + + info.tempValue = s; + t.setEditableColor(inLimits? 0xFFFFFFFF : 0xFFFF7777); + info.inLimits = inLimits; + b.active = entries.stream().allMatch(e -> e.inLimits); + + if (inLimits) + info.value = isNumber? value : s; + + return true; + }; + } + + public static void write(String modid) { + path = FabricLoader.getInstance().getConfigDir().resolve(modid + ".json"); + try { + if (!Files.exists(path)) Files.createFile(path); + Files.write(path, gson.toJson(configClass.get(modid).getDeclaredConstructor().newInstance()).getBytes()); + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Environment(EnvType.CLIENT) + public static Screen getScreen(Screen parent, String modid) { + return new TinyConfigScreen(parent, modid); + } + + @Environment(EnvType.CLIENT) + private static class TinyConfigScreen extends Screen { + + protected TinyConfigScreen(Screen parent, String modid) { + super(new TranslatableText(modid + ".midnightconfig." + "title")); + this.parent = parent; + this.modid = modid; + this.translationPrefix = modid + ".midnightconfig."; + } + private final String translationPrefix; + private final Screen parent; + private final String modid; + private MidnightConfigListWidget list; + + // Real Time config update // + @Override + public void tick() { + for (EntryInfo info : entries) + try { info.field.set(null, info.value); } + catch (IllegalAccessException ignored) {} + } + + @Override + protected void init() { + super.init(); + + this.addDrawableChild(new ButtonWidget(this.width / 2 - 154, this.height - 28, 150, 20, ScreenTexts.CANCEL, button -> { + try { gson.fromJson(Files.newBufferedReader(path), configClass.get(modid)); } + catch (Exception e) { write(modid); } + + for (EntryInfo info : entries) { + if (info.field.isAnnotationPresent(Entry.class)) { + try { + info.value = info.field.get(null); + info.tempValue = info.value.toString(); + } catch (IllegalAccessException ignored) { + } + } + } + Objects.requireNonNull(client).openScreen(parent); + })); + + ButtonWidget done = this.addDrawableChild(new ButtonWidget(this.width / 2 + 4, this.height - 28, 150, 20, ScreenTexts.DONE, (button) -> { + for (EntryInfo info : entries) + if (info.id.equals(modid)) { + try { + info.field.set(null, info.value); + } catch (IllegalAccessException ignored) {} + } + write(modid); + Objects.requireNonNull(client).openScreen(parent); + })); + + this.list = new MidnightConfigListWidget(this.client, this.width, this.height, 32, this.height - 32, 25); + this.addSelectableChild(this.list); + for (EntryInfo info : entries) { + if (info.id.equals(modid)) { + TranslatableText name = new TranslatableText(translationPrefix + info.field.getName()); + ButtonWidget resetButton = new ButtonWidget(width - 155, 0, 40, 20, new LiteralText("Reset").formatted(Formatting.RED), (button -> { + info.value = info.defaultValue; + info.tempValue = info.value.toString(); + double scrollAmount = list.getScrollAmount(); + Objects.requireNonNull(client).openScreen(this); + list.setScrollAmount(scrollAmount); + })); + + if (info.widget instanceof Map.Entry) { + Map.Entry> widget = (Map.Entry>) info.widget; + if (info.field.getType().isEnum()) widget.setValue(value -> new TranslatableText(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString())); + this.list.addButton(new ButtonWidget(width - 110, 0, info.width, 20, widget.getValue().apply(info.value), widget.getKey()),resetButton,name); + } else if (info.widget != null) { + TextFieldWidget widget = new TextFieldWidget(textRenderer, width - 110, 0, info.width, 20, null); + + widget.setText(info.tempValue); + Predicate processor = ((BiFunction>) info.widget).apply(widget, done); + widget.setTextPredicate(processor); + this.list.addButton(widget, resetButton, name); + } else { + ButtonWidget dummy = new ButtonWidget(-10, 0, 0, 0, Text.of(""), null); + this.list.addButton(dummy,dummy,name); + } + } + } + + } + @Override + public void render(MatrixStack matrices, int mouseX, int mouseY, float delta) { + this.renderBackground(matrices); + this.list.render(matrices, mouseX, mouseY, delta); + + int stringWidth = (int) (title.getString().length() * 2.75f); + if (useTooltipForTitle) renderTooltip(matrices, title, width/2 - stringWidth, 27); + else drawCenteredText(matrices, textRenderer, title, width / 2, 15, 0xFFFFFF); + + for (EntryInfo info : entries) { + if (info.id.equals(modid)) { + if (list.getHoveredButton(mouseX,mouseY).isPresent()) { + ClickableWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get(); + Text text = ButtonEntry.buttonsWithText.get(buttonWidget); + TranslatableText name = new TranslatableText(this.translationPrefix + info.field.getName()); + String key = translationPrefix + info.field.getName() + ".tooltip"; + + if (info.error != null && text.equals(name)) renderTooltip(matrices, info.error.getValue(), mouseX, mouseY); + else if (I18n.hasTranslation(key) && text.equals(name)) { + List list = new ArrayList<>(); + for (String str : I18n.translate(key).split("\n")) + list.add(new LiteralText(str)); + renderTooltip(matrices, list, mouseX, mouseY); + } + } + } + } + super.render(matrices,mouseX,mouseY,delta); + } + } + @Environment(EnvType.CLIENT) + public static class MidnightConfigListWidget extends ElementListWidget { + TextRenderer textRenderer; + + public MidnightConfigListWidget(MinecraftClient minecraftClient, int i, int j, int k, int l, int m) { + super(minecraftClient, i, j, k, l, m); + this.centerListVertically = false; + textRenderer = minecraftClient.textRenderer; + } + @Override + public int getScrollbarPositionX() { return this.width -7; } + + public void addButton(ClickableWidget button, ClickableWidget resetButton, Text text) { + this.addEntry(ButtonEntry.create(button, text, resetButton)); + } + @Override + public int getRowWidth() { return 10000; } + public Optional getHoveredButton(double mouseX, double mouseY) { + for (ButtonEntry buttonEntry : this.children()) { + for (ClickableWidget ClickableWidget : buttonEntry.buttons) { + if (ClickableWidget.isMouseOver(mouseX, mouseY)) { + return Optional.of(ClickableWidget); + } + } + } + return Optional.empty(); + } + } + public static class ButtonEntry extends ElementListWidget.Entry { + private static final TextRenderer textRenderer = MinecraftClient.getInstance().textRenderer; + private final List buttons = new ArrayList<>(); + private final List resetButtons = new ArrayList<>(); + private final List texts = new ArrayList<>(); + private final List buttonsWithResetButtons = new ArrayList<>(); + public static final Map buttonsWithText = new HashMap<>(); + + private ButtonEntry(ClickableWidget button, Text text, ClickableWidget resetButton) { + buttonsWithText.put(button,text); + this.buttons.add(button); + this.resetButtons.add(resetButton); + this.texts.add(text); + this.buttonsWithResetButtons.add(button); + this.buttonsWithResetButtons.add(resetButton); + } + public static ButtonEntry create(ClickableWidget button, Text text, ClickableWidget resetButton) { + return new ButtonEntry(button, text, resetButton); + } + public void render(MatrixStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta) { + this.buttons.forEach(button -> { + button.y = y; + button.render(matrices, mouseX, mouseY, tickDelta); + }); + this.texts.forEach(text -> DrawableHelper.drawTextWithShadow(matrices,textRenderer, text,12,y+5,0xFFFFFF)); + this.resetButtons.forEach((button) -> { + button.y = y; + button.render(matrices, mouseX, mouseY, tickDelta); + }); + } + public List children() { + return buttonsWithResetButtons; + } + + public List method_37025() { + return buttonsWithResetButtons; + } + } + @Retention(RetentionPolicy.RUNTIME) + @Target(ElementType.FIELD) + public @interface Entry { + int width() default 100; + double min() default Double.MIN_NORMAL; + double max() default Double.MAX_VALUE; + } + @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.FIELD) public @interface Comment {} + + public static class HiddenAnnotationExclusionStrategy implements ExclusionStrategy { + public boolean shouldSkipClass(Class clazz) { return false; } + public boolean shouldSkipField(FieldAttributes fieldAttributes) { + return fieldAttributes.getAnnotation(Entry.class) == null; + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cullleaves/icon.png b/src/main/resources/assets/cullleaves/icon.png old mode 100644 new mode 100755 diff --git a/src/main/resources/assets/cullleaves/lang/en_us.json b/src/main/resources/assets/cullleaves/lang/en_us.json old mode 100644 new mode 100755 index 1c29f84..2f284ab --- a/src/main/resources/assets/cullleaves/lang/en_us.json +++ b/src/main/resources/assets/cullleaves/lang/en_us.json @@ -1,5 +1,5 @@ -{ - "cullleaves.midnightconfig.title":"Cull Leaves Config", - "cullleaves.midnightconfig.enabled.tooltip":"After changing this setting you have to reload all chunks (F3 + A)", - "cullleaves.midnightconfig.enabled":"Enabled" +{ + "cullleaves.midnightconfig.title":"Cull Leaves Config", + "cullleaves.midnightconfig.enabled.tooltip":"After changing this setting you have to reload all chunks (F3 + A)", + "cullleaves.midnightconfig.enabled":"Enabled" } \ No newline at end of file diff --git a/src/main/resources/cullleaves.mixins.json b/src/main/resources/cullleaves.mixins.json old mode 100644 new mode 100755 index c504e12..32a524a --- a/src/main/resources/cullleaves.mixins.json +++ b/src/main/resources/cullleaves.mixins.json @@ -1,11 +1,11 @@ -{ - "required": true, - "package": "eu.midnightdust.cullleaves.mixin", - "compatibilityLevel": "JAVA_8", - "client": [ - "MixinLeavesBlock" - ], - "injectors": { - "defaultRequire": 1 - } +{ + "required": true, + "package": "eu.midnightdust.cullleaves.mixin", + "compatibilityLevel": "JAVA_8", + "client": [ + "MixinLeavesBlock" + ], + "injectors": { + "defaultRequire": 1 + } } \ No newline at end of file diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json old mode 100644 new mode 100755 diff --git a/src/main/resources/resourcepacks/smartleaves/assets/minecraft/models/block/leaves.json b/src/main/resources/resourcepacks/smartleaves/assets/minecraft/models/block/leaves.json old mode 100644 new mode 100755 diff --git a/src/main/resources/resourcepacks/smartleaves/license.txt b/src/main/resources/resourcepacks/smartleaves/license.txt old mode 100644 new mode 100755 index 4f67261..375aefc --- a/src/main/resources/resourcepacks/smartleaves/license.txt +++ b/src/main/resources/resourcepacks/smartleaves/license.txt @@ -1,10 +1,10 @@ -The MIT License -Copyright © 2020 Motschen - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), -to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, -and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN +The MIT License +Copyright © 2020 Motschen + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/src/main/resources/resourcepacks/smartleaves/pack.mcmeta b/src/main/resources/resourcepacks/smartleaves/pack.mcmeta old mode 100644 new mode 100755 index 9ebbcf5..96f6b62 --- a/src/main/resources/resourcepacks/smartleaves/pack.mcmeta +++ b/src/main/resources/resourcepacks/smartleaves/pack.mcmeta @@ -1,6 +1,6 @@ -{ - "pack": { - "pack_format": 6, - "description": "§2Makes the leaves look identical to the optifine smart leaves effect" - } -} +{ + "pack": { + "pack_format": 7, + "description": "§2Makes leaves look identical to optifine's smart leaves" + } +} diff --git a/src/main/resources/resourcepacks/smartleaves/pack.png b/src/main/resources/resourcepacks/smartleaves/pack.png old mode 100644 new mode 100755