Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

jar squishing, part 8 #18

Merged
merged 58 commits into from
Jun 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
717e928
make mixins abstract
rhysdh540 May 11, 2024
3a3ca29
remove refmap
rhysdh540 May 12, 2024
330ef30
yes
rhysdh540 May 12, 2024
edec9e8
no way zson writing
rhysdh540 May 12, 2024
80e417c
inline stuff
rhysdh540 May 12, 2024
ed34093
Merge branch 'Nolij:master' into master
rhysdh540 May 12, 2024
69b4af7
Merge branch 'refs/heads/master' into zson
rhysdh540 May 12, 2024
94db923
nicer error handling
rhysdh540 May 12, 2024
1e4a6c2
add a ZsonMap class to avoid all the ugly generics stuff
rhysdh540 May 12, 2024
64c7201
quote keys among other things
rhysdh540 May 12, 2024
832227c
remove switch
rhysdh540 May 12, 2024
743d866
add ZsonKey
rhysdh540 May 13, 2024
94d224c
remove zson
rhysdh540 May 13, 2024
ffd0363
Merge remote-tracking branch 'upstream/master' into zson
rhysdh540 May 14, 2024
74af0fe
depend on external zson
rhysdh540 May 14, 2024
a8a20dc
fix config loading
rhysdh540 May 16, 2024
6d83e4e
use an @Comment annotation on fields for readability
rhysdh540 May 16, 2024
2c64251
Merge pull request #1 from rhysdh540/zson
rhysdh540 May 16, 2024
7b8fe2c
remap fabric entrypoints
rhysdh540 May 16, 2024
15f5418
remove debug stuff
rhysdh540 May 16, 2024
2af43ae
change
rhysdh540 May 17, 2024
0138bb2
remove comment annotation
rhysdh540 May 17, 2024
1b31765
Merge remote-tracking branch 'refs/remotes/upstream/master'
rhysdh540 May 19, 2024
100674d
update to zson 0.2
rhysdh540 May 19, 2024
0e3d9b8
remove mavenlocal
rhysdh540 May 20, 2024
5c2316a
whitelist
rhysdh540 May 20, 2024
a6ad4ce
Merge remote-tracking branch 'refs/remotes/upstream/master'
rhysdh540 May 20, 2024
acae3c7
shade downgraded zson
rhysdh540 May 20, 2024
f050c99
bump zson + add icon
rhysdh540 May 24, 2024
6d95894
- disable jar task for :integration
rhysdh540 May 24, 2024
942f050
- repackage mixins to zume.mixin
rhysdh540 May 24, 2024
be29bb0
- fix removing constructors (should only remove empty constructors now)
rhysdh540 May 24, 2024
5400383
file separator fix
rhysdh540 May 24, 2024
39ff130
🗿
rhysdh540 May 24, 2024
7f3293d
rename JarShrinkingType to DeflateAlgorithm
rhysdh540 May 24, 2024
545f169
stop jabel from making the jvm throw a hissy fit
rhysdh540 May 25, 2024
5cfebbc
use Paths.get
rhysdh540 May 28, 2024
6659e85
bigfix
rhysdh540 May 28, 2024
a3da683
fix proguard config a little bit
rhysdh540 May 28, 2024
6103f69
move plugin version declarations to gradle.properties
rhysdh540 May 28, 2024
2361de9
remove idea plugin
rhysdh540 May 28, 2024
20cbb60
Include mappings in CI
embeddedt May 28, 2024
604bf0f
Prevent ProGuard from optimizing out mixin plugin methods
embeddedt May 28, 2024
4b29052
Fix compiling non-proguard builds
embeddedt May 28, 2024
c6a11ec
allow optimization on mixin config class members
rhysdh540 May 29, 2024
1869636
bruh
rhysdh540 May 29, 2024
c63679f
Do not devirtualize methods
embeddedt May 29, 2024
def90b7
Fix ProGuard rule not applying due to package rename
embeddedt May 29, 2024
5bd3fcc
add a gradle property (from command line/code pending) to keep debug …
rhysdh540 May 30, 2024
a20fc7d
Reduce heap size for sanity
embeddedt May 31, 2024
c6ceddc
Bump ZSON
embeddedt May 31, 2024
a92261e
run formatter, remove unused stuff from editorconfig
rhysdh540 May 31, 2024
a1f068d
Merge remote-tracking branch 'origin/master'
rhysdh540 May 31, 2024
2544a77
obfuscate old forge config guis - saves ~500 bytes
rhysdh540 May 31, 2024
a41e506
obfuscate old forge config gui providers - saves ~200 bytes
rhysdh540 May 31, 2024
a23c821
Revert "run formatter, remove unused stuff from editorconfig"
rhysdh540 May 31, 2024
766ca72
* import begone (forever)
rhysdh540 May 31, 2024
d33a4a0
keep build config even when cleaning
rhysdh540 May 31, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 1 addition & 191 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ ij_java_case_statement_on_separate_line = true
ij_java_catch_on_new_line = false
ij_java_class_annotation_wrap = split_into_lines
ij_java_class_brace_style = end_of_line
ij_java_class_count_to_use_import_on_demand = 5
ij_java_class_count_to_use_import_on_demand = 10000
ij_java_class_names_in_javadoc = 1
ij_java_deconstruction_list_wrap = normal
ij_java_do_not_indent_top_level_class_members = false
Expand Down Expand Up @@ -291,196 +291,6 @@ ij_java_wrap_comments = false
ij_java_wrap_first_method_in_call_chain = false
ij_java_wrap_long_lines = false

