mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 11:29:15 +00:00
Improve server panel compatibility (#9836)
This commit is contained in:
1 parent
f09fd1f05b
commit
fdb22d02cc
5 files changed
+36
-4
No files matched your search
@@ -1,5 +1,6 @@
|
||||
package net.minecraftforge.forge.tasks
|
||||
|
||||
import org.gradle.api.file.DuplicatesStrategy
|
||||
import org.gradle.api.tasks.bundling.Zip
|
||||
import org.gradle.api.tasks.*
|
||||
import org.gradle.api.DefaultTask
|
||||
@@ -27,7 +28,7 @@ abstract class InstallerJar extends Zip {
|
||||
from(project.rootProject.file('/src/main/resources/url.png'))
|
||||
project.afterEvaluate {
|
||||
from(project.zipTree(downloadInstaller.output)) {
|
||||
duplicatesStrategy = 'exclude'
|
||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
}
|
||||
|
||||
if (fat.get() || offline.get()) {
|
||||
|
||||
+32
-1
@@ -1,3 +1,4 @@
|
||||
import de.undercouch.gradle.tasks.download.Download
|
||||
import net.minecraftforge.forge.tasks.checks.CheckATs
|
||||
import net.minecraftforge.forge.tasks.checks.CheckExcs
|
||||
import net.minecraftforge.forge.tasks.checks.CheckPatches
|
||||
@@ -81,6 +82,8 @@ ext {
|
||||
rootProject.file('LICENSE.txt'),
|
||||
rootProject.tasks.createChangelog.outputFile
|
||||
]
|
||||
|
||||
MAVEN_PATH = "${group.toString().replace('.', '/')}/${project.name}/${VERSION}".toString()
|
||||
}
|
||||
|
||||
configurations {
|
||||
@@ -707,6 +710,20 @@ tasks.register('installerJson', InstallerJson) {
|
||||
],
|
||||
processors: [
|
||||
[
|
||||
sides: ['server'],
|
||||
jar: INSTALLER_TOOLS,
|
||||
classpath: INSTALLER_TOOLS_CLASSPATH,
|
||||
args: [
|
||||
'--task', 'EXTRACT_FILES',
|
||||
'--archive', '{INSTALLER}',
|
||||
|
||||
'--from', 'data/unix_args.txt',
|
||||
'--to', "{ROOT}/libraries/${MAVEN_PATH}/unix_args.txt",
|
||||
|
||||
'--from', 'data/win_args.txt',
|
||||
'--to', "{ROOT}/libraries/${MAVEN_PATH}/win_args.txt"
|
||||
]
|
||||
], [
|
||||
sides: ['server'],
|
||||
jar: INSTALLER_TOOLS,
|
||||
classpath: INSTALLER_TOOLS_CLASSPATH,
|
||||
@@ -819,7 +836,7 @@ tasks.named('universalJar').configure {
|
||||
}
|
||||
|
||||
from(EXTRA_TXTS)
|
||||
duplicatesStrategy = 'exclude'
|
||||
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
|
||||
exclude '.cache'
|
||||
|
||||
manifest {
|
||||
@@ -856,6 +873,20 @@ tasks.register('installerJar', InstallerJar) {
|
||||
from(genServerBinPatches.output) {
|
||||
rename { 'data/server.lzma' }
|
||||
}
|
||||
|
||||
final var argsFile = rootProject.file('server_files/args.txt')
|
||||
final Map<String, Map<String, String>> tokens = [tokens: [SHIM_JAR_FILE: serverShimJar.archiveFileName.get()]]
|
||||
from(argsFile) {
|
||||
filter(tokens, ReplaceTokens)
|
||||
into 'data'
|
||||
rename { 'unix_args.txt' }
|
||||
}
|
||||
from(argsFile) {
|
||||
filter(tokens, ReplaceTokens)
|
||||
into 'data'
|
||||
rename { 'win_args.txt' }
|
||||
}
|
||||
|
||||
jarSigner.sign(it)
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
MinecraftForge
|
||||
=============
|
||||
[][Download]
|
||||
[][Download]
|
||||
[][Download] [][Discord] [][Patreon]
|
||||
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
-Djava.net.preferIPv6Addresses=system -jar @SHIM_JAR_FILE@
|
||||
@@ -4,7 +4,6 @@ net/minecraft/client/gui/Gui.renderSelectedItemName(Lnet/minecraft/client/gui/Gu
|
||||
net/minecraft/client/gui/screens/MenuScreens.getScreenFactory(Lnet/minecraft/world/inventory/MenuType;Lnet/minecraft/client/Minecraft;ILnet/minecraft/network/chat/Component;)Ljava/util/Optional;=|p_96202_,p_96203_,p_96204_,p_96205_
|
||||
net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.renderRectangle(Lnet/minecraft/client/gui/GuiGraphics;IIIIIII)V=|p_281392_,p_282294_,p_283353_,p_282640_,p_281964_,p_283211_,p_282349_,colorTo
|
||||
net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.renderTooltipBackground(Lnet/minecraft/client/gui/GuiGraphics;IIIIIIIII)V=|p_282666_,p_281901_,p_281846_,p_281559_,p_283336_,p_283422_,backgroundTop,backgroundBottom,borderTop,borderBottom
|
||||
net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.doLoadLevel(Lnet/minecraft/client/gui/screens/Screen;Ljava/lang/String;ZZZ)V=|p_233146_,p_233147_,p_233148_,p_233149_,confirmExperimentalWarning
|
||||
net/minecraft/client/renderer/ScreenEffectRenderer.getOverlayBlock(Lnet/minecraft/world/entity/player/Player;)Lorg/apache/commons/lang3/tuple/Pair;=|p_110717_
|
||||
net/minecraft/client/renderer/ScreenEffectRenderer.renderFluid(Lnet/minecraft/client/Minecraft;Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/resources/ResourceLocation;)V=|p_110726_,p_110727_,texture
|
||||
net/minecraft/client/renderer/ShaderInstance.<init>(Lnet/minecraft/server/packs/resources/ResourceProvider;Lnet/minecraft/resources/ResourceLocation;Lcom/mojang/blaze3d/vertex/VertexFormat;)V=|p_173336_,shaderLocation,p_173338_
|
||||
|
||||
Reference in new issue
Block a user