From 4d4fed2482d7f3597c2072605f33bf9f7d44a291 Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Sun, 27 Jun 2021 21:32:10 +0300 Subject: [PATCH 1/3] Update gradle. --- MineTweaker3-API/build.gradle | 7 ++-- MineTweaker3-MC1710-Main/build.gradle | 24 ++--------- MineTweaker3-MC1710-Mod-IC2/build.gradle | 24 ++--------- MineTweaker3-MC1710-Mod-NEI/build.gradle | 24 ++--------- build.gradle | 38 +++++++++++++----- .../tasks/RegisterZenClassesTask.java | 10 ++++- common.gradle | 17 +++++++- gradle.properties | 4 +- gradle/wrapper/gradle-wrapper.jar | Bin 53638 -> 53324 bytes gradle/wrapper/gradle-wrapper.properties | 3 +- gradlew | 26 +++++------- gradlew.bat | 6 +++ 12 files changed, 84 insertions(+), 99 deletions(-) diff --git a/MineTweaker3-API/build.gradle b/MineTweaker3-API/build.gradle index 82d7b22..ef642b9 100644 --- a/MineTweaker3-API/build.gradle +++ b/MineTweaker3-API/build.gradle @@ -7,12 +7,11 @@ version = ext.mineTweakerVersion sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 -sourceCompatibility = 1.8 -targetCompatibility = 1.8 task makeRegistry(type: RegisterZenClassesTask) { - inputDir = file('build/classes/main') - outputDir = file('build/classes/main') + dependsOn tasks.compileJava + inputDir = file('build/classes/java/main') + outputDir = file('build/classes/java/main') className = 'minetweaker.ClassRegistry' } diff --git a/MineTweaker3-MC1710-Main/build.gradle b/MineTweaker3-MC1710-Main/build.gradle index e1c07d8..a403d07 100644 --- a/MineTweaker3-MC1710-Main/build.gradle +++ b/MineTweaker3-MC1710-Main/build.gradle @@ -1,29 +1,10 @@ import minetweaker.tasks.RegisterZenClassesTask; -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } -} - apply plugin: 'forge' apply plugin: 'maven' sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 -sourceCompatibility = 1.8 -targetCompatibility = 1.8 version = "1.7.10-" + ext.mineTweakerVersion archivesBaseName = project.projectDir.name @@ -40,8 +21,9 @@ dependencies { } task makeRegistry(type: RegisterZenClassesTask) { - inputDir = file('build/classes/main') - outputDir = file('build/classes/main') + dependsOn tasks.compileJava + inputDir = file('build/classes/java/main') + outputDir = file('build/classes/java/main') className = 'minetweaker.mc1710.MineTweakerRegistry' } diff --git a/MineTweaker3-MC1710-Mod-IC2/build.gradle b/MineTweaker3-MC1710-Mod-IC2/build.gradle index 102ef22..e9e9c88 100644 --- a/MineTweaker3-MC1710-Mod-IC2/build.gradle +++ b/MineTweaker3-MC1710-Mod-IC2/build.gradle @@ -1,28 +1,9 @@ import minetweaker.tasks.RegisterZenClassesTask; -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } -} - apply plugin: 'forge' sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 -sourceCompatibility = 1.8 -targetCompatibility = 1.8 minecraft { version = forgeVersion1710 @@ -39,8 +20,9 @@ dependencies { } task makeRegistry(type: RegisterZenClassesTask) { - inputDir = file('build/classes/main') - outputDir = file('build/classes/main') + dependsOn tasks.compileJava + inputDir = file('build/classes/java/main') + outputDir = file('build/classes/java/main') className = 'minetweaker.mods.ic2.ClassRegistry' } diff --git a/MineTweaker3-MC1710-Mod-NEI/build.gradle b/MineTweaker3-MC1710-Mod-NEI/build.gradle index d56df9d..4b8a050 100644 --- a/MineTweaker3-MC1710-Mod-NEI/build.gradle +++ b/MineTweaker3-MC1710-Mod-NEI/build.gradle @@ -1,28 +1,9 @@ import minetweaker.tasks.RegisterZenClassesTask; -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "https://files.minecraftforge.net/maven" - } - maven { - name = "sonatype" - url = "https://oss.sonatype.org/content/repositories/snapshots/" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' - } -} - apply plugin: 'forge' sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 -sourceCompatibility = 1.8 -targetCompatibility = 1.8 minecraft { version = forgeVersion1710 @@ -40,8 +21,9 @@ dependencies { } task makeRegistry(type: RegisterZenClassesTask) { - inputDir = file('build/classes/main') - outputDir = file('build/classes/main') + dependsOn tasks.compileJava + inputDir = file('build/classes/java/main') + outputDir = file('build/classes/java/main') className = 'minetweaker.mods.nei.ClassRegistry' } diff --git a/build.gradle b/build.gradle index 64051b5..cec462e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,41 @@ +buildscript { + repositories { + mavenCentral() + jcenter() + maven { + name = "gt" + url = "https://gregtech.overminddl1.com/" + } + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + maven { + name = "sonatype" + url = "https://oss.sonatype.org/content/repositories/snapshots/" + } + maven { + name = "jitpack" + url = "https://jitpack.io" + } + } + dependencies { + classpath "com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT" + } +} + apply plugin: 'base' // To add "clean" task to the root project. apply from: 'configuration.gradle' apply plugin: "maven" - - subprojects { apply from: rootProject.file('common.gradle') + apply plugin: 'eclipse' } repositories { mavenLocal() mavenCentral() - maven { + /*maven { name "Tesla" url 'http://maven.epoxide.xyz' } @@ -21,7 +46,7 @@ repositories { maven { name 'JEI' url "http://dvs1.progwml6.com/files/maven" - } + } unused */ } configurations { deployerJars @@ -30,11 +55,6 @@ dependencies { deployerJars 'org.apache.maven.wagon:wagon-ftp:2.2' } - -task wrapper(type: Wrapper, description: 'Creates and deploys the Gradle wrapper to the current directory.') { - gradleVersion = '3.0' -} - subprojects.each { subproject -> evaluationDependsOn( subproject.path ) } task setupDecompWorkspaceAll(dependsOn: projects1710.collect { ':' + it + ":setupDecompWorkspace" }) {} diff --git a/buildSrc/src/main/java/minetweaker/tasks/RegisterZenClassesTask.java b/buildSrc/src/main/java/minetweaker/tasks/RegisterZenClassesTask.java index 47e7648..f070162 100644 --- a/buildSrc/src/main/java/minetweaker/tasks/RegisterZenClassesTask.java +++ b/buildSrc/src/main/java/minetweaker/tasks/RegisterZenClassesTask.java @@ -37,7 +37,15 @@ public class RegisterZenClassesTask extends DefaultTask { @OutputDirectory public File outputDir = null; - + + public void setInputDir(File inputDir) { + this.inputDir = inputDir; + } + + public void setOutputDir(File inputDir) { + this.outputDir = inputDir; + } + @Input public String className; diff --git a/common.gradle b/common.gradle index 801caae..7ac1475 100644 --- a/common.gradle +++ b/common.gradle @@ -7,13 +7,26 @@ apply from: rootProject.file('configuration.gradle') // -- end of configurable properties repositories { + mavenLocal() mavenCentral() maven { name = "forge" url = "http://files.minecraftforge.net/maven" - } + } maven { name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } -} \ No newline at end of file + maven { + name = "chickenbones" + url = "http://chickenbones.net/maven/" + } + maven { + name = "gt" + url = "https://gregtech.overminddl1.com/" + } + maven { + name = "jitpack" + url = "https://jitpack.io" + } +} diff --git a/gradle.properties b/gradle.properties index b10b9c1..c50355f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,4 @@ +org.gradle.daemon=false +org.gradle.parallel=true org.gradle.configureondemand=true -org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError \ No newline at end of file +org.gradle.jvmargs=-Xmx4096m -XX:MaxPermSize=4096m -XX:+HeapDumpOnOutOfMemoryError diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e8c6bf7bb47dff6b81c2cf7a349eb7e912c9fbe2..3baa851b28c65f87dd36a6748e1a85cf360c1301 100644 GIT binary patch delta 5494 zcmZWs2{=^k`yRuf82ebJ(b)I3Qg&rmk*(}ojioHvLZk_$vZOl65+Y=&tb;z07&91K zRLH(%Em6su{%2-<_09ixuIpUqnP=|je(vXa-}9dLjm@R+$fjpAKS9s17Xo2shA zGrq?r4kte~)KoWgArOeoy`xtA0_k%C-vUYx*F#P>6x@?2x2B*AyvFK!$Fd zVpOt01EEycb%q(L%MX@IbyXsmxfrQFS+)Tv8<`0c-Z6Hc0Rqw518{PxVjZj;PV?*> zHc=Huk?Ic_JLFYecd%467RSl(h#{cj%=yj>!Wj}bV}mB!Oz1AIZrZz`JQrdvvURC; zy-!hUO^94GDjG8rneHQDDt-=nM@D?9YN+Zr+u7Vo(xI!nbun^|kQXhDUQn9HUpgt9 zy3#0`cyS}!^^BQ_<*S@=Uo0$W?@XjuQy!m%nu2k;6u}g2EoTz;oU=WwfK%2sdGg`# z^iw`>?P208%Q{KI7T4x6(WP-cSbFrOsOkZGpUdGpU6Z{{B7`3&r+E{D9t}pyKj`hy zmzo)fO=D&`WNPO@>^bRaaKimk)aD-ip$uK|kDOIZv z6k_ZG1jLqOn^piY~VThfT)8ITlFlcz3-FL`d{l!qufFH4^hSxWqyXEb{%5;;O zPM$&TTB~`4Dq1Sf+crl)H2)^k-gnQ><>`L6PhYHyZ96wN`0!c->ptaob_L@iCzZ;( zM6npRaLJMaLHvRFppkc>SOMco?vL^#!6Y?%+p+gkY!;V@22pqJ{}R39=Y2;U&`H)N z+4-63T^@uc8Z;|ZK0JA5KR!i4ZFQb&O?jW&ywp_0kzeT9+)s3p#qo~5{}8Xil||hy znDu!i%zFk!PNu$2O|F^>kGhprV67>YQvC83AA^0;TH1#LCQJE3C1Ga+s9_rpS0o6jmL_ih|i8)^eT=5ZM$BXKrO@M>`?VQ{0Hh zlLrxxr=sE%m-C}bt*>AcFETKm8nuMVC#TpRmCsM~_2Vg(9ojy;XnvUvv)CTAH$yEX z`De0z*rc?qXiQu1$+Je#4{K+$N!DU2j!}x$LzTKT+h{}Yv))%PNCIs#oeQ;o`c(J!8%RLJ=6c7!iic}*{dGERhwR$cJiFpdZUKrJF~W<#vjhgw=rjQ z_cl|2n$D(jY`~#jQFgR}#wWY50JhHQ@?_S{HW#$r;;iQ_9D~{&i+z&vZd{ddoC7#* zpRi+)c4Or>8O~QhAKFt)dQ?kjgr!`0aRB)2eK@d(k^bn>BWH5bDJ zS%R4^FOGNdR&vFwiX5Bpe@ws1YW3ExMFM^IhToq09`U=ddhDaqiR@bv8^^wOMx-D4 zp82)oQO)n2?#16wf41KV6PgKn4@z3h-xwy`m&U^dvTQ6Kd@;4Nl{v25jCE}_v&-Xq zQsy3V)_j5#Vi5aC#*g5Sa!~eZ$IdR7OKI=NOD?zZYv15A*u=$kw{CyrH=7DNaK)M6 zi*UI$8Luq1Y{}!o^+~aP8KL~+^u5=-gnsuOL!PmONeAUC`^GqD6^&L#q+Ux(x|~^w zMCh3N`_$q}_#{nRsyeIUys;1EVD^0#tPxKNHSSDEsb0E#)h96g!lm7FSSk1y-D1v-udrmUVNnEPY=uKv7TbephQBnorr z=1UZBDJy+&*Z_az+`|J&j|^fYM3T}U&O2Ma%|bbz;YgSIR1^|Ch)YN#VQ13a6c@Y= z^tM^n-A4|)3;M(k!-2xBf)gRaQ?E$F6{~?C%MJ$BzEUO@9xginuBUwZYX9UHuSWm1 z@8#(}?u*h`4_tqzE}_pLGXM^ey7~I+%!}J7}`3riuWEWvGyFQ3V`iBr&->z@V>9sf^Ge_Y8Hz`-{He2jwBYz z_m`oPX6}9}&%Fy5KhYK4v6ZpP)GCkfl1)kWt2c8>djb{q5Ajl#mmi6HM%edGArDwwN=bfkP zAF6CKhaS>o%CxB!AcPU*X5bF^B!gMWb!mY%ul2O&hATnv29EiZm$~EH8m0c_E3$}& zKBXAD(S_k@QJJf`6WE&d%(yY{b^4vciBs#9(F*JX5}oeEPTju1#OUnJc&UWR(r7QE z#ueVQGjHDwWR}{N{B!>EMrG&|Yv~#8Gi|0mWlG#nPnW#h({RYJ`RB8Q)TXiJP3MU%^TIDKb0ud@HMI^o}U9@ZbFXL!dzt zQ@`euY1<`;+K5Ul##U}H?75dUUQ=owXpXeav+P<_(7F!v6JZ!JG~||8xYJ51U%PI2WPpsewibRVqZdFUuTQqCM7y$o|%(L zk#_?hMEJy`&{GTb8Hlb4YdGmy)`IvQ<*uV>-7pUHle~@N>qHY!jHL1# z=ey`R;7OcKP@R0;>zA2-W#t2}LtIV7qQr$HlmrI06}5^oE*A8j#`SZM@?$SBcjv{v zQ_)w54aq5K#k%w$*}jNWTk0{{*duOE8L0-}RJ9Jk#dgI{Y}K~>oF}f$hxeLKnPd1` zY%E76mW<&}8ms={922P+sTkGchNpy0-|7uCmGKQC(7{@`p;QsA=ZLG1ojnu=!xki} z6z)E>DqDv*38`@BecNNn@iY@3cHi=P`jrgm0g~elRV;hnt+M(!Zk3FT^ZJu9=%0;W z4~Z|MxI;(r55M`oFNcSz@|;TlcE50fZd%jF_ZuT@^y_j)2I}_X+M7&)!2?ow&a z=5XbkNz3|Jrj4`~Xn96{-7Rs&^n2=?oN^I!L(}5ycePLWO4pPGZ~GwVlU7HMsn!F2 zUtdg)z?~&86CdPR|ZNO)_D-ao=7 zjc@X`)lq{23oKeT1Ux)RQb2(JL~4LnLLM+Mg&S?f9zQkW&7S3k@(EClI$e79kh92& zqTNKO$@p*aEN(-IcPkh~OsPiKh1^AWBJv7ut}$LgDnY$ct0FiSRD z5u;wZn}-%x1;QgAs@b|x*W69x?m9BimZg#qf;aE7EV;a{`@lrG(IF zZt7MadyoZ2weF}QSg2Nk-p{>ME5~ej_ec~7zn`s%$yzzVCg?t4Q&hzM+`*hH0XLr4V>T48$zA@zo|s9$l?OSrbuy5sCc>3N zw#lYPYL(-e1P@wE%t^#y8{@6tO>a6 zCd)uJDhu6iLOIFS0T=hAr=ZL^@RkC~6T|=vriO|^yYE1$max~{t_AnLPe+N<;q&_4 z!UTcb6@3k~g+%y)UR@p#Gcq97<0S zTK%RhC>08U6oZ?gU7_8m%JI@CyCJa^j=O1RDv$04%e?H~_5J$CY8Pi+cb}e%EQ_$;fodwsn|Rk!J%Pl!yNBc^2@0bCC8x3zWT4 zIZU2TAQ1#qNV&ix=kCP;`E@K4v@ZsFD*l&@90BZWM5;IL{^=R$hVgO#9}Jo1UsiCC zb}usPXYzhf_WyHwMPod2LDUEE7X23vK5eFE80lFqD zAu?w6vu#i@_}>tCi_l;$GXTm&ULdXsNdYnxg^xIbWELQqJPq(13@C3z080c$V5~`q z0!B?b4G~}v$R^m)gEZj1%oMOHvk+k4%t`@wz?}{6fy^7=nA0)~u~EQgY)GIKPX+%y z=|dn&G|bx^6!0=$nzAMUg3UdN;{x1lk)XV&KzR!i zig5)xTLh`Um%!hEE1=XR0Cc+{0j*Y6s^7E~3Eh7VIEImt`|r#pC$iMtBUlIy_ZnET z=ASg=nY$MQ28aUY?)!jW{}RF5kWf}nAg5Fsu=U~vmO7|v=S1P(jKF@J0Ev`oNY>AT zBq*S)O_Wj=&B{juyyFd&`{)3#+o_BwZ{G4wkZlN*b%X|37DP$E9nA43{q)%nk`o}< z4_s4qXu!Q8lp6TM_WxlP32(E%555d(aPV+P1Lg>)Xgw9d3cMmxWn}m`b{Bw!J^i17 zp21RNylCHTeOEgYIu!*xdM*O6c5qROjX$R1a|H}$0fW_PGQGMDXm=P>$0n`=2~CQp z$ZYFSruue3pVl4FCjw}8QpsG{wR>~H8l}M+Y2V?wY)Y`g6R!UmT%#V3&-cNg46t6> zpy6DK{Pj+LiqtTPNo!YdDM7M8AR07M8=ivG$%HB^vI_|fdj{61@TWmEUkIAOt0iED zzXK}CV9Y82Hp7!#0}U{soYMBP3U=~@rO46i;hk9kyLJVXLpv#ZDk#McbW2iz07N5= z+~RGJRgH!fQ3Igg8c}s$c#DM2y`*-jmXkaasD2XY*Lg+p@9B}C5Ym32{xagCKD-7$ MSIUeM4P@v40p5%%-2eap delta 5701 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 bKi@x~80mdC-3;tBodo3HFj3mK9J%^G#jsYK diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e54dad4..fd50c3c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Wed Oct 16 21:11:58 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip \ No newline at end of file diff --git a/gradlew b/gradlew index cccdd3d..27309d9 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/usr/bin/env bash ############################################################################## ## @@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS="" # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn () { +warn ( ) { echo "$*" } -die () { +die ( ) { echo echo "$*" echo @@ -154,19 +154,11 @@ if $cygwin ; then esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") } -APP_ARGS=$(save "$@") +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" -# 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" "$@" +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat index f955316..832fdb6 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -49,6 +49,7 @@ goto fail @rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -59,6 +60,11 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ :execute @rem Setup the command line From 86b4108e4f3ec412774ae09d4a0d720fd6e11479 Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Mon, 28 Jun 2021 14:33:14 +0300 Subject: [PATCH 2/3] Configuration! Config options: handleDesktopPackets (Handle OpenBrowser and CopyClipboard packets? Insecure. Default false), handleLoadScripts (Proccess LoadScripts packet on client? Insecure, takes time, but update scripts on the fly... Default true), sendLoadScripts (Send scripts to players on logging in. Default true), sendScriptsOnReloading (Send scripts to players on command "mt reload". Default true), loadScriptsOnConnection (Load scripts before connect to server? Save time and traffic. Requires server with disabled sendLoadScripts. Default false), antiStuck (Do not reload scripts when relogging, saves time. Usable when playing on one server/singleplayer... Default false). Config lies at config/MineTweaker3.cfg --- .../minetweaker/mc1710/FMLEventHandler.java | 2 +- .../minetweaker/mc1710/ForgeEventHandler.java | 10 ++++++ .../mc1710/MCPlatformFunctions.java | 2 +- .../minetweaker/mc1710/MineTweakerConfig.java | 32 +++++++++++++++++++ .../minetweaker/mc1710/MineTweakerMod.java | 31 +++++++++++------- .../MineTweakerCopyClipboardHandler.java | 4 ++- .../MineTweakerLoadScriptsHandler.java | 7 ++-- .../MineTweakerOpenBrowserHandler.java | 6 ++-- .../minetweaker/mc1710/player/MCPlayer.java | 5 +-- 9 files changed, 75 insertions(+), 24 deletions(-) create mode 100644 MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerConfig.java diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java index 366f08a..650f3ab 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/FMLEventHandler.java @@ -22,7 +22,7 @@ import cpw.mods.fml.common.gameevent.PlayerEvent; public class FMLEventHandler { @SubscribeEvent public void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent ev) { - if (ev.player instanceof EntityPlayerMP) { + if (ev.player instanceof EntityPlayerMP && MineTweakerConfig.sendLoadScripts) { EntityPlayerMP player = (EntityPlayerMP) ev.player; MineTweakerMod.NETWORK.sendTo(new MineTweakerLoadScriptsPacket(MineTweakerAPI.tweaker.getScriptData()), player); } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java index 8bfb323..6b19645 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/ForgeEventHandler.java @@ -7,6 +7,8 @@ package minetweaker.mc1710; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; import minetweaker.*; import minetweaker.api.entity.*; import minetweaker.api.formatting.IFormattedText; @@ -15,10 +17,12 @@ import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.tooltip.IngredientTooltips; import minetweaker.mc1710.formatting.IMCFormattedString; import minetweaker.mc1710.item.*; +import net.minecraft.client.multiplayer.GuiConnecting; import net.minecraft.entity.*; import net.minecraft.entity.item.*; import net.minecraft.entity.player.*; import net.minecraft.item.*; +import net.minecraftforge.client.event.GuiOpenEvent; import net.minecraftforge.event.entity.living.*; import net.minecraftforge.event.entity.player.ItemTooltipEvent; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -42,6 +46,12 @@ public class ForgeEventHandler { MineTweakerImplementationAPI.events.publishPlayerInteract(event); } + @SideOnly(Side.CLIENT) + @SubscribeEvent + public void onPlayerGuiOpen(GuiOpenEvent ev) { + if (ev.gui != null && ev.gui instanceof GuiConnecting) MineTweakerMod.INSTANCE.onClientAboutToConnect(); + } + @SubscribeEvent public void onItemTooltip(ItemTooltipEvent ev) { if(ev.itemStack!= null) { diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java index bee2839..2f52434 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MCPlatformFunctions.java @@ -32,7 +32,7 @@ public class MCPlatformFunctions implements IPlatformFunctions { @Override public void distributeScripts(byte[] data) { - MineTweakerMod.NETWORK.sendToAll(new MineTweakerLoadScriptsPacket(data)); + if (MineTweakerConfig.sendScriptsOnReloading) MineTweakerMod.NETWORK.sendToAll(new MineTweakerLoadScriptsPacket(data)); } @Override diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerConfig.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerConfig.java new file mode 100644 index 0000000..cc6d14b --- /dev/null +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerConfig.java @@ -0,0 +1,32 @@ +package minetweaker.mc1710; + +import java.io.File; + +import net.minecraftforge.common.config.Configuration; + +public class MineTweakerConfig { + private MineTweakerConfig() { } + public static boolean handleDesktopPackets = false, handleLoadScripts = true, sendLoadScripts = true, + sendScriptsOnReloading = true, loadScriptsBeforeConnection = false, antiStuck = true; + static File file; + + public static void load() { + Configuration config = new Configuration(file, "1"); + config.load(); + handleDesktopPackets = config.getBoolean("handleDesktopPackets", + "network", false, "Handle OpenBrowser and CopyClipboard packets? Insecure."); + handleLoadScripts = config.getBoolean("handleLoadScripts", "network", true, + "Proccess LoadScripts packet on client? Insecure, takes time, but update scripts on the fly..."); + + sendLoadScripts = config.getBoolean("sendLoadScripts", + "network", true, "Send scripts to players on logging in"); + sendScriptsOnReloading = config.getBoolean("sendScriptsOnReloading", + "network", true, "Send scripts to players on command \"mt reload\""); + + loadScriptsBeforeConnection = config.getBoolean("loadScriptsBeforeConnection", + "core", false, "Load scripts before connect to server? Save time and traffic. Requires server with disabled sendLoadScripts."); + antiStuck = config.getBoolean("antiStuck", + "core", false, "Do not reload scripts when relogging, saves time. Usable when playing on one server/singleplayer..."); + config.save(); + } +} diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java index d88a0e0..5787e6a 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/MineTweakerMod.java @@ -35,6 +35,7 @@ import minetweaker.runtime.*; import minetweaker.runtime.providers.ScriptProviderCascade; import minetweaker.runtime.providers.ScriptProviderCustom; import minetweaker.runtime.providers.ScriptProviderDirectory; +import net.minecraft.client.Minecraft; import net.minecraft.item.crafting.CraftingManager; import net.minecraft.item.crafting.IRecipe; import net.minecraft.nbt.NBTTagCompound; @@ -82,6 +83,7 @@ public class MineTweakerMod { private final IScriptProvider scriptsGlobal; private final ScriptProviderCustom scriptsIMC; + private volatile boolean loaded = false; public MineTweakerMod() { MCRecipeManager.recipes = (List) CraftingManager.getInstance().getRecipeList(); @@ -127,6 +129,8 @@ public class MineTweakerMod { @EventHandler public void onLoad(FMLPreInitializationEvent ev) { + MineTweakerConfig.file = new File(ev.getModConfigurationDirectory(), MODID + ".cfg"); + MineTweakerConfig.load(); MinecraftForge.EVENT_BUS.register(new ForgeEventHandler()); FMLCommonHandler.instance().bus().register(new FMLEventHandler()); } @@ -148,17 +152,13 @@ public class MineTweakerMod { ItemBracketHandler.rebuildItemRegistry(); LiquidBracketHandler.rebuildLiquidRegistry(); MineTweakerAPI.logInfo("MineTweaker: Sucessfully built item registry"); + if (MineTweakerPlatformUtils.isClient()) { + MineTweakerAPI.client = new MCClient(); + } } @EventHandler public void onServerAboutToStart(FMLServerAboutToStartEvent ev) { - // starts before loading worlds - // perfect place to start MineTweaker! - - if (MineTweakerPlatformUtils.isClient()) { - MineTweakerAPI.client = new MCClient(); - } - File scriptsDir = new File(MineTweakerHacks.getWorldDirectory(ev.getServer()), "scripts"); if (!scriptsDir.exists()) { scriptsDir.mkdir(); @@ -168,12 +168,21 @@ public class MineTweakerMod { IScriptProvider cascaded = new ScriptProviderCascade(scriptsIMC, scriptsGlobal,scriptsLocal); MineTweakerImplementationAPI.setScriptProvider(cascaded); - MineTweakerImplementationAPI.onServerStart(new MCServer(ev.getServer())); + MCServer srv = new MCServer(ev.getServer()); + if (loaded && MineTweakerConfig.antiStuck) MineTweakerAPI.server = srv; + else { + MineTweakerImplementationAPI.onServerStart(srv); + loaded = true; + } } - @EventHandler - public void onServerStarting(FMLServerStartingEvent ev) { - + public void onClientAboutToConnect() { + if (!MineTweakerConfig.loadScriptsBeforeConnection) return; + IScriptProvider cascaded = new ScriptProviderCascade(scriptsIMC, scriptsGlobal); + MineTweakerImplementationAPI.setScriptProvider(cascaded); + if (loaded && MineTweakerConfig.antiStuck) return; + MineTweakerImplementationAPI.reload(); + loaded = true; } @EventHandler diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java index 9212a7e..127f718 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerCopyClipboardHandler.java @@ -9,6 +9,8 @@ package minetweaker.mc1710.network; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import minetweaker.mc1710.MineTweakerConfig; + import java.awt.Desktop; import java.awt.Toolkit; import java.awt.datatransfer.Clipboard; @@ -21,7 +23,7 @@ import java.awt.datatransfer.StringSelection; public class MineTweakerCopyClipboardHandler implements IMessageHandler { @Override public IMessage onMessage(MineTweakerCopyClipboardPacket message, MessageContext ctx) { - if (Desktop.isDesktopSupported()) { + if (Desktop.isDesktopSupported() && MineTweakerConfig.handleDesktopPackets) { StringSelection stringSelection = new StringSelection(message.getData()); Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); clipboard.setContents(stringSelection, null); diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java index 89abe66..ef9244a 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerLoadScriptsHandler.java @@ -11,7 +11,7 @@ import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; import minetweaker.MineTweakerAPI; import minetweaker.MineTweakerImplementationAPI; -import minetweaker.mc1710.client.MCClient; +import minetweaker.mc1710.MineTweakerConfig; import minetweaker.runtime.providers.ScriptProviderMemory; /** @@ -21,13 +21,10 @@ import minetweaker.runtime.providers.ScriptProviderMemory; public class MineTweakerLoadScriptsHandler implements IMessageHandler { @Override public IMessage onMessage(MineTweakerLoadScriptsPacket message, MessageContext ctx) { - if (MineTweakerAPI.server == null) { - MineTweakerAPI.client = new MCClient(); - + if (MineTweakerAPI.server == null && MineTweakerConfig.handleLoadScripts) { MineTweakerImplementationAPI.setScriptProvider(new ScriptProviderMemory(message.getData())); MineTweakerImplementationAPI.reload(); } - return null; } } diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserHandler.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserHandler.java index e8bccd5..2148b9b 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserHandler.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/network/MineTweakerOpenBrowserHandler.java @@ -9,6 +9,8 @@ package minetweaker.mc1710.network; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; import cpw.mods.fml.common.network.simpleimpl.MessageContext; +import minetweaker.mc1710.MineTweakerConfig; + import java.awt.Desktop; import java.io.IOException; import java.net.URI; @@ -21,15 +23,13 @@ import java.net.URISyntaxException; public class MineTweakerOpenBrowserHandler implements IMessageHandler { @Override public IMessage onMessage(MineTweakerOpenBrowserPacket message, MessageContext ctx) { - if (Desktop.isDesktopSupported()) { + if (Desktop.isDesktopSupported() && MineTweakerConfig.handleDesktopPackets) { Desktop desktop = Desktop.getDesktop(); try { desktop.browse(new URI(message.getUrl())); } catch (IOException e) { } catch (URISyntaxException e) { } - } else { - System.out.println("Desktop not supported"); } return null; diff --git a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java index 58611a8..7bde50a 100644 --- a/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java +++ b/MineTweaker3-MC1710-Main/src/main/java/minetweaker/mc1710/player/MCPlayer.java @@ -12,6 +12,7 @@ import minetweaker.api.data.IData; import minetweaker.api.item.IItemStack; import minetweaker.api.minecraft.MineTweakerMC; import minetweaker.api.player.IPlayer; +import minetweaker.mc1710.MineTweakerConfig; import minetweaker.mc1710.MineTweakerMod; import minetweaker.mc1710.data.NBTConverter; import minetweaker.mc1710.network.MineTweakerCopyClipboardPacket; @@ -126,7 +127,7 @@ public class MCPlayer implements IPlayer { @Override public void openBrowser(String url) { - if (player instanceof EntityPlayerMP) { + if (player instanceof EntityPlayerMP && MineTweakerConfig.handleDesktopPackets) { MineTweakerMod.NETWORK.sendTo( new MineTweakerOpenBrowserPacket(url), (EntityPlayerMP) player); @@ -135,7 +136,7 @@ public class MCPlayer implements IPlayer { @Override public void copyToClipboard(String value) { - if (player instanceof EntityPlayerMP) { + if (player instanceof EntityPlayerMP && MineTweakerConfig.handleDesktopPackets) { MineTweakerMod.NETWORK.sendTo( new MineTweakerCopyClipboardPacket(value), (EntityPlayerMP) player); From a348865dda92923ad0f7e1de2f1c517ec571b24d Mon Sep 17 00:00:00 2001 From: Zaxar163 Date: Tue, 29 Jun 2021 10:25:16 +0300 Subject: [PATCH 3/3] Remove usage of sun.* in MineTweakerImplementationAPI --- .../main/java/minetweaker/MineTweakerImplementationAPI.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java index ddfbc39..fb94d57 100644 --- a/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java +++ b/MineTweaker3-API/src/main/java/minetweaker/MineTweakerImplementationAPI.java @@ -27,7 +27,6 @@ import minetweaker.api.world.IBiome; import minetweaker.runtime.IScriptProvider; import minetweaker.util.EventList; import minetweaker.util.IEventHandler; -import sun.awt.HeadlessToolkit; import java.awt.*; import java.awt.datatransfer.Clipboard; @@ -686,7 +685,7 @@ public class MineTweakerImplementationAPI { private static void copyToClipboard(String value) { StringSelection stringSelection = new StringSelection(value); - if (!(Toolkit.getDefaultToolkit() instanceof HeadlessToolkit)) { + if (Desktop.isDesktopSupported()) { Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard(); clipboard.setContents(stringSelection, null); }