[{*.gant,*.groovy,*.gy}]
ij_smart_tabs = false
ij_groovy_align_group_field_declarations = false
ij_groovy_align_multiline_array_initializer_expression = false
ij_groovy_align_multiline_assignment = false
ij_groovy_align_multiline_binary_operation = false
ij_groovy_align_multiline_chained_methods = false
ij_groovy_align_multiline_extends_list = false
ij_groovy_align_multiline_for = true
ij_groovy_align_multiline_list_or_map = true
ij_groovy_align_multiline_method_parentheses = false
ij_groovy_align_multiline_parameters = true
ij_groovy_align_multiline_parameters_in_calls = false
ij_groovy_align_multiline_resources = true
ij_groovy_align_multiline_ternary_operation = false
ij_groovy_align_multiline_throws_list = false
ij_groovy_align_named_args_in_map = true
ij_groovy_align_throws_keyword = false
ij_groovy_array_initializer_new_line_after_left_brace = false
ij_groovy_array_initializer_right_brace_on_new_line = false
ij_groovy_array_initializer_wrap = off
ij_groovy_assert_statement_wrap = off
ij_groovy_assignment_wrap = off
ij_groovy_binary_operation_wrap = off
ij_groovy_blank_lines_after_class_header = 0
ij_groovy_blank_lines_after_imports = 1
ij_groovy_blank_lines_after_package = 1
ij_groovy_blank_lines_around_class = 1
ij_groovy_blank_lines_around_field = 0
ij_groovy_blank_lines_around_field_in_interface = 0
ij_groovy_blank_lines_around_method = 1
ij_groovy_blank_lines_around_method_in_interface = 1
ij_groovy_blank_lines_before_imports = 1
ij_groovy_blank_lines_before_method_body = 0
ij_groovy_blank_lines_before_package = 0
ij_groovy_block_brace_style = end_of_line
ij_groovy_block_comment_add_space = false
ij_groovy_block_comment_at_first_column = true
ij_groovy_call_parameters_new_line_after_left_paren = false
ij_groovy_call_parameters_right_paren_on_new_line = false
ij_groovy_call_parameters_wrap = off
ij_groovy_catch_on_new_line = false
ij_groovy_class_annotation_wrap = split_into_lines
ij_groovy_class_brace_style = end_of_line
ij_groovy_class_count_to_use_import_on_demand = 5
ij_groovy_do_while_brace_force = never
ij_groovy_else_on_new_line = false
ij_groovy_enable_groovydoc_formatting = true
ij_groovy_enum_constants_wrap = off
ij_groovy_extends_keyword_wrap = off
ij_groovy_extends_list_wrap = off
ij_groovy_field_annotation_wrap = split_into_lines
ij_groovy_finally_on_new_line = false
ij_groovy_for_brace_force = never
ij_groovy_for_statement_new_line_after_left_paren = false
ij_groovy_for_statement_right_paren_on_new_line = false
ij_groovy_for_statement_wrap = off
ij_groovy_ginq_general_clause_wrap_policy = 2
ij_groovy_ginq_having_wrap_policy = 1
ij_groovy_ginq_indent_having_clause = true
ij_groovy_ginq_indent_on_clause = true
ij_groovy_ginq_on_wrap_policy = 1
ij_groovy_ginq_space_after_keyword = true
ij_groovy_if_brace_force = never
ij_groovy_import_annotation_wrap = 2
ij_groovy_imports_layout = *,|,javax.**,java.**,|,$*
ij_groovy_indent_case_from_switch = true
ij_groovy_indent_label_blocks = true
ij_groovy_insert_inner_class_imports = false
ij_groovy_keep_blank_lines_before_right_brace = 2
ij_groovy_keep_blank_lines_in_code = 2
ij_groovy_keep_blank_lines_in_declarations = 2
ij_groovy_keep_control_statement_in_one_line = true
ij_groovy_keep_first_column_comment = true
ij_groovy_keep_multiple_expressions_in_one_line = false
ij_groovy_keep_simple_blocks_in_one_line = false
ij_groovy_keep_simple_classes_in_one_line = true
ij_groovy_keep_simple_lambdas_in_one_line = true
ij_groovy_keep_simple_methods_in_one_line = true
ij_groovy_label_indent_absolute = false
ij_groovy_label_indent_size = 0
ij_groovy_lambda_brace_style = end_of_line
ij_groovy_layout_static_imports_separately = true
ij_groovy_line_comment_add_space = false
ij_groovy_line_comment_add_space_on_reformat = false
ij_groovy_line_comment_at_first_column = true
ij_groovy_method_annotation_wrap = split_into_lines
ij_groovy_method_brace_style = end_of_line
ij_groovy_method_call_chain_wrap = off
ij_groovy_method_parameters_new_line_after_left_paren = false
ij_groovy_method_parameters_right_paren_on_new_line = false
ij_groovy_method_parameters_wrap = off
ij_groovy_modifier_list_wrap = false
ij_groovy_names_count_to_use_import_on_demand = 3
ij_groovy_packages_to_use_import_on_demand = java.awt.*,javax.swing.*
ij_groovy_parameter_annotation_wrap = off
ij_groovy_parentheses_expression_new_line_after_left_paren = false
ij_groovy_parentheses_expression_right_paren_on_new_line = false
ij_groovy_prefer_parameters_wrap = false
ij_groovy_resource_list_new_line_after_left_paren = false
ij_groovy_resource_list_right_paren_on_new_line = false
ij_groovy_resource_list_wrap = off
ij_groovy_space_after_assert_separator = true
ij_groovy_space_after_colon = true
ij_groovy_space_after_comma = true
ij_groovy_space_after_comma_in_type_arguments = true
ij_groovy_space_after_for_semicolon = true
ij_groovy_space_after_quest = true
ij_groovy_space_after_type_cast = true
ij_groovy_space_before_annotation_parameter_list = false
ij_groovy_space_before_array_initializer_left_brace = false
ij_groovy_space_before_assert_separator = false
ij_groovy_space_before_catch_keyword = true
ij_groovy_space_before_catch_left_brace = true
ij_groovy_space_before_catch_parentheses = true
ij_groovy_space_before_class_left_brace = true
ij_groovy_space_before_closure_left_brace = true
ij_groovy_space_before_colon = true
ij_groovy_space_before_comma = false
ij_groovy_space_before_do_left_brace = true
ij_groovy_space_before_else_keyword = true
ij_groovy_space_before_else_left_brace = true
ij_groovy_space_before_finally_keyword = true
ij_groovy_space_before_finally_left_brace = true
ij_groovy_space_before_for_left_brace = true
ij_groovy_space_before_for_parentheses = true
ij_groovy_space_before_for_semicolon = false
ij_groovy_space_before_if_left_brace = true
ij_groovy_space_before_if_parentheses = true
ij_groovy_space_before_method_call_parentheses = false
ij_groovy_space_before_method_left_brace = true
ij_groovy_space_before_method_parentheses = false
ij_groovy_space_before_quest = true
ij_groovy_space_before_record_parentheses = false
ij_groovy_space_before_switch_left_brace = true
ij_groovy_space_before_switch_parentheses = true
ij_groovy_space_before_synchronized_left_brace = true
ij_groovy_space_before_synchronized_parentheses = true
ij_groovy_space_before_try_left_brace = true
ij_groovy_space_before_try_parentheses = true
ij_groovy_space_before_while_keyword = true
ij_groovy_space_before_while_left_brace = true
ij_groovy_space_before_while_parentheses = true
ij_groovy_space_in_named_argument = true
ij_groovy_space_in_named_argument_before_colon = false
ij_groovy_space_within_empty_array_initializer_braces = false
ij_groovy_space_within_empty_method_call_parentheses = false
ij_groovy_spaces_around_additive_operators = true
ij_groovy_spaces_around_assignment_operators = true
ij_groovy_spaces_around_bitwise_operators = true
ij_groovy_spaces_around_equality_operators = true
ij_groovy_spaces_around_lambda_arrow = true
ij_groovy_spaces_around_logical_operators = true
ij_groovy_spaces_around_multiplicative_operators = true
ij_groovy_spaces_around_regex_operators = true
ij_groovy_spaces_around_relational_operators = true
ij_groovy_spaces_around_shift_operators = true
ij_groovy_spaces_within_annotation_parentheses = false
ij_groovy_spaces_within_array_initializer_braces = false
ij_groovy_spaces_within_braces = true
ij_groovy_spaces_within_brackets = false
ij_groovy_spaces_within_cast_parentheses = false
ij_groovy_spaces_within_catch_parentheses = false
ij_groovy_spaces_within_for_parentheses = false
ij_groovy_spaces_within_gstring_injection_braces = false
ij_groovy_spaces_within_if_parentheses = false
ij_groovy_spaces_within_list_or_map = false
ij_groovy_spaces_within_method_call_parentheses = false
ij_groovy_spaces_within_method_parentheses = false
ij_groovy_spaces_within_parentheses = false
ij_groovy_spaces_within_switch_parentheses = false
ij_groovy_spaces_within_synchronized_parentheses = false
ij_groovy_spaces_within_try_parentheses = false
ij_groovy_spaces_within_tuple_expression = false
ij_groovy_spaces_within_while_parentheses = false
ij_groovy_special_else_if_treatment = true
ij_groovy_ternary_operation_wrap = off
ij_groovy_throws_keyword_wrap = off
ij_groovy_throws_list_wrap = off
ij_groovy_use_flying_geese_braces = false
ij_groovy_use_fq_class_names = false
ij_groovy_use_fq_class_names_in_javadoc = true
ij_groovy_use_relative_indents = false
ij_groovy_use_single_class_imports = true
ij_groovy_variable_annotation_wrap = off
ij_groovy_while_brace_force = never
ij_groovy_while_on_new_line = false
ij_groovy_wrap_chain_calls_after_dot = false
ij_groovy_wrap_long_lines = false

[{*.har,*.jsb2,*.jsb3,*.json,*.png.mcmeta,.babelrc,.eslintrc,.prettierrc,.stylelintrc,bowerrc,jest.config,mcmod.info,pack.mcmeta}]
ij_smart_tabs = false
ij_json_array_wrapping = split_into_lines
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,6 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: zume
path: "**/zume-*.jar"
path: |
**/zume-*.jar
**/*mappings.txt
4 changes: 3 additions & 1 deletion .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,6 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: zume
path: "**/zume-*.jar"
path: |
**/zume-*.jar
**/*mappings.txt
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# User-specific stuff
.idea/
zume.json5

*.iml
*.ipr
Expand Down
Binary file added .idea/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions api/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ dependencies {
compileOnly("org.apache.logging.log4j:log4j-core:${"log4j_version"()}")
}

tasks.clean {
finalizedBy(tasks.generateBuildConfig)
}

tasks.processResources {
from("src/main/resources/assets/zume/lang/") {
include("*.lang")
Expand Down
4 changes: 2 additions & 2 deletions api/src/main/java/dev/nolij/zume/impl/Zume.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ public class Zume {

if (OS_NAME.contains("linux"))
HOST_PLATFORM = HostPlatform.LINUX;
else if (OS_NAME.contains("win"))
HOST_PLATFORM = HostPlatform.WINDOWS;
else if (OS_NAME.contains("mac"))
HOST_PLATFORM = HostPlatform.MAC_OS;
else if (OS_NAME.contains("win"))
HOST_PLATFORM = HostPlatform.WINDOWS;
else
HOST_PLATFORM = HostPlatform.UNKNOWN;
}
Expand Down
16 changes: 16 additions & 0 deletions api/src/main/java/dev/nolij/zume/impl/config/NullFileWatcher.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package dev.nolij.zume.impl.config;

public final class NullFileWatcher implements IFileWatcher {
@Override
public void lock() {
}

@Override
public boolean tryLock() {
return true;
}

@Override
public void unlock() {
}
}
Loading
Loading