mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-18 19:39:22 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c047cf136c | ||
|
|
f4287ecc81 | ||
|
|
364a1e737f | ||
|
|
45a977bb33 | ||
|
|
ab00c907e7 | ||
|
|
979abb2b93 | ||
|
|
056360b050 | ||
|
|
960fce505c | ||
|
|
ea597ff45a | ||
|
|
f35dce7eb3 | ||
|
|
ef224bd2b8 | ||
|
|
0749f49b6c | ||
|
|
5c508efaa9 | ||
|
|
dbafe039d8 | ||
|
|
b36ee22925 | ||
|
|
287ee7b0b5 | ||
|
|
5f67621477 | ||
|
|
f237e7a8c3 | ||
|
|
a54420de36 | ||
|
|
65dbdc8eb0 | ||
|
|
d42979f620 | ||
|
|
ac56afc99c | ||
|
|
81b7bfe4ea | ||
|
|
4cbcf64ce1 | ||
|
|
29b763a0c3 | ||
|
|
52f41a4448 | ||
|
|
597409e2f2 | ||
|
|
21fbd72585 | ||
|
|
83a09f7584 | ||
|
|
0e864fbe6e | ||
|
|
2fd8900c01 | ||
|
|
e643d0a11f | ||
|
|
5efb8d3f12 | ||
|
|
70537542d1 | ||
|
|
bd4b059c2b | ||
|
|
e0d2c68c5b | ||
|
|
86d4bda32e | ||
|
|
98b90f26bc | ||
|
|
4e7c471fa3 | ||
|
|
ec6f9fc6e7 | ||
|
|
427fef1d4b | ||
|
|
83594b0b0a | ||
|
|
b76064e57a | ||
|
|
b2bf70c7f1 | ||
|
|
384286a453 | ||
|
|
d93b7db69a | ||
|
|
bdbde4bb0f | ||
|
|
e2a68ad903 | ||
|
|
46cfe50108 | ||
|
|
4b423a3087 | ||
|
|
7d0b07e858 | ||
|
|
40220600b0 | ||
|
|
0c7a0e927c | ||
|
|
60e8157b9a | ||
|
|
b8f5e4553b | ||
|
|
de587eb50a | ||
|
|
086bcb7148 |
No files matched your search
+1
-12
@@ -26,7 +26,6 @@
|
|||||||
/projects/mcp/
|
/projects/mcp/
|
||||||
/projects/clean/
|
/projects/clean/
|
||||||
/projects/forge/
|
/projects/forge/
|
||||||
#/patches/*
|
|
||||||
|
|
||||||
#occupational hazards
|
#occupational hazards
|
||||||
/projects/**/build/
|
/projects/**/build/
|
||||||
@@ -35,20 +34,10 @@
|
|||||||
/projects/**/*.launch
|
/projects/**/*.launch
|
||||||
/repo/
|
/repo/
|
||||||
src/*/generated/**/.cache/
|
src/*/generated/**/.cache/
|
||||||
|
|
||||||
# Generated by gradle every import
|
# Generated by gradle every import
|
||||||
**/src/main/resources/META-INF/MANIFEST.MF
|
**/src/main/resources/META-INF/MANIFEST.MF
|
||||||
/fmlloader/src/main/resources/forge_version.json
|
/fmlloader/src/main/resources/forge_version.json
|
||||||
|
|
||||||
#Patch rejects
|
|
||||||
#/patches-/
|
|
||||||
#*.patch.rej
|
|
||||||
#/projects/*/rejects/
|
|
||||||
|
|
||||||
# FML changelog
|
|
||||||
changelog.txt
|
|
||||||
*.py
|
|
||||||
*.7z
|
|
||||||
/logs/
|
|
||||||
|
|
||||||
/ForgeRoot.ipr
|
/ForgeRoot.ipr
|
||||||
/ForgeRoot.iws
|
/ForgeRoot.iws
|
||||||
+19
-3
@@ -3,6 +3,7 @@ package net.minecraftforge.forge.tasks
|
|||||||
import groovy.transform.CompileStatic
|
import groovy.transform.CompileStatic
|
||||||
import org.gradle.api.provider.Property
|
import org.gradle.api.provider.Property
|
||||||
import org.gradle.api.tasks.Internal
|
import org.gradle.api.tasks.Internal
|
||||||
|
import org.objectweb.asm.Opcodes
|
||||||
import org.objectweb.asm.tree.ClassNode
|
import org.objectweb.asm.tree.ClassNode
|
||||||
import org.objectweb.asm.tree.MethodNode
|
import org.objectweb.asm.tree.MethodNode
|
||||||
|
|
||||||
@@ -12,13 +13,19 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
|
|||||||
@Internal
|
@Internal
|
||||||
abstract Property<Closure<Boolean>> getPredicate()
|
abstract Property<Closure<Boolean>> getPredicate()
|
||||||
|
|
||||||
private final Set<String> matches = new HashSet<>()
|
private final Map<String, List<String>> matches = new TreeMap<>(Comparator.naturalOrder())
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected process(ClassNode parent, MethodNode node) {
|
protected process(ClassNode parent, MethodNode node) {
|
||||||
for (final current : node.instructions) {
|
for (final current : node.instructions) {
|
||||||
if (predicate.get().call(parent, node, current)) {
|
if (predicate.get().call(parent, node, current)) {
|
||||||
matches.add(parent.name)
|
var methods = matches.compute(parent.name, { k, v -> v ?: new ArrayList<>() })
|
||||||
|
|
||||||
|
// only add non-synthetic methods
|
||||||
|
if ((node.access & Opcodes.ACC_SYNTHETIC) == 0) {
|
||||||
|
methods.add(node.name + node.desc)
|
||||||
|
}
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -27,6 +34,15 @@ abstract class BytecodePredicateFinder extends BytecodeFinder {
|
|||||||
@Internal
|
@Internal
|
||||||
@Override
|
@Override
|
||||||
protected Object getData() {
|
protected Object getData() {
|
||||||
return matches.toSorted(Comparator.naturalOrder()) ?: {throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.')}()
|
var array = new ArrayList<Object>()
|
||||||
|
matches.forEach { c, m ->
|
||||||
|
{
|
||||||
|
array.add(
|
||||||
|
'class': c,
|
||||||
|
'methods': m
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return array ?: { throw new RuntimeException('Failed to find any targets, please ensure that method names and descriptors are correct.') }()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+8
-4
@@ -47,6 +47,7 @@ jarSigner.autoDetect('forge')
|
|||||||
applyPatches {
|
applyPatches {
|
||||||
level 'WARNING'
|
level 'WARNING'
|
||||||
failOnError = UPDATING != 'true'
|
failOnError = UPDATING != 'true'
|
||||||
|
rejects = rootProject.layout.projectDirectory.dir('rejects').asFile
|
||||||
}
|
}
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
@@ -117,7 +118,7 @@ dependencies {
|
|||||||
bootstrap(libs.unsafe) // Needed by securemodules
|
bootstrap(libs.unsafe) // Needed by securemodules
|
||||||
bootstrap(libs.bundles.asm) // Needed by securemodules
|
bootstrap(libs.bundles.asm) // Needed by securemodules
|
||||||
|
|
||||||
implementation(libs.jopt.simple) { version { strictly '5.0.4' } }
|
implementation(libs.jopt.simple)
|
||||||
|
|
||||||
installer(libs.bootstrap)
|
installer(libs.bootstrap)
|
||||||
installer(libs.bootstrap.api) // Needed by securemodules
|
installer(libs.bootstrap.api) // Needed by securemodules
|
||||||
@@ -380,14 +381,14 @@ tasks.register('extractInheritance', ExtractInheritance) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
|
tasks.register("findFinalizeSpawnTargets", BytecodePredicateFinder) {
|
||||||
jar = createJoinedSRG.output
|
jar = createClientOfficial.output
|
||||||
output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
|
output = rootProject.file('src/main/resources/coremods/finalize_spawn_targets.json')
|
||||||
predicate = {
|
predicate = {
|
||||||
parent, node, insn ->
|
parent, node, insn ->
|
||||||
return 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
|
return 'net/minecraft/world/level/BaseSpawner' != parent.name // Ignore this class as we special case it.
|
||||||
&& insn.getOpcode().equals(Opcodes.INVOKEVIRTUAL)
|
&& insn.getOpcode().equals(Opcodes.INVOKEVIRTUAL)
|
||||||
&& insn.name == 'm_6518_'
|
&& insn.name == 'finalizeSpawn'
|
||||||
&& insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/MobSpawnType;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;';
|
&& insn.desc == '(Lnet/minecraft/world/level/ServerLevelAccessor;Lnet/minecraft/world/DifficultyInstance;Lnet/minecraft/world/entity/EntitySpawnReason;Lnet/minecraft/world/entity/SpawnGroupData;)Lnet/minecraft/world/entity/SpawnGroupData;';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
tasks.register('validateDeprecations', ValidateDeprecations) {
|
tasks.register('validateDeprecations', ValidateDeprecations) {
|
||||||
@@ -922,6 +923,9 @@ tasks.register('mdkZip', Zip) {
|
|||||||
rename 'gitignore\\.txt', '.gitignore'
|
rename 'gitignore\\.txt', '.gitignore'
|
||||||
rename 'gitattributes\\.txt', '.gitattributes'
|
rename 'gitattributes\\.txt', '.gitattributes'
|
||||||
}
|
}
|
||||||
|
from(rootProject.file('src/test/java/com/example/examplemod/')) {
|
||||||
|
into('src/main/java/com/example/examplemod/')
|
||||||
|
}
|
||||||
from(rootProject.file('src/test/generated/mdk_datagen/')) {
|
from(rootProject.file('src/test/generated/mdk_datagen/')) {
|
||||||
into('src/main/resources/')
|
into('src/main/resources/')
|
||||||
exclude '**/.cache/'
|
exclude '**/.cache/'
|
||||||
|
|||||||
@@ -75,3 +75,11 @@ eclipse {
|
|||||||
// Run when importing the project
|
// Run when importing the project
|
||||||
synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
|
synchronizationTasks generateResources, copyEclipseSettings, eclipseClasspath, eclipseProject
|
||||||
}
|
}
|
||||||
|
|
||||||
|
idea {
|
||||||
|
module {
|
||||||
|
// IntelliJ IDEA does not do this by itself anymore...
|
||||||
|
downloadJavadoc = true
|
||||||
|
downloadSources = true
|
||||||
|
}
|
||||||
|
}
|
||||||
+25
-6
@@ -2,16 +2,15 @@
|
|||||||
|
|
||||||
MinecraftForge
|
MinecraftForge
|
||||||
=============
|
=============
|
||||||
[][Download]
|
[][Download]
|
||||||
[][Download] [][Discord] [][Patreon]
|
)][Download] [][Discord] [][Patreon]
|
||||||
|
|
||||||
Forge is a free, open-source modding API all of your favourite mods use!
|
Forge is a free, open-source modding API all of your favourite mods use!
|
||||||
|
|
||||||
| Version | Support |
|
| Version | Support |
|
||||||
|---------| ------------- |
|
|--------------|-----------------------------|
|
||||||
| 1.20.x | Active |
|
| All versions | [Supported][Support-Policy] |
|
||||||
| 1.19.x | Legacy |
|
|
||||||
|
|
||||||
* [Download]
|
* [Download]
|
||||||
* [Forum]
|
* [Forum]
|
||||||
@@ -31,6 +30,19 @@ You can download the installer for the *Recommended Build* or the
|
|||||||
|
|
||||||
For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
|
For support and questions, visit [the Support Forum][Support-Forum] or [the Forge Discord server][Discord].
|
||||||
|
|
||||||
|
## Required Java Versions
|
||||||
|
|
||||||
|
We require the version of Java that Minecraft requires, which is currently:
|
||||||
|
|
||||||
|
| Minecraft | Java |
|
||||||
|
|---------------|-------------------|
|
||||||
|
| 1.20.6+ | [21][Adoptium-21] |
|
||||||
|
| 1.18 - 1.20.4 | [17][Adoptium-17] |
|
||||||
|
| 1.17.1 | [16][Adoptium-16] |
|
||||||
|
| 1.16.5- | [8][Adoptium-8] |
|
||||||
|
|
||||||
|
**If you are on Windows and have difficulty using Java to launch JAR files, consider using [Jarfix by Johann Löfflmann][Jarfix].**
|
||||||
|
|
||||||
# Creating Mods
|
# Creating Mods
|
||||||
|
|
||||||
[See the "Getting Started" section in the Forge Documentation][Getting-Started].
|
[See the "Getting Started" section in the Forge Documentation][Getting-Started].
|
||||||
@@ -63,8 +75,15 @@ Please ensure you have a valid email address associated with your GitHub account
|
|||||||
|
|
||||||
[Download]: https://files.minecraftforge.net/
|
[Download]: https://files.minecraftforge.net/
|
||||||
|
|
||||||
|
[Adoptium-21]: https://adoptium.net/temurin/releases/?version=21
|
||||||
|
[Adoptium-17]: https://adoptium.net/temurin/releases/?version=17
|
||||||
|
[Adoptium-16]: https://adoptium.net/temurin/releases/?version=16
|
||||||
|
[Adoptium-8]: https://adoptium.net/temurin/releases/?version=8
|
||||||
|
[Jarfix]: https://johann.loefflmann.net/en/software/jarfix/index.html
|
||||||
|
|
||||||
[Forum]: https://forums.minecraftforge.net/
|
[Forum]: https://forums.minecraftforge.net/
|
||||||
[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
|
[Support-Forum]: https://forums.minecraftforge.net/forum/18-support-bug-reports/
|
||||||
|
[Support-Policy]: https://forums.minecraftforge.net/topic/144690-new-tiered-support-policy
|
||||||
|
|
||||||
[Discord]: https://discord.minecraftforge.net/
|
[Discord]: https://discord.minecraftforge.net/
|
||||||
|
|
||||||
|
|||||||
@@ -68,13 +68,15 @@ public interface IModLoadingState {
|
|||||||
* @return a transition task for this state
|
* @return a transition task for this state
|
||||||
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
|
* @see #buildTransition(Executor, Executor, ProgressMeter, Function, Function)
|
||||||
*/
|
*/
|
||||||
default <T extends Event & IModBusEvent>
|
default <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
|
||||||
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar) {
|
final ProgressMeter progressBar
|
||||||
|
) {
|
||||||
return buildTransition(syncExecutor, parallelExecutor, progressBar,
|
return buildTransition(syncExecutor, parallelExecutor, progressBar,
|
||||||
e -> CompletableFuture.runAsync(() -> {}, e),
|
e -> CompletableFuture.completedFuture(null),
|
||||||
e -> CompletableFuture.runAsync(() -> {}, e));
|
e -> CompletableFuture.completedFuture(null)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -9,8 +9,6 @@ import net.minecraftforge.eventbus.api.Event;
|
|||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.concurrent.Executor;
|
import java.util.concurrent.Executor;
|
||||||
import java.util.function.BiFunction;
|
import java.util.function.BiFunction;
|
||||||
@@ -18,103 +16,67 @@ import java.util.function.Function;
|
|||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
public interface IModStateTransition {
|
public interface IModStateTransition {
|
||||||
|
/** Magic value to allow me to optimize the futures list by ignoring the default value without making old methods nullable. */
|
||||||
|
public static final BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> NULL_HOOK = (e, g) -> CompletableFuture.completedFuture(null);
|
||||||
|
|
||||||
static IModStateTransition buildNoopTransition() {
|
static IModStateTransition buildNoopTransition() {
|
||||||
return new NoopTransition();
|
return ModStateTransitionHelper.NOOP;
|
||||||
}
|
}
|
||||||
|
|
||||||
default <T extends Event & IModBusEvent>
|
default CompletableFuture<Void> build(
|
||||||
CompletableFuture<Void> build(final String name,
|
final String name,
|
||||||
final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar,
|
final ProgressMeter progressBar,
|
||||||
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
||||||
final Function<Executor, CompletableFuture<Void>> postSyncTask) {
|
final Function<Executor, CompletableFuture<Void>> postSyncTask
|
||||||
List<CompletableFuture<Void>> futures = new ArrayList<>();
|
) {
|
||||||
|
return ModStateTransitionHelper.build(this, name, syncExecutor, parallelExecutor, progressBar, preSyncTask, postSyncTask);
|
||||||
this.eventFunctionStream().get()
|
|
||||||
.map(f -> (EventGenerator<T>) f)
|
|
||||||
.reduce((head, tail) -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, head, ModLoadingStage::currentState, tail))
|
|
||||||
.ifPresent(last -> addCompletableFutureTaskForModDispatch(syncExecutor, parallelExecutor, futures, progressBar, last, nextModLoadingStage(), null));
|
|
||||||
|
|
||||||
final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
|
|
||||||
final CompletableFuture<Void> eventDispatchCF = ModList.gather(futures).thenCompose(ModList::completableFutureFromExceptionList);
|
|
||||||
final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
|
|
||||||
.thenApplyAsync(n -> {
|
|
||||||
progressBar.label(progressBar.name() + ": dispatching "+name);
|
|
||||||
return null;
|
|
||||||
}, parallelExecutor)
|
|
||||||
.thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
|
|
||||||
.thenApply(r -> {
|
|
||||||
postSyncTask.apply(syncExecutor);
|
|
||||||
return null;
|
|
||||||
});
|
|
||||||
return this.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
|
default BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextModLoadingStage() {
|
||||||
return ModLoadingStage::nextState;
|
return ModLoadingStage::nextState;
|
||||||
}
|
}
|
||||||
|
|
||||||
private <T extends Event & IModBusEvent>
|
/**
|
||||||
EventGenerator<T> addCompletableFutureTaskForModDispatch(final Executor syncExecutor,
|
* This used to allow you to fire multiple events during the transition. However, in doing so it would cause issues with the default
|
||||||
final Executor parallelExecutor,
|
* ModContainer's event handlers causing issues such as mod classes being constructed multiple times.
|
||||||
final List<CompletableFuture<Void>> completableFutures,
|
*/
|
||||||
final ProgressMeter progressBar,
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
final EventGenerator<T> eventGenerator,
|
default Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
|
||||||
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState,
|
return () -> Stream.ofNullable(eventFunction());
|
||||||
final EventGenerator<T> nextGenerator) {
|
}
|
||||||
final Executor selectedExecutor = threadSelector().apply(syncExecutor, parallelExecutor);
|
|
||||||
|
@Nullable
|
||||||
var preDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) preDispatchHook();
|
default <T extends Event & IModBusEvent> EventGenerator<T> eventFunction() {
|
||||||
completableFutures.add(preDispatchHook.apply(selectedExecutor, eventGenerator));
|
return null;
|
||||||
|
|
||||||
completableFutures.add(ModList.get().futureVisitor(eventGenerator, progressBar, nextState).apply(threadSelector().apply(syncExecutor, parallelExecutor)));
|
|
||||||
|
|
||||||
var postDispatchHook = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>) postDispatchHook();
|
|
||||||
completableFutures.add(postDispatchHook.apply(selectedExecutor, eventGenerator));
|
|
||||||
|
|
||||||
return nextGenerator;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Supplier<Stream<EventGenerator<?>>> eventFunctionStream();
|
|
||||||
ThreadSelector threadSelector();
|
ThreadSelector threadSelector();
|
||||||
BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
|
BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator();
|
||||||
BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook();
|
|
||||||
BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook();
|
/**
|
||||||
|
* I think this was meant as a way to do some things for each mod container beforge/after the transition had been sent to the container.
|
||||||
|
* However, the Future returned by this was never linked to the main transition future in any way. Which means that it was run
|
||||||
|
* in parallel and couldn't guarantee the state of the ModContainer.
|
||||||
|
* <p>
|
||||||
|
* Plus all existing code that I could find returned a completedFuture, so I don't think anyone ever used this.
|
||||||
|
* <p>
|
||||||
|
* If I were to add this back it would be a CompletableFuture wrap(ModContainer, CompletableFuture)
|
||||||
|
* <p>
|
||||||
|
* Added magic value NULL_HOOK to allow me to optimize the futures list by ignoring the default value without making this method nullable.
|
||||||
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
|
default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() { return NULL_HOOK; }
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
|
default BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() { return NULL_HOOK; }
|
||||||
|
|
||||||
interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> {
|
interface EventGenerator<T extends Event & IModBusEvent> extends Function<ModContainer, T> {
|
||||||
static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
|
static <FN extends Event & IModBusEvent> EventGenerator<FN> fromFunction(Function<ModContainer, FN> fn) {
|
||||||
return fn::apply;
|
return fn::apply;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
record NoopTransition() implements IModStateTransition {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public Supplier<Stream<EventGenerator<?>>> eventFunctionStream() {
|
|
||||||
return Stream::of;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ThreadSelector threadSelector() {
|
|
||||||
return ThreadSelector.SYNC;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
|
|
||||||
return (e, t) -> t.thenApplyAsync(Function.identity(), e);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> preDispatchHook() {
|
|
||||||
return (t, f)-> CompletableFuture.completedFuture(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> postDispatchHook() {
|
|
||||||
return (t, f)-> CompletableFuture.completedFuture(null);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -9,18 +9,15 @@ import net.minecraftforge.eventbus.api.Event;
|
|||||||
import net.minecraftforge.fml.config.IConfigEvent;
|
import net.minecraftforge.fml.config.IConfigEvent;
|
||||||
import net.minecraftforge.fml.config.ModConfig;
|
import net.minecraftforge.fml.config.ModConfig;
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
|
|
||||||
import java.util.EnumMap;
|
import java.util.EnumMap;
|
||||||
import java.util.HashMap;
|
import java.util.HashSet;
|
||||||
import java.util.IdentityHashMap;
|
import java.util.IdentityHashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.Set;
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
import java.util.function.BiFunction;
|
|
||||||
import java.util.function.BiPredicate;
|
import java.util.function.BiPredicate;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
@@ -33,13 +30,8 @@ import java.util.function.Supplier;
|
|||||||
* a mechanism by which we can wrap actual mod code so that the loader and other
|
* a mechanism by which we can wrap actual mod code so that the loader and other
|
||||||
* facilities can treat mods at arms length.
|
* facilities can treat mods at arms length.
|
||||||
* </p>
|
* </p>
|
||||||
*
|
|
||||||
* @author cpw
|
|
||||||
*
|
|
||||||
*/
|
*/
|
||||||
|
public abstract class ModContainer {
|
||||||
public abstract class ModContainer
|
|
||||||
{
|
|
||||||
protected final String modId;
|
protected final String modId;
|
||||||
protected final String namespace;
|
protected final String namespace;
|
||||||
protected final IModInfo modInfo;
|
protected final IModInfo modInfo;
|
||||||
@@ -48,11 +40,14 @@ public abstract class ModContainer
|
|||||||
protected final Map<ModLoadingStage, Runnable> activityMap = new EnumMap<>(ModLoadingStage.class);
|
protected final Map<ModLoadingStage, Runnable> activityMap = new EnumMap<>(ModLoadingStage.class);
|
||||||
protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
|
protected final Map<Class<? extends IExtensionPoint<?>>, Supplier<?>> extensionPoints = new IdentityHashMap<>();
|
||||||
protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
|
protected final EnumMap<ModConfig.Type, ModConfig> configs = new EnumMap<>(ModConfig.Type.class);
|
||||||
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
final Set<ModContainer> dependencies = new HashSet<>();
|
||||||
|
/**
|
||||||
|
* If you want to handle the event, override {@link #dispatchConfigEvent(IConfigEvent)}
|
||||||
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty();
|
protected Optional<Consumer<IConfigEvent>> configHandler = Optional.empty();
|
||||||
|
|
||||||
public ModContainer(IModInfo info)
|
public ModContainer(IModInfo info) {
|
||||||
{
|
|
||||||
this.modId = info.getModId();
|
this.modId = info.getModId();
|
||||||
// TODO: Currently not reading namespace from configuration..
|
// TODO: Currently not reading namespace from configuration..
|
||||||
this.namespace = this.modId;
|
this.namespace = this.modId;
|
||||||
@@ -82,58 +77,35 @@ public abstract class ModContainer
|
|||||||
/**
|
/**
|
||||||
* Errored container state, used for filtering. Does nothing.
|
* Errored container state, used for filtering. Does nothing.
|
||||||
*/
|
*/
|
||||||
ModContainer()
|
ModContainer() {
|
||||||
{
|
|
||||||
this.modLoadingStage = ModLoadingStage.ERROR;
|
this.modLoadingStage = ModLoadingStage.ERROR;
|
||||||
modId = "BROKEN";
|
modId = "BROKEN";
|
||||||
namespace = "BROKEN";
|
namespace = "BROKEN";
|
||||||
modInfo = null;
|
modInfo = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the modid for this mod
|
* @return the modid for this mod
|
||||||
*/
|
*/
|
||||||
public final String getModId()
|
public final String getModId() {
|
||||||
{
|
|
||||||
return modId;
|
return modId;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the resource prefix for the mod
|
* @return the resource prefix for the mod
|
||||||
*/
|
*/
|
||||||
public final String getNamespace()
|
public final String getNamespace() {
|
||||||
{
|
|
||||||
return namespace;
|
return namespace;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return The current loading stage for this mod
|
* @return The current loading stage for this mod
|
||||||
*/
|
*/
|
||||||
public ModLoadingStage getCurrentState()
|
public ModLoadingStage getCurrentState() {
|
||||||
{
|
|
||||||
return modLoadingStage;
|
return modLoadingStage;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static <T extends Event & IModBusEvent> CompletableFuture<Void> buildTransitionHandler(
|
public IModInfo getModInfo() {
|
||||||
final ModContainer target,
|
|
||||||
final IModStateTransition.EventGenerator<T> eventGenerator,
|
|
||||||
final ProgressMeter progressBar,
|
|
||||||
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChangeHandler,
|
|
||||||
final Executor executor) {
|
|
||||||
return CompletableFuture
|
|
||||||
.runAsync(() -> {
|
|
||||||
ModLoadingContext.get().setActiveContainer(target);
|
|
||||||
target.activityMap.getOrDefault(target.modLoadingStage, ()->{}).run();
|
|
||||||
target.acceptEvent(eventGenerator.apply(target));
|
|
||||||
}, executor)
|
|
||||||
.whenComplete((mc, exception) -> {
|
|
||||||
target.modLoadingStage = stateChangeHandler.apply(target.modLoadingStage, exception);
|
|
||||||
progressBar.increment();
|
|
||||||
ModLoadingContext.get().setActiveContainer(null);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public IModInfo getModInfo()
|
|
||||||
{
|
|
||||||
return modInfo;
|
return modInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,8 +114,7 @@ public abstract class ModContainer
|
|||||||
return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
|
return Optional.ofNullable((T)extensionPoints.getOrDefault(point,()-> null).get());
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension)
|
public <T extends Record & IExtensionPoint<T>> void registerExtensionPoint(Class<? extends IExtensionPoint<T>> point, Supplier<T> extension) {
|
||||||
{
|
|
||||||
extensionPoints.put(point, extension);
|
extensionPoints.put(point, extension);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,9 +5,6 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
|
||||||
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
|
||||||
import net.minecraftforge.forgespi.language.IModFileInfo;
|
import net.minecraftforge.forgespi.language.IModFileInfo;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import net.minecraftforge.forgespi.language.ModFileScanData;
|
import net.minecraftforge.forgespi.language.ModFileScanData;
|
||||||
@@ -15,27 +12,15 @@ import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
|||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
||||||
import net.minecraftforge.forgespi.locating.IModFile;
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import java.util.Collections;
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
import java.util.AbstractMap;
|
|
||||||
import java.util.ArrayList;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.Collection;
|
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.concurrent.CompletableFuture;
|
|
||||||
import java.util.concurrent.CompletionException;
|
|
||||||
import java.util.concurrent.CompletionStage;
|
|
||||||
import java.util.concurrent.Executor;
|
|
||||||
import java.util.concurrent.ForkJoinPool;
|
|
||||||
import java.util.concurrent.ForkJoinWorkerThread;
|
|
||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
||||||
import java.util.function.BiFunction;
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -45,27 +30,25 @@ import java.util.stream.Stream;
|
|||||||
* Master list of all mods - game-side version. This is classloaded in the game scope and
|
* Master list of all mods - game-side version. This is classloaded in the game scope and
|
||||||
* can dispatch game level events as a result.
|
* can dispatch game level events as a result.
|
||||||
*/
|
*/
|
||||||
public class ModList
|
public class ModList {
|
||||||
{
|
|
||||||
//private static final Logger LOGGER = LogManager.getLogger();
|
|
||||||
private static ModList INSTANCE;
|
private static ModList INSTANCE;
|
||||||
private final List<IModFileInfo> modFiles;
|
private final List<IModFileInfo> modFiles;
|
||||||
private final List<IModInfo> sortedList;
|
private final List<IModInfo> sortedList;
|
||||||
private final Map<String, ModFileInfo> fileById;
|
private final Map<String, IModFileInfo> fileById;
|
||||||
private List<ModContainer> mods;
|
private List<ModContainer> mods;
|
||||||
private Map<String, ModContainer> indexedMods;
|
private Map<String, ModContainer> indexedMods;
|
||||||
private List<ModFileScanData> modFileScanData;
|
private List<ModFileScanData> modFileScanData;
|
||||||
private List<ModContainer> sortedContainers;
|
private List<ModContainer> sortedContainers;
|
||||||
|
|
||||||
private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
|
private ModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
|
||||||
{
|
this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).toList();
|
||||||
this.modFiles = modFiles.stream().map(ModFile::getModFileInfo).map(ModFileInfo.class::cast).collect(Collectors.toList());
|
this.sortedList = sortedList.stream().map(IModInfo.class::cast).toList();
|
||||||
this.sortedList = sortedList.stream().
|
var byId = new HashMap<String, IModFileInfo>();
|
||||||
map(ModInfo.class::cast).
|
for (var file : this.modFiles) {
|
||||||
collect(Collectors.toList());
|
for (var mod : file.getMods())
|
||||||
this.fileById = this.modFiles.stream().map(IModFileInfo::getMods).flatMap(Collection::stream).
|
byId.put(mod.getModId(), mod.getOwningFile());
|
||||||
map(ModInfo.class::cast).
|
}
|
||||||
collect(Collectors.toMap(ModInfo::getModId, ModInfo::getOwningFile));
|
this.fileById = Collections.unmodifiableMap(byId);
|
||||||
CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
|
CrashReportCallables.registerCrashCallable("Mod List", this::crashReport);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -82,12 +65,12 @@ public class ModList
|
|||||||
getModContainerState(mainMod.getModId()),
|
getModContainerState(mainMod.getModId()),
|
||||||
((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
|
((ModFileInfo)mf.getModFileInfo()).getCodeSigningFingerprint().orElse("NOSIGNATURE"));
|
||||||
}
|
}
|
||||||
|
|
||||||
private String crashReport() {
|
private String crashReport() {
|
||||||
return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
return "\n"+applyForEachModFile(this::fileToLine).collect(Collectors.joining("\n\t\t", "\t\t", ""));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList)
|
public static ModList of(List<ModFile> modFiles, List<ModInfo> sortedList) {
|
||||||
{
|
|
||||||
INSTANCE = new ModList(modFiles, sortedList);
|
INSTANCE = new ModList(modFiles, sortedList);
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
@@ -96,103 +79,47 @@ public class ModList
|
|||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<IModFileInfo> getModFiles()
|
public List<IModFileInfo> getModFiles() {
|
||||||
{
|
|
||||||
return modFiles;
|
return modFiles;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IModFileInfo getModFileById(String modid)
|
public IModFileInfo getModFileById(String modid) {
|
||||||
{
|
|
||||||
return this.fileById.get(modid);
|
return this.fileById.get(modid);
|
||||||
}
|
}
|
||||||
|
|
||||||
<T extends Event & IModBusEvent> Function<Executor, CompletableFuture<Void>> futureVisitor(
|
void setLoadedMods(final List<ModContainer> modContainers) {
|
||||||
final IModStateTransition.EventGenerator<T> eventGenerator,
|
|
||||||
final ProgressMeter progressBar,
|
|
||||||
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> stateChange) {
|
|
||||||
return executor -> gather(
|
|
||||||
this.mods.stream()
|
|
||||||
.map(mod -> ModContainer.buildTransitionHandler(mod, eventGenerator, progressBar, stateChange, executor))
|
|
||||||
.toList()
|
|
||||||
).thenComposeAsync(ModList::completableFutureFromExceptionList, executor);
|
|
||||||
}
|
|
||||||
static CompletionStage<Void> completableFutureFromExceptionList(List<? extends Map.Entry<?, Throwable>> t) {
|
|
||||||
if (t.stream().noneMatch(e->e.getValue()!=null)) {
|
|
||||||
return CompletableFuture.completedFuture(null);
|
|
||||||
} else {
|
|
||||||
final List<Throwable> throwables = t.stream().filter(e -> e.getValue() != null).map(Map.Entry::getValue).toList();
|
|
||||||
CompletableFuture<Void> cf = new CompletableFuture<>();
|
|
||||||
final RuntimeException accumulator = new RuntimeException();
|
|
||||||
cf.completeExceptionally(accumulator);
|
|
||||||
for (Throwable exception : throwables) {
|
|
||||||
if (exception instanceof CompletionException) {
|
|
||||||
exception = exception.getCause();
|
|
||||||
}
|
|
||||||
if (exception.getSuppressed().length != 0) {
|
|
||||||
for (Throwable throwable : exception.getSuppressed()) {
|
|
||||||
accumulator.addSuppressed(throwable);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
accumulator.addSuppressed(exception);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return cf;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static <V> CompletableFuture<List<Map.Entry<V, Throwable>>> gather(List<? extends CompletableFuture<? extends V>> futures) {
|
|
||||||
List<Map.Entry<V, Throwable>> list = new ArrayList<>(futures.size());
|
|
||||||
CompletableFuture<?>[] results = new CompletableFuture[futures.size()];
|
|
||||||
for (var future : futures) {
|
|
||||||
int i = list.size();
|
|
||||||
list.add(null);
|
|
||||||
results[i] = future.whenComplete((result, exception) -> list.set(i, new AbstractMap.SimpleImmutableEntry<>(result, exception)));
|
|
||||||
}
|
|
||||||
return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
|
|
||||||
}
|
|
||||||
|
|
||||||
void setLoadedMods(final List<ModContainer> modContainers)
|
|
||||||
{
|
|
||||||
this.mods = modContainers;
|
this.mods = modContainers;
|
||||||
this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c->sortedList.indexOf(c.getModInfo()))).toList();
|
this.sortedContainers = modContainers.stream().sorted(Comparator.comparingInt(c -> sortedList.indexOf(c.getModInfo()))).toList();
|
||||||
this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
|
this.indexedMods = modContainers.stream().collect(Collectors.toMap(ModContainer::getModId, Function.identity()));
|
||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
public <T> Optional<T> getModObjectById(String modId)
|
public <T> Optional<T> getModObjectById(String modId) {
|
||||||
{
|
|
||||||
return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
|
return getModContainerById(modId).map(ModContainer::getMod).map(o -> (T) o);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Optional<? extends ModContainer> getModContainerById(String modId)
|
public Optional<? extends ModContainer> getModContainerById(String modId) {
|
||||||
{
|
|
||||||
return Optional.ofNullable(this.indexedMods.get(modId));
|
return Optional.ofNullable(this.indexedMods.get(modId));
|
||||||
}
|
}
|
||||||
|
|
||||||
public Optional<? extends ModContainer> getModContainerByObject(Object obj)
|
public Optional<? extends ModContainer> getModContainerByObject(Object obj) {
|
||||||
{
|
|
||||||
return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
|
return mods.stream().filter(mc -> mc.getMod() == obj).findFirst();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<IModInfo> getMods()
|
public List<IModInfo> getMods() {
|
||||||
{
|
|
||||||
return this.sortedList;
|
return this.sortedList;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isLoaded(String modTarget)
|
public boolean isLoaded(String modTarget) {
|
||||||
{
|
|
||||||
return this.indexedMods.containsKey(modTarget);
|
return this.indexedMods.containsKey(modTarget);
|
||||||
}
|
}
|
||||||
|
|
||||||
public int size()
|
public int size() {
|
||||||
{
|
|
||||||
return mods.size();
|
return mods.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModFileScanData> getAllScanData()
|
public List<ModFileScanData> getAllScanData() {
|
||||||
{
|
if (modFileScanData == null) {
|
||||||
if (modFileScanData == null)
|
|
||||||
{
|
|
||||||
modFileScanData = this.sortedList.stream().
|
modFileScanData = this.sortedList.stream().
|
||||||
map(IModInfo::getOwningFile).
|
map(IModInfo::getOwningFile).
|
||||||
filter(Objects::nonNull).
|
filter(Objects::nonNull).
|
||||||
@@ -205,8 +132,7 @@ public class ModList
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void forEachModFile(Consumer<IModFile> fileConsumer)
|
public void forEachModFile(Consumer<IModFile> fileConsumer) {
|
||||||
{
|
|
||||||
modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
|
modFiles.stream().map(IModFileInfo::getFile).forEach(fileConsumer);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -222,13 +148,11 @@ public class ModList
|
|||||||
this.sortedContainers.forEach(containerConsumer);
|
this.sortedContainers.forEach(containerConsumer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public List<ModContainer> getLoadedMods() {
|
||||||
|
return this.sortedContainers;
|
||||||
|
}
|
||||||
|
|
||||||
public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
|
public <T> Stream<T> applyForEachModContainer(Function<ModContainer, T> function) {
|
||||||
return indexedMods.values().stream().map(function);
|
return indexedMods.values().stream().map(function);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class UncaughtModLoadingException extends ModLoadingException {
|
|
||||||
public UncaughtModLoadingException(ModLoadingStage stage, Throwable originalException) {
|
|
||||||
super(null, stage, "fml.modloading.uncaughterror", originalException);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -6,7 +6,6 @@
|
|||||||
package net.minecraftforge.fml;
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
import com.google.common.collect.ImmutableList;
|
import com.google.common.collect.ImmutableList;
|
||||||
import com.google.common.collect.Streams;
|
|
||||||
import net.minecraftforge.eventbus.api.Event;
|
import net.minecraftforge.eventbus.api.Event;
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.fml.loading.FMLEnvironment;
|
import net.minecraftforge.fml.loading.FMLEnvironment;
|
||||||
@@ -33,8 +32,6 @@ import java.util.function.BiConsumer;
|
|||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
import static net.minecraftforge.fml.Logging.CORE;
|
import static net.minecraftforge.fml.Logging.CORE;
|
||||||
import static net.minecraftforge.fml.Logging.LOADING;
|
import static net.minecraftforge.fml.Logging.LOADING;
|
||||||
|
|
||||||
@@ -74,8 +71,7 @@ import static net.minecraftforge.fml.Logging.LOADING;
|
|||||||
* and completes the mod loading sequence.</dd>
|
* and completes the mod loading sequence.</dd>
|
||||||
* </dl>
|
* </dl>
|
||||||
*/
|
*/
|
||||||
public class ModLoader
|
public class ModLoader {
|
||||||
{
|
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
private final LoadingModList loadingModList;
|
private final LoadingModList loadingModList;
|
||||||
|
|
||||||
@@ -84,17 +80,15 @@ public class ModLoader
|
|||||||
private final List<ModLoadingWarning> loadingWarnings;
|
private final List<ModLoadingWarning> loadingWarnings;
|
||||||
private final ModStateManager stateManager;
|
private final ModStateManager stateManager;
|
||||||
private static boolean loadingStateValid;
|
private static boolean loadingStateValid;
|
||||||
@SuppressWarnings("OptionalUsedAsFieldOrParameterType")
|
private final Consumer<String> statusConsumer = StartupNotificationManager.modLoaderConsumer().orElse(msg -> {});
|
||||||
private final Optional<Consumer<String>> statusConsumer = StartupNotificationManager.modLoaderConsumer();
|
|
||||||
private final Set<IModLoadingState> completedStates = new HashSet<>();
|
private final Set<IModLoadingState> completedStates = new HashSet<>();
|
||||||
private ModList modList;
|
private ModList modList;
|
||||||
|
|
||||||
private ModLoader()
|
private ModLoader() {
|
||||||
{
|
|
||||||
this.loadingModList = FMLLoader.getLoadingModList();
|
this.loadingModList = FMLLoader.getLoadingModList();
|
||||||
this.loadingExceptions = this.loadingModList.getErrors().stream()
|
this.loadingExceptions = this.loadingModList.getErrors().stream()
|
||||||
.flatMap(ModLoadingException::fromEarlyException)
|
.flatMap(ModLoadingException::fromEarlyException)
|
||||||
.collect(Collectors.toList());
|
.toList();
|
||||||
this.loadingWarnings = this.loadingModList.getBrokenFiles().stream()
|
this.loadingWarnings = this.loadingModList.getBrokenFiles().stream()
|
||||||
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
|
.map(file -> new ModLoadingWarning(null, ModLoadingStage.VALIDATE, InvalidModIdentifier.identifyJarProblem(file.getFilePath()).orElse("fml.modloading.brokenfile"), file.getFileName()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
@@ -156,7 +150,7 @@ public class ModLoader
|
|||||||
loadingModList.getMods());
|
loadingModList.getMods());
|
||||||
if (!this.loadingExceptions.isEmpty()) {
|
if (!this.loadingExceptions.isEmpty()) {
|
||||||
LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.getFirst());
|
LOGGER.fatal(CORE, "Error during pre-loading phase", loadingExceptions.getFirst());
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
statusConsumer.accept("ERROR DURING MOD LOADING");
|
||||||
modList.setLoadedMods(Collections.emptyList());
|
modList.setLoadedMods(Collections.emptyList());
|
||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
throw new LoadingFailedException(loadingExceptions);
|
throw new LoadingFailedException(loadingExceptions);
|
||||||
@@ -169,7 +163,7 @@ public class ModLoader
|
|||||||
|
|
||||||
if (!failedBounds.isEmpty()) {
|
if (!failedBounds.isEmpty()) {
|
||||||
LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
|
LOGGER.fatal(CORE, "Failed to validate feature bounds for mods: {}", failedBounds);
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
statusConsumer.accept("ERROR DURING MOD LOADING");
|
||||||
modList.setLoadedMods(Collections.emptyList());
|
modList.setLoadedMods(Collections.emptyList());
|
||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
throw new LoadingFailedException(failedBounds.stream()
|
throw new LoadingFailedException(failedBounds.stream()
|
||||||
@@ -177,19 +171,42 @@ public class ModLoader
|
|||||||
.toList());
|
.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
final List<ModContainer> modContainers = loadingModList.getModFiles().stream()
|
final var modContainers = new HashMap<String, ModContainer>();
|
||||||
.map(ModFileInfo::getFile)
|
for (var file : loadingModList.getModFiles()) {
|
||||||
.map(this::buildMods)
|
var containers = this.buildMods(file.getFile());
|
||||||
.flatMap(List::stream)
|
for (var container : containers)
|
||||||
.toList();
|
modContainers.put(container.getModId(), container);
|
||||||
|
}
|
||||||
|
|
||||||
if (!loadingExceptions.isEmpty()) {
|
if (!loadingExceptions.isEmpty()) {
|
||||||
LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.getFirst());
|
LOGGER.fatal(CORE, "Failed to initialize mod containers", loadingExceptions.getFirst());
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
statusConsumer.accept("ERROR DURING MOD LOADING");
|
||||||
modList.setLoadedMods(Collections.emptyList());
|
modList.setLoadedMods(Collections.emptyList());
|
||||||
loadingStateValid = false;
|
loadingStateValid = false;
|
||||||
throw new LoadingFailedException(loadingExceptions);
|
throw new LoadingFailedException(loadingExceptions);
|
||||||
}
|
}
|
||||||
modList.setLoadedMods(modContainers);
|
|
||||||
|
// Gather all dependencies, so we can make sure they have finished their transition events before we fire ours
|
||||||
|
for (var mod : modContainers.values()) {
|
||||||
|
for (var dep : mod.getModInfo().getDependencies()) {
|
||||||
|
var target = modContainers.get(dep.getModId());
|
||||||
|
if (target == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
switch (dep.getOrdering()) {
|
||||||
|
case AFTER:
|
||||||
|
mod.dependencies.add(target);
|
||||||
|
break;
|
||||||
|
case BEFORE:
|
||||||
|
target.dependencies.add(mod);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
modList.setLoadedMods(modContainers.values().stream().toList());
|
||||||
this.modList = modList;
|
this.modList = modList;
|
||||||
var stateList = stateManager.getStates(ModLoadingPhase.GATHER);
|
var stateList = stateManager.getStates(ModLoadingPhase.GATHER);
|
||||||
var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(this.modList)).sum());
|
var progress = StartupMessageManager.addProgressBar("Mod Gather", stateList.stream().mapToInt(mls -> mls.size().applyAsInt(this.modList)).sum());
|
||||||
@@ -214,7 +231,7 @@ public class ModLoader
|
|||||||
for (IModLoadingState mls : stateList) {
|
for (IModLoadingState mls : stateList) {
|
||||||
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
|
dispatchAndHandleError(mls, syncExecutor, parallelExecutor, periodicTask, progress);
|
||||||
}
|
}
|
||||||
statusConsumer.ifPresent(c->c.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size())));
|
statusConsumer.accept(String.format("Mod loading complete - %d mods loaded", this.modList.size()));
|
||||||
progress.complete();
|
progress.complete();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -243,10 +260,12 @@ public class ModLoader
|
|||||||
pb.complete();
|
pb.complete();
|
||||||
syncExecutor.drive(ticker);
|
syncExecutor.drive(ticker);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
|
private void waitForTransition(final IModLoadingState state, final ModWorkManager.DrivenExecutor syncExecutor, final Runnable ticker, final CompletableFuture<Void> transition) {
|
||||||
while (!transition.isDone()) {
|
while (!transition.isDone()) {
|
||||||
syncExecutor.drive(ticker);
|
syncExecutor.drive(ticker);
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
transition.join();
|
transition.join();
|
||||||
} catch (CompletionException e) {
|
} catch (CompletionException e) {
|
||||||
@@ -256,36 +275,38 @@ public class ModLoader
|
|||||||
.anyMatch(obj -> !(obj instanceof ModLoadingException));
|
.anyMatch(obj -> !(obj instanceof ModLoadingException));
|
||||||
if (hasNotModLoadingEx) {
|
if (hasNotModLoadingEx) {
|
||||||
LOGGER.fatal("Encountered non-modloading exceptions!", e);
|
LOGGER.fatal("Encountered non-modloading exceptions!", e);
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
statusConsumer.accept("ERROR DURING MOD LOADING");
|
||||||
throw e;
|
throw e;
|
||||||
}
|
}
|
||||||
|
|
||||||
final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
|
final List<ModLoadingException> modLoadingExceptions = Arrays.stream(t.getSuppressed())
|
||||||
.filter(ModLoadingException.class::isInstance)
|
.filter(ModLoadingException.class::isInstance)
|
||||||
.map(ModLoadingException.class::cast)
|
.map(ModLoadingException.class::cast)
|
||||||
.collect(Collectors.toList());
|
.toList();
|
||||||
LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
|
LOGGER.fatal(LOADING,"Failed to complete lifecycle event {}, {} errors found", state.name(), modLoadingExceptions.size());
|
||||||
statusConsumer.ifPresent(c->c.accept("ERROR DURING MOD LOADING"));
|
statusConsumer.accept("ERROR DURING MOD LOADING");
|
||||||
throw new LoadingFailedException(modLoadingExceptions);
|
throw new LoadingFailedException(modLoadingExceptions);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<ModContainer> buildMods(final IModFile modFile)
|
private List<ModContainer> buildMods(final IModFile modFile) {
|
||||||
{
|
final Map<String, IModInfo> modInfoMap = new HashMap<>();
|
||||||
final Map<String, IModInfo> modInfoMap = modFile.getModFileInfo().getMods().stream().collect(Collectors.toMap(IModInfo::getModId, Function.identity()));
|
for (var mod : modFile.getModFileInfo().getMods())
|
||||||
|
modInfoMap.put(mod.getModId(), mod);
|
||||||
|
|
||||||
LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
|
LOGGER.trace(LOADING, "ModContainer is {}", ModContainer.class.getClassLoader());
|
||||||
final List<ModContainer> containers = modFile.getScanResult().getTargets()
|
final List<ModContainer> containers = new ArrayList<>();
|
||||||
.entrySet()
|
for (var entry : modFile.getScanResult().getTargets().entrySet()) {
|
||||||
.stream()
|
var container = buildModContainerFromTOML(modFile, modInfoMap, entry.getKey(), entry.getValue());
|
||||||
.map(e -> buildModContainerFromTOML(modFile, modInfoMap, e))
|
if (container != null)
|
||||||
.filter(Objects::nonNull)
|
containers.add(container);
|
||||||
.toList();
|
}
|
||||||
|
|
||||||
if (containers.size() != modInfoMap.size()) {
|
if (containers.size() != modInfoMap.size()) {
|
||||||
var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
|
var modIds = modInfoMap.values().stream().map(IModInfo::getModId).sorted().toList();
|
||||||
var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();
|
var containerIds = containers.stream().map(c -> c != null ? c.getModId() : "(null)").sorted().toList();
|
||||||
|
|
||||||
LOGGER.fatal(LOADING,"File {} constructed {} mods: {}, but had {} mods specified: {}",
|
LOGGER.fatal(LOADING, "File {} constructed {} mods: {}, but had {} mods specified: {}",
|
||||||
modFile.getFilePath(),
|
modFile.getFilePath(),
|
||||||
containers.size(), containerIds,
|
containers.size(), containerIds,
|
||||||
modInfoMap.size(), modIds);
|
modInfoMap.size(), modIds);
|
||||||
@@ -300,15 +321,15 @@ public class ModLoader
|
|||||||
|
|
||||||
loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
|
loadingExceptions.add(new ModLoadingException(null, ModLoadingStage.CONSTRUCT, "fml.modloading.missingclasses", null, modFile.getFilePath()));
|
||||||
}
|
}
|
||||||
|
|
||||||
// remove errored mod containers
|
// remove errored mod containers
|
||||||
return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
|
return containers.stream().filter(mc -> mc.modLoadingStage != ModLoadingStage.ERROR).toList();
|
||||||
}
|
}
|
||||||
|
|
||||||
private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap, final Map.Entry<String, ? extends IModLanguageProvider.IModLanguageLoader> idToProviderEntry) {
|
private ModContainer buildModContainerFromTOML(final IModFile modFile, final Map<String, IModInfo> modInfoMap,
|
||||||
|
final String modId, final IModLanguageProvider.IModLanguageLoader languageLoader
|
||||||
|
) {
|
||||||
try {
|
try {
|
||||||
final String modId = idToProviderEntry.getKey();
|
|
||||||
final IModLanguageProvider.IModLanguageLoader languageLoader = idToProviderEntry.getValue();
|
|
||||||
|
|
||||||
IModInfo info = modInfoMap.get(modId);
|
IModInfo info = modInfoMap.get(modId);
|
||||||
// throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
|
// throw a missing metadata error if there is no matching modid in the modInfoMap from the mods.toml file
|
||||||
if (info == null)
|
if (info == null)
|
||||||
@@ -351,6 +372,7 @@ public class ModLoader
|
|||||||
}
|
}
|
||||||
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
|
public <T extends Event & IModBusEvent> T postEventWithReturn(T e) {
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
||||||
@@ -359,9 +381,15 @@ public class ModLoader
|
|||||||
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
ModList.get().forEachModInOrder(mc -> mc.acceptEvent(e));
|
||||||
return e;
|
return e;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("removal")
|
||||||
public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
|
public <T extends Event & IModBusEvent> void postEventWrapContainerInModOrder(T event) {
|
||||||
postEventWithWrapInModOrder(event, (mc, e) -> ModLoadingContext.get().setActiveContainer(mc), (mc, e) -> ModLoadingContext.get().setActiveContainer(null));
|
postEventWithWrapInModOrder(event,
|
||||||
|
(mc, e) -> ModLoadingContext.get().setActiveContainer(mc),
|
||||||
|
(mc, e) -> ModLoadingContext.get().setActiveContainer(null)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
|
public <T extends Event & IModBusEvent> void postEventWithWrapInModOrder(T e, BiConsumer<ModContainer, T> pre, BiConsumer<ModContainer, T> post) {
|
||||||
if (!loadingStateValid) {
|
if (!loadingStateValid) {
|
||||||
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
LOGGER.error("Cowardly refusing to send event {} to a broken mod state", e.getClass().getName());
|
||||||
@@ -374,13 +402,11 @@ public class ModLoader
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModLoadingWarning> getWarnings()
|
public List<ModLoadingWarning> getWarnings() {
|
||||||
{
|
|
||||||
return ImmutableList.copyOf(this.loadingWarnings);
|
return ImmutableList.copyOf(this.loadingWarnings);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addWarning(ModLoadingWarning warning)
|
public void addWarning(ModLoadingWarning warning) {
|
||||||
{
|
|
||||||
this.loadingWarnings.add(warning);
|
this.loadingWarnings.add(warning);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,20 +8,15 @@ package net.minecraftforge.fml;
|
|||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import net.minecraftforge.fml.config.IConfigSpec;
|
import net.minecraftforge.fml.config.IConfigSpec;
|
||||||
import net.minecraftforge.fml.config.ModConfig;
|
import net.minecraftforge.fml.config.ModConfig;
|
||||||
import net.minecraftforge.fml.loading.FMLLoader;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
|
||||||
|
|
||||||
import java.util.function.BiPredicate;
|
import java.util.function.BiPredicate;
|
||||||
import java.util.function.Supplier;
|
import java.util.function.Supplier;
|
||||||
|
|
||||||
public class ModLoadingContext
|
public class ModLoadingContext {
|
||||||
{
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
|
private static final ThreadLocal<ModLoadingContext> context = ThreadLocal.withInitial(ModLoadingContext::new);
|
||||||
private ModContainer activeContainer;
|
private ModContainer activeContainer;
|
||||||
private Object languageExtension;
|
private Object languageExtension;
|
||||||
private ModLoadingStage stage;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated Use the context provided by your language loader in your mod's constructor
|
* @deprecated Use the context provided by your language loader in your mod's constructor
|
||||||
|
|||||||
@@ -26,19 +26,23 @@ import java.util.function.ToIntFunction;
|
|||||||
* @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
|
* @param inlineRunnable an optional runnable, which runs before starting the transition from this state to the next
|
||||||
* @param transition optional state transition information
|
* @param transition optional state transition information
|
||||||
*/
|
*/
|
||||||
public record ModLoadingState(String name, String previous,
|
public record ModLoadingState(
|
||||||
Function<ModList, String> message,
|
String name,
|
||||||
ToIntFunction<ModList> size,
|
String previous,
|
||||||
ModLoadingPhase phase,
|
Function<ModList, String> message,
|
||||||
Optional<Consumer<ModList>> inlineRunnable,
|
ToIntFunction<ModList> size,
|
||||||
Optional<IModStateTransition> transition) implements IModLoadingState {
|
ModLoadingPhase phase,
|
||||||
|
Optional<Consumer<ModList>> inlineRunnable,
|
||||||
|
Optional<IModStateTransition> transition
|
||||||
|
) implements IModLoadingState {
|
||||||
@Override
|
@Override
|
||||||
public <T extends Event & IModBusEvent>
|
public <T extends Event & IModBusEvent> Optional<CompletableFuture<Void>> buildTransition(
|
||||||
Optional<CompletableFuture<Void>> buildTransition(final Executor syncExecutor,
|
final Executor syncExecutor,
|
||||||
final Executor parallelExecutor,
|
final Executor parallelExecutor,
|
||||||
final ProgressMeter progressBar,
|
final ProgressMeter progressBar,
|
||||||
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
||||||
final Function<Executor, CompletableFuture<Void>> postSyncTask) {
|
final Function<Executor, CompletableFuture<Void>> postSyncTask
|
||||||
|
) {
|
||||||
var transition = this.transition.orElse(null);
|
var transition = this.transition.orElse(null);
|
||||||
return transition == null
|
return transition == null
|
||||||
? Optional.empty()
|
? Optional.empty()
|
||||||
@@ -52,9 +56,12 @@ public record ModLoadingState(String name, String previous,
|
|||||||
* @param name the name of the state
|
* @param name the name of the state
|
||||||
* @param previous the name of the immediately previous state to this state
|
* @param previous the name of the immediately previous state to this state
|
||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
|
*
|
||||||
|
* @deprecated Use the builder
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
|
public static ModLoadingState empty(final String name, final String previous, final ModLoadingPhase phase) {
|
||||||
return new ModLoadingState(name, previous, ml -> "", f->0, phase, Optional.empty(), Optional.empty());
|
return of(name, phase).after(previous).empty();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -65,11 +72,13 @@ public record ModLoadingState(String name, String previous,
|
|||||||
* @param previous the name of the immediately previous state to this state
|
* @param previous the name of the immediately previous state to this state
|
||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
* @param transition the state transition information
|
* @param transition the state transition information
|
||||||
* @return a mod loading state with state transition information and a default message
|
*
|
||||||
|
* @deprecated Use the builder
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
|
public static ModLoadingState withTransition(final String name, final String previous, final ModLoadingPhase phase,
|
||||||
final IModStateTransition transition) {
|
final IModStateTransition transition) {
|
||||||
return new ModLoadingState(name, previous, ml -> "Processing transition " + name, ModList::size, phase, Optional.empty(), Optional.of(transition));
|
return of(name, phase).after(previous).withTransition(transition);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -81,11 +90,14 @@ public record ModLoadingState(String name, String previous,
|
|||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
* @param transition the state transition information
|
* @param transition the state transition information
|
||||||
* @return a mod loading state with state transition information and a custom message
|
* @return a mod loading state with state transition information and a custom message
|
||||||
|
*
|
||||||
|
* @deprecated Use the builder
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
public static ModLoadingState withTransition(final String name, final String previous,
|
public static ModLoadingState withTransition(final String name, final String previous,
|
||||||
final Function<ModList, String> message, final ModLoadingPhase phase,
|
final Function<ModList, String> message, final ModLoadingPhase phase,
|
||||||
final IModStateTransition transition) {
|
final IModStateTransition transition) {
|
||||||
return new ModLoadingState(name, previous, message, ModList::size, phase, Optional.empty(), Optional.of(transition));
|
return of(name, phase).after(previous).message(message).withTransition(transition);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -97,9 +109,59 @@ public record ModLoadingState(String name, String previous,
|
|||||||
* @param phase the mod loading phase the state belongs to
|
* @param phase the mod loading phase the state belongs to
|
||||||
* @param inline an optional runnable, which runs before starting the transition from this state to the next
|
* @param inline an optional runnable, which runs before starting the transition from this state to the next
|
||||||
* @return a mod loading state with an inline runnable and default message
|
* @return a mod loading state with an inline runnable and default message
|
||||||
|
*
|
||||||
|
* @deprecated Use the builder
|
||||||
*/
|
*/
|
||||||
|
@Deprecated(since = "1.21.3", forRemoval = true)
|
||||||
public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
|
public static ModLoadingState withInline(final String name, final String previous, final ModLoadingPhase phase,
|
||||||
final Consumer<ModList> inline) {
|
final Consumer<ModList> inline) {
|
||||||
return new ModLoadingState(name, previous, ml -> "Processing work " + name, ml->0, phase, Optional.of(inline), Optional.empty());
|
return of(name, phase).after(previous).withInline(inline);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static Builder of(final String name, final ModLoadingPhase phase) {
|
||||||
|
return new Builder(name, phase);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static class Builder {
|
||||||
|
private final String name;
|
||||||
|
private final ModLoadingPhase phase;
|
||||||
|
private String after;
|
||||||
|
private Function<ModList, String> message = null;
|
||||||
|
private ToIntFunction<ModList> size = null;
|
||||||
|
|
||||||
|
private Builder(final String name, final ModLoadingPhase phase) {
|
||||||
|
this.name = name;
|
||||||
|
this.phase = phase;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder after(final ModLoadingState value) { return after(value.name()); }
|
||||||
|
public Builder after(final String value) {
|
||||||
|
this.after = value;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder message(final String value) { return message(ml -> value); }
|
||||||
|
public Builder message(final Function<ModList, String> value) {
|
||||||
|
this.message = value;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Builder size(final int value) { return size(ml -> value); }
|
||||||
|
public Builder size(final ToIntFunction<ModList> value) {
|
||||||
|
this.size = value;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ModLoadingState empty() {
|
||||||
|
return new ModLoadingState(name, after, message != null ? message : ml -> "", size != null ? size : ml -> 0, phase, Optional.empty(), Optional.empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
public ModLoadingState withTransition(final IModStateTransition transition) {
|
||||||
|
return new ModLoadingState(name, after, message != null ? message : ml -> "Processing transition " + name, size != null ? size : ModList::size, phase, Optional.empty(), Optional.of(transition));
|
||||||
|
}
|
||||||
|
|
||||||
|
public ModLoadingState withInline(final Consumer<ModList> inline) {
|
||||||
|
return new ModLoadingState(name, after, message != null ? message : ml -> "Processing work " + name, size != null ? size : ml -> 0, phase, Optional.of(inline), Optional.empty());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,181 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) Forge Development LLC and contributors
|
||||||
|
* SPDX-License-Identifier: LGPL-2.1-only
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.minecraftforge.fml;
|
||||||
|
|
||||||
|
import java.util.ArrayList;
|
||||||
|
import java.util.Collection;
|
||||||
|
import java.util.LinkedHashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.concurrent.CompletableFuture;
|
||||||
|
import java.util.concurrent.CompletionException;
|
||||||
|
import java.util.concurrent.CompletionStage;
|
||||||
|
import java.util.concurrent.Executor;
|
||||||
|
import java.util.function.BiFunction;
|
||||||
|
import java.util.function.Function;
|
||||||
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
|
import net.minecraftforge.eventbus.api.Event;
|
||||||
|
import net.minecraftforge.fml.IModStateTransition.EventGenerator;
|
||||||
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
|
import net.minecraftforge.fml.loading.progress.ProgressMeter;
|
||||||
|
|
||||||
|
@ApiStatus.Internal
|
||||||
|
class ModStateTransitionHelper {
|
||||||
|
static final IModStateTransition NOOP = new NoopTransition();
|
||||||
|
record NoopTransition() implements IModStateTransition {
|
||||||
|
@Override
|
||||||
|
public ThreadSelector threadSelector() {
|
||||||
|
return ThreadSelector.SYNC;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BiFunction<Executor, CompletableFuture<Void>, CompletableFuture<Void>> finalActivityGenerator() {
|
||||||
|
return (e, t) -> t.thenApplyAsync(Function.identity(), e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static <V> CompletionStage<Void> completableFutureFromExceptionList(List<FutureResult<V>> t) {
|
||||||
|
if (t.stream().noneMatch(e -> e.exception() != null)) {
|
||||||
|
return CompletableFuture.completedFuture(null);
|
||||||
|
} else {
|
||||||
|
final var throwables = t.stream().map(FutureResult::exception).filter(e -> e != null).toList();
|
||||||
|
CompletableFuture<Void> cf = new CompletableFuture<>();
|
||||||
|
final RuntimeException accumulator = new RuntimeException();
|
||||||
|
cf.completeExceptionally(accumulator);
|
||||||
|
for (Throwable exception : throwables) {
|
||||||
|
if (exception instanceof CompletionException) {
|
||||||
|
exception = exception.getCause();
|
||||||
|
}
|
||||||
|
if (exception.getSuppressed().length != 0) {
|
||||||
|
for (Throwable throwable : exception.getSuppressed()) {
|
||||||
|
accumulator.addSuppressed(throwable);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
accumulator.addSuppressed(exception);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return cf;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
record FutureResult<V>(V value, Throwable exception){}
|
||||||
|
|
||||||
|
static <V> CompletableFuture<List<FutureResult<V>>> gather(Collection<? extends CompletableFuture<? extends V>> futures) {
|
||||||
|
var list = new ArrayList<FutureResult<V>>(futures.size());
|
||||||
|
var results = new CompletableFuture[futures.size()];
|
||||||
|
|
||||||
|
for (var future : futures) {
|
||||||
|
int i = list.size();
|
||||||
|
list.add(null);
|
||||||
|
results[i] = future.whenComplete((result, exception) -> list.set(i, new FutureResult<>(result, exception)));
|
||||||
|
}
|
||||||
|
|
||||||
|
return CompletableFuture.allOf(results).handle((r, th)->null).thenApply(res -> list);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static <T extends Event & IModBusEvent> void addCompletableFutureTaskForModDispatch(
|
||||||
|
final IModStateTransition transition,
|
||||||
|
final Executor executor,
|
||||||
|
final List<CompletableFuture<Void>> completableFutures,
|
||||||
|
final ProgressMeter progressBar,
|
||||||
|
final EventGenerator<T> eventGenerator,
|
||||||
|
final BiFunction<ModLoadingStage, Throwable, ModLoadingStage> nextState
|
||||||
|
) {
|
||||||
|
|
||||||
|
@SuppressWarnings("removal")
|
||||||
|
var preDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
|
||||||
|
if (preDispatchHook != null)
|
||||||
|
completableFutures.add(preDispatchHook);
|
||||||
|
|
||||||
|
var modFutures = new LinkedHashMap<String, CompletableFuture<Void>>();
|
||||||
|
for (var mod : ModList.get().getLoadedMods()) {
|
||||||
|
|
||||||
|
CompletableFuture<Void> parent = null;
|
||||||
|
if (mod.dependencies.isEmpty()) {
|
||||||
|
parent = CompletableFuture.allOf();
|
||||||
|
} else {
|
||||||
|
var deps = new CompletableFuture[mod.dependencies.size()];
|
||||||
|
int idx = 0;
|
||||||
|
for (var depContainer : mod.dependencies) {
|
||||||
|
var future = modFutures.get(depContainer.getModId());
|
||||||
|
if (future == null)
|
||||||
|
throw new IllegalStateException("Could not find dependency future " + depContainer.getModId() + " for " + mod.getModId());
|
||||||
|
deps[idx++] = future;
|
||||||
|
}
|
||||||
|
parent = CompletableFuture.allOf(deps);
|
||||||
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("removal")
|
||||||
|
var dispatch = parent
|
||||||
|
.thenRunAsync(() -> {
|
||||||
|
ModLoadingContext.get().setActiveContainer(mod);
|
||||||
|
var handler = mod.activityMap.get(mod.modLoadingStage);
|
||||||
|
if (handler != null)
|
||||||
|
handler.run();
|
||||||
|
mod.acceptEvent(eventGenerator.apply(mod));
|
||||||
|
}, executor)
|
||||||
|
.whenComplete((mc, exception) -> {
|
||||||
|
mod.modLoadingStage = nextState.apply(mod.modLoadingStage, exception);
|
||||||
|
progressBar.increment();
|
||||||
|
ModLoadingContext.get().setActiveContainer(null);
|
||||||
|
});
|
||||||
|
|
||||||
|
modFutures.put(mod.getModId(), dispatch);
|
||||||
|
}
|
||||||
|
|
||||||
|
var dispatch = gather(modFutures.values()).thenComposeAsync(ModStateTransitionHelper::completableFutureFromExceptionList, executor);
|
||||||
|
completableFutures.add(dispatch);
|
||||||
|
|
||||||
|
@SuppressWarnings("removal")
|
||||||
|
var postDispatchHook = getHook(transition.preDispatchHook(), executor, eventGenerator);
|
||||||
|
if (postDispatchHook != null)
|
||||||
|
completableFutures.add(postDispatchHook);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static <T extends Event & IModBusEvent> CompletableFuture<Void> getHook(BiFunction<Executor, ? extends EventGenerator<?>, CompletableFuture<Void>> hook, Executor executor, EventGenerator<T> eventGenerator) {
|
||||||
|
if (hook == null || hook == IModStateTransition.NULL_HOOK) return null;
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
|
var hookTyped = (BiFunction<Executor, EventGenerator<T>, CompletableFuture<Void>>)hook;
|
||||||
|
return hookTyped.apply(executor, eventGenerator);
|
||||||
|
}
|
||||||
|
|
||||||
|
static <T extends Event & IModBusEvent> CompletableFuture<Void> build(
|
||||||
|
final IModStateTransition transition,
|
||||||
|
final String name,
|
||||||
|
final Executor syncExecutor,
|
||||||
|
final Executor parallelExecutor,
|
||||||
|
final ProgressMeter progressBar,
|
||||||
|
final Function<Executor, CompletableFuture<Void>> preSyncTask,
|
||||||
|
final Function<Executor, CompletableFuture<Void>> postSyncTask
|
||||||
|
) {
|
||||||
|
List<CompletableFuture<Void>> futures = new ArrayList<>();
|
||||||
|
final var executor = transition.threadSelector().apply(syncExecutor, parallelExecutor);
|
||||||
|
|
||||||
|
@SuppressWarnings({ "removal", "unchecked" })
|
||||||
|
var events = transition.eventFunctionStream().get().map(f -> (EventGenerator<T>)f).toList();
|
||||||
|
for (int x = 0; x < events.size(); x++) {
|
||||||
|
var gen = events.get(x);
|
||||||
|
BiFunction<ModLoadingStage, Throwable, ModLoadingStage> state = x == events.size() - 1
|
||||||
|
? transition.nextModLoadingStage()
|
||||||
|
: ModLoadingStage::currentState;
|
||||||
|
addCompletableFutureTaskForModDispatch(transition, executor, futures, progressBar, gen, state);
|
||||||
|
}
|
||||||
|
|
||||||
|
final CompletableFuture<Void> preSyncTaskCF = preSyncTask.apply(syncExecutor);
|
||||||
|
final CompletableFuture<Void> eventDispatchCF = gather(futures).thenCompose(ModStateTransitionHelper::completableFutureFromExceptionList);
|
||||||
|
final CompletableFuture<Void> postEventDispatchCF = preSyncTaskCF
|
||||||
|
.thenApplyAsync(n -> {
|
||||||
|
progressBar.label(progressBar.name() + ": dispatching " + name);
|
||||||
|
return null;
|
||||||
|
}, parallelExecutor)
|
||||||
|
.thenComposeAsync(n -> eventDispatchCF, parallelExecutor)
|
||||||
|
.thenApply(r -> {
|
||||||
|
postSyncTask.apply(syncExecutor);
|
||||||
|
return null;
|
||||||
|
});
|
||||||
|
return transition.finalActivityGenerator().apply(syncExecutor, postEventDispatchCF);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,6 +14,7 @@ import com.mojang.logging.LogUtils;
|
|||||||
import net.minecraftforge.fml.loading.FMLConfig;
|
import net.minecraftforge.fml.loading.FMLConfig;
|
||||||
import net.minecraftforge.fml.loading.FMLPaths;
|
import net.minecraftforge.fml.loading.FMLPaths;
|
||||||
import org.apache.commons.io.FilenameUtils;
|
import org.apache.commons.io.FilenameUtils;
|
||||||
|
import org.jetbrains.annotations.Nullable;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
@@ -25,9 +26,66 @@ import static net.minecraftforge.fml.config.ConfigTracker.CONFIG;
|
|||||||
|
|
||||||
public class ConfigFileTypeHandler {
|
public class ConfigFileTypeHandler {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
static final ConfigFileTypeHandler TOML = new ConfigFileTypeHandler();
|
|
||||||
private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
|
private static final Path defaultConfigPath = FMLPaths.GAMEDIR.get().resolve(FMLConfig.getConfigValue(FMLConfig.ConfigValue.DEFAULT_CONFIG_PATH));
|
||||||
|
|
||||||
|
private static final ConfigFileTypeHandler CLIENT = new ConfigFileTypeHandler(ModConfig.Type.CLIENT);
|
||||||
|
private static final ConfigFileTypeHandler COMMON = new ConfigFileTypeHandler(ModConfig.Type.COMMON);
|
||||||
|
private static final ConfigFileTypeHandler SERVER = new ConfigFileTypeHandler(ModConfig.Type.SERVER);
|
||||||
|
|
||||||
|
private final @Nullable ModConfig.Type type;
|
||||||
|
private @Nullable FileWatcher watcher;
|
||||||
|
|
||||||
|
// exists for bin compat
|
||||||
|
public ConfigFileTypeHandler() {
|
||||||
|
this(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
private ConfigFileTypeHandler(@Nullable ModConfig.Type type) {
|
||||||
|
this.type = type;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the handler for the given {@link ModConfig.Type}.
|
||||||
|
*
|
||||||
|
* @param type The type to get the handler for
|
||||||
|
* @return The handler
|
||||||
|
*/
|
||||||
|
static ConfigFileTypeHandler get(ModConfig.Type type) {
|
||||||
|
return switch (type) {
|
||||||
|
case CLIENT -> CLIENT;
|
||||||
|
case COMMON -> COMMON;
|
||||||
|
case SERVER -> SERVER;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the {@link FileWatcher} for this handler, creating it if it doesn't exist and/or has been stopped.
|
||||||
|
*
|
||||||
|
* @return The watcher
|
||||||
|
*
|
||||||
|
* @apiNote This is package-private so modders can't just call {@link FileWatcher#stop()} and fuck up everything.
|
||||||
|
*/
|
||||||
|
FileWatcher getWatcher() {
|
||||||
|
if (this.watcher == null) {
|
||||||
|
LOGGER.debug(CONFIG, "Starting watcher for handler: {}", this);
|
||||||
|
this.watcher = new FileWatcher();
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.watcher;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Stops the {@link FileWatcher} for this handler, and sets it to null afterward. Use this instead of
|
||||||
|
* {@link FileWatcher#stop()}.
|
||||||
|
*/
|
||||||
|
void stopWatcher() {
|
||||||
|
if (this.watcher == null) return;
|
||||||
|
|
||||||
|
LOGGER.debug(CONFIG, "Stopping watcher for hander: {}", this);
|
||||||
|
this.watcher.stop();
|
||||||
|
this.watcher = null;
|
||||||
|
}
|
||||||
|
|
||||||
public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
|
public Function<ModConfig, CommentedFileConfig> reader(Path configBasePath) {
|
||||||
return (c) -> {
|
return (c) -> {
|
||||||
final Path configPath = configBasePath.resolve(c.getFileName());
|
final Path configPath = configBasePath.resolve(c.getFileName());
|
||||||
@@ -37,7 +95,7 @@ public class ConfigFileTypeHandler {
|
|||||||
onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)).
|
onFileNotFound((newfile, configFormat)-> setupConfigFile(c, newfile, configFormat)).
|
||||||
writingMode(WritingMode.REPLACE).
|
writingMode(WritingMode.REPLACE).
|
||||||
build();
|
build();
|
||||||
LOGGER.debug(CONFIG, "Built TOML config for {}", configPath.toString());
|
LOGGER.debug(CONFIG, "Built TOML config for {}", configPath);
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
configData.load();
|
configData.load();
|
||||||
@@ -46,9 +104,9 @@ public class ConfigFileTypeHandler {
|
|||||||
{
|
{
|
||||||
throw new ConfigLoadingException(c, ex);
|
throw new ConfigLoadingException(c, ex);
|
||||||
}
|
}
|
||||||
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath.toString());
|
LOGGER.debug(CONFIG, "Loaded TOML config file {}", configPath);
|
||||||
FileWatcher.defaultInstance().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
|
this.getWatcher().addWatch(configPath, new ConfigWatcher(c, configData, Thread.currentThread().getContextClassLoader()));
|
||||||
LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath.toString());
|
LOGGER.debug(CONFIG, "Watching TOML config file {} for changes", configPath);
|
||||||
return configData;
|
return configData;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -56,9 +114,9 @@ public class ConfigFileTypeHandler {
|
|||||||
public void unload(Path configBasePath, ModConfig config) {
|
public void unload(Path configBasePath, ModConfig config) {
|
||||||
Path configPath = configBasePath.resolve(config.getFileName());
|
Path configPath = configBasePath.resolve(config.getFileName());
|
||||||
try {
|
try {
|
||||||
FileWatcher.defaultInstance().removeWatch(configBasePath.resolve(config.getFileName()));
|
this.getWatcher().removeWatch(configPath);
|
||||||
} catch (RuntimeException e) {
|
} catch (RuntimeException e) {
|
||||||
LOGGER.error("Failed to remove config {} from tracker!", configPath.toString(), e);
|
LOGGER.error("Failed to remove config {} from tracker!", configPath, e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,6 +167,11 @@ public class ConfigFileTypeHandler {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "ConfigFileTypeHandler[" + (type != null ? type : "UNKNOWN") + "]";
|
||||||
|
}
|
||||||
|
|
||||||
private record ConfigWatcher(
|
private record ConfigWatcher(
|
||||||
ModConfig modConfig,
|
ModConfig modConfig,
|
||||||
CommentedFileConfig commentedFileConfig,
|
CommentedFileConfig commentedFileConfig,
|
||||||
|
|||||||
@@ -8,6 +8,9 @@ package net.minecraftforge.fml.config;
|
|||||||
import com.electronwill.nightconfig.core.CommentedConfig;
|
import com.electronwill.nightconfig.core.CommentedConfig;
|
||||||
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
|
import net.minecraftforge.api.distmarker.Dist;
|
||||||
|
import net.minecraftforge.fml.DistExecutor;
|
||||||
|
import net.minecraftforge.fml.loading.FMLPaths;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.Marker;
|
import org.slf4j.Marker;
|
||||||
import org.slf4j.MarkerFactory;
|
import org.slf4j.MarkerFactory;
|
||||||
@@ -52,11 +55,24 @@ public class ConfigTracker {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: [FML] This is only called for the server (outside of forceUnload)
|
||||||
|
// rethink config implementation for eventual FML rewrite
|
||||||
public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
|
public void unloadConfigs(ModConfig.Type type, Path configBasePath) {
|
||||||
LOGGER.debug(CONFIG, "Unloading configs type {}", type);
|
LOGGER.debug(CONFIG, "Unloading configs type {}", type);
|
||||||
for (ModConfig config : this.configSets.get(type)) {
|
for (ModConfig config : this.configSets.get(type)) {
|
||||||
closeConfig(config, configBasePath);
|
closeConfig(config, configBasePath);
|
||||||
}
|
}
|
||||||
|
ConfigFileTypeHandler.get(type).stopWatcher();
|
||||||
|
}
|
||||||
|
|
||||||
|
// If there is a better way to do this, please tell me. Because this is FUCKED
|
||||||
|
public void forceUnload() {
|
||||||
|
// This is how ModStateProvider handles loading configs. So we're doing the same but with unloadConfigs instead
|
||||||
|
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> this.unloadConfigs(ModConfig.Type.CLIENT, FMLPaths.CONFIGDIR.get()));
|
||||||
|
this.unloadConfigs(ModConfig.Type.COMMON, FMLPaths.CONFIGDIR.get());
|
||||||
|
|
||||||
|
// just in case server watcher is still alive somehow...
|
||||||
|
ConfigFileTypeHandler.get(ModConfig.Type.SERVER).stopWatcher();
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void openConfig(final ModConfig config, final Path configBasePath) {
|
private static void openConfig(final ModConfig config, final Path configBasePath) {
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ public class ModConfig
|
|||||||
this.spec = spec;
|
this.spec = spec;
|
||||||
this.fileName = fileName;
|
this.fileName = fileName;
|
||||||
this.container = container;
|
this.container = container;
|
||||||
this.configHandler = ConfigFileTypeHandler.TOML;
|
this.configHandler = ConfigFileTypeHandler.get(type);
|
||||||
ConfigTracker.INSTANCE.trackConfig(this);
|
ConfigTracker.INSTANCE.trackConfig(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+27
-21
@@ -22,9 +22,7 @@ import org.slf4j.Logger;
|
|||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.awt.Desktop;
|
import java.awt.Desktop;
|
||||||
import java.io.BufferedReader;
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStreamReader;
|
|
||||||
import java.lang.reflect.Method;
|
import java.lang.reflect.Method;
|
||||||
import java.lang.reflect.Modifier;
|
import java.lang.reflect.Modifier;
|
||||||
import java.net.URI;
|
import java.net.URI;
|
||||||
@@ -87,6 +85,7 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
private ScheduledFuture<?> initializationFuture;
|
private ScheduledFuture<?> initializationFuture;
|
||||||
|
|
||||||
private PerformanceInfo performanceInfo;
|
private PerformanceInfo performanceInfo;
|
||||||
|
@SuppressWarnings("unused")
|
||||||
private ScheduledFuture<?> performanceTick;
|
private ScheduledFuture<?> performanceTick;
|
||||||
// The GL ID of the window. Used for all operations
|
// The GL ID of the window. Used for all operations
|
||||||
private long window;
|
private long window;
|
||||||
@@ -259,7 +258,11 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||||
|
|
||||||
this.elements.removeIf(element -> !element.render(context, framecount));
|
for (var itr = this.elements.iterator(); itr.hasNext(); ) {
|
||||||
|
var element = itr.next();
|
||||||
|
if (!element.render(context, framecount))
|
||||||
|
itr.remove();
|
||||||
|
}
|
||||||
if (animationTimerTrigger.compareAndSet(true, false)) // we only increment the framecount on a periodic basis
|
if (animationTimerTrigger.compareAndSet(true, false)) // we only increment the framecount on a periodic basis
|
||||||
framecount++;
|
framecount++;
|
||||||
}
|
}
|
||||||
@@ -302,13 +305,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private void crashElegantly(String errorDetails) {
|
private void crashElegantly(String errorDetails) {
|
||||||
String qrText;
|
|
||||||
try (var is = new BufferedReader(new InputStreamReader(getClass().getResourceAsStream("/glfailure.txt")))) {
|
|
||||||
qrText = is.lines().collect(Collectors.joining("\n"));
|
|
||||||
} catch (IOException ioe) {
|
|
||||||
qrText = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
StringBuilder msgBuilder = new StringBuilder(2000);
|
StringBuilder msgBuilder = new StringBuilder(2000);
|
||||||
msgBuilder.append("Failed to initialize graphics window with current settings.\n");
|
msgBuilder.append("Failed to initialize graphics window with current settings.\n");
|
||||||
msgBuilder.append("\n\n");
|
msgBuilder.append("\n\n");
|
||||||
@@ -407,13 +403,13 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
if (showHelpLog && versidx == 0) {
|
if (showHelpLog && versidx == 0) {
|
||||||
LOGGER.info("""
|
LOGGER.info("""
|
||||||
If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
|
If this message is the only thing at the bottom of your log before a crash, you probably have a driver issue.
|
||||||
|
|
||||||
Possible solutions:
|
Possible solutions:
|
||||||
A) Make sure Minecraft is set to prefer high performance graphics in the OS and/or driver control panel
|
A) Make sure Minecraft is set to prefer high performance graphics in the OS and/or driver control panel
|
||||||
B) Check for driver updates on the graphics brand's website
|
B) Check for driver updates on the graphics brand's website
|
||||||
C) Try reinstalling your graphics drivers
|
C) Try reinstalling your graphics drivers
|
||||||
D) If still not working after trying all of the above, ask for further help on the Forge forums or Discord
|
D) If still not working after trying all of the above, ask for further help on the Forge forums or Discord
|
||||||
|
|
||||||
You can safely ignore this message if the game starts up successfully.""");
|
You can safely ignore this message if the game starts up successfully.""");
|
||||||
}
|
}
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, GL_VERSIONS[versidx][0]); // we try our versions one at a time
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, GL_VERSIONS[versidx][0]); // we try our versions one at a time
|
||||||
@@ -497,10 +493,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
glfwPollEvents();
|
glfwPollEvents();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void badWindowHandler(final int code, final long desc) {
|
|
||||||
LOGGER.error("Got error from GLFW window init: "+code+ " "+MemoryUtil.memUTF8(desc));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void winResize(long window, int width, int height) {
|
private void winResize(long window, int width, int height) {
|
||||||
if (window == this.window && width != 0 && height != 0) {
|
if (window == this.window && width != 0 && height != 0) {
|
||||||
this.winWidth = width;
|
this.winWidth = width;
|
||||||
@@ -612,10 +604,25 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateModuleReads(final ModuleLayer layer) {
|
public void updateModuleReads(final ModuleLayer layer) {
|
||||||
var fm = layer.findModule("forge").orElseThrow();
|
final var FORGE_MODULE = "net.minecraftforge.forge";
|
||||||
getClass().getModule().addReads(fm);
|
var forge_module = layer.findModule(FORGE_MODULE).orElse(null);
|
||||||
var clz = FMLLoader.getGameLayer().findModule("forge").map(l->Class.forName(l, "net.minecraftforge.client.loading.ForgeLoadingOverlay")).orElseThrow();
|
if (forge_module == null)
|
||||||
loadingOverlay = Arrays.stream(clz.getDeclaredMethods()).filter(m-> Modifier.isStatic(m.getModifiers()) && m.getName().equals("newInstance")).findFirst().orElseThrow();
|
throw new IllegalStateException("Could not find " + FORGE_MODULE + " in " + layer);
|
||||||
|
|
||||||
|
getClass().getModule().addReads(forge_module);
|
||||||
|
|
||||||
|
|
||||||
|
var clz = Class.forName(forge_module, "net.minecraftforge.client.loading.ForgeLoadingOverlay");
|
||||||
|
|
||||||
|
for (var mtd : clz.getDeclaredMethods()) {
|
||||||
|
if (Modifier.isStatic(mtd.getModifiers()) && "newInstance".equals(mtd.getName())) {
|
||||||
|
this.loadingOverlay = mtd;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (loadingOverlay == null)
|
||||||
|
throw new IllegalStateException("Could not find static newInstace method in " + clz.getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getFramebufferTextureId() {
|
public int getFramebufferTextureId() {
|
||||||
@@ -634,7 +641,6 @@ public class DisplayWindow implements ImmediateWindowProvider {
|
|||||||
|
|
||||||
public void addMojangTexture(final int textureId) {
|
public void addMojangTexture(final int textureId) {
|
||||||
this.elements.add(0, RenderElement.mojang(textureId, framecount));
|
this.elements.add(0, RenderElement.mojang(textureId, framecount));
|
||||||
// this.elements.get(0).retire(framecount + 1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void close() {
|
public void close() {
|
||||||
|
|||||||
+4
-5
@@ -13,10 +13,10 @@ import java.lang.management.MemoryMXBean;
|
|||||||
import java.lang.management.MemoryUsage;
|
import java.lang.management.MemoryUsage;
|
||||||
|
|
||||||
public class PerformanceInfo {
|
public class PerformanceInfo {
|
||||||
|
private static final MemoryMXBean MEMORY_BEAN = ManagementFactory.getMemoryMXBean();
|
||||||
|
|
||||||
private final boolean showCPUUsage;
|
private final boolean showCPUUsage;
|
||||||
private final OperatingSystemMXBean osBean;
|
private final OperatingSystemMXBean osBean;
|
||||||
private final MemoryMXBean memoryBean;
|
|
||||||
|
|
||||||
private float memory;
|
private float memory;
|
||||||
private String text;
|
private String text;
|
||||||
@@ -24,15 +24,14 @@ public class PerformanceInfo {
|
|||||||
PerformanceInfo() {
|
PerformanceInfo() {
|
||||||
showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
|
showCPUUsage = FMLConfig.getBoolConfigValue(FMLConfig.ConfigValue.EARLY_WINDOW_SHOW_CPU);
|
||||||
osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
|
osBean = showCPUUsage ? ManagementFactory.getPlatformMXBean(OperatingSystemMXBean.class) : null;
|
||||||
memoryBean = ManagementFactory.getMemoryMXBean();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void update() {
|
void update() {
|
||||||
final MemoryUsage heapusage = memoryBean.getHeapMemoryUsage();
|
final MemoryUsage heapusage = MEMORY_BEAN.getHeapMemoryUsage();
|
||||||
memory = (float) heapusage.getUsed() / heapusage.getMax();
|
memory = (float) heapusage.getUsed() / heapusage.getMax();
|
||||||
|
|
||||||
if (!showCPUUsage) {
|
if (!showCPUUsage) {
|
||||||
text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20);
|
text = "Memory: %d/%dMB (%.1f%%)".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,7 +43,7 @@ public class PerformanceInfo {
|
|||||||
cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
|
cpuText = "CPU: %.1f%%".formatted(cpuLoad * 100f);
|
||||||
}
|
}
|
||||||
|
|
||||||
text = "Heap: %d/%d MB (%.1f%%) OffHeap: %d MB %s".formatted(heapusage.getUsed() >> 20, heapusage.getMax() >> 20, memory * 100.0, memoryBean.getNonHeapMemoryUsage().getUsed() >> 20, cpuText);
|
text = "Memory: %d/%dMB (%.1f%%) %s".formatted(heapusage.getUsed() >>> 20, heapusage.getMax() >>> 20, memory * 100f, cpuText);
|
||||||
}
|
}
|
||||||
|
|
||||||
String text() {
|
String text() {
|
||||||
|
|||||||
@@ -11,8 +11,6 @@ import org.lwjgl.stb.STBTTFontinfo;
|
|||||||
import org.lwjgl.stb.STBTTPackContext;
|
import org.lwjgl.stb.STBTTPackContext;
|
||||||
import org.lwjgl.stb.STBTTPackRange;
|
import org.lwjgl.stb.STBTTPackRange;
|
||||||
import org.lwjgl.stb.STBTTPackedchar;
|
import org.lwjgl.stb.STBTTPackedchar;
|
||||||
import org.lwjgl.system.MemoryStack;
|
|
||||||
|
|
||||||
import java.nio.ByteBuffer;
|
import java.nio.ByteBuffer;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
|
|
||||||
|
|||||||
+8
-1
@@ -50,7 +50,14 @@ public class CapabilityTokenSubclass implements ILaunchPluginService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
return isEmpty ? NAY : YAY;
|
if (isEmpty)
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
if (internalName.startsWith("net/minecraft/") || internalName.startsWith("com/mojang/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+24
-3
@@ -8,6 +8,7 @@ package net.minecraftforge.fml.common.asm;
|
|||||||
import java.util.EnumSet;
|
import java.util.EnumSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
@@ -35,6 +36,9 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
|
|||||||
new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"),
|
new VanillaObjectHolderData("net.minecraft.core.particles.ParticleTypes", "particle_type", "net.minecraft.core.particles.ParticleType"),
|
||||||
new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent")
|
new VanillaObjectHolderData("net.minecraft.sounds.SoundEvents", "sound_event", "net.minecraft.sounds.SoundEvent")
|
||||||
).collect(Collectors.toUnmodifiableMap(VanillaObjectHolderData::holderClass, Function.identity()));
|
).collect(Collectors.toUnmodifiableMap(VanillaObjectHolderData::holderClass, Function.identity()));
|
||||||
|
private static final Set<String> VANILLA_OBJECT_HOLDER_CLASSES = VANILLA_OBJECT_HOLDERS.keySet().stream()
|
||||||
|
.map(it -> it.replace('.', '/'))
|
||||||
|
.collect(Collectors.toUnmodifiableSet());
|
||||||
private static final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
|
private static final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading.
|
||||||
private static final int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
|
private static final int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
|
||||||
|
|
||||||
@@ -47,9 +51,26 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
|
|||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
{
|
if (isEmpty)
|
||||||
return isEmpty ? NAY : YAY;
|
return NAY;
|
||||||
|
|
||||||
|
// Let's skip processing classes that definitely don't have object holders
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
|
||||||
|
// Forge classes that aren't in the debug package (that package is used for tests)
|
||||||
|
if (internalName.startsWith("net/minecraftforge/") && !internalName.substring(18).contains("debug"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
// Vanilla classes that don't have object holders
|
||||||
|
if (internalName.startsWith("com/mojang/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
// ...except specific ones we added to the VANILLA_OBJECT_HOLDERS map
|
||||||
|
if (internalName.startsWith("net/minecraft/") && !VANILLA_OBJECT_HOLDER_CLASSES.contains(internalName))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean hasHolder(List<AnnotationNode> lst) {
|
private static boolean hasHolder(List<AnnotationNode> lst) {
|
||||||
|
|||||||
@@ -48,9 +48,15 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
|
|||||||
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
private static final EnumSet<Phase> NAY = EnumSet.noneOf(Phase.class);
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty)
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
{
|
if (isEmpty)
|
||||||
return isEmpty ? NAY : YAY;
|
return NAY;
|
||||||
|
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
if (internalName.startsWith("net/minecraftforge/") || internalName.startsWith("com/mojang/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -59,15 +65,14 @@ public class RuntimeEnumExtender implements ILaunchPluginService {
|
|||||||
if ((classNode.access & Opcodes.ACC_ENUM) == 0)
|
if ((classNode.access & Opcodes.ACC_ENUM) == 0)
|
||||||
return ComputeFlags.NO_REWRITE;
|
return ComputeFlags.NO_REWRITE;
|
||||||
|
|
||||||
|
if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName()))
|
||||||
|
return ComputeFlags.NO_REWRITE;
|
||||||
|
|
||||||
Type array = Type.getType("[" + classType.getDescriptor());
|
Type array = Type.getType("[" + classType.getDescriptor());
|
||||||
String arrayDesc = array.getDescriptor();
|
String arrayDesc = array.getDescriptor();
|
||||||
|
|
||||||
FieldNode values = classNode.fields.stream().filter(f -> f.desc.equals(arrayDesc) && ((f.access & FLAGS) == FLAGS)).findFirst().orElse(null);
|
FieldNode values = classNode.fields.stream().filter(f -> f.desc.equals(arrayDesc) && ((f.access & FLAGS) == FLAGS)).findFirst().orElse(null);
|
||||||
|
|
||||||
if (!classNode.interfaces.contains(MARKER_IFACE.getInternalName())) {
|
|
||||||
return ComputeFlags.NO_REWRITE;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Static methods named "create" with first argument as a string
|
//Static methods named "create" with first argument as a string
|
||||||
List<MethodNode> candidates = classNode.methods.stream()
|
List<MethodNode> candidates = classNode.methods.stream()
|
||||||
.filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create"))
|
.filter(m -> ((m.access & Opcodes.ACC_STATIC) != 0) && m.name.equals("create"))
|
||||||
|
|||||||
@@ -140,7 +140,7 @@ public class ImmediateWindowHandler {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void updateModuleReads(final ModuleLayer layer) {
|
public void updateModuleReads(final ModuleLayer layer) {
|
||||||
var fm = layer.findModule("forge");
|
var fm = layer.findModule("net.minecraftforge.forge");
|
||||||
if (fm.isPresent()) {
|
if (fm.isPresent()) {
|
||||||
getClass().getModule().addReads(fm.get());
|
getClass().getModule().addReads(fm.get());
|
||||||
var clz = fm.map(l -> Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback")).orElseThrow();
|
var clz = fm.map(l -> Class.forName(l, "net.minecraftforge.client.loading.NoVizFallback")).orElseThrow();
|
||||||
|
|||||||
@@ -5,31 +5,25 @@
|
|||||||
|
|
||||||
package net.minecraftforge.fml.loading;
|
package net.minecraftforge.fml.loading;
|
||||||
|
|
||||||
import cpw.mods.modlauncher.api.LamdbaExceptionUtils;
|
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
|
import net.minecraftforge.fml.loading.moddiscovery.BackgroundScanHandler;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModInfo;
|
||||||
import net.minecraftforge.forgespi.locating.IModFile;
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
|
|
||||||
import java.net.URL;
|
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.Enumeration;
|
|
||||||
import java.util.Iterator;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.NoSuchElementException;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Master list of all mods <em>in the loading context. This class cannot refer outside the
|
* Master list of all mods <em>in the loading context. This class cannot refer outside the
|
||||||
* loading package</em>
|
* loading package</em>
|
||||||
*/
|
*/
|
||||||
public class LoadingModList
|
public class LoadingModList {
|
||||||
{
|
|
||||||
private static LoadingModList INSTANCE;
|
private static LoadingModList INSTANCE;
|
||||||
private final List<ModFileInfo> modFiles;
|
private final List<ModFileInfo> modFiles;
|
||||||
private final List<ModInfo> sortedList;
|
private final List<ModInfo> sortedList;
|
||||||
@@ -37,15 +31,14 @@ public class LoadingModList
|
|||||||
private final List<EarlyLoadingException> preLoadErrors;
|
private final List<EarlyLoadingException> preLoadErrors;
|
||||||
private List<IModFile> brokenFiles;
|
private List<IModFile> brokenFiles;
|
||||||
|
|
||||||
private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList)
|
private LoadingModList(final List<ModFile> modFiles, final List<ModInfo> sortedList) {
|
||||||
{
|
|
||||||
this.modFiles = modFiles.stream()
|
this.modFiles = modFiles.stream()
|
||||||
.map(ModFile::getModFileInfo)
|
.map(ModFile::getModFileInfo)
|
||||||
.map(ModFileInfo.class::cast)
|
.map(ModFileInfo.class::cast)
|
||||||
.collect(Collectors.toList());
|
.toList();
|
||||||
this.sortedList = sortedList.stream()
|
this.sortedList = sortedList.stream()
|
||||||
.map(ModInfo.class::cast)
|
.map(ModInfo.class::cast)
|
||||||
.collect(Collectors.toList());
|
.toList();
|
||||||
this.fileById = this.modFiles.stream()
|
this.fileById = this.modFiles.stream()
|
||||||
.map(ModFileInfo::getMods)
|
.map(ModFileInfo::getMods)
|
||||||
.flatMap(Collection::stream)
|
.flatMap(Collection::stream)
|
||||||
@@ -54,21 +47,18 @@ public class LoadingModList
|
|||||||
this.preLoadErrors = new ArrayList<>();
|
this.preLoadErrors = new ArrayList<>();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException)
|
public static LoadingModList of(List<ModFile> modFiles, List<ModInfo> sortedList, final EarlyLoadingException earlyLoadingException) {
|
||||||
{
|
|
||||||
INSTANCE = new LoadingModList(modFiles, sortedList);
|
INSTANCE = new LoadingModList(modFiles, sortedList);
|
||||||
if (earlyLoadingException != null)
|
if (earlyLoadingException != null)
|
||||||
{
|
|
||||||
INSTANCE.preLoadErrors.add(earlyLoadingException);
|
INSTANCE.preLoadErrors.add(earlyLoadingException);
|
||||||
}
|
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static LoadingModList get() {
|
public static LoadingModList get() {
|
||||||
return INSTANCE;
|
return INSTANCE;
|
||||||
}
|
}
|
||||||
public void addCoreMods()
|
|
||||||
{
|
public void addCoreMods() {
|
||||||
modFiles.stream()
|
modFiles.stream()
|
||||||
.map(ModFileInfo::getFile)
|
.map(ModFileInfo::getFile)
|
||||||
.map(ModFile::getCoreMods)
|
.map(ModFile::getCoreMods)
|
||||||
@@ -76,8 +66,7 @@ public class LoadingModList
|
|||||||
.forEach(FMLLoader.getCoreModProvider()::addCoreMod);
|
.forEach(FMLLoader.getCoreModProvider()::addCoreMod);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addAccessTransformers()
|
public void addAccessTransformers() {
|
||||||
{
|
|
||||||
for (ModFileInfo modFile : modFiles) {
|
for (ModFileInfo modFile : modFiles) {
|
||||||
ModFile mod = modFile.getFile();
|
ModFile mod = modFile.getFile();
|
||||||
var at = mod.getAccessTransformer().orElse(null);
|
var at = mod.getAccessTransformer().orElse(null);
|
||||||
@@ -87,21 +76,18 @@ public class LoadingModList
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addForScanning(BackgroundScanHandler backgroundScanHandler)
|
public void addForScanning(BackgroundScanHandler backgroundScanHandler) {
|
||||||
{
|
|
||||||
backgroundScanHandler.setLoadingModList(this);
|
backgroundScanHandler.setLoadingModList(this);
|
||||||
modFiles.stream()
|
modFiles.stream()
|
||||||
.map(ModFileInfo::getFile)
|
.map(ModFileInfo::getFile)
|
||||||
.forEach(backgroundScanHandler::submitForScanning);
|
.forEach(backgroundScanHandler::submitForScanning);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModFileInfo> getModFiles()
|
public List<ModFileInfo> getModFiles() {
|
||||||
{
|
|
||||||
return modFiles;
|
return modFiles;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Path findResource(final String className)
|
public Path findResource(final String className) {
|
||||||
{
|
|
||||||
for (ModFileInfo mf : modFiles) {
|
for (ModFileInfo mf : modFiles) {
|
||||||
final Path resource = mf.getFile().findResource(className);
|
final Path resource = mf.getFile().findResource(className);
|
||||||
if (Files.exists(resource)) return resource;
|
if (Files.exists(resource)) return resource;
|
||||||
@@ -109,55 +95,11 @@ public class LoadingModList
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Enumeration<URL> findAllURLsForResource(final String resName) {
|
public ModFileInfo getModFileById(String modid) {
|
||||||
final String resourceName;
|
|
||||||
// strip a leading slash
|
|
||||||
if (resName.startsWith("/")) {
|
|
||||||
resourceName = resName.substring(1);
|
|
||||||
} else {
|
|
||||||
resourceName = resName;
|
|
||||||
}
|
|
||||||
return new Enumeration<URL>() {
|
|
||||||
private final Iterator<ModFileInfo> modFileIterator = modFiles.iterator();
|
|
||||||
private URL next;
|
|
||||||
@Override
|
|
||||||
public boolean hasMoreElements() {
|
|
||||||
if (next!=null) return true;
|
|
||||||
next = findNextURL();
|
|
||||||
return next != null;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public URL nextElement() {
|
|
||||||
if (next == null) {
|
|
||||||
next = findNextURL();
|
|
||||||
if (next == null) throw new NoSuchElementException();
|
|
||||||
}
|
|
||||||
URL result = next;
|
|
||||||
next = null;
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
private URL findNextURL() {
|
|
||||||
while (modFileIterator.hasNext()) {
|
|
||||||
final ModFileInfo next = modFileIterator.next();
|
|
||||||
final Path resource = next.getFile().findResource(resourceName);
|
|
||||||
if (Files.exists(resource)) {
|
|
||||||
return LamdbaExceptionUtils.uncheck(()->new URL("modjar://" + next.getMods().get(0).getModId() + "/" + resourceName));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public ModFileInfo getModFileById(String modid)
|
|
||||||
{
|
|
||||||
return this.fileById.get(modid);
|
return this.fileById.get(modid);
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<ModInfo> getMods()
|
public List<ModInfo> getMods() {
|
||||||
{
|
|
||||||
return this.sortedList;
|
return this.sortedList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ package net.minecraftforge.fml.loading;
|
|||||||
import com.google.common.graph.GraphBuilder;
|
import com.google.common.graph.GraphBuilder;
|
||||||
import com.google.common.graph.MutableGraph;
|
import com.google.common.graph.MutableGraph;
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo.ModVersion;
|
||||||
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
|
import net.minecraftforge.fml.loading.EarlyLoadingException.ExceptionData;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
|
||||||
@@ -20,235 +20,250 @@ import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collection;
|
||||||
import java.util.Comparator;
|
import java.util.Comparator;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.HashSet;
|
||||||
|
import java.util.LinkedHashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
|
||||||
import java.util.function.Function;
|
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import static java.util.stream.Collectors.*;
|
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
||||||
|
|
||||||
public class ModSorter
|
public class ModSorter {
|
||||||
{
|
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
private final UniqueModListBuilder uniqueModListBuilder;
|
|
||||||
private List<ModFile> modFiles;
|
|
||||||
private List<ModInfo> sortedList;
|
|
||||||
private Map<String, IModInfo> modIdNameLookup;
|
|
||||||
private List<ModFile> systemMods;
|
|
||||||
|
|
||||||
private ModSorter(final List<ModFile> modFiles)
|
private record State(List<ModFile> files, List<ModInfo> mods) {}
|
||||||
{
|
|
||||||
this.uniqueModListBuilder = new UniqueModListBuilder(modFiles);
|
private ModSorter() {}
|
||||||
}
|
|
||||||
|
@SuppressWarnings("removal")
|
||||||
|
public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors) {
|
||||||
|
State systemMods = detectSystemMods(mods);
|
||||||
|
List<ModFile> modFiles;
|
||||||
|
|
||||||
public static LoadingModList sort(List<ModFile> mods, final List<ExceptionData> errors)
|
|
||||||
{
|
|
||||||
final ModSorter ms = new ModSorter(mods);
|
|
||||||
try {
|
try {
|
||||||
ms.buildUniqueList();
|
modFiles = new UniqueModListBuilder(mods).buildUniqueList().modFiles();
|
||||||
} catch (EarlyLoadingException e) {
|
} catch (EarlyLoadingException e) {
|
||||||
// We cannot build any list with duped mods. We have to abort immediately and report it
|
// We cannot build any list with duped mods. We have to abort immediately and report it
|
||||||
// Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
|
// Note this will never actually throw an error because the duplicate checks are done in ModDiscovererer before we get to this phase
|
||||||
// So all this is really doing is wasting time.
|
// So all this is really doing is wasting time.
|
||||||
// But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
|
// But i'm leaving it here until I rewrite all of cpw's mod loading code because its such a clusterfuck.
|
||||||
return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).toList(), e);
|
return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var named = new HashMap<String, ModInfo>();
|
||||||
|
for (var file : modFiles) {
|
||||||
|
for (var info : file.getModInfos())
|
||||||
|
named.put(info.getModId(), (ModInfo)info);
|
||||||
|
}
|
||||||
|
|
||||||
// try and validate dependencies
|
// try and validate dependencies
|
||||||
final List<ExceptionData> failedList = Stream.concat(ms.verifyDependencyVersions().stream(), errors.stream()).toList();
|
final List<ExceptionData> failedList = Stream.concat(verifyDependencyVersions(modFiles).stream(), errors.stream()).toList();
|
||||||
|
|
||||||
// if we miss one or the other, we abort now
|
// if we miss one or the other, we abort now
|
||||||
if (!failedList.isEmpty()) {
|
if (!failedList.isEmpty()) {
|
||||||
return LoadingModList.of(ms.systemMods, ms.systemMods.stream().map(mf->(ModInfo)mf.getModInfos().get(0)).toList(), new EarlyLoadingException("failure to validate mod list", null, failedList));
|
return LoadingModList.of(systemMods.files(), systemMods.mods(), new EarlyLoadingException("failure to validate mod list", null, failedList));
|
||||||
} else {
|
} else {
|
||||||
// Otherwise, lets try and sort the modlist and proceed
|
// Otherwise, lets try and sort the modlist and proceed
|
||||||
EarlyLoadingException earlyLoadingException = null;
|
|
||||||
try {
|
try {
|
||||||
ms.sort();
|
var sorted = sort(modFiles, named);
|
||||||
|
return LoadingModList.of(sorted.files(), sorted.mods(), null);
|
||||||
} catch (EarlyLoadingException e) {
|
} catch (EarlyLoadingException e) {
|
||||||
earlyLoadingException = e;
|
// The only exception that can happen here is a cyclic exception, but fall back to system mods so we can display the nice screen.
|
||||||
|
return LoadingModList.of(systemMods.files(), systemMods.mods(), e);
|
||||||
}
|
}
|
||||||
return LoadingModList.of(ms.modFiles, ms.sortedList, earlyLoadingException);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void sort()
|
private static State sort(final List<ModFile> modFiles, final Map<String, ModInfo> named) {
|
||||||
{
|
final MutableGraph<ModInfo> graph = GraphBuilder.directed().build();
|
||||||
// lambdas are identity based, so sorting them is impossible unless you hold reference to them
|
|
||||||
final MutableGraph<ModFileInfo> graph = GraphBuilder.directed().build();
|
|
||||||
AtomicInteger counter = new AtomicInteger();
|
|
||||||
Map<ModFileInfo, Integer> infos = modFiles.stream()
|
|
||||||
.map(ModFile::getModFileInfo)
|
|
||||||
.filter(ModFileInfo.class::isInstance)
|
|
||||||
.map(ModFileInfo.class::cast)
|
|
||||||
.collect(toMap(Function.identity(), e -> counter.incrementAndGet()));
|
|
||||||
infos.keySet().forEach(graph::addNode);
|
|
||||||
modFiles.stream()
|
|
||||||
.map(ModFile::getModInfos)
|
|
||||||
.flatMap(List::stream)
|
|
||||||
.map(IModInfo::getDependencies)
|
|
||||||
.<IModInfo.ModVersion>flatMap(List::stream)
|
|
||||||
.forEach(dep -> addDependency(graph, dep));
|
|
||||||
|
|
||||||
final List<ModFileInfo> sorted;
|
int counter = 0;
|
||||||
try
|
var infos = new HashMap<ModInfo, Integer>();
|
||||||
{
|
for (var file : modFiles) {
|
||||||
sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
|
if (file.getModFileInfo() instanceof ModFileInfo info) {
|
||||||
}
|
for (var imod : info.getMods()) {
|
||||||
catch (CyclePresentException e)
|
var mod = (ModInfo)imod;
|
||||||
{
|
infos.put(mod, counter++);
|
||||||
Set<Set<ModFileInfo>> cycles = e.getCycles();
|
graph.addNode(mod);
|
||||||
if (LOGGER.isErrorEnabled(LOADING))
|
}
|
||||||
{
|
|
||||||
LOGGER.error(LOADING, "Mod Sorting failed.\nDetected Cycles: {}\n", cycles);
|
|
||||||
}
|
}
|
||||||
var dataList = cycles.stream()
|
}
|
||||||
.flatMap(Set::stream)
|
|
||||||
.<IModInfo>mapMulti((mf,c)->mf.getMods().forEach(c))
|
for (var file : modFiles) {
|
||||||
.map(IModInfo::getModId)
|
for (var info : file.getModInfos()) {
|
||||||
.map(list -> new ExceptionData("fml.modloading.cycle", list))
|
for (var dep : info.getDependencies()) {
|
||||||
.toList();
|
// Ordering isn't effected by sides, should it be?
|
||||||
|
//if (!dep.getSide().isCorrectSide())
|
||||||
|
// continue;
|
||||||
|
|
||||||
|
var target = named.get(dep.getModId());
|
||||||
|
|
||||||
|
// soft dep that doesn't exist. No edge required.
|
||||||
|
if (target == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var self = (ModInfo)dep.getOwner();
|
||||||
|
|
||||||
|
switch (dep.getOrdering()) {
|
||||||
|
case BEFORE -> graph.putEdge(self, target);
|
||||||
|
case AFTER -> graph.putEdge(target, self);
|
||||||
|
default -> {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
final List<ModInfo> sorted;
|
||||||
|
try {
|
||||||
|
sorted = TopologicalSort.topologicalSort(graph, Comparator.comparing(infos::get));
|
||||||
|
} catch (CyclePresentException e) {
|
||||||
|
Set<Set<ModInfo>> cycles = e.getCycles();
|
||||||
|
var buf = new StringBuilder();
|
||||||
|
buf.append("Mod Sorting failed - Detected Cycles: \n");
|
||||||
|
|
||||||
|
var dataList = new ArrayList<ExceptionData>();
|
||||||
|
for (var cycle : cycles) {
|
||||||
|
buf.append("\tCycle:\n");
|
||||||
|
for (var mod : cycle) {
|
||||||
|
var modDeps = new StringBuilder()
|
||||||
|
.append(mod.getModId())
|
||||||
|
.append(' ')
|
||||||
|
.append(mod.getDependencies().stream()
|
||||||
|
.filter(v -> cycle.stream().anyMatch(m -> m.getModId().equals(v.getModId())))
|
||||||
|
.map(dep -> dep.getOrdering().name() + " " + dep.getModId())
|
||||||
|
.collect(Collectors.joining(", "))
|
||||||
|
);
|
||||||
|
dataList.add(new ExceptionData("fml.modloading.cycle", modDeps.toString()));
|
||||||
|
buf.append("\t\tMod: ").append(modDeps.toString()).append('\n');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGGER.error(LOADING, buf.toString());
|
||||||
|
|
||||||
throw new EarlyLoadingException("Sorting error", e, dataList);
|
throw new EarlyLoadingException("Sorting error", e, dataList);
|
||||||
}
|
}
|
||||||
this.sortedList = sorted.stream()
|
|
||||||
.map(ModFileInfo::getMods)
|
|
||||||
.flatMap(List::stream)
|
|
||||||
.map(ModInfo.class::cast)
|
|
||||||
.collect(toList());
|
|
||||||
this.modFiles = sorted.stream()
|
|
||||||
.map(ModFileInfo::getFile)
|
|
||||||
.collect(toList());
|
|
||||||
}
|
|
||||||
|
|
||||||
private void addDependency(MutableGraph<ModFileInfo> topoGraph, IModInfo.ModVersion dep)
|
var files = new LinkedHashSet<ModFile>();
|
||||||
{
|
var list = new ArrayList<ModInfo>();
|
||||||
final IModInfo targetModInfo = modIdNameLookup.get(dep.getModId());
|
|
||||||
// soft dep that doesn't exist. Just return. No edge required.
|
|
||||||
if (targetModInfo == null || !(targetModInfo.getOwningFile() instanceof final ModFileInfo target)) return;
|
|
||||||
|
|
||||||
final ModFileInfo self = (ModFileInfo)dep.getOwner().getOwningFile();
|
for (var mod : sorted) {
|
||||||
if (self == target)
|
files.add(mod.getOwningFile().getFile());
|
||||||
return; // in case a jar has two mods that have dependencies between
|
list.add(mod);
|
||||||
|
|
||||||
switch (dep.getOrdering()) {
|
|
||||||
case BEFORE -> topoGraph.putEdge(self, target);
|
|
||||||
case AFTER -> topoGraph.putEdge(target, self);
|
|
||||||
default -> {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return new State(files.stream().toList(), list);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void buildUniqueList()
|
private static State detectSystemMods(final List<ModFile> modFiles) {
|
||||||
{
|
|
||||||
final UniqueModListBuilder.UniqueModListData uniqueModListData = uniqueModListBuilder.buildUniqueList();
|
|
||||||
|
|
||||||
this.modFiles = uniqueModListData.modFiles();
|
|
||||||
|
|
||||||
detectSystemMods(uniqueModListData.modFilesByFirstId());
|
|
||||||
|
|
||||||
modIdNameLookup = uniqueModListData.modFilesByFirstId().entrySet().stream()
|
|
||||||
.filter(e -> !e.getValue().get(0).getModInfos().isEmpty())
|
|
||||||
.collect(Collectors.toMap(
|
|
||||||
Map.Entry::getKey,
|
|
||||||
e -> e.getValue().get(0).getModInfos().get(0)
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
private void detectSystemMods(final Map<String, List<ModFile>> modFilesByFirstId) {
|
|
||||||
// Capture system mods (ex. MC, Forge) here, so we can keep them for later
|
// Capture system mods (ex. MC, Forge) here, so we can keep them for later
|
||||||
var systemMods = List.of("minecraft", "forge");
|
var systemMods = List.of("minecraft", "forge");
|
||||||
LOGGER.debug("Configured system mods: {}", systemMods);
|
LOGGER.debug("Configured system mods: {}", systemMods);
|
||||||
|
|
||||||
this.systemMods = new ArrayList<>();
|
var mods = new ArrayList<ModInfo>();
|
||||||
|
var files = new ArrayList<ModFile>();
|
||||||
for (var systemMod : systemMods) {
|
for (var systemMod : systemMods) {
|
||||||
var container = modFilesByFirstId.get(systemMod);
|
var mod = findMod(modFiles, systemMod);
|
||||||
if (container != null && !container.isEmpty()) {
|
if (mod == null)
|
||||||
LOGGER.debug("Found system mod: {}", systemMod);
|
|
||||||
this.systemMods.add(container.getFirst());
|
|
||||||
} else {
|
|
||||||
throw new IllegalStateException("Failed to find system mod: " + systemMod);
|
throw new IllegalStateException("Failed to find system mod: " + systemMod);
|
||||||
}
|
|
||||||
|
LOGGER.debug("Found system mod: {}", systemMod);
|
||||||
|
mods.add(mod.info());
|
||||||
|
files.add(mod.file());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return new State(files, mods);
|
||||||
}
|
}
|
||||||
|
|
||||||
private List<EarlyLoadingException.ExceptionData> verifyDependencyVersions()
|
private record ModPair(ModFile file, ModInfo info) {}
|
||||||
{
|
private static ModPair findMod(final List<ModFile> modFiles, String name) {
|
||||||
final var modVersions = modFiles.stream()
|
for (var file : modFiles) {
|
||||||
.map(ModFile::getModInfos)
|
for (var mod : file.getModFileInfo().getMods()) {
|
||||||
.flatMap(List::stream)
|
if (name.equals(mod.getModId()))
|
||||||
.collect(toMap(IModInfo::getModId, IModInfo::getVersion));
|
return new ModPair(file, (ModInfo)mod);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
final var modVersionDependencies = modFiles.stream()
|
private static List<ExceptionData> verifyDependencyVersions(final List<ModFile> files) {
|
||||||
.map(ModFile::getModInfos)
|
final var modVersions = new HashMap<String, ArtifactVersion>();
|
||||||
.flatMap(List::stream)
|
final var modRequirements = new HashSet<ModVersion>();
|
||||||
.collect(groupingBy(Function.identity(), flatMapping(e -> e.getDependencies().stream(), toList())));
|
int mandatoryRequired = 0;
|
||||||
|
|
||||||
final var modRequirements = modVersionDependencies.values().stream()
|
for (var file : files) {
|
||||||
.<IModInfo.ModVersion>flatMap(List::stream)
|
for (var info : file.getModInfos()) {
|
||||||
.filter(mv -> mv.getSide().isCorrectSide())
|
modVersions.put(info.getModId(), info.getVersion());
|
||||||
.collect(toSet());
|
for (var dep : info.getDependencies()) {
|
||||||
|
if (dep.getSide().isCorrectSide()) {
|
||||||
|
if (modRequirements.add(dep) && dep.isMandatory())
|
||||||
|
mandatoryRequired++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
final long mandatoryRequired = modRequirements.stream().filter(IModInfo.ModVersion::isMandatory).count();
|
|
||||||
LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired);
|
LOGGER.debug(LOADING, "Found {} mod requirements ({} mandatory, {} optional)", modRequirements.size(), mandatoryRequired, modRequirements.size() - mandatoryRequired);
|
||||||
final var missingVersions = modRequirements.stream()
|
|
||||||
.filter(mv -> (mv.isMandatory() || modVersions.containsKey(mv.getModId())) && !modVersionContained(mv, modVersions))
|
|
||||||
.collect(toSet());
|
|
||||||
final long mandatoryMissing = missingVersions.stream().filter(IModInfo.ModVersion::isMandatory).count();
|
|
||||||
LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingVersions.size(), mandatoryMissing, missingVersions.size() - mandatoryMissing);
|
|
||||||
|
|
||||||
if (!missingVersions.isEmpty()) {
|
final var missingMandatory = new HashSet<ModVersion>();
|
||||||
if (mandatoryMissing > 0) {
|
final var missingOptional = new HashSet<ModVersion>();
|
||||||
LOGGER.error(
|
|
||||||
LOADING,
|
|
||||||
"Missing or unsupported mandatory dependencies:\n{}",
|
|
||||||
missingVersions.stream()
|
|
||||||
.filter(IModInfo.ModVersion::isMandatory)
|
|
||||||
.map(ver -> formatDependencyError(ver, modVersions))
|
|
||||||
.collect(Collectors.joining("\n"))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if (missingVersions.size() - mandatoryMissing > 0) {
|
|
||||||
LOGGER.error(
|
|
||||||
LOADING,
|
|
||||||
"Unsupported installed optional dependencies:\n{}",
|
|
||||||
missingVersions.stream()
|
|
||||||
.filter(ver -> !ver.isMandatory())
|
|
||||||
.map(ver -> formatDependencyError(ver, modVersions))
|
|
||||||
.collect(Collectors.joining("\n"))
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return missingVersions.stream()
|
for (var dep : modRequirements) {
|
||||||
.map(mv -> new ExceptionData(mv.isMandatory() ? "fml.modloading.missingdependency" : "fml.modloading.missingdependency.optional",
|
var modId = dep.getModId();
|
||||||
mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(),
|
var existing = modVersions.get(modId);
|
||||||
modVersions.getOrDefault(mv.getModId(), new DefaultArtifactVersion("null"))))
|
|
||||||
.toList();
|
if (!dep.isMandatory() && existing == null)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
var range = dep.getVersionRange();
|
||||||
|
if (existing != null && (range.containsVersion(existing) || "0.0NONE".equals(existing.toString())))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
if (!VersionSupportMatrix.testVersionSupportMatrix(range, modId, "mod"))
|
||||||
|
(dep.isMandatory() ? missingMandatory : missingOptional).add(dep);
|
||||||
}
|
}
|
||||||
return Collections.emptyList();
|
|
||||||
|
|
||||||
|
LOGGER.debug(LOADING, "Found {} mod requirements missing ({} mandatory, {} optional)", missingMandatory.size() + missingOptional.size(), missingMandatory.size(), missingOptional.size());
|
||||||
|
|
||||||
|
var ret = new ArrayList<ExceptionData>();
|
||||||
|
|
||||||
|
if (!missingMandatory.isEmpty()) {
|
||||||
|
LOGGER.error(LOADING, "Missing or unsupported mandatory dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
|
||||||
|
for (var mv : missingMandatory)
|
||||||
|
ret.add(data(mv, modVersions, "fml.modloading.missingdependency"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!missingOptional.isEmpty()) {
|
||||||
|
LOGGER.error(LOADING, "Unsupported installed optional dependencies:\n{}", formatDependencyError(missingMandatory, modVersions));
|
||||||
|
for (var mv : missingMandatory)
|
||||||
|
ret.add(data(mv, modVersions, "fml.modloading.missingdependency.optional"));
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static String formatDependencyError(IModInfo.ModVersion dependency, Map<String, ArtifactVersion> modVersions)
|
private static String formatDependencyError(Collection<ModVersion> missing, Map<String, ArtifactVersion> modVersions) {
|
||||||
{
|
var ret = new ArrayList<String>();
|
||||||
ArtifactVersion installed = modVersions.get(dependency.getModId());
|
for (var dep : missing) {
|
||||||
return String.format(
|
var installed = modVersions.get(dep.getModId());
|
||||||
|
ret.add(String.format(
|
||||||
"\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
|
"\tMod ID: '%s', Requested by: '%s', Expected range: '%s', Actual version: '%s'",
|
||||||
dependency.getModId(),
|
dep.getModId(),
|
||||||
dependency.getOwner().getModId(),
|
dep.getOwner().getModId(),
|
||||||
dependency.getVersionRange(),
|
dep.getVersionRange(),
|
||||||
installed != null ? installed.toString() : "[MISSING]"
|
installed != null ? installed.toString() : "[MISSING]"
|
||||||
);
|
));
|
||||||
|
}
|
||||||
|
return String.join("\n", ret);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static boolean modVersionContained(IModInfo.ModVersion mv, Map<String, ArtifactVersion> modVersions) {
|
private static final ArtifactVersion NULL_VERSION = new DefaultArtifactVersion("null");
|
||||||
var modId = mv.getModId();
|
private static ExceptionData data(ModVersion mv, Map<String, ArtifactVersion> modVersions, String key) {
|
||||||
var range = mv.getVersionRange();
|
return new ExceptionData(key, mv.getOwner(), mv.getModId(), mv.getOwner().getModId(), mv.getVersionRange(), modVersions.getOrDefault(mv.getModId(), NULL_VERSION));
|
||||||
if (modVersions.containsKey(modId)
|
|
||||||
&& (range.containsVersion(modVersions.get(modId)) || modVersions.get(modId).toString().equals("0.0NONE")))
|
|
||||||
return true;
|
|
||||||
|
|
||||||
return VersionSupportMatrix.testVersionSupportMatrix(mv.getVersionRange(), mv.getModId(), "mod");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -203,7 +203,14 @@ public class RuntimeDistCleaner implements ILaunchPluginService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
public EnumSet<Phase> handlesClass(Type classType, boolean isEmpty) {
|
||||||
return isEmpty ? NAY : YAY;
|
if (isEmpty)
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
String internalName = classType.getInternalName();
|
||||||
|
if (internalName.startsWith("net/minecraftforge/"))
|
||||||
|
return NAY;
|
||||||
|
|
||||||
|
return YAY;
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class LambdaGatherer extends MethodVisitor {
|
private static class LambdaGatherer extends MethodVisitor {
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import com.mojang.logging.LogUtils;
|
|||||||
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
import net.minecraftforge.fml.loading.moddiscovery.ModFile;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
import org.apache.maven.artifact.versioning.ArtifactVersion;
|
||||||
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -23,16 +24,18 @@ import static java.util.stream.Collectors.groupingBy;
|
|||||||
import static java.util.stream.Collectors.joining;
|
import static java.util.stream.Collectors.joining;
|
||||||
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
import static net.minecraftforge.fml.loading.LogMarkers.LOADING;
|
||||||
|
|
||||||
public class UniqueModListBuilder
|
@ApiStatus.Internal
|
||||||
{
|
@Deprecated(since = "1.21.3", forRemoval = true) // TODO: [FML][Loading] Convert to package private in 1.22
|
||||||
|
public class UniqueModListBuilder {
|
||||||
private final static Logger LOGGER = LogUtils.getLogger();
|
private final static Logger LOGGER = LogUtils.getLogger();
|
||||||
|
|
||||||
private final List<ModFile> modFiles;
|
private final List<ModFile> modFiles;
|
||||||
|
|
||||||
public UniqueModListBuilder(final List<ModFile> modFiles) {this.modFiles = modFiles;}
|
public UniqueModListBuilder(final List<ModFile> modFiles) {
|
||||||
|
this.modFiles = modFiles;
|
||||||
|
}
|
||||||
|
|
||||||
public UniqueModListData buildUniqueList()
|
public UniqueModListData buildUniqueList() {
|
||||||
{
|
|
||||||
List<ModFile> uniqueModList;
|
List<ModFile> uniqueModList;
|
||||||
List<ModFile> uniqueLibListWithVersion;
|
List<ModFile> uniqueLibListWithVersion;
|
||||||
|
|
||||||
@@ -135,9 +138,8 @@ public class UniqueModListBuilder
|
|||||||
return modFile.getSecureJar().name();
|
return modFile.getSecureJar().name();
|
||||||
}
|
}
|
||||||
|
|
||||||
return modFile.getModFileInfo().moduleName();
|
return modFile.getModFileInfo().getMods().get(0).getModId();
|
||||||
}
|
}
|
||||||
|
|
||||||
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
|
public record UniqueModListData(List<ModFile> modFiles, Map<String, List<ModFile>> modFilesByFirstId) {}
|
||||||
|
|
||||||
}
|
}
|
||||||
+62
-7
@@ -6,6 +6,7 @@
|
|||||||
package net.minecraftforge.fml.loading.moddiscovery;
|
package net.minecraftforge.fml.loading.moddiscovery;
|
||||||
|
|
||||||
import com.mojang.logging.LogUtils;
|
import com.mojang.logging.LogUtils;
|
||||||
|
|
||||||
import cpw.mods.jarhandling.JarMetadata;
|
import cpw.mods.jarhandling.JarMetadata;
|
||||||
import cpw.mods.jarhandling.SecureJar;
|
import cpw.mods.jarhandling.SecureJar;
|
||||||
import net.minecraftforge.fml.loading.LogMarkers;
|
import net.minecraftforge.fml.loading.LogMarkers;
|
||||||
@@ -22,19 +23,25 @@ import org.jetbrains.annotations.Nullable;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
|
import java.lang.module.InvalidModuleDescriptorException;
|
||||||
|
import java.lang.module.ModuleDescriptor;
|
||||||
|
import java.lang.module.ModuleDescriptor.Version;
|
||||||
import java.nio.file.Files;
|
import java.nio.file.Files;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
|
import java.util.HashSet;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Optional;
|
import java.util.Optional;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.jar.JarFile;
|
import java.util.jar.JarFile;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public abstract class AbstractModProvider implements IModProvider {
|
public abstract class AbstractModProvider implements IModProvider {
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
protected static final String MODS_TOML = "META-INF/mods.toml";
|
protected static final String MODS_TOML = "META-INF/mods.toml";
|
||||||
|
protected static final String MODULE_INFO = "module-info.class";
|
||||||
|
|
||||||
protected IModLocator.ModFileOrException createMod(Path path) {
|
protected IModLocator.ModFileOrException createMod(Path path) {
|
||||||
return createMod(path, false);
|
return createMod(path, false);
|
||||||
@@ -48,10 +55,12 @@ public abstract class AbstractModProvider implements IModProvider {
|
|||||||
@Nullable
|
@Nullable
|
||||||
protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) {
|
protected IModLocator.ModFileOrException createMod(Path path, boolean ignoreUnknown, String defaultType) {
|
||||||
var mjm = new ModJarMetadata();
|
var mjm = new ModJarMetadata();
|
||||||
var sj = SecureJar.from(
|
SecureJar sj = null;
|
||||||
jar -> jar.moduleDataProvider().findFile(MODS_TOML).isPresent() ? mjm : JarMetadata.from(jar, path),
|
try {
|
||||||
path
|
sj = SecureJar.from(jar -> loadMetaFromJar(jar, mjm), path);
|
||||||
);
|
} catch (Throwable t) {
|
||||||
|
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Failed to create secure jar for \"" + path + "\" - " + t.getMessage()));
|
||||||
|
}
|
||||||
|
|
||||||
IModFile mod;
|
IModFile mod;
|
||||||
var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
|
var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
|
||||||
@@ -61,6 +70,8 @@ public abstract class AbstractModProvider implements IModProvider {
|
|||||||
if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
|
if (sj.moduleDataProvider().findFile(MODS_TOML).isPresent()) {
|
||||||
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
|
LOGGER.debug(LogMarkers.SCAN, "Found {} mod of type {}: {}", MODS_TOML, type, path);
|
||||||
mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
|
mod = new ModFile(sj, this, ModFileParser::modsTomlParser);
|
||||||
|
// ModJarMetadata is only used when loading mods.toml mods as ModJarMetadata
|
||||||
|
mjm.setModFile(mod);
|
||||||
if (mod.getModFileInfo().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
|
if (mod.getModFileInfo().getFileProperties().containsKey(ModFileInfo.NOT_A_FORGE_MOD_PROP)) {
|
||||||
LOGGER.error(LogMarkers.SCAN, "Unable to load file \"{}\" because its mods.toml is requesting an invalid javafml loaderVersion (use \"*\" if you want to allow all versions) and is missing a forge modId dependency declaration (see the sample mods.toml in the MDK).", path);
|
LOGGER.error(LogMarkers.SCAN, "Unable to load file \"{}\" because its mods.toml is requesting an invalid javafml loaderVersion (use \"*\" if you want to allow all versions) and is missing a forge modId dependency declaration (see the sample mods.toml in the MDK).", path);
|
||||||
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName())));
|
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("File \"%s\" is not a Forge mod and cannot be loaded. Look for a Forge version of this mod or consider alternative mods.".formatted(mod.getFileName())));
|
||||||
@@ -73,10 +84,54 @@ public abstract class AbstractModProvider implements IModProvider {
|
|||||||
} else
|
} else
|
||||||
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path));
|
return new IModLocator.ModFileOrException(null, new ModFileLoadingException("Invalid mod file found " + path));
|
||||||
|
|
||||||
mjm.setModFile(mod);
|
|
||||||
return new IModLocator.ModFileOrException(mod, null);
|
return new IModLocator.ModFileOrException(mod, null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static JarMetadata loadMetaFromJar(SecureJar jar, ModJarMetadata mjm) {
|
||||||
|
var info = jar.moduleDataProvider().open(MODULE_INFO).orElse(null);
|
||||||
|
if (info != null) {
|
||||||
|
try {
|
||||||
|
var desc = ModuleDescriptor.read(info, jar::getPackages);
|
||||||
|
var all = new HashSet<>(jar.getPackages());
|
||||||
|
all.removeAll(desc.packages());
|
||||||
|
if (!all.isEmpty()) {
|
||||||
|
var missing = all.stream().sorted().collect(Collectors.joining(", "));
|
||||||
|
LOGGER.error("Invalid module-info, missing packages " + missing);
|
||||||
|
throw new ModFileLoadingException("Invalid module-info, missing packages " + missing);
|
||||||
|
} else {
|
||||||
|
return new JarMetadata() {
|
||||||
|
@Override
|
||||||
|
public String name() {
|
||||||
|
return desc.name();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String version() {
|
||||||
|
return desc.version().map(Version::toString).or(desc::rawVersion).orElse(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ModuleDescriptor descriptor() {
|
||||||
|
return desc;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
} catch (InvalidModuleDescriptorException | IOException e) {
|
||||||
|
LOGGER.error("Failed to parse " + jar.getPrimaryPath() + " module-info", e);
|
||||||
|
throw new ModFileLoadingException("Invalid module-info: " + e.getMessage());
|
||||||
|
} finally {
|
||||||
|
try {
|
||||||
|
info.close();
|
||||||
|
} catch (IOException e) {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (jar.moduleDataProvider().findFile(MODS_TOML).isEmpty())
|
||||||
|
return JarMetadata.from(jar, jar.getPrimaryPath());
|
||||||
|
|
||||||
|
return mjm;
|
||||||
|
}
|
||||||
|
|
||||||
protected IModFileInfo manifestParser(final IModFile mod) {
|
protected IModFileInfo manifestParser(final IModFile mod) {
|
||||||
var mf = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes();
|
var mf = mod.getSecureJar().moduleDataProvider().getManifest().getMainAttributes();
|
||||||
var license = mf.getValue("LICENSE");
|
var license = mf.getValue("LICENSE");
|
||||||
|
|||||||
+2
-4
@@ -22,13 +22,11 @@ public final class MinecraftLocator extends AbstractModProvider implements IModL
|
|||||||
@Override
|
@Override
|
||||||
public List<IModLocator.ModFileOrException> scanMods() {
|
public List<IModLocator.ModFileOrException> scanMods() {
|
||||||
var minecraft = FMLLoader.getLaunchHandler().getMinecraftPaths();
|
var minecraft = FMLLoader.getLaunchHandler().getMinecraftPaths();
|
||||||
|
var paths = minecraft.toArray(Path[]::new);
|
||||||
|
|
||||||
// Minecraft itself.
|
// Minecraft itself.
|
||||||
var meta = new ModJarMetadata();
|
var meta = new ModJarMetadata();
|
||||||
var mcjar = SecureJar.from(
|
var mcjar = SecureJar.from(jar -> meta, paths);
|
||||||
jar -> meta,
|
|
||||||
minecraft.toArray(Path[]::new)
|
|
||||||
);
|
|
||||||
var mc = ModFileFactory.FACTORY.build(mcjar, this, MinecraftLocator::buildMinecraftTOML);
|
var mc = ModFileFactory.FACTORY.build(mcjar, this, MinecraftLocator::buildMinecraftTOML);
|
||||||
meta.setModFile(mc);
|
meta.setModFile(mc);
|
||||||
|
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ public class ModDiscoverer {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@SuppressWarnings("removal")
|
||||||
public ModValidator discoverMods() {
|
public ModValidator discoverMods() {
|
||||||
LOGGER.debug(LogMarkers.SCAN,"Scanning for mods and other resources to load. We know {} ways to find mods", modLocatorList.size());
|
LOGGER.debug(LogMarkers.SCAN,"Scanning for mods and other resources to load. We know {} ways to find mods", modLocatorList.size());
|
||||||
List<ModFile> loadedFiles = new ArrayList<>();
|
List<ModFile> loadedFiles = new ArrayList<>();
|
||||||
|
|||||||
+1
-1
@@ -259,7 +259,7 @@ public class ModFileInfo implements IModFileInfo, IConfigurable {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String moduleName() {
|
public String moduleName() {
|
||||||
return getMods().get(0).getModId();
|
return this.modFile.getSecureJar().name();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+31
-16
@@ -9,49 +9,64 @@ import cpw.mods.jarhandling.JarMetadata;
|
|||||||
import net.minecraftforge.forgespi.locating.IModFile;
|
import net.minecraftforge.forgespi.locating.IModFile;
|
||||||
import java.lang.module.ModuleDescriptor;
|
import java.lang.module.ModuleDescriptor;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
import org.jetbrains.annotations.ApiStatus;
|
import org.jetbrains.annotations.ApiStatus;
|
||||||
|
|
||||||
@ApiStatus.Internal
|
@ApiStatus.Internal
|
||||||
public final class ModJarMetadata implements JarMetadata {
|
public final class ModJarMetadata implements JarMetadata {
|
||||||
|
private static final String AUTOMATIC_MODULE_NAME = "Automatic-Module-Name";
|
||||||
private IModFile modFile;
|
private IModFile modFile;
|
||||||
|
private String name;
|
||||||
|
private String version;
|
||||||
private ModuleDescriptor descriptor;
|
private ModuleDescriptor descriptor;
|
||||||
|
|
||||||
ModJarMetadata() {
|
ModJarMetadata() { }
|
||||||
}
|
|
||||||
|
|
||||||
public void setModFile(IModFile file) {
|
public void setModFile(IModFile file) {
|
||||||
this.modFile = file;
|
this.modFile = file;
|
||||||
|
var mods = this.modFile.getModFileInfo().getMods();
|
||||||
|
|
||||||
|
if (!mods.isEmpty()) {
|
||||||
|
var main = mods.get(0);
|
||||||
|
this.name = main.getModId();
|
||||||
|
this.version = main.getVersion().toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
var jar = file.getSecureJar();
|
||||||
|
var aname = jar.moduleDataProvider().getManifest().getMainAttributes().getValue(AUTOMATIC_MODULE_NAME);
|
||||||
|
if (aname != null)
|
||||||
|
this.name = aname;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String name() {
|
public String name() {
|
||||||
return modFile.getModFileInfo().moduleName();
|
return this.name;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String version() {
|
public String version() {
|
||||||
return modFile.getModFileInfo().versionString();
|
return this.version;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ModuleDescriptor descriptor() {
|
public ModuleDescriptor descriptor() {
|
||||||
if (descriptor != null) return descriptor;
|
if (descriptor != null)
|
||||||
|
return descriptor;
|
||||||
|
|
||||||
var bld = ModuleDescriptor.newAutomaticModule(name())
|
var bld = ModuleDescriptor.newAutomaticModule(name())
|
||||||
.version(version())
|
.version(version())
|
||||||
.packages(modFile.getSecureJar().getPackages());
|
.packages(modFile.getSecureJar().getPackages());
|
||||||
modFile.getSecureJar().getProviders().stream()
|
|
||||||
.filter(p -> !p.providers().isEmpty())
|
for (var provider : modFile.getSecureJar().getProviders()) {
|
||||||
.forEach(p -> bld.provides(p.serviceName(), p.providers()));
|
if (provider.providers().isEmpty())
|
||||||
modFile.getModFileInfo().usesServices().forEach(bld::uses);
|
continue;
|
||||||
|
|
||||||
|
bld.provides(provider.serviceName(), provider.providers());
|
||||||
|
}
|
||||||
|
|
||||||
descriptor = bld.build();
|
descriptor = bld.build();
|
||||||
return descriptor;
|
return descriptor;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IModFile modFile() {
|
|
||||||
return modFile;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean equals(Object obj) {
|
public boolean equals(Object obj) {
|
||||||
if (obj == this) return true;
|
if (obj == this) return true;
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ record Scanner(ModFile fileToScan, ModFileScanData result) {
|
|||||||
try (InputStream in = Files.newInputStream(path)) {
|
try (InputStream in = Files.newInputStream(path)) {
|
||||||
ModClassVisitor mcv = new ModClassVisitor();
|
ModClassVisitor mcv = new ModClassVisitor();
|
||||||
ClassReader cr = new ClassReader(in);
|
ClassReader cr = new ClassReader(in);
|
||||||
cr.accept(mcv, 0);
|
cr.accept(mcv, ClassReader.SKIP_CODE | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
|
||||||
mcv.buildData(result.getClasses(), result.getAnnotations());
|
mcv.buildData(result.getClasses(), result.getAnnotations());
|
||||||
} catch (IOException | IllegalArgumentException e) {
|
} catch (IOException | IllegalArgumentException e) {
|
||||||
// mark path bad
|
// mark path bad
|
||||||
|
|||||||
+1
-1
@@ -73,7 +73,7 @@ public abstract class CommonLaunchHandler implements ILaunchHandlerService {
|
|||||||
protected static final LaunchType CLIENT = new LaunchType("client", "minecraft", "net.minecraft.client.main.Main", Dist.CLIENT, false);
|
protected static final LaunchType CLIENT = new LaunchType("client", "minecraft", "net.minecraft.client.main.Main", Dist.CLIENT, false);
|
||||||
protected static final LaunchType DATA = new LaunchType("data", "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true);
|
protected static final LaunchType DATA = new LaunchType("data", "minecraft", "net.minecraft.data.Main", Dist.CLIENT, true);
|
||||||
protected static final LaunchType SERVER = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false);
|
protected static final LaunchType SERVER = new LaunchType("server", "minecraft", "net.minecraft.server.Main", Dist.DEDICATED_SERVER, false);
|
||||||
protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);
|
protected static final LaunchType SERVER_GAMETEST = new LaunchType("server_gametest", "net.minecraftforge.forge", "net.minecraftforge.gametest.GameTestMain", Dist.DEDICATED_SERVER, false);
|
||||||
|
|
||||||
protected void runTarget(String module, String target, final String[] arguments, final ModuleLayer layer) throws Throwable {
|
protected void runTarget(String module, String target, final String[] arguments, final ModuleLayer layer) throws Throwable {
|
||||||
var mod = layer.findModule(module).orElse(null);
|
var mod = layer.findModule(module).orElse(null);
|
||||||
|
|||||||
+28
-12
@@ -91,23 +91,24 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
// First lets find all class files, that have the @Mod annotation and map packages to modids.
|
// First lets find all class files, that have the @Mod annotation and map packages to modids.
|
||||||
var packages = findTestModPackages(path);
|
var packages = findTestModPackages(path);
|
||||||
for (var entry : packages.entrySet()) {
|
for (var entry : packages.entrySet()) {
|
||||||
var pkg = entry.getKey();
|
var pkg = entry.getKey() + '/';
|
||||||
var modids = entry.getValue();
|
var modids = entry.getValue();
|
||||||
|
|
||||||
// Find resource directories for every mod in this group
|
// Find resource directories for every mod in this group
|
||||||
var resourcePaths = new LinkedHashSet<Path>();
|
var paths = new LinkedHashSet<Path>();
|
||||||
for (var modid : modids) {
|
for (var modid : modids) {
|
||||||
var rsc = path.resolve(modid);
|
var rsc = path.resolve(modid);
|
||||||
if (Files.exists(rsc))
|
if (Files.exists(rsc))
|
||||||
resourcePaths.add(rsc);
|
paths.add(rsc);
|
||||||
}
|
}
|
||||||
|
|
||||||
var root = memory.getPath(modids.iterator().next()); // use the first modid as our root
|
var root = memory.getPath(modids.iterator().next()); // use the first modid as our root
|
||||||
buildModsToml(resourcePaths, modids, root);
|
buildModsToml(paths, modids, root);
|
||||||
buildPackMeta(resourcePaths, root);
|
buildPackMeta(paths, root);
|
||||||
|
moveModuleInfo(paths, root);
|
||||||
|
|
||||||
if (Files.exists(root))
|
if (Files.exists(root))
|
||||||
resourcePaths.add(root);
|
paths.add(root);
|
||||||
|
|
||||||
// We want just the class files from the root of the input paths. So make a new union with a filter.
|
// We want just the class files from the root of the input paths. So make a new union with a filter.
|
||||||
var classes = UnionHelper.newFileSystem(
|
var classes = UnionHelper.newFileSystem(
|
||||||
@@ -121,14 +122,10 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
}, new Path[] { path }
|
}, new Path[] { path }
|
||||||
);
|
);
|
||||||
|
|
||||||
// And we want the resources, and none of the classes, just in case things get kinda fucky and somehow a package overlaps a sub package {shading?}
|
paths.addFirst(classes.getRootDirectories().iterator().next());
|
||||||
var resources = UnionHelper.newFileSystem((name, base) -> !name.endsWith(".class"), resourcePaths.toArray(Path[]::new));
|
|
||||||
|
|
||||||
// Union of unions, Yay!
|
// Union of unions, Yay!
|
||||||
var union = UnionHelper.newFileSystem(null, new Path[] {
|
var union = UnionHelper.newFileSystem(null, paths.stream().toArray(Path[]::new));
|
||||||
classes.getRootDirectories().iterator().next(),
|
|
||||||
resources.getRootDirectories().iterator().next()
|
|
||||||
});
|
|
||||||
mod.add(union.getRootDirectories().iterator().next());
|
mod.add(union.getRootDirectories().iterator().next());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -274,6 +271,25 @@ public final class ForgeDevLocator extends AbstractModProvider implements IModLo
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static void moveModuleInfo(Set<Path> paths, Path root) {
|
||||||
|
var existing = paths.stream()
|
||||||
|
.map(p -> p.resolve("module-info.dat"))
|
||||||
|
.filter(Files::exists)
|
||||||
|
.findFirst()
|
||||||
|
.orElse(null);
|
||||||
|
|
||||||
|
if (existing == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
var target = root.resolve("module-info.class");
|
||||||
|
try {
|
||||||
|
Files.createDirectories(target.getParent());
|
||||||
|
Files.copy(existing, target);
|
||||||
|
} catch (IOException e) {
|
||||||
|
throw new IllegalStateException("Failed to copy module-info.dat to memory: " + target, e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
private static <E extends Throwable, R> R sneak(Throwable e) throws E {
|
private static <E extends Throwable, R> R sneak(Throwable e) throws E {
|
||||||
throw (E)e;
|
throw (E)e;
|
||||||
|
|||||||
+3
-3
@@ -5,11 +5,11 @@ org.gradle.daemon=false
|
|||||||
org.gradle.parallel=true
|
org.gradle.parallel=true
|
||||||
|
|
||||||
JAVA_VERSION=21
|
JAVA_VERSION=21
|
||||||
MC_VERSION=1.21.1
|
MC_VERSION=1.21.3
|
||||||
MC_NEXT_VERSION=1.22
|
MC_NEXT_VERSION=1.22
|
||||||
MCP_VERSION=20240808.132146
|
MCP_VERSION=20241025.112443
|
||||||
MAPPING_CHANNEL=official
|
MAPPING_CHANNEL=official
|
||||||
MAPPING_VERSION=1.21.1
|
MAPPING_VERSION=1.21.3
|
||||||
|
|
||||||
// Set to true before the first build of a new MC version, so we don't do compatibility checks
|
// Set to true before the first build of a new MC version, so we don't do compatibility checks
|
||||||
CHECK_COMPATIBILITY=false
|
CHECK_COMPATIBILITY=false
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
+2
-1
@@ -1,6 +1,7 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
@@ -83,7 +83,8 @@ done
|
|||||||
# This is normally unused
|
# This is normally unused
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
APP_BASE_NAME=${0##*/}
|
APP_BASE_NAME=${0##*/}
|
||||||
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD=maximum
|
MAX_FD=maximum
|
||||||
@@ -130,10 +131,13 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD=java
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
@@ -141,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
case $MAX_FD in #(
|
case $MAX_FD in #(
|
||||||
max*)
|
max*)
|
||||||
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
MAX_FD=$( ulimit -H -n ) ||
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
warn "Could not query maximum file descriptor limit"
|
warn "Could not query maximum file descriptor limit"
|
||||||
esac
|
esac
|
||||||
@@ -149,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
|||||||
'' | soft) :;; #(
|
'' | soft) :;; #(
|
||||||
*)
|
*)
|
||||||
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
# shellcheck disable=SC3045
|
# shellcheck disable=SC2039,SC3045
|
||||||
ulimit -n "$MAX_FD" ||
|
ulimit -n "$MAX_FD" ||
|
||||||
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
esac
|
esac
|
||||||
@@ -198,11 +202,11 @@ fi
|
|||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
# Collect all arguments for the java command;
|
# Collect all arguments for the java command:
|
||||||
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
# shell script including quotes and variable substitutions, so put them in
|
# and any embedded shellness will be escaped.
|
||||||
# double quotes to make sure that they get re-expanded; and
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
# * put everything else in single quotes, so that it's not re-expanded.
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
set -- \
|
set -- \
|
||||||
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
|||||||
Vendored
+10
-10
@@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
|
|||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if %ERRORLEVEL% equ 0 goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ dependencies {
|
|||||||
compileOnly(libs.nulls)
|
compileOnly(libs.nulls)
|
||||||
implementation(project(':fmlloader'))
|
implementation(project(':fmlloader'))
|
||||||
implementation(project(':fmlcore'))
|
implementation(project(':fmlcore'))
|
||||||
|
implementation(libs.unsafe)
|
||||||
|
implementation(libs.securemodules)
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
@@ -57,7 +59,7 @@ publishing {
|
|||||||
license PomUtils.Licenses.LGPLv2_1
|
license PomUtils.Licenses.LGPLv2_1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
maven gradleutils.publishingForgeMaven
|
maven gradleutils.publishingForgeMaven
|
||||||
}
|
}
|
||||||
|
|||||||
+86
-3
@@ -13,18 +13,24 @@ import net.minecraftforge.eventbus.api.IEventListener;
|
|||||||
import net.minecraftforge.fml.ModContainer;
|
import net.minecraftforge.fml.ModContainer;
|
||||||
import net.minecraftforge.fml.ModLoadingException;
|
import net.minecraftforge.fml.ModLoadingException;
|
||||||
import net.minecraftforge.fml.ModLoadingStage;
|
import net.minecraftforge.fml.ModLoadingStage;
|
||||||
|
import net.minecraftforge.fml.config.IConfigEvent;
|
||||||
import net.minecraftforge.fml.event.IModBusEvent;
|
import net.minecraftforge.fml.event.IModBusEvent;
|
||||||
import net.minecraftforge.forgespi.language.IModInfo;
|
import net.minecraftforge.forgespi.language.IModInfo;
|
||||||
import net.minecraftforge.forgespi.language.ModFileScanData;
|
import net.minecraftforge.forgespi.language.ModFileScanData;
|
||||||
|
import net.minecraftforge.unsafe.UnsafeHacks;
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
import org.apache.logging.log4j.LogManager;
|
||||||
import org.apache.logging.log4j.Logger;
|
import org.apache.logging.log4j.Logger;
|
||||||
import org.apache.logging.log4j.Marker;
|
import org.apache.logging.log4j.Marker;
|
||||||
import org.apache.logging.log4j.MarkerManager;
|
import org.apache.logging.log4j.MarkerManager;
|
||||||
|
|
||||||
|
import cpw.mods.jarhandling.SecureJar;
|
||||||
|
|
||||||
import java.lang.reflect.Constructor;
|
import java.lang.reflect.Constructor;
|
||||||
import java.lang.reflect.InvocationTargetException;
|
import java.lang.reflect.InvocationTargetException;
|
||||||
|
import java.lang.reflect.Method;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Optional;
|
import java.util.jar.Attributes;
|
||||||
|
|
||||||
public class FMLModContainer extends ModContainer {
|
public class FMLModContainer extends ModContainer {
|
||||||
private static final Logger LOGGER = LogManager.getLogger();
|
private static final Logger LOGGER = LogManager.getLogger();
|
||||||
@@ -41,20 +47,87 @@ public class FMLModContainer extends ModContainer {
|
|||||||
this.scanResults = modFileScanResults;
|
this.scanResults = modFileScanResults;
|
||||||
activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
|
activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
|
||||||
this.eventBus = BusBuilder.builder().setExceptionHandler(FMLModContainer::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
|
this.eventBus = BusBuilder.builder().setExceptionHandler(FMLModContainer::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
|
||||||
this.configHandler = Optional.of(ce->this.eventBus.post(ce.self()));
|
|
||||||
this.contextExtension = () -> context;
|
this.contextExtension = () -> context;
|
||||||
try {
|
try {
|
||||||
var moduleName = info.getOwningFile().moduleName();
|
var moduleName = info.getOwningFile().moduleName();
|
||||||
var module = gameLayer.findModule(moduleName)
|
var module = gameLayer.findModule(moduleName)
|
||||||
.orElseThrow(() -> new IllegalStateException("Failed to find " + moduleName + " in " + gameLayer));
|
.orElseThrow(() -> new IllegalStateException("Failed to find " + moduleName + " in " + gameLayer));
|
||||||
|
|
||||||
|
openModules(gameLayer, module, info.getOwningFile().getFile().getSecureJar());
|
||||||
|
|
||||||
modClass = Class.forName(module, className);
|
modClass = Class.forName(module, className);
|
||||||
LOGGER.trace(LOADING,"Loaded modclass {} with {}", modClass.getName(), modClass.getClassLoader());
|
LOGGER.debug(LOADING,"Loaded modclass {}/{} with {}", modClass.getModule().getName(), modClass.getName(), modClass.getClassLoader());
|
||||||
} catch (Throwable e) {
|
} catch (Throwable e) {
|
||||||
LOGGER.error(LOADING, "Failed to load class {}", className, e);
|
LOGGER.error(LOADING, "Failed to load class {}", className, e);
|
||||||
throw new ModLoadingException(info, ModLoadingStage.CONSTRUCT, "fml.modloading.failedtoloadmodclass", e);
|
throw new ModLoadingException(info, ModLoadingStage.CONSTRUCT, "fml.modloading.failedtoloadmodclass", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* <pre>
|
||||||
|
* Reads the Add-Exports and Add-Opens attributes (see note) from a mod file and
|
||||||
|
* attempts to apply them. This differers from the JEP in two significant ways:
|
||||||
|
* 1) Instead of opening things to ALL-UNNAMED it instead only opens to the
|
||||||
|
* mod's module itself. Because I don't want other mods accidently relying
|
||||||
|
* on transitive behavior
|
||||||
|
* 2) It is read from all mods not just the executable jars.
|
||||||
|
*
|
||||||
|
* From <a href = "https://openjdk.org/jeps/261">JEP 261: Module System</a>
|
||||||
|
*
|
||||||
|
* Two new JDK-specific JAR-file manifest attributes are defined to correspond
|
||||||
|
* to the --add-exports and --add-opens command-line options:
|
||||||
|
* Add-Exports: <module>/<package>( <module>/<package>)*
|
||||||
|
* Add-Opens: <module>/<package>( <module>/<package>)*
|
||||||
|
*
|
||||||
|
* The value of each attribute is a space-separated list of slash-separated
|
||||||
|
* module-name/package-name pairs. A >module</>package< pair in
|
||||||
|
* the value of an Add-Exports attribute has the same meaning as the
|
||||||
|
* command-line option --add-exports >module</>package<=ALL-UNNAMED.
|
||||||
|
*
|
||||||
|
* A >module</>package< pair in the value of an Add-Opens attribute has the
|
||||||
|
* same meaning as the command-line option --add-opens >module</>package<=ALL-UNNAMED.
|
||||||
|
*
|
||||||
|
* Each attribute can occur at most once, in the main section of a MANIFEST.MF file.
|
||||||
|
* A particular pair can be listed more than once. If a specified module was not
|
||||||
|
* resolved, or if a specified package does not exist, then the corresponding pair
|
||||||
|
* is ignored.
|
||||||
|
*/
|
||||||
|
private static void openModules(ModuleLayer layer, Module self, SecureJar jar) throws NoSuchMethodException, SecurityException, IllegalAccessException, InvocationTargetException {
|
||||||
|
var manifest = jar.moduleDataProvider().getManifest().getMainAttributes();
|
||||||
|
addOpenOrExports(layer, self, true, manifest);
|
||||||
|
addOpenOrExports(layer, self, false, manifest);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void addOpenOrExports(ModuleLayer layer, Module self, boolean open, Attributes attrs) throws NoSuchMethodException, SecurityException, IllegalAccessException, InvocationTargetException {
|
||||||
|
var key = open ? "Add-Opens" : "Add-Exports";
|
||||||
|
var entry = attrs.getValue(key);
|
||||||
|
if (entry == null)
|
||||||
|
return;
|
||||||
|
|
||||||
|
for (var pair : entry.split(" ")) {
|
||||||
|
var pts = pair.trim().split("/");
|
||||||
|
if (pts.length == 2) {
|
||||||
|
var target = layer.findModule(pts[0]).orElse(null);
|
||||||
|
if (target == null || !target.getDescriptor().packages().contains(pts[1]))
|
||||||
|
continue;
|
||||||
|
addOpenOrExport(target, pts[1], self, open);
|
||||||
|
} else {
|
||||||
|
LOGGER.warn(LOADING, "Invalid {} entry in {}: {}", key, self.getName(), pair);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static Method implAddExportsOrOpens;
|
||||||
|
private static void addOpenOrExport(Module target, String pkg, Module reader, boolean open) throws NoSuchMethodException, SecurityException, IllegalAccessException, InvocationTargetException {
|
||||||
|
if (implAddExportsOrOpens == null) {
|
||||||
|
implAddExportsOrOpens = Module.class.getDeclaredMethod("implAddExportsOrOpens", String.class, Module.class, boolean.class, boolean.class);
|
||||||
|
UnsafeHacks.setAccessible(implAddExportsOrOpens);
|
||||||
|
}
|
||||||
|
|
||||||
|
LOGGER.info(LOADING, "{} {}/{} to {}", open ? "Opening" : "Exporting", target.getName(), pkg, reader.getName());
|
||||||
|
implAddExportsOrOpens.invoke(target, pkg, reader, open, /*syncVM*/true);
|
||||||
|
}
|
||||||
|
|
||||||
private static void onEventFailed(IEventBus iEventBus, Event event, IEventListener[] iEventListeners, int i, Throwable throwable) {
|
private static void onEventFailed(IEventBus iEventBus, Event event, IEventListener[] iEventListeners, int i, Throwable throwable) {
|
||||||
LOGGER.error(new EventBusErrorMessage(event, i, iEventListeners, throwable));
|
LOGGER.error(new EventBusErrorMessage(event, i, iEventListeners, throwable));
|
||||||
}
|
}
|
||||||
@@ -115,4 +188,14 @@ public class FMLModContainer extends ModContainer {
|
|||||||
throw new ModLoadingException(modInfo, modLoadingStage, "fml.modloading.errorduringevent", t);
|
throw new ModLoadingException(modInfo, modLoadingStage, "fml.modloading.errorduringevent", t);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void dispatchConfigEvent(IConfigEvent event) {
|
||||||
|
this.eventBus.post(event.self());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "FMLModContainer[" + this.getModInfo().getModId() + ", " + this.getClass().getName() + "]";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+4
-3
@@ -141,9 +141,6 @@ dependencies {
|
|||||||
// For more info:
|
// For more info:
|
||||||
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
|
// http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
|
||||||
// http://www.gradle.org/docs/current/userguide/dependency_management.html
|
// http://www.gradle.org/docs/current/userguide/dependency_management.html
|
||||||
|
|
||||||
// Hack fix for now, force jopt-simple to be exactly 5.0.4 because Mojang ships that version, but some transitive dependencies request 6.0+
|
|
||||||
implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// This block of code expands all declared replace properties in the specified resource targets.
|
// This block of code expands all declared replace properties in the specified resource targets.
|
||||||
@@ -197,6 +194,10 @@ tasks.withType(JavaCompile).configureEach {
|
|||||||
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// IntelliJ no longer downloads javadocs and sources by default.
|
||||||
|
// This tells Gradle to force IDEA to do it.
|
||||||
|
idea.module { downloadJavadoc = downloadSources = true }
|
||||||
|
|
||||||
eclipse {
|
eclipse {
|
||||||
// Run everytime eclipse builds the code
|
// Run everytime eclipse builds the code
|
||||||
//autoBuildTasks genEclipseRuns
|
//autoBuildTasks genEclipseRuns
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/com/mojang/blaze3d/pipeline/RenderTarget.java
|
--- a/com/mojang/blaze3d/pipeline/RenderTarget.java
|
||||||
+++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
|
+++ b/com/mojang/blaze3d/pipeline/RenderTarget.java
|
||||||
@@ -104,7 +_,10 @@
|
@@ -96,7 +_,10 @@
|
||||||
GlStateManager._texParameter(3553, 34892, 0);
|
GlStateManager._texParameter(3553, 34892, 0);
|
||||||
GlStateManager._texParameter(3553, 10242, 33071);
|
GlStateManager._texParameter(3553, 10242, 33071);
|
||||||
GlStateManager._texParameter(3553, 10243, 33071);
|
GlStateManager._texParameter(3553, 10243, 33071);
|
||||||
@@ -11,22 +11,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.setFilterMode(9728, true);
|
this.setFilterMode(9728, true);
|
||||||
@@ -114,8 +_,13 @@
|
@@ -108,6 +_,7 @@
|
||||||
GlStateManager._texImage2D(3553, 0, 32856, this.width, this.height, 0, 6408, 5121, null);
|
|
||||||
GlStateManager._glBindFramebuffer(36160, this.frameBufferId);
|
|
||||||
GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
|
GlStateManager._glFramebufferTexture2D(36160, 36064, 3553, this.colorTextureId, 0);
|
||||||
- if (this.useDepth) {
|
if (this.useDepth) {
|
||||||
+ if (this.useDepth && !stencilEnabled) {
|
|
||||||
GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0);
|
GlStateManager._glFramebufferTexture2D(36160, 36096, 3553, this.depthBufferId, 0);
|
||||||
+ } else if(this.useDepth && net.minecraftforge.common.ForgeConfig.CLIENT.useCombinedDepthStencilAttachment.get()) {
|
+ if (stencilEnabled) GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
|
||||||
+ GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
|
|
||||||
+ } else if (this.useDepth) {
|
|
||||||
+ GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_DEPTH_ATTACHMENT, 3553, this.depthBufferId, 0);
|
|
||||||
+ GlStateManager._glFramebufferTexture2D(org.lwjgl.opengl.GL30.GL_FRAMEBUFFER, org.lwjgl.opengl.GL30.GL_STENCIL_ATTACHMENT, 3553, this.depthBufferId, 0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.checkStatus();
|
this.checkStatus();
|
||||||
@@ -257,5 +_,26 @@
|
@@ -229,5 +_,26 @@
|
||||||
|
|
||||||
public int getDepthTextureId() {
|
public int getDepthTextureId() {
|
||||||
return this.depthBufferId;
|
return this.depthBufferId;
|
||||||
@@ -42,7 +35,7 @@
|
|||||||
+ public void enableStencil() {
|
+ public void enableStencil() {
|
||||||
+ if (stencilEnabled) return;
|
+ if (stencilEnabled) return;
|
||||||
+ stencilEnabled = true;
|
+ stencilEnabled = true;
|
||||||
+ this.resize(viewWidth, viewHeight, net.minecraft.client.Minecraft.ON_OSX);
|
+ this.resize(viewWidth, viewHeight);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ /**
|
+ /**
|
||||||
|
|||||||
@@ -1,6 +1,18 @@
|
|||||||
--- a/com/mojang/blaze3d/platform/GlStateManager.java
|
--- a/com/mojang/blaze3d/platform/GlStateManager.java
|
||||||
+++ b/com/mojang/blaze3d/platform/GlStateManager.java
|
+++ b/com/mojang/blaze3d/platform/GlStateManager.java
|
||||||
@@ -493,9 +_,17 @@
|
@@ -94,6 +_,11 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ public static boolean _isBlendEnabled() {
|
||||||
|
+ RenderSystem.assertOnRenderThread();
|
||||||
|
+ return BLEND.mode.enabled;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
public static void _disableBlend() {
|
||||||
|
RenderSystem.assertOnRenderThread();
|
||||||
|
BLEND.mode.disable();
|
||||||
|
@@ -519,9 +_,17 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/com/mojang/blaze3d/platform/Window.java
|
--- a/com/mojang/blaze3d/platform/Window.java
|
||||||
+++ b/com/mojang/blaze3d/platform/Window.java
|
+++ b/com/mojang/blaze3d/platform/Window.java
|
||||||
@@ -84,7 +_,8 @@
|
@@ -88,7 +_,8 @@
|
||||||
GLFW.glfwWindowHint(139267, 2);
|
GLFW.glfwWindowHint(139267, 2);
|
||||||
GLFW.glfwWindowHint(139272, 204801);
|
GLFW.glfwWindowHint(139272, 204801);
|
||||||
GLFW.glfwWindowHint(139270, 1);
|
GLFW.glfwWindowHint(139270, 1);
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
if (monitor != null) {
|
if (monitor != null) {
|
||||||
VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
|
VideoMode videomode = monitor.getPreferredVidMode(this.fullscreen ? this.preferredFullscreenVideoMode : Optional.empty());
|
||||||
this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
|
this.windowedX = this.x = monitor.getX() + videomode.getWidth() / 2 - this.width / 2;
|
||||||
@@ -96,6 +_,7 @@
|
@@ -100,6 +_,7 @@
|
||||||
this.windowedX = this.x = aint1[0];
|
this.windowedX = this.x = aint1[0];
|
||||||
this.windowedY = this.y = aint[0];
|
this.windowedY = this.y = aint[0];
|
||||||
}
|
}
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
GLFW.glfwMakeContextCurrent(this.window);
|
GLFW.glfwMakeContextCurrent(this.window);
|
||||||
GL.createCapabilities();
|
GL.createCapabilities();
|
||||||
@@ -254,6 +_,9 @@
|
@@ -267,6 +_,9 @@
|
||||||
GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
|
GLFW.glfwGetFramebufferSize(this.window, aint, aint1);
|
||||||
this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
|
this.framebufferWidth = aint[0] > 0 ? aint[0] : 1;
|
||||||
this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
|
this.framebufferHeight = aint1[0] > 0 ? aint1[0] : 1;
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
--- a/com/mojang/blaze3d/systems/RenderSystem.java
|
||||||
|
+++ b/com/mojang/blaze3d/systems/RenderSystem.java
|
||||||
|
@@ -196,6 +_,11 @@
|
||||||
|
GlStateManager._depthMask(p_69459_);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ public static boolean isBlendEnabled() {
|
||||||
|
+ assertOnRenderThread();
|
||||||
|
+ return GlStateManager._isBlendEnabled();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
public static void enableBlend() {
|
||||||
|
assertOnRenderThread();
|
||||||
|
GlStateManager._enableBlend();
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/com/mojang/blaze3d/vertex/PoseStack.java
|
--- a/com/mojang/blaze3d/vertex/PoseStack.java
|
||||||
+++ b/com/mojang/blaze3d/vertex/PoseStack.java
|
+++ b/com/mojang/blaze3d/vertex/PoseStack.java
|
||||||
@@ -13,7 +_,7 @@
|
@@ -14,7 +_,7 @@
|
||||||
import org.joml.Vector3f;
|
import org.joml.Vector3f;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
--- a/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
|
|
||||||
+++ b/com/mojang/blaze3d/vertex/SheetedDecalTextureGenerator.java
|
|
||||||
@@ -62,7 +_,7 @@
|
|
||||||
public VertexConsumer setNormal(float p_344306_, float p_342091_, float p_344579_) {
|
|
||||||
this.delegate.setNormal(p_344306_, p_342091_, p_344579_);
|
|
||||||
Vector3f vector3f = this.normalInversePose.transform(p_344306_, p_342091_, p_344579_, this.normal);
|
|
||||||
- Direction direction = Direction.getNearest(vector3f.x(), vector3f.y(), vector3f.z());
|
|
||||||
+ Direction direction = net.minecraftforge.client.ForgeHooksClient.getNearestStable(vector3f.x(), vector3f.y(), vector3f.z());
|
|
||||||
Vector3f vector3f1 = this.cameraInversePose.transformPosition(this.x, this.y, this.z, this.worldPos);
|
|
||||||
vector3f1.rotateY((float) Math.PI);
|
|
||||||
vector3f1.rotateX((float) (-Math.PI / 2));
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/com/mojang/blaze3d/vertex/VertexConsumer.java
|
--- a/com/mojang/blaze3d/vertex/VertexConsumer.java
|
||||||
+++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
|
+++ b/com/mojang/blaze3d/vertex/VertexConsumer.java
|
||||||
@@ -12,7 +_,7 @@
|
@@ -13,7 +_,7 @@
|
||||||
import org.lwjgl.system.MemoryStack;
|
import org.lwjgl.system.MemoryStack;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -9,16 +9,15 @@
|
|||||||
VertexConsumer addVertex(float p_344294_, float p_342213_, float p_344859_);
|
VertexConsumer addVertex(float p_344294_, float p_342213_, float p_344859_);
|
||||||
|
|
||||||
VertexConsumer setColor(int p_342749_, int p_344324_, int p_343336_, int p_342831_);
|
VertexConsumer setColor(int p_342749_, int p_344324_, int p_343336_, int p_342831_);
|
||||||
@@ -135,10 +_,11 @@
|
@@ -133,9 +_,11 @@
|
||||||
}
|
|
||||||
|
|
||||||
int i1 = FastColor.ARGB32.color(k, (int)f3, (int)f4, (int)f5);
|
int j1 = ARGB.color(k, (int)f3, (int)f4, (int)f5);
|
||||||
- int j1 = p_331444_[l];
|
int k1 = LightTexture.lightCoordsWithEmission(p_331444_[i1], l);
|
||||||
+ int j1 = applyBakedLighting(p_331444_[l], bytebuffer);
|
+ k1 = applyBakedLighting(k1, bytebuffer);
|
||||||
float f10 = bytebuffer.getFloat(16);
|
float f10 = bytebuffer.getFloat(16);
|
||||||
float f9 = bytebuffer.getFloat(20);
|
float f9 = bytebuffer.getFloat(20);
|
||||||
Vector3f vector3f1 = matrix4f.transformPosition(f, f1, f2, new Vector3f());
|
Vector3f vector3f1 = matrix4f.transformPosition(f, f1, f2, new Vector3f());
|
||||||
+ applyBakedNormals(vector3f, bytebuffer, p_85988_.normal());
|
+ applyBakedNormals(vector3f, bytebuffer, p_85988_.normal());
|
||||||
this.addVertex(vector3f1.x(), vector3f1.y(), vector3f1.z(), i1, f10, f9, p_85993_, j1, vector3f.x(), vector3f.y(), vector3f.z());
|
this.addVertex(vector3f1.x(), vector3f1.y(), vector3f1.z(), j1, f10, f9, p_85993_, k1, vector3f.x(), vector3f.y(), vector3f.z());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/com/mojang/blaze3d/vertex/VertexFormat.java
|
--- a/com/mojang/blaze3d/vertex/VertexFormat.java
|
||||||
+++ b/com/mojang/blaze3d/vertex/VertexFormat.java
|
+++ b/com/mojang/blaze3d/vertex/VertexFormat.java
|
||||||
@@ -13,7 +_,7 @@
|
@@ -14,7 +_,7 @@
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
public static final int UNKNOWN_ELEMENT = -1;
|
public static final int UNKNOWN_ELEMENT = -1;
|
||||||
private final List<VertexFormatElement> elements;
|
private final List<VertexFormatElement> elements;
|
||||||
private final List<String> names;
|
private final List<String> names;
|
||||||
@@ -22,6 +_,7 @@
|
@@ -23,6 +_,7 @@
|
||||||
private final int[] offsetsByElement = new int[32];
|
private final int[] offsetsByElement = new int[32];
|
||||||
@Nullable
|
@Nullable
|
||||||
private VertexBuffer immediateDrawVertexBuffer;
|
private VertexBuffer immediateDrawVertexBuffer;
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
VertexFormat(List<VertexFormatElement> p_343616_, List<String> p_345241_, IntList p_345522_, int p_344162_) {
|
VertexFormat(List<VertexFormatElement> p_343616_, List<String> p_345241_, IntList p_345522_, int p_344162_) {
|
||||||
this.elements = p_343616_;
|
this.elements = p_343616_;
|
||||||
@@ -34,6 +_,11 @@
|
@@ -35,6 +_,11 @@
|
||||||
int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1;
|
int j = vertexformatelement != null ? p_343616_.indexOf(vertexformatelement) : -1;
|
||||||
this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1;
|
this.offsetsByElement[i] = j != -1 ? p_345522_.getInt(j) : -1;
|
||||||
}
|
}
|
||||||
@@ -29,7 +29,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static VertexFormat.Builder builder() {
|
public static VertexFormat.Builder builder() {
|
||||||
@@ -158,6 +_,9 @@
|
@@ -141,6 +_,9 @@
|
||||||
|
|
||||||
return vertexbuffer;
|
return vertexbuffer;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/SharedConstants.java
|
--- a/net/minecraft/SharedConstants.java
|
||||||
+++ b/net/minecraft/SharedConstants.java
|
+++ b/net/minecraft/SharedConstants.java
|
||||||
@@ -171,6 +_,7 @@
|
@@ -170,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/Util.java
|
--- a/net/minecraft/Util.java
|
||||||
+++ b/net/minecraft/Util.java
|
+++ b/net/minecraft/Util.java
|
||||||
@@ -267,7 +_,7 @@
|
@@ -264,7 +_,7 @@
|
||||||
.getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
|
.getSchema(DataFixUtils.makeKey(SharedConstants.getCurrentVersion().getDataVersion().getVersion()))
|
||||||
.getChoiceType(p_137552_, p_137553_);
|
.getChoiceType(p_137552_, p_137553_);
|
||||||
} catch (IllegalArgumentException illegalargumentexception) {
|
} catch (IllegalArgumentException illegalargumentexception) {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/advancements/AdvancementRewards.java
|
--- a/net/minecraft/advancements/AdvancementRewards.java
|
||||||
+++ b/net/minecraft/advancements/AdvancementRewards.java
|
+++ b/net/minecraft/advancements/AdvancementRewards.java
|
||||||
@@ -40,6 +_,7 @@
|
@@ -41,6 +_,7 @@
|
||||||
LootParams lootparams = new LootParams.Builder(p_9990_.serverLevel())
|
LootParams lootparams = new LootParams.Builder(p_9990_.serverLevel())
|
||||||
.withParameter(LootContextParams.THIS_ENTITY, p_9990_)
|
.withParameter(LootContextParams.THIS_ENTITY, p_9990_)
|
||||||
.withParameter(LootContextParams.ORIGIN, p_9990_.position())
|
.withParameter(LootContextParams.ORIGIN, p_9990_.position())
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/Camera.java
|
--- a/net/minecraft/client/Camera.java
|
||||||
+++ b/net/minecraft/client/Camera.java
|
+++ b/net/minecraft/client/Camera.java
|
||||||
@@ -105,9 +_,13 @@
|
@@ -120,9 +_,13 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void setRotation(float p_90573_, float p_90574_) {
|
protected void setRotation(float p_90573_, float p_90574_) {
|
||||||
@@ -15,7 +15,7 @@
|
|||||||
FORWARDS.rotate(this.rotation, this.forwards);
|
FORWARDS.rotate(this.rotation, this.forwards);
|
||||||
UP.rotate(this.rotation, this.up);
|
UP.rotate(this.rotation, this.up);
|
||||||
LEFT.rotate(this.rotation, this.left);
|
LEFT.rotate(this.rotation, this.left);
|
||||||
@@ -223,6 +_,13 @@
|
@@ -238,6 +_,13 @@
|
||||||
|
|
||||||
public float getPartialTickTime() {
|
public float getPartialTickTime() {
|
||||||
return this.partialTickTime;
|
return this.partialTickTime;
|
||||||
|
|||||||
@@ -1,20 +0,0 @@
|
|||||||
--- a/net/minecraft/client/ClientRecipeBook.java
|
|
||||||
+++ b/net/minecraft/client/ClientRecipeBook.java
|
|
||||||
@@ -65,7 +_,7 @@
|
|
||||||
Recipe<?> recipe = recipeholder.value();
|
|
||||||
if (!recipe.isSpecial() && !recipe.isIncomplete()) {
|
|
||||||
RecipeBookCategories recipebookcategories = getCategory(recipeholder);
|
|
||||||
- String s = recipe.getGroup();
|
|
||||||
+ String s = recipe.getGroup().isEmpty() ? recipeholder.id().toString() : recipe.getGroup(); // FORGE: Group value defaults to the recipe's ID if the recipe's explicit group is empty.
|
|
||||||
if (s.isEmpty()) {
|
|
||||||
map.computeIfAbsent(recipebookcategories, p_90645_ -> Lists.newArrayList()).add(ImmutableList.of(recipeholder));
|
|
||||||
} else {
|
|
||||||
@@ -125,6 +_,8 @@
|
|
||||||
} else if (recipetype == RecipeType.SMITHING) {
|
|
||||||
return RecipeBookCategories.SMITHING;
|
|
||||||
} else {
|
|
||||||
+ var categories = net.minecraftforge.client.RecipeBookManager.findCategories((RecipeType)recipetype, p_299041_);
|
|
||||||
+ if (categories != null) return categories;
|
|
||||||
LOGGER.warn(
|
|
||||||
"Unknown recipe category: {}/{}",
|
|
||||||
LogUtils.defer(() -> BuiltInRegistries.RECIPE_TYPE.getKey(recipe.getType())),
|
|
||||||
@@ -1,18 +1,21 @@
|
|||||||
--- a/net/minecraft/client/KeyboardHandler.java
|
--- a/net/minecraft/client/KeyboardHandler.java
|
||||||
+++ b/net/minecraft/client/KeyboardHandler.java
|
+++ b/net/minecraft/client/KeyboardHandler.java
|
||||||
@@ -405,9 +_,9 @@
|
@@ -424,12 +_,12 @@
|
||||||
Screen.wrapScreenError(() -> {
|
if (screen != null) {
|
||||||
if (p_90897_ == 1 || p_90897_ == 2) {
|
try {
|
||||||
|
if (p_90897_ != 1 && p_90897_ != 2) {
|
||||||
|
- if (p_90897_ == 0 && screen.keyReleased(p_90895_, p_90896_, p_90898_)) {
|
||||||
|
+ if (p_90897_ == 0 && net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleased(screen, p_90895_, p_90896_, p_90898_)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
screen.afterKeyboardAction();
|
screen.afterKeyboardAction();
|
||||||
- aboolean[0] = screen.keyPressed(p_90895_, p_90896_, p_90898_);
|
- if (screen.keyPressed(p_90895_, p_90896_, p_90898_)) {
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressed(aboolean, screen, p_90895_, p_90896_, p_90898_);
|
+ if (net.minecraftforge.client.ForgeHooksClient.onScreenKeyPressed(screen, p_90895_, p_90896_, p_90898_)) {
|
||||||
} else if (p_90897_ == 0) {
|
return;
|
||||||
- aboolean[0] = screen.keyReleased(p_90895_, p_90896_, p_90898_);
|
}
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onScreenKeyReleased(aboolean, screen, p_90895_, p_90896_, p_90898_);
|
|
||||||
}
|
}
|
||||||
}, "keyPressed event handler", screen.getClass().getCanonicalName());
|
@@ -505,6 +_,7 @@
|
||||||
if (aboolean[0]) {
|
|
||||||
@@ -476,20 +_,21 @@
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -20,20 +23,17 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void charTyped(long p_90890_, int p_90891_, int p_90892_) {
|
@@ -514,10 +_,10 @@
|
||||||
if (p_90890_ == this.minecraft.getWindow().getWindow()) {
|
if (screen != null && this.minecraft.getOverlay() == null) {
|
||||||
- GuiEventListener guieventlistener = this.minecraft.screen;
|
try {
|
||||||
+ Screen guieventlistener = this.minecraft.screen;
|
if (Character.isBmpCodePoint(p_90891_)) {
|
||||||
if (guieventlistener != null && this.minecraft.getOverlay() == null) {
|
- screen.charTyped((char)p_90891_, p_90892_);
|
||||||
if (Character.charCount(p_90891_) == 1) {
|
+ net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, (char)p_90891_, p_90892_);
|
||||||
Screen.wrapScreenError(
|
} else if (Character.isValidCodePoint(p_90891_)) {
|
||||||
- () -> guieventlistener.charTyped((char)p_90891_, p_90892_), "charTyped event handler", guieventlistener.getClass().getCanonicalName()
|
- screen.charTyped(Character.highSurrogate(p_90891_), p_90892_);
|
||||||
+ () -> net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(guieventlistener, (char)p_90891_, p_90892_), "charTyped event handler", guieventlistener.getClass().getCanonicalName()
|
- screen.charTyped(Character.lowSurrogate(p_90891_), p_90892_);
|
||||||
);
|
+ net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, Character.highSurrogate(p_90891_), p_90892_);
|
||||||
} else {
|
+ net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(screen, Character.lowSurrogate(p_90891_), p_90892_);
|
||||||
for (char c0 : Character.toChars(p_90891_)) {
|
|
||||||
- Screen.wrapScreenError(() -> guieventlistener.charTyped(c0, p_90892_), "charTyped event handler", guieventlistener.getClass().getCanonicalName());
|
|
||||||
+ Screen.wrapScreenError(() -> net.minecraftforge.client.ForgeHooksClient.onScreenCharTyped(guieventlistener, c0, p_90892_), "charTyped event handler", guieventlistener.getClass().getCanonicalName());
|
|
||||||
}
|
}
|
||||||
}
|
} catch (Throwable throwable) {
|
||||||
}
|
CrashReport crashreport = CrashReport.forThrowable(throwable, "charTyped event handler");
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/Minecraft.java
|
--- a/net/minecraft/client/Minecraft.java
|
||||||
+++ b/net/minecraft/client/Minecraft.java
|
+++ b/net/minecraft/client/Minecraft.java
|
||||||
@@ -254,7 +_,7 @@
|
@@ -253,7 +_,7 @@
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
static Minecraft instance;
|
static Minecraft instance;
|
||||||
private static final Logger LOGGER = LogUtils.getLogger();
|
private static final Logger LOGGER = LogUtils.getLogger();
|
||||||
public static final boolean ON_OSX = Util.getPlatform() == Util.OS.OSX;
|
public static final boolean ON_OSX = Util.getPlatform() == Util.OS.OSX;
|
||||||
@@ -431,7 +_,6 @@
|
@@ -433,7 +_,6 @@
|
||||||
}
|
}
|
||||||
}, Util.nonCriticalIoPool());
|
}, Util.nonCriticalIoPool());
|
||||||
LOGGER.info("Setting user: {}", this.user.getName());
|
LOGGER.info("Setting user: {}", this.user.getName());
|
||||||
@@ -17,10 +17,10 @@
|
|||||||
this.demo = p_91084_.game.demo;
|
this.demo = p_91084_.game.demo;
|
||||||
this.allowsMultiplayer = !p_91084_.game.disableMultiplayer;
|
this.allowsMultiplayer = !p_91084_.game.disableMultiplayer;
|
||||||
this.allowsChat = !p_91084_.game.disableChat;
|
this.allowsChat = !p_91084_.game.disableChat;
|
||||||
@@ -468,15 +_,15 @@
|
@@ -480,15 +_,15 @@
|
||||||
|
LOGGER.error("Couldn't set icon", (Throwable)ioexception);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.window.setFramerateLimit(this.options.framerateLimit().get());
|
|
||||||
+ // FORGE: Move mouse and keyboard handler setup further below
|
+ // FORGE: Move mouse and keyboard handler setup further below
|
||||||
this.mouseHandler = new MouseHandler(this);
|
this.mouseHandler = new MouseHandler(this);
|
||||||
- this.mouseHandler.setup(this.window.getWindow());
|
- this.mouseHandler.setup(this.window.getWindow());
|
||||||
@@ -29,27 +29,21 @@
|
|||||||
RenderSystem.initRenderer(this.options.glDebugVerbosity, false);
|
RenderSystem.initRenderer(this.options.glDebugVerbosity, false);
|
||||||
this.mainRenderTarget = new MainTarget(this.window.getWidth(), this.window.getHeight());
|
this.mainRenderTarget = new MainTarget(this.window.getWidth(), this.window.getHeight());
|
||||||
this.mainRenderTarget.setClearColor(0.0F, 0.0F, 0.0F, 0.0F);
|
this.mainRenderTarget.setClearColor(0.0F, 0.0F, 0.0F, 0.0F);
|
||||||
this.mainRenderTarget.clear(ON_OSX);
|
this.mainRenderTarget.clear();
|
||||||
this.resourceManager = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
|
this.resourceManager = new ReloadableResourceManager(PackType.CLIENT_RESOURCES);
|
||||||
+ net.minecraftforge.client.loading.ClientModLoader.begin(this, this.resourcePackRepository, this.resourceManager);
|
+ net.minecraftforge.client.loading.ClientModLoader.begin(this, this.resourcePackRepository, this.resourceManager);
|
||||||
this.resourcePackRepository.reload();
|
this.resourcePackRepository.reload();
|
||||||
this.options.loadSelectedResourcePacks(this.resourcePackRepository);
|
this.options.loadSelectedResourcePacks(this.resourcePackRepository);
|
||||||
this.languageManager = new LanguageManager(this.options.languageCode, p_340763_ -> {
|
this.languageManager = new LanguageManager(this.options.languageCode, p_340763_ -> {
|
||||||
@@ -540,6 +_,7 @@
|
@@ -562,6 +_,7 @@
|
||||||
this.entityRenderDispatcher = new EntityRenderDispatcher(this, this.textureManager, this.itemRenderer, this.blockRenderer, this.font, this.options, this.entityModels);
|
);
|
||||||
this.resourceManager.registerReloadListener(this.entityRenderDispatcher);
|
this.resourceManager.registerReloadListener(this.entityRenderDispatcher);
|
||||||
this.particleEngine = new ParticleEngine(this.level, this.textureManager);
|
this.particleEngine = new ParticleEngine(this.level, this.textureManager);
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleEngine);
|
+ net.minecraftforge.client.ForgeHooksClient.onRegisterParticleProviders(this.particleEngine);
|
||||||
this.resourceManager.registerReloadListener(this.particleEngine);
|
this.resourceManager.registerReloadListener(this.particleEngine);
|
||||||
this.paintingTextures = new PaintingTextureManager(this.textureManager);
|
this.paintingTextures = new PaintingTextureManager(this.textureManager);
|
||||||
this.resourceManager.registerReloadListener(this.paintingTextures);
|
this.resourceManager.registerReloadListener(this.paintingTextures);
|
||||||
@@ -552,11 +_,15 @@
|
@@ -577,6 +_,9 @@
|
||||||
this.gameRenderer = new GameRenderer(this, this.entityRenderDispatcher.getItemInHandRenderer(), this.resourceManager, this.renderBuffers);
|
|
||||||
this.resourceManager.registerReloadListener(this.gameRenderer.createReloadListener());
|
|
||||||
this.levelRenderer = new LevelRenderer(this, this.entityRenderDispatcher, this.blockEntityRenderDispatcher, this.renderBuffers);
|
|
||||||
+ net.minecraftforge.fml.ModLoader.get().postEvent(new net.minecraftforge.client.event.RenderLevelStageEvent.RegisterStageEvent());
|
|
||||||
this.resourceManager.registerReloadListener(this.levelRenderer);
|
|
||||||
this.gpuWarnlistManager = new GpuWarnlistManager();
|
|
||||||
this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
|
this.resourceManager.registerReloadListener(this.gpuWarnlistManager);
|
||||||
this.resourceManager.registerReloadListener(this.regionalCompliancies);
|
this.resourceManager.registerReloadListener(this.regionalCompliancies);
|
||||||
this.gui = new Gui(this);
|
this.gui = new Gui(this);
|
||||||
@@ -59,7 +53,7 @@
|
|||||||
this.debugRenderer = new DebugRenderer(this);
|
this.debugRenderer = new DebugRenderer(this);
|
||||||
RealmsClient realmsclient = RealmsClient.create(this);
|
RealmsClient realmsclient = RealmsClient.create(this);
|
||||||
this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
|
this.realmsDataFetcher = new RealmsDataFetcher(realmsclient);
|
||||||
@@ -580,6 +_,7 @@
|
@@ -600,6 +_,7 @@
|
||||||
this.options.fullscreen().set(this.window.isFullscreen());
|
this.options.fullscreen().set(this.window.isFullscreen());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -67,7 +61,7 @@
|
|||||||
this.window.updateVsync(this.options.enableVsync().get());
|
this.window.updateVsync(this.options.enableVsync().get());
|
||||||
this.window.updateRawMouseInput(this.options.rawMouseInput().get());
|
this.window.updateRawMouseInput(this.options.rawMouseInput().get());
|
||||||
this.window.setDefaultErrorCallback();
|
this.window.setDefaultErrorCallback();
|
||||||
@@ -600,16 +_,17 @@
|
@@ -620,16 +_,17 @@
|
||||||
GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
|
GameLoadTimesEvent.INSTANCE.beginStep(TelemetryProperty.LOAD_TIME_LOADING_OVERLAY_MS);
|
||||||
Minecraft.GameLoadCookie minecraft$gameloadcookie = new Minecraft.GameLoadCookie(realmsclient, p_91084_.quickPlay);
|
Minecraft.GameLoadCookie minecraft$gameloadcookie = new Minecraft.GameLoadCookie(realmsclient, p_91084_.quickPlay);
|
||||||
this.setOverlay(
|
this.setOverlay(
|
||||||
@@ -87,8 +81,8 @@
|
|||||||
+ ).get()
|
+ ).get()
|
||||||
);
|
);
|
||||||
this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.path());
|
this.quickPlayLog = QuickPlayLog.of(p_91084_.quickPlay.path());
|
||||||
}
|
this.framerateLimitTracker = new FramerateLimitTracker(this.options, this);
|
||||||
@@ -698,6 +_,7 @@
|
@@ -724,6 +_,7 @@
|
||||||
StringBuilder stringbuilder = new StringBuilder("Minecraft");
|
StringBuilder stringbuilder = new StringBuilder("Minecraft");
|
||||||
if (checkModStatus().shouldReportAsModified()) {
|
if (checkModStatus().shouldReportAsModified()) {
|
||||||
stringbuilder.append("*");
|
stringbuilder.append("*");
|
||||||
@@ -96,7 +90,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
stringbuilder.append(" ");
|
stringbuilder.append(" ");
|
||||||
@@ -721,6 +_,8 @@
|
@@ -747,6 +_,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private UserApiService createUserApiService(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
|
private UserApiService createUserApiService(YggdrasilAuthenticationService p_193586_, GameConfig p_193587_) {
|
||||||
@@ -105,7 +99,7 @@
|
|||||||
return p_193587_.user.user.getType() != User.Type.MSA
|
return p_193587_.user.user.getType() != User.Type.MSA
|
||||||
? UserApiService.OFFLINE
|
? UserApiService.OFFLINE
|
||||||
: p_193586_.createUserApiService(p_193587_.user.user.getAccessToken());
|
: p_193586_.createUserApiService(p_193587_.user.user.getAccessToken());
|
||||||
@@ -731,7 +_,7 @@
|
@@ -757,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void rollbackResourcePacks(Throwable p_91240_, @Nullable Minecraft.GameLoadCookie p_299515_) {
|
private void rollbackResourcePacks(Throwable p_91240_, @Nullable Minecraft.GameLoadCookie p_299515_) {
|
||||||
@@ -114,7 +108,7 @@
|
|||||||
this.clearResourcePacksOnError(p_91240_, null, p_299515_);
|
this.clearResourcePacksOnError(p_91240_, null, p_299515_);
|
||||||
} else {
|
} else {
|
||||||
Util.throwAsRuntime(p_91240_);
|
Util.throwAsRuntime(p_91240_);
|
||||||
@@ -991,12 +_,6 @@
|
@@ -1043,12 +_,6 @@
|
||||||
LOGGER.error("setScreen called from non-game thread");
|
LOGGER.error("setScreen called from non-game thread");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,7 +121,7 @@
|
|||||||
if (p_91153_ == null && this.clientLevelTeardownInProgress) {
|
if (p_91153_ == null && this.clientLevelTeardownInProgress) {
|
||||||
throw new IllegalStateException("Trying to return to in-game GUI during disconnection");
|
throw new IllegalStateException("Trying to return to in-game GUI during disconnection");
|
||||||
} else {
|
} else {
|
||||||
@@ -1010,6 +_,23 @@
|
@@ -1062,6 +_,23 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -151,19 +145,27 @@
|
|||||||
this.screen = p_91153_;
|
this.screen = p_91153_;
|
||||||
if (this.screen != null) {
|
if (this.screen != null) {
|
||||||
this.screen.added();
|
this.screen.added();
|
||||||
@@ -1155,9 +_,11 @@
|
@@ -1146,6 +_,7 @@
|
||||||
|
|
||||||
|
FreeTypeUtil.destroy();
|
||||||
|
Util.shutdownExecutors();
|
||||||
|
+ net.minecraftforge.fml.config.ConfigTracker.INSTANCE.forceUnload();
|
||||||
|
} catch (Throwable throwable) {
|
||||||
|
LOGGER.error("Shutdown failure!", throwable);
|
||||||
|
throw throwable;
|
||||||
|
@@ -1215,9 +_,11 @@
|
||||||
this.mouseHandler.handleAccumulatedMovement();
|
this.mouseHandler.handleAccumulatedMovement();
|
||||||
this.profiler.pop();
|
profilerfiller.pop();
|
||||||
if (!this.noRender) {
|
if (!this.noRender) {
|
||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickStart(this.timer);
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickStart(this.deltaTracker);
|
||||||
this.profiler.popPush("gameRenderer");
|
profilerfiller.popPush("gameRenderer");
|
||||||
this.gameRenderer.render(this.timer, p_91384_);
|
this.gameRenderer.render(this.deltaTracker, p_91384_);
|
||||||
this.profiler.pop();
|
profilerfiller.pop();
|
||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickEnd(this.timer);
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTickEnd(this.deltaTracker);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.fpsPieResults != null) {
|
profilerfiller.push("blit");
|
||||||
@@ -1283,10 +_,12 @@
|
@@ -1339,10 +_,12 @@
|
||||||
this.window.setGuiScale((double)i);
|
this.window.setGuiScale((double)i);
|
||||||
if (this.screen != null) {
|
if (this.screen != null) {
|
||||||
this.screen.resize(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
this.screen.resize(this, this.window.getGuiScaledWidth(), this.window.getGuiScaledHeight());
|
||||||
@@ -171,12 +173,12 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
RenderTarget rendertarget = this.getMainRenderTarget();
|
RenderTarget rendertarget = this.getMainRenderTarget();
|
||||||
rendertarget.resize(this.window.getWidth(), this.window.getHeight(), ON_OSX);
|
rendertarget.resize(this.window.getWidth(), this.window.getHeight());
|
||||||
+ if (this.gameRenderer != null)
|
+ if (this.gameRenderer != null)
|
||||||
this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
|
this.gameRenderer.resize(this.window.getWidth(), this.window.getHeight());
|
||||||
this.mouseHandler.setIgnoreFirstMove();
|
this.mouseHandler.setIgnoreFirstMove();
|
||||||
}
|
}
|
||||||
@@ -1554,6 +_,7 @@
|
@@ -1483,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void stop() {
|
public void stop() {
|
||||||
@@ -184,7 +186,7 @@
|
|||||||
this.running = false;
|
this.running = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1582,10 +_,18 @@
|
@@ -1511,10 +_,18 @@
|
||||||
if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
|
if (p_91387_ && this.hitResult != null && this.hitResult.getType() == HitResult.Type.BLOCK) {
|
||||||
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
|
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
|
||||||
BlockPos blockpos = blockhitresult.getBlockPos();
|
BlockPos blockpos = blockhitresult.getBlockPos();
|
||||||
@@ -206,7 +208,7 @@
|
|||||||
this.player.swing(InteractionHand.MAIN_HAND);
|
this.player.swing(InteractionHand.MAIN_HAND);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1613,6 +_,8 @@
|
@@ -1542,6 +_,8 @@
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
boolean flag = false;
|
boolean flag = false;
|
||||||
@@ -215,7 +217,7 @@
|
|||||||
switch (this.hitResult.getType()) {
|
switch (this.hitResult.getType()) {
|
||||||
case ENTITY:
|
case ENTITY:
|
||||||
this.gameMode.attack(this.player, ((EntityHitResult)this.hitResult).getEntity());
|
this.gameMode.attack(this.player, ((EntityHitResult)this.hitResult).getEntity());
|
||||||
@@ -1620,7 +_,7 @@
|
@@ -1549,7 +_,7 @@
|
||||||
case BLOCK:
|
case BLOCK:
|
||||||
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
|
BlockHitResult blockhitresult = (BlockHitResult)this.hitResult;
|
||||||
BlockPos blockpos = blockhitresult.getBlockPos();
|
BlockPos blockpos = blockhitresult.getBlockPos();
|
||||||
@@ -224,7 +226,7 @@
|
|||||||
this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection());
|
this.gameMode.startDestroyBlock(blockpos, blockhitresult.getDirection());
|
||||||
if (this.level.getBlockState(blockpos).isAir()) {
|
if (this.level.getBlockState(blockpos).isAir()) {
|
||||||
flag = true;
|
flag = true;
|
||||||
@@ -1633,8 +_,10 @@
|
@@ -1562,8 +_,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.player.resetAttackStrengthTicker();
|
this.player.resetAttackStrengthTicker();
|
||||||
@@ -235,7 +237,7 @@
|
|||||||
this.player.swing(InteractionHand.MAIN_HAND);
|
this.player.swing(InteractionHand.MAIN_HAND);
|
||||||
return flag;
|
return flag;
|
||||||
}
|
}
|
||||||
@@ -1650,6 +_,12 @@
|
@@ -1579,6 +_,12 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
for (InteractionHand interactionhand : InteractionHand.values()) {
|
for (InteractionHand interactionhand : InteractionHand.values()) {
|
||||||
@@ -248,68 +250,68 @@
|
|||||||
ItemStack itemstack = this.player.getItemInHand(interactionhand);
|
ItemStack itemstack = this.player.getItemInHand(interactionhand);
|
||||||
if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
|
if (!itemstack.isItemEnabled(this.level.enabledFeatures())) {
|
||||||
return;
|
return;
|
||||||
@@ -1670,7 +_,7 @@
|
@@ -1599,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (interactionresult.consumesAction()) {
|
if (interactionresult instanceof InteractionResult.Success interactionresult$success2) {
|
||||||
- if (interactionresult.shouldSwing()) {
|
- if (interactionresult$success2.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
||||||
+ if (interactionresult.shouldSwing() && inputEvent.shouldSwingHand()) {
|
+ if (interactionresult$success2.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
|
||||||
this.player.swing(interactionhand);
|
this.player.swing(interactionhand);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1682,7 +_,7 @@
|
@@ -1611,7 +_,7 @@
|
||||||
int i = itemstack.getCount();
|
int i = itemstack.getCount();
|
||||||
InteractionResult interactionresult1 = this.gameMode.useItemOn(this.player, interactionhand, blockhitresult);
|
InteractionResult interactionresult1 = this.gameMode.useItemOn(this.player, interactionhand, blockhitresult);
|
||||||
if (interactionresult1.consumesAction()) {
|
if (interactionresult1 instanceof InteractionResult.Success interactionresult$success) {
|
||||||
- if (interactionresult1.shouldSwing()) {
|
- if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
||||||
+ if (interactionresult1.shouldSwing() && inputEvent.shouldSwingHand()) {
|
+ if (interactionresult$success.swingSource() == InteractionResult.SwingSource.CLIENT && inputEvent.shouldSwingHand()) {
|
||||||
this.player.swing(interactionhand);
|
this.player.swing(interactionhand);
|
||||||
if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.gameMode.hasInfiniteItems())) {
|
if (!itemstack.isEmpty() && (itemstack.getCount() != i || this.gameMode.hasInfiniteItems())) {
|
||||||
this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
|
this.gameRenderer.itemInHandRenderer.itemUsed(interactionhand);
|
||||||
@@ -1698,6 +_,9 @@
|
@@ -1627,6 +_,9 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+ if (itemstack.isEmpty() && (this.hitResult == null || this.hitResult.getType() == HitResult.Type.MISS))
|
+ if (itemstack.isEmpty() && (this.hitResult == null || this.hitResult.getType() == HitResult.Type.MISS))
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.onRightClickEmpty(this.player, interactionhand);
|
+ net.minecraftforge.event.ForgeEventFactory.onRightClickEmpty(this.player, interactionhand);
|
||||||
+
|
+
|
||||||
if (!itemstack.isEmpty()) {
|
if (!itemstack.isEmpty()
|
||||||
InteractionResult interactionresult2 = this.gameMode.useItem(this.player, interactionhand);
|
&& this.gameMode.useItem(this.player, interactionhand) instanceof InteractionResult.Success interactionresult$success1) {
|
||||||
if (interactionresult2.consumesAction()) {
|
if (interactionresult$success1.swingSource() == InteractionResult.SwingSource.CLIENT) {
|
||||||
@@ -1728,6 +_,8 @@
|
@@ -1656,6 +_,8 @@
|
||||||
this.rightClickDelay--;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ProfilerFiller profilerfiller = Profiler.get();
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.onPreClientTick();
|
+ net.minecraftforge.event.ForgeEventFactory.onPreClientTick();
|
||||||
+
|
+
|
||||||
this.profiler.push("gui");
|
profilerfiller.push("gui");
|
||||||
this.chatListener.tick();
|
this.chatListener.tick();
|
||||||
this.gui.tick(this.pause);
|
this.gui.tick(this.pause);
|
||||||
@@ -1811,6 +_,7 @@
|
@@ -1745,6 +_,7 @@
|
||||||
|
|
||||||
this.tutorial.tick();
|
this.tutorial.tick();
|
||||||
|
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.onPreLevelTick(this.level, () -> true);
|
+ net.minecraftforge.event.ForgeEventFactory.onPreLevelTick(this.level, () -> true);
|
||||||
try {
|
try {
|
||||||
this.level.tick(() -> true);
|
this.level.tick(() -> true);
|
||||||
} catch (Throwable throwable) {
|
} catch (Throwable throwable1) {
|
||||||
@@ -1824,6 +_,7 @@
|
@@ -1758,6 +_,7 @@
|
||||||
|
|
||||||
throw new ReportedException(crashreport);
|
throw new ReportedException(crashreport1);
|
||||||
}
|
}
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.onPostLevelTick(this.level, () -> true);
|
+ net.minecraftforge.event.ForgeEventFactory.onPostLevelTick(this.level, () -> true);
|
||||||
}
|
}
|
||||||
|
|
||||||
this.profiler.popPush("animateTick");
|
profilerfiller.popPush("animateTick");
|
||||||
@@ -1843,6 +_,7 @@
|
@@ -1782,6 +_,7 @@
|
||||||
this.profiler.popPush("keyboard");
|
profilerfiller.popPush("keyboard");
|
||||||
this.keyboardHandler.tick();
|
this.keyboardHandler.tick();
|
||||||
this.profiler.pop();
|
profilerfiller.pop();
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.onPostClientTick();
|
+ net.minecraftforge.event.ForgeEventFactory.onPostClientTick();
|
||||||
}
|
}
|
||||||
|
|
||||||
private boolean isLevelRunningNormally() {
|
private boolean isLevelRunningNormally() {
|
||||||
@@ -2043,6 +_,7 @@
|
@@ -1983,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setLevel(ClientLevel p_91157_, ReceivingLevelScreen.Reason p_335893_) {
|
public void setLevel(ClientLevel p_91157_, ReceivingLevelScreen.Reason p_335893_) {
|
||||||
@@ -317,7 +319,7 @@
|
|||||||
this.updateScreenAndTick(new ReceivingLevelScreen(() -> false, p_335893_));
|
this.updateScreenAndTick(new ReceivingLevelScreen(() -> false, p_335893_));
|
||||||
this.level = p_91157_;
|
this.level = p_91157_;
|
||||||
this.updateLevelInEngines(p_91157_);
|
this.updateLevelInEngines(p_91157_);
|
||||||
@@ -2080,6 +_,7 @@
|
@@ -2020,6 +_,7 @@
|
||||||
IntegratedServer integratedserver = this.singleplayerServer;
|
IntegratedServer integratedserver = this.singleplayerServer;
|
||||||
this.singleplayerServer = null;
|
this.singleplayerServer = null;
|
||||||
this.gameRenderer.resetData();
|
this.gameRenderer.resetData();
|
||||||
@@ -325,15 +327,15 @@
|
|||||||
this.gameMode = null;
|
this.gameMode = null;
|
||||||
this.narrator.clear();
|
this.narrator.clear();
|
||||||
this.clientLevelTeardownInProgress = true;
|
this.clientLevelTeardownInProgress = true;
|
||||||
@@ -2087,6 +_,7 @@
|
@@ -2027,6 +_,7 @@
|
||||||
try {
|
try {
|
||||||
this.updateScreenAndTick(p_335030_);
|
this.updateScreenAndTick(p_335030_);
|
||||||
if (this.level != null) {
|
if (this.level != null) {
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level);
|
+ net.minecraftforge.event.ForgeEventFactory.onLevelUnload(this.level);
|
||||||
if (integratedserver != null) {
|
if (integratedserver != null) {
|
||||||
this.profiler.push("waitForServer");
|
ProfilerFiller profilerfiller = Profiler.get();
|
||||||
|
profilerfiller.push("waitForServer");
|
||||||
@@ -2099,6 +_,7 @@
|
@@ -2040,6 +_,7 @@
|
||||||
|
|
||||||
this.gui.onDisconnected();
|
this.gui.onDisconnected();
|
||||||
this.isLocalServer = false;
|
this.isLocalServer = false;
|
||||||
@@ -341,7 +343,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.level = null;
|
this.level = null;
|
||||||
@@ -2245,6 +_,7 @@
|
@@ -2187,6 +_,7 @@
|
||||||
|
|
||||||
private void pickBlock() {
|
private void pickBlock() {
|
||||||
if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
|
if (this.hitResult != null && this.hitResult.getType() != HitResult.Type.MISS) {
|
||||||
@@ -349,7 +351,7 @@
|
|||||||
boolean flag = this.player.getAbilities().instabuild;
|
boolean flag = this.player.getAbilities().instabuild;
|
||||||
BlockEntity blockentity = null;
|
BlockEntity blockentity = null;
|
||||||
HitResult.Type hitresult$type = this.hitResult.getType();
|
HitResult.Type hitresult$type = this.hitResult.getType();
|
||||||
@@ -2257,7 +_,7 @@
|
@@ -2199,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
Block block = blockstate.getBlock();
|
Block block = blockstate.getBlock();
|
||||||
@@ -358,7 +360,7 @@
|
|||||||
if (itemstack.isEmpty()) {
|
if (itemstack.isEmpty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -2271,7 +_,7 @@
|
@@ -2213,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
Entity entity = ((EntityHitResult)this.hitResult).getEntity();
|
Entity entity = ((EntityHitResult)this.hitResult).getEntity();
|
||||||
@@ -367,7 +369,7 @@
|
|||||||
if (itemstack == null) {
|
if (itemstack == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -2855,6 +_,10 @@
|
@@ -2818,6 +_,10 @@
|
||||||
@Nullable
|
@Nullable
|
||||||
public static String getLauncherBrand() {
|
public static String getLauncherBrand() {
|
||||||
return System.getProperty("minecraft.launcher.brand");
|
return System.getProperty("minecraft.launcher.brand");
|
||||||
|
|||||||
@@ -1,34 +1,40 @@
|
|||||||
--- a/net/minecraft/client/MouseHandler.java
|
--- a/net/minecraft/client/MouseHandler.java
|
||||||
+++ b/net/minecraft/client/MouseHandler.java
|
+++ b/net/minecraft/client/MouseHandler.java
|
||||||
@@ -79,6 +_,7 @@
|
@@ -85,6 +_,7 @@
|
||||||
this.activeButton = -1;
|
this.activeButton = -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPre(p_91532_, p_91533_, p_91534_)) return;
|
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPre(p_91532_, p_91533_, p_91534_)) return;
|
||||||
boolean[] aboolean = new boolean[]{false};
|
|
||||||
if (this.minecraft.getOverlay() == null) {
|
if (this.minecraft.getOverlay() == null) {
|
||||||
if (this.minecraft.screen == null) {
|
if (this.minecraft.screen == null) {
|
||||||
@@ -91,9 +_,9 @@
|
if (!this.mouseGrabbed && flag) {
|
||||||
Screen screen = this.minecraft.screen;
|
@@ -98,7 +_,7 @@
|
||||||
if (flag) {
|
|
||||||
screen.afterMouseAction();
|
screen.afterMouseAction();
|
||||||
- Screen.wrapScreenError(() -> aboolean[0] = screen.mouseClicked(d0, d1, i), "mouseClicked event handler", screen.getClass().getCanonicalName());
|
|
||||||
+ Screen.wrapScreenError(() -> net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClicked(aboolean, screen, d0, d1, i), "mouseClicked event handler", screen.getClass().getCanonicalName());
|
try {
|
||||||
|
- if (screen.mouseClicked(d0, d1, i)) {
|
||||||
|
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseClicked(screen, d0, d1, i)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch (Throwable throwable1) {
|
||||||
|
@@ -112,7 +_,7 @@
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
- Screen.wrapScreenError(() -> aboolean[0] = screen.mouseReleased(d0, d1, i), "mouseReleased event handler", screen.getClass().getCanonicalName());
|
try {
|
||||||
+ Screen.wrapScreenError(() -> net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseReleased(aboolean, screen, d0, d1, i), "mouseReleased event handler", screen.getClass().getCanonicalName());
|
- if (screen.mouseReleased(d0, d1, i)) {
|
||||||
}
|
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseReleased(screen, d0, d1, i)) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch (Throwable throwable) {
|
||||||
|
@@ -147,6 +_,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -116,6 +_,7 @@
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
|
|
||||||
}
|
}
|
||||||
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseButtonPost(p_91532_, p_91533_, p_91534_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,7 +_,9 @@
|
private void onScroll(long p_91527_, double p_91528_, double p_91529_) {
|
||||||
|
@@ -160,7 +_,9 @@
|
||||||
if (this.minecraft.screen != null) {
|
if (this.minecraft.screen != null) {
|
||||||
double d3 = this.xpos * (double)this.minecraft.getWindow().getGuiScaledWidth() / (double)this.minecraft.getWindow().getScreenWidth();
|
double d3 = this.xpos * (double)this.minecraft.getWindow().getGuiScaledWidth() / (double)this.minecraft.getWindow().getScreenWidth();
|
||||||
double d4 = this.ypos * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
|
double d4 = this.ypos * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
|
||||||
@@ -38,25 +44,25 @@
|
|||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseScrollPost(this.minecraft.screen, d3, d4, d1, d2);
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenMouseScrollPost(this.minecraft.screen, d3, d4, d1, d2);
|
||||||
this.minecraft.screen.afterMouseAction();
|
this.minecraft.screen.afterMouseAction();
|
||||||
} else if (this.minecraft.player != null) {
|
} else if (this.minecraft.player != null) {
|
||||||
if (this.accumulatedScrollX != 0.0 && Math.signum(d1) != Math.signum(this.accumulatedScrollX)) {
|
Vector2i vector2i = this.scrollWheelHandler.onMouseScroll(d1, d2);
|
||||||
@@ -151,6 +_,7 @@
|
@@ -169,6 +_,7 @@
|
||||||
this.accumulatedScrollX -= (double)j;
|
}
|
||||||
this.accumulatedScrollY -= (double)i;
|
|
||||||
int k = i == 0 ? -j : i;
|
int i = vector2i.y == 0 ? -vector2i.x : vector2i.y;
|
||||||
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseScroll(this, d1, d2)) return;
|
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onMouseScroll(this, d1, d2)) return;
|
||||||
if (this.minecraft.player.isSpectator()) {
|
if (this.minecraft.player.isSpectator()) {
|
||||||
if (this.minecraft.gui.getSpectatorGui().isMenuActive()) {
|
if (this.minecraft.gui.getSpectatorGui().isMenuActive()) {
|
||||||
this.minecraft.gui.getSpectatorGui().onMouseScrolled(-k);
|
this.minecraft.gui.getSpectatorGui().onMouseScrolled(-i);
|
||||||
@@ -236,7 +_,7 @@
|
@@ -274,7 +_,7 @@
|
||||||
if (this.activeButton != -1 && this.mousePressedTime > 0.0) {
|
|
||||||
double d4 = this.accumulatedDX * (double)this.minecraft.getWindow().getGuiScaledWidth() / (double)this.minecraft.getWindow().getScreenWidth();
|
|
||||||
double d5 = this.accumulatedDY * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
|
double d5 = this.accumulatedDY * (double)this.minecraft.getWindow().getGuiScaledHeight() / (double)this.minecraft.getWindow().getScreenHeight();
|
||||||
- Screen.wrapScreenError(() -> screen.mouseDragged(d2, d3, this.activeButton, d4, d5), "mouseDragged event handler", screen.getClass().getCanonicalName());
|
|
||||||
+ Screen.wrapScreenError(() -> net.minecraftforge.client.ForgeHooksClient.onScreenMouseDrag(screen, d2, d3, this.activeButton, d4, d5), "mouseDragged event handler", screen.getClass().getCanonicalName());
|
|
||||||
}
|
|
||||||
|
|
||||||
screen.afterMouseMove();
|
try {
|
||||||
@@ -303,6 +_,14 @@
|
- screen.mouseDragged(d2, d3, this.activeButton, d4, d5);
|
||||||
|
+ net.minecraftforge.client.ForgeHooksClient.onScreenMouseDrag(screen, d2, d3, this.activeButton, d4, d5);
|
||||||
|
} catch (Throwable throwable) {
|
||||||
|
CrashReport crashreport1 = CrashReport.forThrowable(throwable, "mouseDragged event handler");
|
||||||
|
screen.fillCrashDetails(crashreport1);
|
||||||
|
@@ -349,6 +_,14 @@
|
||||||
|
|
||||||
public double ypos() {
|
public double ypos() {
|
||||||
return this.ypos;
|
return this.ypos;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/Options.java
|
--- a/net/minecraft/client/Options.java
|
||||||
+++ b/net/minecraft/client/Options.java
|
+++ b/net/minecraft/client/Options.java
|
||||||
@@ -681,7 +_,8 @@
|
@@ -698,7 +_,8 @@
|
||||||
},
|
},
|
||||||
new OptionInstance.LazyEnum<>(
|
new OptionInstance.LazyEnum<>(
|
||||||
() -> Stream.concat(Stream.of(""), Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().stream()).toList(),
|
() -> Stream.concat(Stream.of(""), Minecraft.getInstance().getSoundManager().getAvailableSoundDevices().stream()).toList(),
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
? Optional.empty()
|
? Optional.empty()
|
||||||
: Optional.of(p_232011_),
|
: Optional.of(p_232011_),
|
||||||
Codec.STRING
|
Codec.STRING
|
||||||
@@ -1050,6 +_,7 @@
|
@@ -1079,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public Options(Minecraft p_92138_, File p_92139_) {
|
public Options(Minecraft p_92138_, File p_92139_) {
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
this.minecraft = p_92138_;
|
this.minecraft = p_92138_;
|
||||||
this.optionsFile = new File(p_92139_, "options.txt");
|
this.optionsFile = new File(p_92139_, "options.txt");
|
||||||
boolean flag = Runtime.getRuntime().maxMemory() >= 1000000000L;
|
boolean flag = Runtime.getRuntime().maxMemory() >= 1000000000L;
|
||||||
@@ -1184,12 +_,22 @@
|
@@ -1210,12 +_,22 @@
|
||||||
p_168428_.process("telemetryOptInExtra", this.telemetryOptInExtra);
|
p_168428_.process("telemetryOptInExtra", this.telemetryOptInExtra);
|
||||||
this.onboardAccessibility = p_168428_.process("onboardAccessibility", this.onboardAccessibility);
|
this.onboardAccessibility = p_168428_.process("onboardAccessibility", this.onboardAccessibility);
|
||||||
p_168428_.process("menuBackgroundBlurriness", this.menuBackgroundBlurriness);
|
p_168428_.process("menuBackgroundBlurriness", this.menuBackgroundBlurriness);
|
||||||
@@ -42,7 +42,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1207,6 +_,10 @@
|
@@ -1233,6 +_,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void load() {
|
public void load() {
|
||||||
@@ -53,7 +53,7 @@
|
|||||||
try {
|
try {
|
||||||
if (!this.optionsFile.exists()) {
|
if (!this.optionsFile.exists()) {
|
||||||
return;
|
return;
|
||||||
@@ -1234,7 +_,8 @@
|
@@ -1260,7 +_,8 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -63,15 +63,15 @@
|
|||||||
new Options.FieldAccess() {
|
new Options.FieldAccess() {
|
||||||
@Nullable
|
@Nullable
|
||||||
private String getValueOrNull(String p_168459_) {
|
private String getValueOrNull(String p_168459_) {
|
||||||
@@ -1428,6 +_,7 @@
|
@@ -1451,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void broadcastOptions() {
|
public void broadcastOptions() {
|
||||||
+ if (net.minecraftforge.client.loading.ClientModLoader.isLoading()) return; //Don't save settings before mods add keybindigns and the like to prevent them from being deleted.
|
+ if (net.minecraftforge.client.loading.ClientModLoader.isLoading()) return; //Don't save settings before mods add keybindigns and the like to prevent them from being deleted.
|
||||||
if (this.minecraft.player != null) {
|
if (this.minecraft.player != null) {
|
||||||
this.minecraft.player.connection.send(new ServerboundClientInformationPacket(this.buildPlayerInformation()));
|
this.minecraft.player.connection.broadcastClientInformation(this.buildPlayerInformation());
|
||||||
}
|
}
|
||||||
@@ -1546,6 +_,23 @@
|
@@ -1564,6 +_,23 @@
|
||||||
|
|
||||||
public static Component genericValueLabel(Component p_231901_, int p_231902_) {
|
public static Component genericValueLabel(Component p_231901_, int p_231902_) {
|
||||||
return genericValueLabel(p_231901_, Component.literal(Integer.toString(p_231902_)));
|
return genericValueLabel(p_231901_, Component.literal(Integer.toString(p_231902_)));
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
--- a/net/minecraft/client/RecipeBookCategories.java
|
|
||||||
+++ b/net/minecraft/client/RecipeBookCategories.java
|
|
||||||
@@ -12,7 +_,7 @@
|
|
||||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
|
||||||
-public enum RecipeBookCategories {
|
|
||||||
+public enum RecipeBookCategories implements net.minecraftforge.common.IExtensibleEnum {
|
|
||||||
CRAFTING_SEARCH(new ItemStack(Items.COMPASS)),
|
|
||||||
CRAFTING_BUILDING_BLOCKS(new ItemStack(Blocks.BRICKS)),
|
|
||||||
CRAFTING_REDSTONE(new ItemStack(Items.REDSTONE)),
|
|
||||||
@@ -38,7 +_,7 @@
|
|
||||||
public static final List<RecipeBookCategories> CRAFTING_CATEGORIES = ImmutableList.of(
|
|
||||||
CRAFTING_SEARCH, CRAFTING_EQUIPMENT, CRAFTING_BUILDING_BLOCKS, CRAFTING_MISC, CRAFTING_REDSTONE
|
|
||||||
);
|
|
||||||
- public static final Map<RecipeBookCategories, List<RecipeBookCategories>> AGGREGATE_CATEGORIES = ImmutableMap.of(
|
|
||||||
+ public static final Map<RecipeBookCategories, List<RecipeBookCategories>> AGGREGATE_CATEGORIES = net.minecraftforge.client.RecipeBookManager.getAggregateCategories(ImmutableMap.of(
|
|
||||||
CRAFTING_SEARCH,
|
|
||||||
ImmutableList.of(CRAFTING_EQUIPMENT, CRAFTING_BUILDING_BLOCKS, CRAFTING_MISC, CRAFTING_REDSTONE),
|
|
||||||
FURNACE_SEARCH,
|
|
||||||
@@ -47,7 +_,7 @@
|
|
||||||
ImmutableList.of(BLAST_FURNACE_BLOCKS, BLAST_FURNACE_MISC),
|
|
||||||
SMOKER_SEARCH,
|
|
||||||
ImmutableList.of(SMOKER_FOOD)
|
|
||||||
- );
|
|
||||||
+ ));
|
|
||||||
private final List<ItemStack> itemIcons;
|
|
||||||
|
|
||||||
private RecipeBookCategories(final ItemStack... p_92267_) {
|
|
||||||
@@ -60,10 +_,15 @@
|
|
||||||
case FURNACE -> FURNACE_CATEGORIES;
|
|
||||||
case BLAST_FURNACE -> BLAST_FURNACE_CATEGORIES;
|
|
||||||
case SMOKER -> SMOKER_CATEGORIES;
|
|
||||||
+ default -> net.minecraftforge.client.RecipeBookManager.getCustomCategoriesOrEmpty(p_92270_);
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<ItemStack> getIconItems() {
|
|
||||||
return this.itemIcons;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public static RecipeBookCategories create(String name, ItemStack... icons) {
|
|
||||||
+ throw new IllegalStateException("Enum not extended");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -10,8 +10,8 @@
|
|||||||
|
|
||||||
public static ItemColors createDefault(BlockColors p_92684_) {
|
public static ItemColors createDefault(BlockColors p_92684_) {
|
||||||
ItemColors itemcolors = new ItemColors();
|
ItemColors itemcolors = new ItemColors();
|
||||||
@@ -105,17 +_,20 @@
|
@@ -101,17 +_,20 @@
|
||||||
: FastColor.ARGB32.opaque(p_325310_.getOrDefault(DataComponents.MAP_COLOR, MapItemColor.DEFAULT).rgb()),
|
(p_357654_, p_357655_) -> p_357655_ == 0 ? -1 : ARGB.opaque(p_357654_.getOrDefault(DataComponents.MAP_COLOR, MapItemColor.DEFAULT).rgb()),
|
||||||
Items.FILLED_MAP
|
Items.FILLED_MAP
|
||||||
);
|
);
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onItemColorsInit(itemcolors, p_92684_);
|
+ net.minecraftforge.client.ForgeHooksClient.onItemColorsInit(itemcolors, p_92684_);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/Font.java
|
--- a/net/minecraft/client/gui/Font.java
|
||||||
+++ b/net/minecraft/client/gui/Font.java
|
+++ b/net/minecraft/client/gui/Font.java
|
||||||
@@ -31,7 +_,7 @@
|
@@ -33,7 +_,7 @@
|
||||||
import org.joml.Vector3f;
|
import org.joml.Vector3f;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -9,12 +9,3 @@
|
|||||||
private static final float EFFECT_DEPTH = 0.01F;
|
private static final float EFFECT_DEPTH = 0.01F;
|
||||||
private static final Vector3f SHADOW_OFFSET = new Vector3f(0.0F, 0.0F, 0.03F);
|
private static final Vector3f SHADOW_OFFSET = new Vector3f(0.0F, 0.0F, 0.03F);
|
||||||
public static final int ALPHA_CUTOFF = 8;
|
public static final int ALPHA_CUTOFF = 8;
|
||||||
@@ -322,6 +_,8 @@
|
|
||||||
public StringSplitter getSplitter() {
|
|
||||||
return this.splitter;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ @Override public Font self() { return this; }
|
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
|
||||||
public static enum DisplayMode {
|
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/Gui.java
|
--- a/net/minecraft/client/gui/Gui.java
|
||||||
+++ b/net/minecraft/client/gui/Gui.java
|
+++ b/net/minecraft/client/gui/Gui.java
|
||||||
@@ -131,7 +_,7 @@
|
@@ -147,7 +_,7 @@
|
||||||
public float vignetteBrightness = 1.0F;
|
public float vignetteBrightness = 1.0F;
|
||||||
private int toolHighlightTimer;
|
private int toolHighlightTimer;
|
||||||
private ItemStack lastToolHighlight = ItemStack.EMPTY;
|
private ItemStack lastToolHighlight = ItemStack.EMPTY;
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
private final SubtitleOverlay subtitleOverlay;
|
private final SubtitleOverlay subtitleOverlay;
|
||||||
private final SpectatorGui spectatorGui;
|
private final SpectatorGui spectatorGui;
|
||||||
private final PlayerTabOverlay tabList;
|
private final PlayerTabOverlay tabList;
|
||||||
@@ -318,7 +_,7 @@
|
@@ -345,7 +_,7 @@
|
||||||
Window window = this.minecraft.getWindow();
|
Window window = this.minecraft.getWindow();
|
||||||
int i = Mth.floor(this.minecraft.mouseHandler.xpos() * (double)window.getGuiScaledWidth() / (double)window.getScreenWidth());
|
int i = Mth.floor(this.minecraft.mouseHandler.xpos() * (double)window.getGuiScaledWidth() / (double)window.getScreenWidth());
|
||||||
int j = Mth.floor(this.minecraft.mouseHandler.ypos() * (double)window.getGuiScaledHeight() / (double)window.getScreenHeight());
|
int j = Mth.floor(this.minecraft.mouseHandler.ypos() * (double)window.getGuiScaledHeight() / (double)window.getScreenHeight());
|
||||||
@@ -18,24 +18,24 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -434,6 +_,8 @@
|
@@ -443,6 +_,8 @@
|
||||||
|
|
||||||
for (MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
|
for (MobEffectInstance mobeffectinstance : Ordering.natural().reverse().sortedCopy(collection)) {
|
||||||
Holder<MobEffect> holder = mobeffectinstance.getEffect();
|
Holder<MobEffect> holder = mobeffectinstance.getEffect();
|
||||||
+ var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(mobeffectinstance);
|
+ var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(mobeffectinstance);
|
||||||
+ if (!renderer.isVisibleInGui(mobeffectinstance)) continue;
|
+ if (!renderer.isVisibleInGui(mobeffectinstance)) continue;
|
||||||
if (mobeffectinstance.showIcon()) {
|
if (mobeffectinstance.showIcon()) {
|
||||||
int i = p_282812_.guiWidth();
|
int k = p_282812_.guiWidth();
|
||||||
int j = 1;
|
int l = 1;
|
||||||
@@ -463,6 +_,7 @@
|
@@ -473,6 +_,7 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
+ if (renderer.renderGuiIcon(mobeffectinstance, this, p_282812_, i, j, 0, f)) continue;
|
+ if (renderer.renderGuiIcon(mobeffectinstance, this, p_282812_, k, l, 0, f)) continue;
|
||||||
TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.get(holder);
|
TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.get(holder);
|
||||||
int l1 = i;
|
int l1 = k;
|
||||||
int i1 = j;
|
int k1 = l;
|
||||||
@@ -625,6 +_,10 @@
|
@@ -623,6 +_,10 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void renderSelectedItemName(GuiGraphics p_283501_) {
|
private void renderSelectedItemName(GuiGraphics p_283501_) {
|
||||||
@@ -43,10 +43,10 @@
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public void renderSelectedItemName(GuiGraphics p_283501_, int yShift) {
|
+ public void renderSelectedItemName(GuiGraphics p_283501_, int yShift) {
|
||||||
this.minecraft.getProfiler().push("selectedItemName");
|
Profiler.get().push("selectedItemName");
|
||||||
if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
|
if (this.toolHighlightTimer > 0 && !this.lastToolHighlight.isEmpty()) {
|
||||||
MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color());
|
MutableComponent mutablecomponent = Component.empty().append(this.lastToolHighlight.getHoverName()).withStyle(this.lastToolHighlight.getRarity().color());
|
||||||
@@ -632,9 +_,13 @@
|
@@ -630,9 +_,13 @@
|
||||||
mutablecomponent.withStyle(ChatFormatting.ITALIC);
|
mutablecomponent.withStyle(ChatFormatting.ITALIC);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -62,16 +62,16 @@
|
|||||||
if (!this.minecraft.gameMode.canHurtPlayer()) {
|
if (!this.minecraft.gameMode.canHurtPlayer()) {
|
||||||
k += 14;
|
k += 14;
|
||||||
}
|
}
|
||||||
@@ -645,7 +_,7 @@
|
@@ -643,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
if (l > 0) {
|
if (l > 0) {
|
||||||
- p_283501_.drawStringWithBackdrop(this.getFont(), mutablecomponent, j, k, i, FastColor.ARGB32.color(l, -1));
|
- p_283501_.drawStringWithBackdrop(this.getFont(), mutablecomponent, j, k, i, ARGB.color(l, -1));
|
||||||
+ p_283501_.drawStringWithBackdrop(font, highlightTip, j, k, i, FastColor.ARGB32.color(l, -1));
|
+ p_283501_.drawStringWithBackdrop(font, highlightTip, j, k, i, ARGB.color(l, -1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1146,7 +_,7 @@
|
@@ -1152,7 +_,7 @@
|
||||||
ItemStack itemstack = this.minecraft.player.getInventory().getSelected();
|
ItemStack itemstack = this.minecraft.player.getInventory().getSelected();
|
||||||
if (itemstack.isEmpty()) {
|
if (itemstack.isEmpty()) {
|
||||||
this.toolHighlightTimer = 0;
|
this.toolHighlightTimer = 0;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/GuiGraphics.java
|
--- a/net/minecraft/client/gui/GuiGraphics.java
|
||||||
+++ b/net/minecraft/client/gui/GuiGraphics.java
|
+++ b/net/minecraft/client/gui/GuiGraphics.java
|
||||||
@@ -56,7 +_,7 @@
|
@@ -53,7 +_,7 @@
|
||||||
import org.joml.Vector2ic;
|
import org.joml.Vector2ic;
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
public static final float MAX_GUI_Z = 10000.0F;
|
public static final float MAX_GUI_Z = 10000.0F;
|
||||||
public static final float MIN_GUI_Z = -10000.0F;
|
public static final float MIN_GUI_Z = -10000.0F;
|
||||||
private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
|
private static final int EXTRA_SPACE_AFTER_FIRST_TOOLTIP_LINE = 2;
|
||||||
@@ -268,6 +_,11 @@
|
@@ -227,6 +_,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public int drawString(Font p_283343_, @Nullable String p_281896_, int p_283569_, int p_283418_, int p_281560_, boolean p_282130_) {
|
public int drawString(Font p_283343_, @Nullable String p_281896_, int p_283569_, int p_283418_, int p_281560_, boolean p_282130_) {
|
||||||
@@ -18,10 +18,10 @@
|
|||||||
+
|
+
|
||||||
+ // Forge: Add float variant for x,y coordinates
|
+ // Forge: Add float variant for x,y coordinates
|
||||||
+ public int drawString(Font p_283343_, @Nullable String p_281896_, float p_283569_, float p_283418_, int p_281560_, boolean p_282130_) {
|
+ public int drawString(Font p_283343_, @Nullable String p_281896_, float p_283569_, float p_283418_, int p_281560_, boolean p_282130_) {
|
||||||
if (p_281896_ == null) {
|
return p_281896_ == null
|
||||||
return 0;
|
? 0
|
||||||
} else {
|
: p_283343_.drawInBatch(
|
||||||
@@ -294,6 +_,11 @@
|
@@ -248,6 +_,11 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public int drawString(Font p_282636_, FormattedCharSequence p_281596_, int p_281586_, int p_282816_, int p_281743_, boolean p_282394_) {
|
public int drawString(Font p_282636_, FormattedCharSequence p_281596_, int p_281586_, int p_282816_, int p_281743_, boolean p_282394_) {
|
||||||
@@ -30,10 +30,10 @@
|
|||||||
+
|
+
|
||||||
+ // Forge: Add float variant for x,y coordinates
|
+ // Forge: Add float variant for x,y coordinates
|
||||||
+ public int drawString(Font p_282636_, FormattedCharSequence p_281596_, float p_281586_, float p_282816_, int p_281743_, boolean p_282394_) {
|
+ public int drawString(Font p_282636_, FormattedCharSequence p_281596_, float p_281586_, float p_282816_, int p_281743_, boolean p_282394_) {
|
||||||
int i = p_282636_.drawInBatch(
|
return p_282636_.drawInBatch(
|
||||||
p_281596_,
|
p_281596_,
|
||||||
(float)p_281586_,
|
(float)p_281586_,
|
||||||
@@ -864,6 +_,7 @@
|
@@ -872,6 +_,7 @@
|
||||||
CrashReport crashreport = CrashReport.forThrowable(throwable, "Rendering item");
|
CrashReport crashreport = CrashReport.forThrowable(throwable, "Rendering item");
|
||||||
CrashReportCategory crashreportcategory = crashreport.addCategory("Item being rendered");
|
CrashReportCategory crashreportcategory = crashreport.addCategory("Item being rendered");
|
||||||
crashreportcategory.setDetail("Item Type", () -> String.valueOf(p_281675_.getItem()));
|
crashreportcategory.setDetail("Item Type", () -> String.valueOf(p_281675_.getItem()));
|
||||||
@@ -41,9 +41,9 @@
|
|||||||
crashreportcategory.setDetail("Item Components", () -> String.valueOf(p_281675_.getComponents()));
|
crashreportcategory.setDetail("Item Components", () -> String.valueOf(p_281675_.getComponents()));
|
||||||
crashreportcategory.setDetail("Item Foil", () -> String.valueOf(p_281675_.hasFoil()));
|
crashreportcategory.setDetail("Item Foil", () -> String.valueOf(p_281675_.hasFoil()));
|
||||||
throw new ReportedException(crashreport);
|
throw new ReportedException(crashreport);
|
||||||
@@ -904,16 +_,26 @@
|
@@ -892,13 +_,24 @@
|
||||||
}
|
this.renderItemCount(p_282005_, p_283349_, p_282641_, p_282146_, p_282803_);
|
||||||
|
this.renderItemCooldown(p_283349_, p_282641_, p_282146_);
|
||||||
this.pose.popPose();
|
this.pose.popPose();
|
||||||
+ net.minecraftforge.client.ItemDecoratorHandler.of(p_283349_).render(this, p_282005_, p_283349_, p_282641_, p_282146_);
|
+ net.minecraftforge.client.ItemDecoratorHandler.of(p_283349_).render(this, p_282005_, p_283349_, p_282641_, p_282146_);
|
||||||
}
|
}
|
||||||
@@ -53,50 +53,56 @@
|
|||||||
|
|
||||||
public void renderTooltip(Font p_282308_, ItemStack p_282781_, int p_282687_, int p_282292_) {
|
public void renderTooltip(Font p_282308_, ItemStack p_282781_, int p_282687_, int p_282292_) {
|
||||||
+ this.tooltipStack = p_282781_;
|
+ this.tooltipStack = p_282781_;
|
||||||
this.renderTooltip(p_282308_, Screen.getTooltipFromItem(this.minecraft, p_282781_), p_282781_.getTooltipImage(), p_282687_, p_282292_);
|
this.renderTooltip(
|
||||||
|
p_282308_, Screen.getTooltipFromItem(this.minecraft, p_282781_), p_282781_.getTooltipImage(), p_282687_, p_282292_, p_282781_.get(DataComponents.TOOLTIP_STYLE)
|
||||||
|
);
|
||||||
+ this.tooltipStack = ItemStack.EMPTY;
|
+ this.tooltipStack = ItemStack.EMPTY;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public void renderTooltip(Font font, List<Component> textComponents, Optional<TooltipComponent> tooltipComponent, ItemStack stack, int mouseX, int mouseY) {
|
+ public void renderTooltip(Font font, List<Component> textComponents, Optional<TooltipComponent> tooltipComponent, ItemStack stack, int mouseX, int mouseY) {
|
||||||
+ this.tooltipStack = stack;
|
+ this.tooltipStack = stack;
|
||||||
+ this.renderTooltip(font, textComponents, tooltipComponent, mouseX, mouseY);
|
+ this.renderTooltip(font, textComponents, tooltipComponent, mouseX, mouseY, stack.get(DataComponents.TOOLTIP_STYLE));
|
||||||
+ this.tooltipStack = ItemStack.EMPTY;
|
+ this.tooltipStack = ItemStack.EMPTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void renderTooltip(Font p_283128_, List<Component> p_282716_, Optional<TooltipComponent> p_281682_, int p_283678_, int p_281696_) {
|
public void renderTooltip(Font p_283128_, List<Component> p_282716_, Optional<TooltipComponent> p_281682_, int p_283678_, int p_281696_) {
|
||||||
- List<ClientTooltipComponent> list = p_282716_.stream().map(Component::getVisualOrderText).map(ClientTooltipComponent::create).collect(Util.toMutableList());
|
@@ -908,8 +_,7 @@
|
||||||
- p_281682_.ifPresent(p_325321_ -> list.add(list.isEmpty() ? 0 : 1, ClientTooltipComponent.create(p_325321_)));
|
public void renderTooltip(
|
||||||
+ List<ClientTooltipComponent> list = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_282716_, p_281682_, p_283678_, guiWidth(), guiHeight(), p_283128_);
|
Font p_362491_, List<Component> p_368544_, Optional<TooltipComponent> p_362815_, int p_366300_, int p_368952_, @Nullable ResourceLocation p_368469_
|
||||||
this.renderTooltipInternal(p_283128_, list, p_283678_, p_281696_, DefaultTooltipPositioner.INSTANCE);
|
) {
|
||||||
|
- List<ClientTooltipComponent> list = p_368544_.stream().map(Component::getVisualOrderText).map(ClientTooltipComponent::create).collect(Util.toMutableList());
|
||||||
|
- p_362815_.ifPresent(p_325321_ -> list.add(list.isEmpty() ? 0 : 1, ClientTooltipComponent.create(p_325321_)));
|
||||||
|
+ List<ClientTooltipComponent> list = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_368544_, p_362815_, p_366300_, guiWidth(), guiHeight(), p_362491_);
|
||||||
|
this.renderTooltipInternal(p_362491_, list, p_366300_, p_368952_, DefaultTooltipPositioner.INSTANCE, p_368469_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -922,7 +_,22 @@
|
@@ -922,7 +_,22 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void renderComponentTooltip(Font p_282739_, List<Component> p_281832_, int p_282191_, int p_282446_) {
|
public void renderComponentTooltip(Font p_282739_, List<Component> p_281832_, int p_282191_, int p_282446_) {
|
||||||
- this.renderTooltip(p_282739_, Lists.transform(p_281832_, Component::getVisualOrderText), p_282191_, p_282446_);
|
- this.renderComponentTooltip(p_282739_, p_281832_, p_282191_, p_282446_, null);
|
||||||
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_281832_, p_282191_, guiWidth(), guiHeight(), p_282739_);
|
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(this.tooltipStack, p_281832_, p_282191_, guiWidth(), guiHeight(), p_282739_);
|
||||||
+ this.renderTooltipInternal(p_282739_, components, p_282191_, p_282446_, DefaultTooltipPositioner.INSTANCE);
|
+ this.renderTooltipInternal(p_282739_, components, p_282191_, p_282446_, DefaultTooltipPositioner.INSTANCE, null);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public void renderComponentTooltip(Font font, List<? extends net.minecraft.network.chat.FormattedText> tooltips, int mouseX, int mouseY, ItemStack stack) {
|
+ public void renderComponentTooltip(Font font, List<? extends net.minecraft.network.chat.FormattedText> tooltips, int mouseX, int mouseY, ItemStack stack) {
|
||||||
+ this.tooltipStack = stack;
|
+ this.tooltipStack = stack;
|
||||||
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(stack, tooltips, mouseX, guiWidth(), guiHeight(), font);
|
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponents(stack, tooltips, mouseX, guiWidth(), guiHeight(), font);
|
||||||
+ this.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE);
|
+ this.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, null);
|
||||||
+ this.tooltipStack = ItemStack.EMPTY;
|
+ this.tooltipStack = ItemStack.EMPTY;
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public void renderComponentTooltipFromElements(Font font, List<com.mojang.datafixers.util.Either<FormattedText, TooltipComponent>> elements, int mouseX, int mouseY, ItemStack stack) {
|
+ public void renderComponentTooltipFromElements(Font font, List<com.mojang.datafixers.util.Either<FormattedText, TooltipComponent>> elements, int mouseX, int mouseY, ItemStack stack) {
|
||||||
+ this.tooltipStack = stack;
|
+ this.tooltipStack = stack;
|
||||||
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponentsFromElements(stack, elements, mouseX, guiWidth(), guiHeight(), font);
|
+ List<ClientTooltipComponent> components = net.minecraftforge.client.ForgeHooksClient.gatherTooltipComponentsFromElements(stack, elements, mouseX, guiWidth(), guiHeight(), font);
|
||||||
+ this.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE);
|
+ this.renderTooltipInternal(font, components, mouseX, mouseY, DefaultTooltipPositioner.INSTANCE, null);
|
||||||
+ this.tooltipStack = ItemStack.EMPTY;
|
+ this.tooltipStack = ItemStack.EMPTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void renderTooltip(Font p_282192_, List<? extends FormattedCharSequence> p_282297_, int p_281680_, int p_283325_) {
|
public void renderComponentTooltip(Font p_369090_, List<Component> p_365405_, int p_368143_, int p_366244_, @Nullable ResourceLocation p_364763_) {
|
||||||
@@ -941,11 +_,13 @@
|
@@ -964,11 +_,13 @@
|
||||||
|
@Nullable ResourceLocation p_368234_
|
||||||
private void renderTooltipInternal(Font p_282675_, List<ClientTooltipComponent> p_282615_, int p_283230_, int p_283417_, ClientTooltipPositioner p_282442_) {
|
) {
|
||||||
if (!p_282615_.isEmpty()) {
|
if (!p_282615_.isEmpty()) {
|
||||||
+ var preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(this.tooltipStack, this, p_283230_, p_283417_, guiWidth(), guiHeight(), p_282615_, p_282675_, p_282442_);
|
+ var preEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipPre(this.tooltipStack, this, p_283230_, p_283417_, guiWidth(), guiHeight(), p_282615_, p_282675_, p_282442_);
|
||||||
+ if (preEvent.isCanceled()) return;
|
+ if (preEvent.isCanceled()) return;
|
||||||
@@ -109,21 +115,19 @@
|
|||||||
if (k > i) {
|
if (k > i) {
|
||||||
i = k;
|
i = k;
|
||||||
}
|
}
|
||||||
@@ -955,18 +_,21 @@
|
@@ -978,18 +_,19 @@
|
||||||
|
|
||||||
int i2 = i;
|
int i2 = i;
|
||||||
int j2 = j;
|
int j2 = j;
|
||||||
- Vector2ic vector2ic = p_282442_.positionTooltip(this.guiWidth(), this.guiHeight(), p_283230_, p_283417_, i2, j2);
|
- Vector2ic vector2ic = p_282442_.positionTooltip(this.guiWidth(), this.guiHeight(), p_283230_, p_283417_, i, j);
|
||||||
+ Vector2ic vector2ic = p_282442_.positionTooltip(this.guiWidth(), this.guiHeight(), preEvent.getX(), preEvent.getY(), i2, j2);
|
+ Vector2ic vector2ic = p_282442_.positionTooltip(this.guiWidth(), this.guiHeight(), preEvent.getX(), preEvent.getY(), i2, j2);
|
||||||
int l = vector2ic.x();
|
int l = vector2ic.x();
|
||||||
int i1 = vector2ic.y();
|
int i1 = vector2ic.y();
|
||||||
this.pose.pushPose();
|
this.pose.pushPose();
|
||||||
int j1 = 400;
|
int j1 = 400;
|
||||||
- this.drawManaged(() -> TooltipRenderUtil.renderTooltipBackground(this, l, i1, i2, j2, 400));
|
- TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, 400, p_368234_);
|
||||||
+ this.drawManaged(() -> {
|
+ var background_event = net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderTooltipBackground(this.tooltipStack, this, l, i1, preEvent.getFont(), p_282615_, p_368234_);
|
||||||
+ var colorEvent = net.minecraftforge.client.ForgeHooksClient.onRenderTooltipColor(this.tooltipStack, this, l, i1, preEvent.getFont(), p_282615_);
|
+ TooltipRenderUtil.renderTooltipBackground(this, l, i1, i, j, 400, background_event.getBackground());
|
||||||
+ TooltipRenderUtil.renderTooltipBackground(this, l, i1, i2, j2, 400, colorEvent.getBackgroundStart(), colorEvent.getBackgroundEnd(), colorEvent.getBorderStart(), colorEvent.getBorderEnd());
|
|
||||||
+ });
|
|
||||||
this.pose.translate(0.0F, 0.0F, 400.0F);
|
this.pose.translate(0.0F, 0.0F, 400.0F);
|
||||||
int k1 = i1;
|
int k1 = i1;
|
||||||
|
|
||||||
@@ -131,15 +135,26 @@
|
|||||||
ClientTooltipComponent clienttooltipcomponent1 = p_282615_.get(l1);
|
ClientTooltipComponent clienttooltipcomponent1 = p_282615_.get(l1);
|
||||||
- clienttooltipcomponent1.renderText(p_282675_, l, k1, this.pose.last().pose(), this.bufferSource);
|
- clienttooltipcomponent1.renderText(p_282675_, l, k1, this.pose.last().pose(), this.bufferSource);
|
||||||
+ clienttooltipcomponent1.renderText(preEvent.getFont(), l, k1, this.pose.last().pose(), this.bufferSource);
|
+ clienttooltipcomponent1.renderText(preEvent.getFont(), l, k1, this.pose.last().pose(), this.bufferSource);
|
||||||
k1 += clienttooltipcomponent1.getHeight() + (l1 == 0 ? 2 : 0);
|
k1 += clienttooltipcomponent1.getHeight(p_282675_) + (l1 == 0 ? 2 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -974,7 +_,7 @@
|
@@ -997,7 +_,7 @@
|
||||||
|
|
||||||
for (int k2 = 0; k2 < p_282615_.size(); k2++) {
|
for (int k2 = 0; k2 < p_282615_.size(); k2++) {
|
||||||
ClientTooltipComponent clienttooltipcomponent2 = p_282615_.get(k2);
|
ClientTooltipComponent clienttooltipcomponent2 = p_282615_.get(k2);
|
||||||
- clienttooltipcomponent2.renderImage(p_282675_, l, k1, this);
|
- clienttooltipcomponent2.renderImage(p_282675_, l, k1, i2, j2, this);
|
||||||
+ clienttooltipcomponent2.renderImage(preEvent.getFont(), l, k1, this);
|
+ clienttooltipcomponent2.renderImage(preEvent.getFont(), l, k1, i2, j2, this);
|
||||||
k1 += clienttooltipcomponent2.getHeight() + (k2 == 0 ? 2 : 0);
|
k1 += clienttooltipcomponent2.getHeight(p_282675_) + (k2 == 0 ? 2 : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1054,6 +_,10 @@
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public MultiBufferSource.BufferSource getBufferSource() {
|
||||||
|
+ return this.bufferSource;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void drawSpecial(Consumer<MultiBufferSource> p_367429_) {
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
--- a/net/minecraft/client/gui/components/AbstractButton.java
|
--- a/net/minecraft/client/gui/components/AbstractButton.java
|
||||||
+++ b/net/minecraft/client/gui/components/AbstractButton.java
|
+++ b/net/minecraft/client/gui/components/AbstractButton.java
|
||||||
@@ -34,7 +_,7 @@
|
@@ -39,7 +_,7 @@
|
||||||
RenderSystem.enableDepthTest();
|
this.getHeight(),
|
||||||
p_281670_.blitSprite(SPRITES.get(this.active, this.isHoveredOrFocused()), this.getX(), this.getY(), this.getWidth(), this.getHeight());
|
ARGB.white(this.alpha)
|
||||||
p_281670_.setColor(1.0F, 1.0F, 1.0F, 1.0F);
|
);
|
||||||
- int i = this.active ? 16777215 : 10526880;
|
- int i = this.active ? 16777215 : 10526880;
|
||||||
+ int i = getFGColor();
|
+ int i = getFGColor();
|
||||||
this.renderString(p_281670_, minecraft.font, i | Mth.ceil(this.alpha * 255.0F) << 24);
|
this.renderString(p_281670_, minecraft.font, i | Mth.ceil(this.alpha * 255.0F) << 24);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/components/AbstractWidget.java
|
--- a/net/minecraft/client/gui/components/AbstractWidget.java
|
||||||
+++ b/net/minecraft/client/gui/components/AbstractWidget.java
|
+++ b/net/minecraft/client/gui/components/AbstractWidget.java
|
||||||
@@ -255,6 +_,25 @@
|
@@ -259,6 +_,25 @@
|
||||||
this.focused = p_93693_;
|
this.focused = p_93693_;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/components/BossHealthOverlay.java
|
--- a/net/minecraft/client/gui/components/BossHealthOverlay.java
|
||||||
+++ b/net/minecraft/client/gui/components/BossHealthOverlay.java
|
+++ b/net/minecraft/client/gui/components/BossHealthOverlay.java
|
||||||
@@ -63,13 +_,16 @@
|
@@ -66,13 +_,16 @@
|
||||||
|
|
||||||
for (LerpingBossEvent lerpingbossevent : this.events.values()) {
|
for (LerpingBossEvent lerpingbossevent : this.events.values()) {
|
||||||
int k = i / 2 - 91;
|
int k = i / 2 - 91;
|
||||||
|
|||||||
+35
-34
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/components/DebugScreenOverlay.java
|
--- a/net/minecraft/client/gui/components/DebugScreenOverlay.java
|
||||||
+++ b/net/minecraft/client/gui/components/DebugScreenOverlay.java
|
+++ b/net/minecraft/client/gui/components/DebugScreenOverlay.java
|
||||||
@@ -101,9 +_,9 @@
|
@@ -105,9 +_,9 @@
|
||||||
@Nullable
|
@Nullable
|
||||||
private CompletableFuture<LevelChunk> serverChunk;
|
private CompletableFuture<LevelChunk> serverChunk;
|
||||||
private boolean renderDebug;
|
private boolean renderDebug;
|
||||||
@@ -13,53 +13,54 @@
|
|||||||
private final LocalSampleLogger frameTimeLogger = new LocalSampleLogger(1);
|
private final LocalSampleLogger frameTimeLogger = new LocalSampleLogger(1);
|
||||||
private final LocalSampleLogger tickTimeLogger = new LocalSampleLogger(TpsDebugDimensions.values().length);
|
private final LocalSampleLogger tickTimeLogger = new LocalSampleLogger(TpsDebugDimensions.values().length);
|
||||||
private final LocalSampleLogger pingLogger = new LocalSampleLogger(1);
|
private final LocalSampleLogger pingLogger = new LocalSampleLogger(1);
|
||||||
@@ -129,14 +_,18 @@
|
@@ -135,14 +_,18 @@
|
||||||
this.clientChunk = null;
|
this.clientChunk = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
- public void render(GuiGraphics p_281427_) {
|
- public void render(GuiGraphics p_281427_) {
|
||||||
- this.minecraft.getProfiler().push("debug");
|
- ProfilerFiller profilerfiller = Profiler.get();
|
||||||
|
- profilerfiller.push("debug");
|
||||||
+ protected void update() {
|
+ protected void update() {
|
||||||
Entity entity = this.minecraft.getCameraEntity();
|
Entity entity = this.minecraft.getCameraEntity();
|
||||||
this.block = entity.pick(20.0, 0.0F, false);
|
this.block = entity.pick(20.0, 0.0F, false);
|
||||||
this.liquid = entity.pick(20.0, 0.0F, true);
|
this.liquid = entity.pick(20.0, 0.0F, true);
|
||||||
- p_281427_.drawManaged(() -> {
|
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ protected void drawText(GuiGraphics p_281427_) {
|
+ protected void drawText(ProfilerFiller profilerfiller, GuiGraphics p_281427_) {
|
||||||
this.drawGameInformation(p_281427_);
|
this.drawGameInformation(p_281427_);
|
||||||
this.drawSystemInformation(p_281427_);
|
this.drawSystemInformation(p_281427_);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ protected void drawFPSCharts(GuiGraphics p_281427_) {
|
+ protected void drawFPSCharts(ProfilerFiller profilerfiller, GuiGraphics p_281427_) {
|
||||||
if (this.renderFpsCharts) {
|
this.profilerPieChart.setBottomOffset(10);
|
||||||
int i = p_281427_.guiWidth();
|
if (this.renderFpsCharts) {
|
||||||
int j = i / 2;
|
int i = p_281427_.guiWidth();
|
||||||
@@ -146,7 +_,9 @@
|
@@ -155,7 +_,9 @@
|
||||||
this.tpsChart.drawChart(p_281427_, i - k, k);
|
|
||||||
}
|
this.profilerPieChart.setBottomOffset(this.tpsChart.getFullHeight());
|
||||||
}
|
}
|
||||||
+ }
|
+ }
|
||||||
|
|
||||||
+ protected void drawNetworkCharts(GuiGraphics p_281427_) {
|
+ protected void drawNetworkCharts(ProfilerFiller profilerfiller, GuiGraphics p_281427_) {
|
||||||
if (this.renderNetworkCharts) {
|
if (this.renderNetworkCharts) {
|
||||||
int l = p_281427_.guiWidth();
|
int l = p_281427_.guiWidth();
|
||||||
int i1 = l / 2;
|
int i1 = l / 2;
|
||||||
@@ -157,12 +_,21 @@
|
@@ -171,12 +_,22 @@
|
||||||
int j1 = this.pingChart.getWidth(i1);
|
try (Zone zone = profilerfiller.zone("profilerPie")) {
|
||||||
this.pingChart.drawChart(p_281427_, l - j1, j1);
|
this.profilerPieChart.render(p_281427_);
|
||||||
}
|
}
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public void render(GuiGraphics p_281427_) {
|
+ public void render(GuiGraphics p_281427_) {
|
||||||
+ this.minecraft.getProfiler().push("debug");
|
+ ProfilerFiller profilerfiller = Profiler.get();
|
||||||
|
+ profilerfiller.push("debug");
|
||||||
+ this.update();
|
+ this.update();
|
||||||
+ p_281427_.drawManaged(() -> {
|
+
|
||||||
+ this.drawText(p_281427_);
|
+ this.drawText(profilerfiller, p_281427_);
|
||||||
+ this.drawFPSCharts(p_281427_);
|
+ this.drawFPSCharts(profilerfiller, p_281427_);
|
||||||
+ this.drawNetworkCharts(p_281427_);
|
+ this.drawNetworkCharts(profilerfiller, p_281427_);
|
||||||
});
|
|
||||||
this.minecraft.getProfiler().pop();
|
profilerfiller.pop();
|
||||||
}
|
}
|
||||||
|
|
||||||
- protected void drawGameInformation(GuiGraphics p_281525_) {
|
- protected void drawGameInformation(GuiGraphics p_281525_) {
|
||||||
@@ -69,7 +70,7 @@
|
|||||||
list.add("");
|
list.add("");
|
||||||
boolean flag = this.minecraft.getSingleplayerServer() != null;
|
boolean flag = this.minecraft.getSingleplayerServer() != null;
|
||||||
list.add(
|
list.add(
|
||||||
@@ -176,11 +_,18 @@
|
@@ -190,11 +_,18 @@
|
||||||
+ (this.renderNetworkCharts ? " visible" : " hidden")
|
+ (this.renderNetworkCharts ? " visible" : " hidden")
|
||||||
);
|
);
|
||||||
list.add("For help: press F3 + Q");
|
list.add("For help: press F3 + Q");
|
||||||
@@ -79,17 +80,17 @@
|
|||||||
+ protected void drawGameInformation(GuiGraphics p_281525_) {
|
+ protected void drawGameInformation(GuiGraphics p_281525_) {
|
||||||
+ List<String> list = this.getGameInformation();
|
+ List<String> list = this.getGameInformation();
|
||||||
+ list.addAll(this.getOverlayHelp());
|
+ list.addAll(this.getOverlayHelp());
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onCustomizeDebugEvent(p_281525_, minecraft.getWindow(), minecraft.getTimer().getRealtimeDeltaTicks(), list, true);
|
+ net.minecraftforge.client.ForgeHooksClient.onCustomizeDebugEvent(p_281525_, minecraft.getWindow(), minecraft.getDeltaTracker().getRealtimeDeltaTicks(), list, true);
|
||||||
+ this.renderLines(p_281525_, list, true);
|
+ this.renderLines(p_281525_, list, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void drawSystemInformation(GuiGraphics p_281261_) {
|
protected void drawSystemInformation(GuiGraphics p_281261_) {
|
||||||
List<String> list = this.getSystemInformation();
|
List<String> list = this.getSystemInformation();
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.onCustomizeDebugEvent(p_281261_, minecraft.getWindow(), minecraft.getTimer().getRealtimeDeltaTicks(), list, false);
|
+ net.minecraftforge.client.ForgeHooksClient.onCustomizeDebugEvent(p_281261_, minecraft.getWindow(), minecraft.getDeltaTracker().getRealtimeDeltaTicks(), list, false);
|
||||||
this.renderLines(p_281261_, list, false);
|
this.renderLines(p_281261_, list, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -529,6 +_,7 @@
|
@@ -543,6 +_,7 @@
|
||||||
list.add("");
|
list.add("");
|
||||||
list.add(ChatFormatting.UNDERLINE + "Targeted Entity");
|
list.add(ChatFormatting.UNDERLINE + "Targeted Entity");
|
||||||
list.add(String.valueOf(BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType())));
|
list.add(String.valueOf(BuiltInRegistries.ENTITY_TYPE.getKey(entity.getType())));
|
||||||
|
|||||||
-10
@@ -1,10 +0,0 @@
|
|||||||
--- a/net/minecraft/client/gui/components/toasts/ToastComponent.java
|
|
||||||
+++ b/net/minecraft/client/gui/components/toasts/ToastComponent.java
|
|
||||||
@@ -97,6 +_,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addToast(Toast p_94923_) {
|
|
||||||
+ if (net.minecraftforge.client.ForgeHooksClient.onToastAdd(p_94923_)) return;
|
|
||||||
this.queued.add(p_94923_);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
--- a/net/minecraft/client/gui/components/toasts/ToastManager.java
|
||||||
|
+++ b/net/minecraft/client/gui/components/toasts/ToastManager.java
|
||||||
|
@@ -107,6 +_,7 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addToast(Toast p_360768_) {
|
||||||
|
+ if (net.minecraftforge.client.event.ForgeEventFactoryClient.onToastAdd(p_360768_)) return;
|
||||||
|
this.queued.add(p_360768_);
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,6 +1,30 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/LoadingOverlay.java
|
--- a/net/minecraft/client/gui/screens/LoadingOverlay.java
|
||||||
+++ b/net/minecraft/client/gui/screens/LoadingOverlay.java
|
+++ b/net/minecraft/client/gui/screens/LoadingOverlay.java
|
||||||
@@ -131,6 +_,7 @@
|
@@ -62,6 +_,8 @@
|
||||||
|
return p_169325_ & 16777215 | p_169326_ << 24;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ protected boolean renderContents(GuiGraphics gui, float alpha) { return true; }
|
||||||
|
+
|
||||||
|
@Override
|
||||||
|
public void render(GuiGraphics p_281839_, int p_282704_, int p_283650_, float p_283394_) {
|
||||||
|
int i = p_281839_.guiWidth();
|
||||||
|
@@ -100,6 +_,7 @@
|
||||||
|
f2 = 1.0F;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (renderContents(p_281839_, f2)) {
|
||||||
|
int k2 = (int)((double)p_281839_.guiWidth() * 0.5);
|
||||||
|
int l2 = (int)((double)p_281839_.guiHeight() * 0.5);
|
||||||
|
double d1 = Math.min((double)p_281839_.guiWidth() * 0.75, (double)p_281839_.guiHeight()) * 0.25;
|
||||||
|
@@ -115,12 +_,14 @@
|
||||||
|
if (f < 1.0F) {
|
||||||
|
this.drawProgressBar(p_281839_, i / 2 - j1, l1 - 5, i / 2 + j1, l1 + 5, 1.0F - Mth.clamp(f, 0.0F, 1.0F));
|
||||||
|
}
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (f >= 2.0F) {
|
||||||
|
this.minecraft.setOverlay(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.fadeOutStart == -1L && this.reload.isDone() && (!this.fadeIn || f1 >= 2.0F)) {
|
if (this.fadeOutStart == -1L && this.reload.isDone() && (!this.fadeIn || f1 >= 2.0F)) {
|
||||||
@@ -8,7 +32,7 @@
|
|||||||
try {
|
try {
|
||||||
this.reload.checkExceptions();
|
this.reload.checkExceptions();
|
||||||
this.onFinish.accept(Optional.empty());
|
this.onFinish.accept(Optional.empty());
|
||||||
@@ -138,7 +_,6 @@
|
@@ -128,7 +_,6 @@
|
||||||
this.onFinish.accept(Optional.of(throwable));
|
this.onFinish.accept(Optional.of(throwable));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/PauseScreen.java
|
--- a/net/minecraft/client/gui/screens/PauseScreen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/PauseScreen.java
|
+++ b/net/minecraft/client/gui/screens/PauseScreen.java
|
||||||
@@ -94,6 +_,7 @@
|
@@ -95,6 +_,7 @@
|
||||||
} else {
|
} else {
|
||||||
gridlayout$rowhelper.addChild(this.openScreenButton(PLAYER_REPORTING, () -> new SocialInteractionsScreen(this)));
|
gridlayout$rowhelper.addChild(this.openScreenButton(PLAYER_REPORTING, () -> new SocialInteractionsScreen(this)));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/Screen.java
|
--- a/net/minecraft/client/gui/screens/Screen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/Screen.java
|
+++ b/net/minecraft/client/gui/screens/Screen.java
|
||||||
@@ -201,7 +_,7 @@
|
@@ -200,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onClose() {
|
public void onClose() {
|
||||||
@@ -9,7 +9,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
protected <T extends GuiEventListener & Renderable & NarratableEntry> T addRenderableWidget(T p_169406_) {
|
protected <T extends GuiEventListener & Renderable & NarratableEntry> T addRenderableWidget(T p_169406_) {
|
||||||
@@ -312,8 +_,10 @@
|
@@ -311,8 +_,10 @@
|
||||||
this.width = p_96608_;
|
this.width = p_96608_;
|
||||||
this.height = p_96609_;
|
this.height = p_96609_;
|
||||||
if (!this.initialized) {
|
if (!this.initialized) {
|
||||||
@@ -20,7 +20,7 @@
|
|||||||
} else {
|
} else {
|
||||||
this.repositionElements();
|
this.repositionElements();
|
||||||
}
|
}
|
||||||
@@ -326,8 +_,10 @@
|
@@ -325,8 +_,10 @@
|
||||||
protected void rebuildWidgets() {
|
protected void rebuildWidgets() {
|
||||||
this.clearWidgets();
|
this.clearWidgets();
|
||||||
this.clearFocus();
|
this.clearFocus();
|
||||||
@@ -31,15 +31,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -354,6 +_,7 @@
|
@@ -353,6 +_,7 @@
|
||||||
|
|
||||||
this.renderBlurredBackground(p_297268_);
|
this.renderBlurredBackground();
|
||||||
this.renderMenuBackground(p_283688_);
|
this.renderMenuBackground(p_283688_);
|
||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderScreenBackground(this, p_283688_);
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onRenderScreenBackground(this, p_283688_);
|
||||||
}
|
}
|
||||||
|
|
||||||
protected void renderBlurredBackground(float p_336041_) {
|
protected void renderBlurredBackground() {
|
||||||
@@ -463,6 +_,19 @@
|
@@ -454,6 +_,19 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public void onFilesDrop(List<Path> p_96591_) {
|
public void onFilesDrop(List<Path> p_96591_) {
|
||||||
|
|||||||
@@ -14,26 +14,26 @@
|
|||||||
int l = this.height / 4 + 48;
|
int l = this.height / 4 + 48;
|
||||||
+ Button modButton = null;
|
+ Button modButton = null;
|
||||||
if (this.minecraft.isDemo()) {
|
if (this.minecraft.isDemo()) {
|
||||||
this.createDemoMenuOptions(l, 24);
|
l = this.createDemoMenuOptions(l, 24);
|
||||||
} else {
|
} else {
|
||||||
this.createNormalMenuOptions(l, 24);
|
l = this.createNormalMenuOptions(l, 24);
|
||||||
+ modButton = this.addRenderableWidget(Button.builder(Component.translatable("fml.menu.mods"), button -> this.minecraft.setScreen(new net.minecraftforge.client.gui.ModListScreen(this)))
|
+ modButton = this.addRenderableWidget(Button.builder(Component.translatable("fml.menu.mods"), button -> this.minecraft.setScreen(new net.minecraftforge.client.gui.ModListScreen(this)))
|
||||||
+ .pos(this.width / 2 - 100, l + 24 * 2).size(98, 20).build());
|
+ .pos(this.width / 2 - 100, l).size(98, 20).build());
|
||||||
}
|
}
|
||||||
+ modUpdateNotification = net.minecraftforge.client.gui.TitleScreenModUpdateIndicator.init(this, modButton);
|
+ modUpdateNotification = net.minecraftforge.client.gui.TitleScreenModUpdateIndicator.init(this, modButton);
|
||||||
|
|
||||||
|
l = this.createTestWorldButton(l, 24);
|
||||||
SpriteIconButton spriteiconbutton = this.addRenderableWidget(
|
SpriteIconButton spriteiconbutton = this.addRenderableWidget(
|
||||||
CommonButtons.language(
|
@@ -184,7 +_,7 @@
|
||||||
@@ -170,7 +_,7 @@
|
}).bounds(this.width / 2 - 100, i = p_96764_ + p_96765_, 200, 20).tooltip(tooltip).build()).active = flag;
|
||||||
}).bounds(this.width / 2 - 100, p_96764_ + p_96765_ * 1, 200, 20).tooltip(tooltip).build()).active = flag;
|
|
||||||
this.addRenderableWidget(
|
this.addRenderableWidget(
|
||||||
Button.builder(Component.translatable("menu.online"), p_325369_ -> this.minecraft.setScreen(new RealmsMainScreen(this)))
|
Button.builder(Component.translatable("menu.online"), p_325369_ -> this.minecraft.setScreen(new RealmsMainScreen(this)))
|
||||||
- .bounds(this.width / 2 - 100, p_96764_ + p_96765_ * 2, 200, 20)
|
- .bounds(this.width / 2 - 100, p_96764_ = i + p_96765_, 200, 20)
|
||||||
+ .bounds(this.width / 2 + 2, p_96764_ + p_96765_ * 2, 98, 20)
|
+ .bounds(this.width / 2 + 2, p_96764_ = i + p_96765_, 98, 20)
|
||||||
.tooltip(tooltip)
|
.tooltip(tooltip)
|
||||||
.build()
|
.build()
|
||||||
)
|
)
|
||||||
@@ -276,6 +_,7 @@
|
@@ -293,6 +_,7 @@
|
||||||
if ((i & -67108864) != 0) {
|
if ((i & -67108864) != 0) {
|
||||||
super.render(p_282860_, p_281753_, p_283539_, p_282628_);
|
super.render(p_282860_, p_281753_, p_283539_, p_282628_);
|
||||||
this.logoRenderer.renderLogo(p_282860_, this.width, f);
|
this.logoRenderer.renderLogo(p_282860_, this.width, f);
|
||||||
@@ -41,7 +41,7 @@
|
|||||||
if (this.splash != null && !this.minecraft.options.hideSplashTexts().get()) {
|
if (this.splash != null && !this.minecraft.options.hideSplashTexts().get()) {
|
||||||
this.splash.render(p_282860_, this.width, this.font, i);
|
this.splash.render(p_282860_, this.width, this.font, i);
|
||||||
}
|
}
|
||||||
@@ -291,11 +_,19 @@
|
@@ -308,10 +_,18 @@
|
||||||
s = s + I18n.get("menu.modded");
|
s = s + I18n.get("menu.modded");
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,7 +55,6 @@
|
|||||||
+ );
|
+ );
|
||||||
+
|
+
|
||||||
if (this.realmsNotificationsEnabled() && f >= 1.0F) {
|
if (this.realmsNotificationsEnabled() && f >= 1.0F) {
|
||||||
RenderSystem.enableDepthTest();
|
|
||||||
this.realmsNotificationsScreen.render(p_282860_, p_281753_, p_283539_, p_282628_);
|
this.realmsNotificationsScreen.render(p_282860_, p_281753_, p_283539_, p_282628_);
|
||||||
}
|
}
|
||||||
+ if (f >= 1.0f) this.modUpdateNotification.render(p_282860_, p_281753_, p_283539_, p_282628_);
|
+ if (f >= 1.0f) this.modUpdateNotification.render(p_282860_, p_281753_, p_283539_, p_282628_);
|
||||||
|
|||||||
+3
-3
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
|
--- a/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
|
||||||
+++ b/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
|
+++ b/net/minecraft/client/gui/screens/advancements/AdvancementTab.java
|
||||||
@@ -37,6 +_,7 @@
|
@@ -38,6 +_,7 @@
|
||||||
private int maxY = Integer.MIN_VALUE;
|
private int maxY = Integer.MIN_VALUE;
|
||||||
private float fade;
|
private float fade;
|
||||||
private boolean centered;
|
private boolean centered;
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
public AdvancementTab(
|
public AdvancementTab(
|
||||||
Minecraft p_97145_, AdvancementsScreen p_97146_, AdvancementTabType p_97147_, int p_97148_, AdvancementNode p_297568_, DisplayInfo p_97150_
|
Minecraft p_97145_, AdvancementsScreen p_97146_, AdvancementTabType p_97147_, int p_97148_, AdvancementNode p_297568_, DisplayInfo p_97150_
|
||||||
@@ -53,6 +_,15 @@
|
@@ -54,6 +_,15 @@
|
||||||
this.addWidget(this.root, p_297568_.holder());
|
this.addWidget(this.root, p_297568_.holder());
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@
|
|||||||
public AdvancementTabType getType() {
|
public AdvancementTabType getType() {
|
||||||
return this.type;
|
return this.type;
|
||||||
}
|
}
|
||||||
@@ -146,8 +_,8 @@
|
@@ -147,8 +_,8 @@
|
||||||
return null;
|
return null;
|
||||||
} else {
|
} else {
|
||||||
for (AdvancementTabType advancementtabtype : AdvancementTabType.values()) {
|
for (AdvancementTabType advancementtabtype : AdvancementTabType.values()) {
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/advancements/AdvancementTabType.java
|
--- a/net/minecraft/client/gui/screens/advancements/AdvancementTabType.java
|
||||||
+++ b/net/minecraft/client/gui/screens/advancements/AdvancementTabType.java
|
+++ b/net/minecraft/client/gui/screens/advancements/AdvancementTabType.java
|
||||||
@@ -69,6 +_,7 @@
|
@@ -70,6 +_,7 @@
|
||||||
5
|
5
|
||||||
);
|
);
|
||||||
|
|
||||||
|
|||||||
+6
-6
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
|
--- a/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
|
+++ b/net/minecraft/client/gui/screens/advancements/AdvancementsScreen.java
|
||||||
@@ -49,6 +_,7 @@
|
@@ -51,6 +_,7 @@
|
||||||
@Nullable
|
@Nullable
|
||||||
private AdvancementTab selectedTab;
|
private AdvancementTab selectedTab;
|
||||||
private boolean isScrolling;
|
private boolean isScrolling;
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
public AdvancementsScreen(ClientAdvancements p_97340_) {
|
public AdvancementsScreen(ClientAdvancements p_97340_) {
|
||||||
this(p_97340_, null);
|
this(p_97340_, null);
|
||||||
@@ -62,6 +_,19 @@
|
@@ -64,6 +_,19 @@
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void init() {
|
protected void init() {
|
||||||
@@ -28,7 +28,7 @@
|
|||||||
this.layout.addTitleHeader(TITLE, this.font);
|
this.layout.addTitleHeader(TITLE, this.font);
|
||||||
this.tabs.clear();
|
this.tabs.clear();
|
||||||
this.selectedTab = null;
|
this.selectedTab = null;
|
||||||
@@ -106,7 +_,7 @@
|
@@ -108,7 +_,7 @@
|
||||||
int j = (this.height - 140) / 2;
|
int j = (this.height - 140) / 2;
|
||||||
|
|
||||||
for (AdvancementTab advancementtab : this.tabs.values()) {
|
for (AdvancementTab advancementtab : this.tabs.values()) {
|
||||||
@@ -37,8 +37,8 @@
|
|||||||
this.advancements.setSelectedTab(advancementtab.getRootNode().holder(), true);
|
this.advancements.setSelectedTab(advancementtab.getRootNode().holder(), true);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -180,10 +_,12 @@
|
@@ -181,10 +_,12 @@
|
||||||
p_283395_.blit(WINDOW_LOCATION, p_281890_, p_282532_, 0, 0, 252, 140);
|
p_283395_.blit(RenderType::guiTextured, WINDOW_LOCATION, p_281890_, p_282532_, 0.0F, 0.0F, 252, 140, 256, 256);
|
||||||
if (this.tabs.size() > 1) {
|
if (this.tabs.size() > 1) {
|
||||||
for (AdvancementTab advancementtab : this.tabs.values()) {
|
for (AdvancementTab advancementtab : this.tabs.values()) {
|
||||||
+ if (advancementtab.getPage() == tabPage)
|
+ if (advancementtab.getPage() == tabPage)
|
||||||
@@ -50,7 +50,7 @@
|
|||||||
advancementtab1.drawIcon(p_283395_, p_281890_, p_282532_);
|
advancementtab1.drawIcon(p_283395_, p_281890_, p_282532_);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -203,6 +_,7 @@
|
@@ -202,6 +_,7 @@
|
||||||
|
|
||||||
if (this.tabs.size() > 1) {
|
if (this.tabs.size() > 1) {
|
||||||
for (AdvancementTab advancementtab : this.tabs.values()) {
|
for (AdvancementTab advancementtab : this.tabs.values()) {
|
||||||
|
|||||||
+27
-50
@@ -1,49 +1,32 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
|
--- a/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
|
+++ b/net/minecraft/client/gui/screens/inventory/AbstractContainerScreen.java
|
||||||
@@ -92,6 +_,7 @@
|
@@ -108,6 +_,7 @@
|
||||||
int i = this.leftPos;
|
int i = this.leftPos;
|
||||||
int j = this.topPos;
|
int j = this.topPos;
|
||||||
super.render(p_283479_, p_283661_, p_281248_, p_281886_);
|
super.render(p_283479_, p_283661_, p_281248_, p_281886_);
|
||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onContainerRenderBackground(this, p_283479_, p_283661_, p_281248_);
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onContainerRenderBackground(this, p_283479_, p_283661_, p_281248_);
|
||||||
RenderSystem.disableDepthTest();
|
|
||||||
p_283479_.pose().pushPose();
|
p_283479_.pose().pushPose();
|
||||||
p_283479_.pose().translate((float)i, (float)j, 0.0F);
|
p_283479_.pose().translate((float)i, (float)j, 0.0F);
|
||||||
@@ -108,12 +_,13 @@
|
Slot slot = this.hoveredSlot;
|
||||||
int l = slot.x;
|
@@ -119,6 +_,8 @@
|
||||||
int i1 = slot.y;
|
this.onStopHovering(slot);
|
||||||
if (this.hoveredSlot.isHighlightable()) {
|
|
||||||
- renderSlotHighlight(p_283479_, l, i1, 0);
|
|
||||||
+ renderSlotHighlight(p_283479_, l, i1, 0, getSlotColor(k));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
this.renderLabels(p_283479_, p_283661_, p_281248_);
|
|
||||||
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onContainerRenderForeground(this, p_283479_, p_283661_, p_281248_);
|
+ net.minecraftforge.client.event.ForgeEventFactoryClient.onContainerRenderForeground(this, p_283479_, p_283661_, p_281248_);
|
||||||
|
+
|
||||||
|
this.renderLabels(p_283479_, p_283661_, p_281248_);
|
||||||
ItemStack itemstack = this.draggingItem.isEmpty() ? this.menu.getCarried() : this.draggingItem;
|
ItemStack itemstack = this.draggingItem.isEmpty() ? this.menu.getCarried() : this.draggingItem;
|
||||||
if (!itemstack.isEmpty()) {
|
if (!itemstack.isEmpty()) {
|
||||||
int l1 = 8;
|
@@ -199,7 +_,7 @@
|
||||||
@@ -156,13 +_,17 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void renderSlotHighlight(GuiGraphics p_283692_, int p_281453_, int p_281915_, int p_283504_) {
|
|
||||||
- p_283692_.fillGradient(RenderType.guiOverlay(), p_281453_, p_281915_, p_281453_ + 16, p_281915_ + 16, -2130706433, -2130706433, p_283504_);
|
|
||||||
+ renderSlotHighlight(p_283692_, p_281453_, p_281915_, p_283504_, -2130706433);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ public static void renderSlotHighlight(GuiGraphics p_283692_, int p_281453_, int p_281915_, int p_283504_, int color) {
|
|
||||||
+ p_283692_.fillGradient(RenderType.guiOverlay(), p_281453_, p_281915_, p_281453_ + 16, p_281915_ + 16, color, color, p_283504_);
|
|
||||||
}
|
|
||||||
|
|
||||||
protected void renderTooltip(GuiGraphics p_283594_, int p_282171_, int p_281909_) {
|
|
||||||
if (this.menu.getCarried().isEmpty() && this.hoveredSlot != null && this.hoveredSlot.hasItem()) {
|
|
||||||
ItemStack itemstack = this.hoveredSlot.getItem();
|
ItemStack itemstack = this.hoveredSlot.getItem();
|
||||||
- p_283594_.renderTooltip(this.font, this.getTooltipFromContainerItem(itemstack), itemstack.getTooltipImage(), p_282171_, p_281909_);
|
if (this.menu.getCarried().isEmpty() || this.showTooltipWithItemInHand(itemstack)) {
|
||||||
+ p_283594_.renderTooltip(this.font, this.getTooltipFromContainerItem(itemstack), itemstack.getTooltipImage(), itemstack, p_282171_, p_281909_);
|
p_283594_.renderTooltip(
|
||||||
|
- this.font, this.getTooltipFromContainerItem(itemstack), itemstack.getTooltipImage(), p_282171_, p_281909_, itemstack.get(DataComponents.TOOLTIP_STYLE)
|
||||||
|
+ this.font, this.getTooltipFromContainerItem(itemstack), itemstack.getTooltipImage(), itemstack, p_282171_, p_281909_
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
@@ -217,7 +_,8 @@
|
||||||
|
|
||||||
@@ -174,7 +_,8 @@
|
|
||||||
p_282567_.pose().pushPose();
|
p_282567_.pose().pushPose();
|
||||||
p_282567_.pose().translate(0.0F, 0.0F, 232.0F);
|
p_282567_.pose().translate(0.0F, 0.0F, 232.0F);
|
||||||
p_282567_.renderItem(p_281330_, p_281772_, p_281689_);
|
p_282567_.renderItem(p_281330_, p_281772_, p_281689_);
|
||||||
@@ -53,17 +36,17 @@
|
|||||||
p_282567_.pose().popPose();
|
p_282567_.pose().popPose();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -282,7 +_,8 @@
|
@@ -324,7 +_,8 @@
|
||||||
if (super.mouseClicked(p_97748_, p_97749_, p_97750_)) {
|
if (super.mouseClicked(p_97748_, p_97749_, p_97750_)) {
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
- boolean flag = this.minecraft.options.keyPickItem.matchesMouse(p_97750_) && this.minecraft.gameMode.hasInfiniteItems();
|
- boolean flag = this.minecraft.options.keyPickItem.matchesMouse(p_97750_) && this.minecraft.gameMode.hasInfiniteItems();
|
||||||
+ InputConstants.Key mouseKey = InputConstants.Type.MOUSE.getOrCreate(p_97750_);
|
+ InputConstants.Key mouseKey = InputConstants.Type.MOUSE.getOrCreate(p_97750_);
|
||||||
+ boolean flag = this.minecraft.options.keyPickItem.isActiveAndMatches(mouseKey);
|
+ boolean flag = this.minecraft.options.keyPickItem.isActiveAndMatches(mouseKey);
|
||||||
Slot slot = this.findSlot(p_97748_, p_97749_);
|
Slot slot = this.getHoveredSlot(p_97748_, p_97749_);
|
||||||
long i = Util.getMillis();
|
long i = Util.getMillis();
|
||||||
this.doubleclick = this.lastClickSlot == slot && i - this.lastClickTime < 250L && this.lastClickButton == p_97750_;
|
this.doubleclick = this.lastClickSlot == slot && i - this.lastClickTime < 250L && this.lastClickButton == p_97750_;
|
||||||
@@ -293,6 +_,7 @@
|
@@ -335,6 +_,7 @@
|
||||||
int j = this.leftPos;
|
int j = this.leftPos;
|
||||||
int k = this.topPos;
|
int k = this.topPos;
|
||||||
boolean flag1 = this.hasClickedOutside(p_97748_, p_97749_, j, k, p_97750_);
|
boolean flag1 = this.hasClickedOutside(p_97748_, p_97749_, j, k, p_97750_);
|
||||||
@@ -71,7 +54,7 @@
|
|||||||
int l = -1;
|
int l = -1;
|
||||||
if (slot != null) {
|
if (slot != null) {
|
||||||
l = slot.index;
|
l = slot.index;
|
||||||
@@ -318,7 +_,7 @@
|
@@ -360,7 +_,7 @@
|
||||||
}
|
}
|
||||||
} else if (!this.isQuickCrafting) {
|
} else if (!this.isQuickCrafting) {
|
||||||
if (this.menu.getCarried().isEmpty()) {
|
if (this.menu.getCarried().isEmpty()) {
|
||||||
@@ -80,7 +63,7 @@
|
|||||||
this.slotClicked(slot, l, p_97750_, ClickType.CLONE);
|
this.slotClicked(slot, l, p_97750_, ClickType.CLONE);
|
||||||
} else {
|
} else {
|
||||||
boolean flag2 = l != -999
|
boolean flag2 = l != -999
|
||||||
@@ -346,7 +_,7 @@
|
@@ -388,7 +_,7 @@
|
||||||
this.quickCraftingType = 0;
|
this.quickCraftingType = 0;
|
||||||
} else if (p_97750_ == 1) {
|
} else if (p_97750_ == 1) {
|
||||||
this.quickCraftingType = 1;
|
this.quickCraftingType = 1;
|
||||||
@@ -89,12 +72,12 @@
|
|||||||
this.quickCraftingType = 2;
|
this.quickCraftingType = 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -425,10 +_,13 @@
|
@@ -467,10 +_,13 @@
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean mouseReleased(double p_97812_, double p_97813_, int p_97814_) {
|
public boolean mouseReleased(double p_97812_, double p_97813_, int p_97814_) {
|
||||||
+ super.mouseReleased(p_97812_, p_97813_, p_97814_); //Forge, Call parent to release buttons
|
+ super.mouseReleased(p_97812_, p_97813_, p_97814_); //Forge, Call parent to release buttons
|
||||||
Slot slot = this.findSlot(p_97812_, p_97813_);
|
Slot slot = this.getHoveredSlot(p_97812_, p_97813_);
|
||||||
int i = this.leftPos;
|
int i = this.leftPos;
|
||||||
int j = this.topPos;
|
int j = this.topPos;
|
||||||
boolean flag = this.hasClickedOutside(p_97812_, p_97813_, i, j, p_97814_);
|
boolean flag = this.hasClickedOutside(p_97812_, p_97813_, i, j, p_97814_);
|
||||||
@@ -103,7 +86,7 @@
|
|||||||
int k = -1;
|
int k = -1;
|
||||||
if (slot != null) {
|
if (slot != null) {
|
||||||
k = slot.index;
|
k = slot.index;
|
||||||
@@ -445,7 +_,7 @@
|
@@ -487,7 +_,7 @@
|
||||||
if (slot2 != null
|
if (slot2 != null
|
||||||
&& slot2.mayPickup(this.minecraft.player)
|
&& slot2.mayPickup(this.minecraft.player)
|
||||||
&& slot2.hasItem()
|
&& slot2.hasItem()
|
||||||
@@ -112,7 +95,7 @@
|
|||||||
&& AbstractContainerMenu.canItemQuickReplace(slot2, this.lastQuickMoved, true)) {
|
&& AbstractContainerMenu.canItemQuickReplace(slot2, this.lastQuickMoved, true)) {
|
||||||
this.slotClicked(slot2, slot2.index, p_97814_, ClickType.QUICK_MOVE);
|
this.slotClicked(slot2, slot2.index, p_97814_, ClickType.QUICK_MOVE);
|
||||||
}
|
}
|
||||||
@@ -509,7 +_,7 @@
|
@@ -551,7 +_,7 @@
|
||||||
|
|
||||||
this.slotClicked(null, -999, AbstractContainerMenu.getQuickcraftMask(2, this.quickCraftingType), ClickType.QUICK_CRAFT);
|
this.slotClicked(null, -999, AbstractContainerMenu.getQuickcraftMask(2, this.quickCraftingType), ClickType.QUICK_CRAFT);
|
||||||
} else if (!this.menu.getCarried().isEmpty()) {
|
} else if (!this.menu.getCarried().isEmpty()) {
|
||||||
@@ -121,7 +104,7 @@
|
|||||||
this.slotClicked(slot, k, p_97814_, ClickType.CLONE);
|
this.slotClicked(slot, k, p_97814_, ClickType.CLONE);
|
||||||
} else {
|
} else {
|
||||||
boolean flag1 = k != -999
|
boolean flag1 = k != -999
|
||||||
@@ -568,9 +_,10 @@
|
@@ -631,9 +_,10 @@
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean keyPressed(int p_97765_, int p_97766_, int p_97767_) {
|
public boolean keyPressed(int p_97765_, int p_97766_, int p_97767_) {
|
||||||
@@ -133,11 +116,10 @@
|
|||||||
this.onClose();
|
this.onClose();
|
||||||
return true;
|
return true;
|
||||||
} else {
|
} else {
|
||||||
@@ -639,5 +_,17 @@
|
@@ -707,4 +_,11 @@
|
||||||
public void onClose() {
|
|
||||||
this.minecraft.player.closeContainer();
|
|
||||||
super.onClose();
|
super.onClose();
|
||||||
+ }
|
}
|
||||||
+
|
+
|
||||||
+ @org.jetbrains.annotations.Nullable
|
+ @org.jetbrains.annotations.Nullable
|
||||||
+ public Slot getSlotUnderMouse() { return this.hoveredSlot; }
|
+ public Slot getSlotUnderMouse() { return this.hoveredSlot; }
|
||||||
@@ -145,9 +127,4 @@
|
|||||||
+ public int getGuiTop() { return topPos; }
|
+ public int getGuiTop() { return topPos; }
|
||||||
+ public int getXSize() { return imageWidth; }
|
+ public int getXSize() { return imageWidth; }
|
||||||
+ public int getYSize() { return imageHeight; }
|
+ public int getYSize() { return imageHeight; }
|
||||||
+
|
|
||||||
+ protected int slotColor = -2130706433;
|
|
||||||
+ public int getSlotColor(int index) {
|
|
||||||
+ return slotColor;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+27
-35
@@ -1,15 +1,15 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
|
--- a/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
|
+++ b/net/minecraft/client/gui/screens/inventory/CreativeModeInventoryScreen.java
|
||||||
@@ -112,6 +_,8 @@
|
@@ -115,6 +_,8 @@
|
||||||
private boolean hasClickedOutside;
|
|
||||||
private final Set<TagKey<Item>> visibleTags = new HashSet<>();
|
private final Set<TagKey<Item>> visibleTags = new HashSet<>();
|
||||||
private final boolean displayOperatorCreativeTab;
|
private final boolean displayOperatorCreativeTab;
|
||||||
|
private final EffectsInInventory effects;
|
||||||
+ private final List<net.minecraftforge.client.gui.CreativeTabsScreenPage> pages = new java.util.ArrayList<>();
|
+ private final List<net.minecraftforge.client.gui.CreativeTabsScreenPage> pages = new java.util.ArrayList<>();
|
||||||
+ private net.minecraftforge.client.gui.CreativeTabsScreenPage currentPage = new net.minecraftforge.client.gui.CreativeTabsScreenPage(new java.util.ArrayList<>());
|
+ private net.minecraftforge.client.gui.CreativeTabsScreenPage currentPage = new net.minecraftforge.client.gui.CreativeTabsScreenPage(new java.util.ArrayList<>());
|
||||||
|
|
||||||
public CreativeModeInventoryScreen(LocalPlayer p_344408_, FeatureFlagSet p_260074_, boolean p_259569_) {
|
public CreativeModeInventoryScreen(LocalPlayer p_344408_, FeatureFlagSet p_260074_, boolean p_259569_) {
|
||||||
super(new CreativeModeInventoryScreen.ItemPickerMenu(p_344408_), p_344408_.getInventory(), CommonComponents.EMPTY);
|
super(new CreativeModeInventoryScreen.ItemPickerMenu(p_344408_), p_344408_.getInventory(), CommonComponents.EMPTY);
|
||||||
@@ -159,7 +_,7 @@
|
@@ -163,7 +_,7 @@
|
||||||
private void refreshCurrentTabContents(Collection<ItemStack> p_261591_) {
|
private void refreshCurrentTabContents(Collection<ItemStack> p_261591_) {
|
||||||
int i = this.menu.getRowIndexForScroll(this.scrollOffs);
|
int i = this.menu.getRowIndexForScroll(this.scrollOffs);
|
||||||
this.menu.items.clear();
|
this.menu.items.clear();
|
||||||
@@ -18,7 +18,7 @@
|
|||||||
this.refreshSearchResults();
|
this.refreshSearchResults();
|
||||||
} else {
|
} else {
|
||||||
this.menu.items.addAll(p_261591_);
|
this.menu.items.addAll(p_261591_);
|
||||||
@@ -322,6 +_,35 @@
|
@@ -331,6 +_,35 @@
|
||||||
protected void init() {
|
protected void init() {
|
||||||
if (this.minecraft.gameMode.hasInfiniteItems()) {
|
if (this.minecraft.gameMode.hasInfiniteItems()) {
|
||||||
super.init();
|
super.init();
|
||||||
@@ -54,7 +54,7 @@
|
|||||||
this.searchBox = new EditBox(this.font, this.leftPos + 82, this.topPos + 6, 80, 9, Component.translatable("itemGroup.search"));
|
this.searchBox = new EditBox(this.font, this.leftPos + 82, this.topPos + 6, 80, 9, Component.translatable("itemGroup.search"));
|
||||||
this.searchBox.setMaxLength(50);
|
this.searchBox.setMaxLength(50);
|
||||||
this.searchBox.setBordered(false);
|
this.searchBox.setBordered(false);
|
||||||
@@ -368,7 +_,7 @@
|
@@ -377,7 +_,7 @@
|
||||||
public boolean charTyped(char p_98521_, int p_98522_) {
|
public boolean charTyped(char p_98521_, int p_98522_) {
|
||||||
if (this.ignoreTextInput) {
|
if (this.ignoreTextInput) {
|
||||||
return false;
|
return false;
|
||||||
@@ -63,7 +63,7 @@
|
|||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
String s = this.searchBox.getValue();
|
String s = this.searchBox.getValue();
|
||||||
@@ -387,7 +_,7 @@
|
@@ -396,7 +_,7 @@
|
||||||
@Override
|
@Override
|
||||||
public boolean keyPressed(int p_98547_, int p_98548_, int p_98549_) {
|
public boolean keyPressed(int p_98547_, int p_98548_, int p_98549_) {
|
||||||
this.ignoreTextInput = false;
|
this.ignoreTextInput = false;
|
||||||
@@ -72,7 +72,7 @@
|
|||||||
if (this.minecraft.options.keyChat.matches(p_98547_, p_98548_)) {
|
if (this.minecraft.options.keyChat.matches(p_98547_, p_98548_)) {
|
||||||
this.ignoreTextInput = true;
|
this.ignoreTextInput = true;
|
||||||
this.selectTab(CreativeModeTabs.searchTab());
|
this.selectTab(CreativeModeTabs.searchTab());
|
||||||
@@ -423,6 +_,7 @@
|
@@ -432,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private void refreshSearchResults() {
|
private void refreshSearchResults() {
|
||||||
@@ -80,7 +80,7 @@
|
|||||||
this.menu.items.clear();
|
this.menu.items.clear();
|
||||||
this.visibleTags.clear();
|
this.visibleTags.clear();
|
||||||
String s = this.searchBox.getValue();
|
String s = this.searchBox.getValue();
|
||||||
@@ -435,10 +_,10 @@
|
@@ -444,10 +_,10 @@
|
||||||
SearchTree<ItemStack> searchtree;
|
SearchTree<ItemStack> searchtree;
|
||||||
if (s.startsWith("#")) {
|
if (s.startsWith("#")) {
|
||||||
s = s.substring(1);
|
s = s.substring(1);
|
||||||
@@ -93,7 +93,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.menu.items.addAll(searchtree.search(s.toLowerCase(Locale.ROOT)));
|
this.menu.items.addAll(searchtree.search(s.toLowerCase(Locale.ROOT)));
|
||||||
@@ -466,7 +_,8 @@
|
@@ -479,7 +_,8 @@
|
||||||
@Override
|
@Override
|
||||||
protected void renderLabels(GuiGraphics p_283168_, int p_281774_, int p_281466_) {
|
protected void renderLabels(GuiGraphics p_283168_, int p_281774_, int p_281466_) {
|
||||||
if (selectedTab.showTitle()) {
|
if (selectedTab.showTitle()) {
|
||||||
@@ -103,7 +103,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -476,7 +_,7 @@
|
@@ -489,7 +_,7 @@
|
||||||
double d0 = p_98531_ - (double)this.leftPos;
|
double d0 = p_98531_ - (double)this.leftPos;
|
||||||
double d1 = p_98532_ - (double)this.topPos;
|
double d1 = p_98532_ - (double)this.topPos;
|
||||||
|
|
||||||
@@ -112,7 +112,7 @@
|
|||||||
if (this.checkTabClicked(creativemodetab, d0, d1)) {
|
if (this.checkTabClicked(creativemodetab, d0, d1)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -498,7 +_,7 @@
|
@@ -511,7 +_,7 @@
|
||||||
double d1 = p_98623_ - (double)this.topPos;
|
double d1 = p_98623_ - (double)this.topPos;
|
||||||
this.scrolling = false;
|
this.scrolling = false;
|
||||||
|
|
||||||
@@ -121,15 +121,7 @@
|
|||||||
if (this.checkTabClicked(creativemodetab, d0, d1)) {
|
if (this.checkTabClicked(creativemodetab, d0, d1)) {
|
||||||
this.selectTab(creativemodetab);
|
this.selectTab(creativemodetab);
|
||||||
return true;
|
return true;
|
||||||
@@ -516,6 +_,7 @@
|
@@ -605,13 +_,15 @@
|
||||||
private void selectTab(CreativeModeTab p_98561_) {
|
|
||||||
CreativeModeTab creativemodetab = selectedTab;
|
|
||||||
selectedTab = p_98561_;
|
|
||||||
+ slotColor = p_98561_.getSlotColor();
|
|
||||||
this.quickCraftSlots.clear();
|
|
||||||
this.menu.items.clear();
|
|
||||||
this.clearDraggingState();
|
|
||||||
@@ -592,13 +_,15 @@
|
|
||||||
this.originalSlots = null;
|
this.originalSlots = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -146,9 +138,9 @@
|
|||||||
|
|
||||||
this.refreshSearchResults();
|
this.refreshSearchResults();
|
||||||
} else {
|
} else {
|
||||||
@@ -661,7 +_,15 @@
|
@@ -677,7 +_,15 @@
|
||||||
public void render(GuiGraphics p_283000_, int p_281317_, int p_282770_, float p_281295_) {
|
|
||||||
super.render(p_283000_, p_281317_, p_282770_, p_281295_);
|
super.render(p_283000_, p_281317_, p_282770_, p_281295_);
|
||||||
|
this.effects.render(p_283000_, p_281317_, p_282770_, p_281295_);
|
||||||
|
|
||||||
- for (CreativeModeTab creativemodetab : CreativeModeTabs.tabs()) {
|
- for (CreativeModeTab creativemodetab : CreativeModeTabs.tabs()) {
|
||||||
+ if (this.pages.size() != 1) {
|
+ if (this.pages.size() != 1) {
|
||||||
@@ -163,7 +155,7 @@
|
|||||||
if (this.checkTabHovering(p_283000_, creativemodetab, p_281317_, p_282770_)) {
|
if (this.checkTabHovering(p_283000_, creativemodetab, p_281317_, p_282770_)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -673,6 +_,7 @@
|
@@ -689,6 +_,7 @@
|
||||||
p_283000_.renderTooltip(this.font, TRASH_SLOT_TOOLTIP, p_281317_, p_282770_);
|
p_283000_.renderTooltip(this.font, TRASH_SLOT_TOOLTIP, p_281317_, p_282770_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,7 +163,7 @@
|
|||||||
this.renderTooltip(p_283000_, p_281317_, p_282770_);
|
this.renderTooltip(p_283000_, p_281317_, p_282770_);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -680,7 +_,7 @@
|
@@ -701,7 +_,7 @@
|
||||||
public List<Component> getTooltipFromContainerItem(ItemStack p_281769_) {
|
public List<Component> getTooltipFromContainerItem(ItemStack p_281769_) {
|
||||||
boolean flag = this.hoveredSlot != null && this.hoveredSlot instanceof CreativeModeInventoryScreen.CustomCreativeSlot;
|
boolean flag = this.hoveredSlot != null && this.hoveredSlot instanceof CreativeModeInventoryScreen.CustomCreativeSlot;
|
||||||
boolean flag1 = selectedTab.getType() == CreativeModeTab.Type.CATEGORY;
|
boolean flag1 = selectedTab.getType() == CreativeModeTab.Type.CATEGORY;
|
||||||
@@ -180,7 +172,7 @@
|
|||||||
TooltipFlag.Default tooltipflag$default = this.minecraft.options.advancedItemTooltips ? TooltipFlag.Default.ADVANCED : TooltipFlag.Default.NORMAL;
|
TooltipFlag.Default tooltipflag$default = this.minecraft.options.advancedItemTooltips ? TooltipFlag.Default.ADVANCED : TooltipFlag.Default.NORMAL;
|
||||||
TooltipFlag tooltipflag = flag ? tooltipflag$default.asCreative() : tooltipflag$default;
|
TooltipFlag tooltipflag = flag ? tooltipflag$default.asCreative() : tooltipflag$default;
|
||||||
List<Component> list = p_281769_.getTooltipLines(Item.TooltipContext.of(this.minecraft.level), this.minecraft.player, tooltipflag);
|
List<Component> list = p_281769_.getTooltipLines(Item.TooltipContext.of(this.minecraft.level), this.minecraft.player, tooltipflag);
|
||||||
@@ -699,7 +_,7 @@
|
@@ -720,7 +_,7 @@
|
||||||
int i = 1;
|
int i = 1;
|
||||||
|
|
||||||
for (CreativeModeTab creativemodetab : CreativeModeTabs.tabs()) {
|
for (CreativeModeTab creativemodetab : CreativeModeTabs.tabs()) {
|
||||||
@@ -189,7 +181,7 @@
|
|||||||
list1.add(i++, creativemodetab.getDisplayName().copy().withStyle(ChatFormatting.BLUE));
|
list1.add(i++, creativemodetab.getDisplayName().copy().withStyle(ChatFormatting.BLUE));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -710,7 +_,7 @@
|
@@ -731,7 +_,7 @@
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void renderBg(GuiGraphics p_282663_, float p_282504_, int p_282089_, int p_282249_) {
|
protected void renderBg(GuiGraphics p_282663_, float p_282504_, int p_282089_, int p_282249_) {
|
||||||
@@ -198,15 +190,15 @@
|
|||||||
if (creativemodetab != selectedTab) {
|
if (creativemodetab != selectedTab) {
|
||||||
this.renderTabButton(p_282663_, creativemodetab);
|
this.renderTabButton(p_282663_, creativemodetab);
|
||||||
}
|
}
|
||||||
@@ -726,6 +_,7 @@
|
@@ -747,6 +_,7 @@
|
||||||
p_282663_.blitSprite(resourcelocation, j, k + (int)((float)(i - k - 17) * this.scrollOffs), 12, 15);
|
p_282663_.blitSprite(RenderType::guiTextured, resourcelocation, j, k + (int)((float)(i - k - 17) * this.scrollOffs), 12, 15);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ if (currentPage.getVisibleTabs().contains(selectedTab)) //Forge: only display tab selection when the selected tab is on the current page
|
+ if (currentPage.getVisibleTabs().contains(selectedTab)) //Forge: only display tab selection when the selected tab is on the current page
|
||||||
this.renderTabButton(p_282663_, selectedTab);
|
this.renderTabButton(p_282663_, selectedTab);
|
||||||
if (selectedTab.getType() == CreativeModeTab.Type.INVENTORY) {
|
if (selectedTab.getType() == CreativeModeTab.Type.INVENTORY) {
|
||||||
InventoryScreen.renderEntityInInventoryFollowsMouse(
|
InventoryScreen.renderEntityInInventoryFollowsMouse(
|
||||||
@@ -744,7 +_,7 @@
|
@@ -765,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
private int getTabX(CreativeModeTab p_260136_) {
|
private int getTabX(CreativeModeTab p_260136_) {
|
||||||
@@ -215,7 +207,7 @@
|
|||||||
int j = 27;
|
int j = 27;
|
||||||
int k = 27 * i;
|
int k = 27 * i;
|
||||||
if (p_260136_.isAlignedRight()) {
|
if (p_260136_.isAlignedRight()) {
|
||||||
@@ -756,7 +_,7 @@
|
@@ -777,7 +_,7 @@
|
||||||
|
|
||||||
private int getTabY(CreativeModeTab p_260181_) {
|
private int getTabY(CreativeModeTab p_260181_) {
|
||||||
int i = 0;
|
int i = 0;
|
||||||
@@ -224,7 +216,7 @@
|
|||||||
i -= 32;
|
i -= 32;
|
||||||
} else {
|
} else {
|
||||||
i += this.imageHeight;
|
i += this.imageHeight;
|
||||||
@@ -784,8 +_,8 @@
|
@@ -805,8 +_,8 @@
|
||||||
|
|
||||||
protected void renderTabButton(GuiGraphics p_283590_, CreativeModeTab p_283489_) {
|
protected void renderTabButton(GuiGraphics p_283590_, CreativeModeTab p_283489_) {
|
||||||
boolean flag = p_283489_ == selectedTab;
|
boolean flag = p_283489_ == selectedTab;
|
||||||
@@ -235,15 +227,15 @@
|
|||||||
int j = this.leftPos + this.getTabX(p_283489_);
|
int j = this.leftPos + this.getTabX(p_283489_);
|
||||||
int k = this.topPos - (flag1 ? 28 : -(this.imageHeight - 4));
|
int k = this.topPos - (flag1 ? 28 : -(this.imageHeight - 4));
|
||||||
ResourceLocation[] aresourcelocation;
|
ResourceLocation[] aresourcelocation;
|
||||||
@@ -795,6 +_,7 @@
|
@@ -816,6 +_,7 @@
|
||||||
aresourcelocation = flag ? SELECTED_BOTTOM_TABS : UNSELECTED_BOTTOM_TABS;
|
aresourcelocation = flag ? SELECTED_BOTTOM_TABS : UNSELECTED_BOTTOM_TABS;
|
||||||
}
|
}
|
||||||
|
|
||||||
+ com.mojang.blaze3d.systems.RenderSystem.enableBlend(); //Forge: Make sure blend is enabled else tabs show a white border.
|
+ com.mojang.blaze3d.systems.RenderSystem.enableBlend(); //Forge: Make sure blend is enabled else tabs show a white border.
|
||||||
p_283590_.blitSprite(aresourcelocation[Mth.clamp(i, 0, aresourcelocation.length)], j, k, 26, 32);
|
p_283590_.blitSprite(RenderType::guiTextured, aresourcelocation[Mth.clamp(i, 0, aresourcelocation.length)], j, k, 26, 32);
|
||||||
p_283590_.pose().pushPose();
|
p_283590_.pose().pushPose();
|
||||||
p_283590_.pose().translate(0.0F, 0.0F, 100.0F);
|
p_283590_.pose().translate(0.0F, 0.0F, 100.0F);
|
||||||
@@ -836,6 +_,14 @@
|
@@ -857,6 +_,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -258,7 +250,7 @@
|
|||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
static class CustomCreativeSlot extends Slot {
|
static class CustomCreativeSlot extends Slot {
|
||||||
public CustomCreativeSlot(Container p_98633_, int p_98634_, int p_98635_, int p_98636_) {
|
public CustomCreativeSlot(Container p_98633_, int p_98634_, int p_98635_, int p_98636_) {
|
||||||
@@ -1020,6 +_,22 @@
|
@@ -1038,6 +_,22 @@
|
||||||
@Override
|
@Override
|
||||||
public boolean mayPickup(Player p_98665_) {
|
public boolean mayPickup(Player p_98665_) {
|
||||||
return this.target.mayPickup(p_98665_);
|
return this.target.mayPickup(p_98665_);
|
||||||
|
|||||||
+28
-18
@@ -1,10 +1,10 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java
|
--- a/net/minecraft/client/gui/screens/inventory/EffectsInInventory.java
|
||||||
+++ b/net/minecraft/client/gui/screens/inventory/EffectRenderingInventoryScreen.java
|
+++ b/net/minecraft/client/gui/screens/inventory/EffectsInInventory.java
|
||||||
@@ -47,12 +_,16 @@
|
@@ -48,12 +_,16 @@
|
||||||
Collection<MobEffectInstance> collection = this.minecraft.player.getActiveEffects();
|
Collection<MobEffectInstance> collection = this.minecraft.player.getActiveEffects();
|
||||||
if (!collection.isEmpty() && j >= 32) {
|
if (!collection.isEmpty() && j >= 32) {
|
||||||
boolean flag = j >= 120;
|
boolean flag = j >= 120;
|
||||||
+ var event = net.minecraftforge.client.ForgeHooksClient.onScreenPotionSize(this, j, !flag, i);
|
+ var event = net.minecraftforge.client.event.ForgeEventFactoryClient.onScreenEffectSize(this.screen, j, !flag, i);
|
||||||
+ if (event.isCanceled()) return;
|
+ if (event.isCanceled()) return;
|
||||||
+ flag = !event.isCompact();
|
+ flag = !event.isCompact();
|
||||||
+ i = event.getHorizontalOffset();
|
+ i = event.getHorizontalOffset();
|
||||||
@@ -15,30 +15,40 @@
|
|||||||
|
|
||||||
- Iterable<MobEffectInstance> iterable = Ordering.natural().sortedCopy(collection);
|
- Iterable<MobEffectInstance> iterable = Ordering.natural().sortedCopy(collection);
|
||||||
+ Iterable<MobEffectInstance> iterable = collection.stream().filter(net.minecraftforge.client.ForgeHooksClient::shouldRenderEffect).sorted().toList();
|
+ Iterable<MobEffectInstance> iterable = collection.stream().filter(net.minecraftforge.client.ForgeHooksClient::shouldRenderEffect).sorted().toList();
|
||||||
this.renderBackgrounds(p_281945_, i, k, iterable, flag);
|
this.renderBackgrounds(p_362146_, i, k, iterable, flag);
|
||||||
this.renderIcons(p_281945_, i, k, iterable, flag);
|
this.renderIcons(p_362146_, i, k, iterable, flag);
|
||||||
if (flag) {
|
if (flag) {
|
||||||
@@ -98,6 +_,11 @@
|
@@ -99,6 +_,11 @@
|
||||||
int i = this.topPos;
|
int i = this.screen.topPos;
|
||||||
|
|
||||||
for (MobEffectInstance mobeffectinstance : p_282642_) {
|
for (MobEffectInstance mobeffectinstance : p_361981_) {
|
||||||
+ var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(mobeffectinstance);
|
+ var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(mobeffectinstance);
|
||||||
+ if (renderer.renderInventoryIcon(mobeffectinstance, this, p_282745_, p_282521_ + (p_281536_ ? 6 : 7), i, 0)) {
|
+ if (renderer.renderInventoryIcon(mobeffectinstance, this, p_367085_, p_367644_ + (p_368681_ ? 6 : 7), i, 0)) {
|
||||||
+ i += p_282291_;
|
+ i += p_367522_;
|
||||||
+ continue;
|
+ continue;
|
||||||
+ }
|
+ }
|
||||||
Holder<MobEffect> holder = mobeffectinstance.getEffect();
|
Holder<MobEffect> holder = mobeffectinstance.getEffect();
|
||||||
TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.get(holder);
|
TextureAtlasSprite textureatlassprite = mobeffecttexturemanager.get(holder);
|
||||||
p_282745_.blit(p_282521_ + (p_281536_ ? 6 : 7), i + 7, 0, 18, 18, textureatlassprite);
|
p_367085_.blitSprite(RenderType::guiTextured, textureatlassprite, p_367644_ + (p_368681_ ? 6 : 7), i + 7, 18, 18);
|
||||||
@@ -109,6 +_,11 @@
|
@@ -110,6 +_,11 @@
|
||||||
int i = this.topPos;
|
int i = this.screen.topPos;
|
||||||
|
|
||||||
for (MobEffectInstance mobeffectinstance : p_281986_) {
|
for (MobEffectInstance mobeffectinstance : p_365480_) {
|
||||||
+ var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(mobeffectinstance);
|
+ var renderer = net.minecraftforge.client.extensions.common.IClientMobEffectExtensions.of(mobeffectinstance);
|
||||||
+ if (renderer.renderInventoryText(mobeffectinstance, this, p_281462_, p_283484_, i, 0)) {
|
+ if (renderer.renderInventoryText(mobeffectinstance, this, p_361851_, p_367468_, i, 0)) {
|
||||||
+ i += p_282057_;
|
+ i += p_365556_;
|
||||||
+ continue;
|
+ continue;
|
||||||
+ }
|
+ }
|
||||||
Component component = this.getEffectName(mobeffectinstance);
|
Component component = this.getEffectName(mobeffectinstance);
|
||||||
p_281462_.drawString(this.font, component, p_283484_ + 10 + 18, i + 6, 16777215);
|
p_361851_.drawString(this.screen.getFont(), component, p_367468_ + 10 + 18, i + 6, 16777215);
|
||||||
Component component1 = MobEffectUtil.formatDuration(mobeffectinstance, 1.0F, this.minecraft.level.tickRateManager().tickrate());
|
Component component1 = MobEffectUtil.formatDuration(mobeffectinstance, 1.0F, this.minecraft.level.tickRateManager().tickrate());
|
||||||
|
@@ -125,5 +_,9 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
return mutablecomponent;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public AbstractContainerScreen<?> getScreen() {
|
||||||
|
+ return this.screen;
|
||||||
|
}
|
||||||
|
}
|
||||||
+7
-7
@@ -1,18 +1,18 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
|
--- a/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
|
+++ b/net/minecraft/client/gui/screens/inventory/EnchantmentScreen.java
|
||||||
@@ -111,7 +_,7 @@
|
@@ -109,7 +_,7 @@
|
||||||
int l1 = 86 - this.font.width(s);
|
int l1 = 86 - this.font.width(s);
|
||||||
FormattedText formattedtext = EnchantmentNames.getInstance().getRandomName(this.font, l1);
|
FormattedText formattedtext = EnchantmentNames.getInstance().getRandomName(this.font, l1);
|
||||||
int i2 = 6839882;
|
int i2 = 6839882;
|
||||||
- if ((k < l + 1 || this.minecraft.player.experienceLevel < k1) && !this.minecraft.player.getAbilities().instabuild) {
|
- if ((k < l + 1 || this.minecraft.player.experienceLevel < k1) && !this.minecraft.player.getAbilities().instabuild) {
|
||||||
+ if (((k < l + 1 || this.minecraft.player.experienceLevel < k1) && !this.minecraft.player.getAbilities().instabuild) || this.menu.enchantClue[l] == -1) { // Forge: render buttons as disabled when enchantable but enchantability not met on lower levels{
|
+ if (((k < l + 1 || this.minecraft.player.experienceLevel < k1) && !this.minecraft.player.getAbilities().instabuild) || this.menu.enchantClue[l] == -1) { // Forge: render buttons as disabled when enchantable but enchantability not met on lower levels{
|
||||||
RenderSystem.enableBlend();
|
p_282430_.blitSprite(RenderType::guiTextured, ENCHANTMENT_SLOT_DISABLED_SPRITE, i1, j + 14 + 19 * l, 108, 19);
|
||||||
p_282430_.blitSprite(ENCHANTMENT_SLOT_DISABLED_SPRITE, i1, j + 14 + 19 * l, 108, 19);
|
p_282430_.blitSprite(RenderType::guiTextured, DISABLED_LEVEL_SPRITES[l], i1 + 1, j + 15 + 19 * l, 16, 16);
|
||||||
p_282430_.blitSprite(DISABLED_LEVEL_SPRITES[l], i1 + 1, j + 15 + 19 * l, 16, 16);
|
p_282430_.drawWordWrap(this.font, formattedtext, j1, j + 16 + 19 * l, l1, (i2 & 16711422) >> 1);
|
||||||
@@ -177,13 +_,16 @@
|
@@ -175,13 +_,16 @@
|
||||||
.registryAccess()
|
.registryAccess()
|
||||||
.registryOrThrow(Registries.ENCHANTMENT)
|
.lookupOrThrow(Registries.ENCHANTMENT)
|
||||||
.getHolder(this.menu.enchantClue[j]);
|
.get(this.menu.enchantClue[j]);
|
||||||
- if (!optional.isEmpty()) {
|
- if (!optional.isEmpty()) {
|
||||||
+ {
|
+ {
|
||||||
int l = this.menu.levelClue[j];
|
int l = this.menu.levelClue[j];
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/inventory/HangingSignEditScreen.java
|
--- a/net/minecraft/client/gui/screens/inventory/HangingSignEditScreen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/inventory/HangingSignEditScreen.java
|
+++ b/net/minecraft/client/gui/screens/inventory/HangingSignEditScreen.java
|
||||||
@@ -15,7 +_,7 @@
|
@@ -16,7 +_,7 @@
|
||||||
private static final Vector3f TEXT_SCALE = new Vector3f(1.0F, 1.0F, 1.0F);
|
private static final Vector3f TEXT_SCALE = new Vector3f(1.0F, 1.0F, 1.0F);
|
||||||
private static final int TEXTURE_WIDTH = 16;
|
private static final int TEXTURE_WIDTH = 16;
|
||||||
private static final int TEXTURE_HEIGHT = 16;
|
private static final int TEXTURE_HEIGHT = 16;
|
||||||
|
|||||||
+5
-4
@@ -1,16 +1,17 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/inventory/MerchantScreen.java
|
--- a/net/minecraft/client/gui/screens/inventory/MerchantScreen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/inventory/MerchantScreen.java
|
+++ b/net/minecraft/client/gui/screens/inventory/MerchantScreen.java
|
||||||
@@ -234,7 +_,12 @@
|
@@ -232,6 +_,14 @@
|
||||||
p_281357_.renderItemDecorations(this.font, p_283466_, p_282403_, p_283601_);
|
|
||||||
} else {
|
} else {
|
||||||
p_281357_.renderItemDecorations(this.font, p_282046_, p_282403_, p_283601_, p_282046_.getCount() == 1 ? "1" : null);
|
p_281357_.renderItemDecorations(this.font, p_282046_, p_282403_, p_283601_, p_282046_.getCount() == 1 ? "1" : null);
|
||||||
- p_281357_.renderItemDecorations(this.font, p_283466_, p_282403_ + 14, p_283601_, p_283466_.getCount() == 1 ? "1" : null);
|
p_281357_.renderItemDecorations(this.font, p_283466_, p_282403_ + 14, p_283601_, p_283466_.getCount() == 1 ? "1" : null);
|
||||||
|
+ /*
|
||||||
+ // Forge: fixes Forge-8806, code for count rendering taken from GuiGraphics#renderGuiItemDecorations
|
+ // Forge: fixes Forge-8806, code for count rendering taken from GuiGraphics#renderGuiItemDecorations
|
||||||
+ p_281357_.pose().pushPose();
|
+ p_281357_.pose().pushPose();
|
||||||
+ p_281357_.pose().translate(0.0F, 0.0F, 200.0F);
|
+ p_281357_.pose().translate(0.0F, 0.0F, 200.0F);
|
||||||
+ String count = p_283466_.getCount() == 1 ? "1" : String.valueOf(p_283466_.getCount());
|
+ String count = p_283466_.getCount() == 1 ? "1" : String.valueOf(p_283466_.getCount());
|
||||||
+ font.drawInBatch(count, (float) (p_282403_ + 14) + 19 - 2 - font.width(count), (float)p_283601_ + 6 + 3, 0xFFFFFF, true, p_281357_.pose().last().pose(), p_281357_.bufferSource(), net.minecraft.client.gui.Font.DisplayMode.NORMAL, 0, 15728880, false);
|
+ font.drawInBatch(count, (float) (p_282403_ + 14) + 19 - 2 - font.width(count), (float)p_283601_ + 6 + 3, 0xFFFFFF, true, p_281357_.pose().last().pose(), p_281357_.bufferSource(), net.minecraft.client.gui.Font.DisplayMode.NORMAL, 0, 15728880, false);
|
||||||
+ p_281357_.pose().popPose();
|
+ p_281357_.pose().popPose();
|
||||||
|
+ */
|
||||||
p_281357_.pose().pushPose();
|
p_281357_.pose().pushPose();
|
||||||
p_281357_.pose().translate(0.0F, 0.0F, 300.0F);
|
p_281357_.pose().translate(0.0F, 0.0F, 300.0F);
|
||||||
p_281357_.blitSprite(DISCOUNT_STRIKETHRUOGH_SPRITE, p_282403_ + 7, p_283601_ + 12, 0, 9, 2);
|
p_281357_.blitSprite(RenderType::guiTextured, DISCOUNT_STRIKETHRUOGH_SPRITE, p_282403_ + 7, p_283601_ + 12, 9, 2);
|
||||||
+8
-8
@@ -1,11 +1,11 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent.java
|
--- a/net/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent.java
|
||||||
+++ b/net/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent.java
|
+++ b/net/minecraft/client/gui/screens/inventory/tooltip/ClientTooltipComponent.java
|
||||||
@@ -22,6 +_,8 @@
|
@@ -25,7 +_,7 @@
|
||||||
} else if (p_169951_ instanceof ClientActivePlayersTooltip.ActivePlayersTooltip clientactiveplayerstooltip$activeplayerstooltip) {
|
case ClientActivePlayersTooltip.ActivePlayersTooltip clientactiveplayerstooltip$activeplayerstooltip -> new ClientActivePlayersTooltip(
|
||||||
return new ClientActivePlayersTooltip(clientactiveplayerstooltip$activeplayerstooltip);
|
clientactiveplayerstooltip$activeplayerstooltip
|
||||||
} else {
|
);
|
||||||
+ ClientTooltipComponent result = net.minecraftforge.client.gui.ClientTooltipComponentManager.createClientTooltipComponent(p_169951_);
|
- default -> throw new IllegalArgumentException("Unknown TooltipComponent");
|
||||||
+ if (result != null) return result;
|
+ default -> net.minecraftforge.client.gui.ClientTooltipComponentManager.createClientTooltipComponent(p_169951_);
|
||||||
throw new IllegalArgumentException("Unknown TooltipComponent");
|
});
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
-40
@@ -1,40 +0,0 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.java
|
|
||||||
+++ b/net/minecraft/client/gui/screens/inventory/tooltip/TooltipRenderUtil.java
|
|
||||||
@@ -17,16 +_,21 @@
|
|
||||||
private static final int BORDER_COLOR_BOTTOM = 1344798847;
|
|
||||||
|
|
||||||
public static void renderTooltipBackground(GuiGraphics p_282666_, int p_281901_, int p_281846_, int p_281559_, int p_283336_, int p_283422_) {
|
|
||||||
+ renderTooltipBackground(p_282666_, p_281901_, p_281846_, p_281559_, p_283336_, p_283422_, BACKGROUND_COLOR, BACKGROUND_COLOR, BORDER_COLOR_TOP, BORDER_COLOR_BOTTOM);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ // Forge: Allow specifying colors for the inner border gradient and a gradient instead of a single color for the background and outer border
|
|
||||||
+ public static void renderTooltipBackground(GuiGraphics p_282666_, int p_281901_, int p_281846_, int p_281559_, int p_283336_, int p_283422_, int backgroundTop, int backgroundBottom, int borderTop, int borderBottom) {
|
|
||||||
int i = p_281901_ - 3;
|
|
||||||
int j = p_281846_ - 3;
|
|
||||||
int k = p_281559_ + 3 + 3;
|
|
||||||
int l = p_283336_ + 3 + 3;
|
|
||||||
- renderHorizontalLine(p_282666_, i, j - 1, k, p_283422_, -267386864);
|
|
||||||
- renderHorizontalLine(p_282666_, i, j + l, k, p_283422_, -267386864);
|
|
||||||
- renderRectangle(p_282666_, i, j, k, l, p_283422_, -267386864);
|
|
||||||
- renderVerticalLine(p_282666_, i - 1, j, l, p_283422_, -267386864);
|
|
||||||
- renderVerticalLine(p_282666_, i + k, j, l, p_283422_, -267386864);
|
|
||||||
- renderFrameGradient(p_282666_, i, j + 1, k, l, p_283422_, 1347420415, 1344798847);
|
|
||||||
+ renderHorizontalLine(p_282666_, i, j - 1, k, p_283422_, backgroundTop);
|
|
||||||
+ renderHorizontalLine(p_282666_, i, j + l, k, p_283422_, backgroundBottom);
|
|
||||||
+ renderRectangleGradient(p_282666_, i, j, k, l, p_283422_, backgroundTop, backgroundBottom);
|
|
||||||
+ renderVerticalLineGradient(p_282666_, i - 1, j, l, p_283422_, backgroundTop, backgroundBottom);
|
|
||||||
+ renderVerticalLineGradient(p_282666_, i + k, j, l, p_283422_, backgroundTop, backgroundBottom);
|
|
||||||
+ renderFrameGradient(p_282666_, i, j + 1, k, l, p_283422_, borderTop, borderBottom);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void renderFrameGradient(
|
|
||||||
@@ -52,5 +_,9 @@
|
|
||||||
|
|
||||||
private static void renderRectangle(GuiGraphics p_281392_, int p_282294_, int p_283353_, int p_282640_, int p_281964_, int p_283211_, int p_282349_) {
|
|
||||||
p_281392_.fill(p_282294_, p_283353_, p_282294_ + p_282640_, p_283353_ + p_281964_, p_283211_, p_282349_);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ private static void renderRectangleGradient(GuiGraphics p_281392_, int p_282294_, int p_283353_, int p_282640_, int p_281964_, int p_283211_, int p_282349_, int colorTo) {
|
|
||||||
+ p_281392_.fillGradient(p_282294_, p_283353_, p_282294_ + p_282640_, p_283353_ + p_281964_, p_283211_, p_282349_, colorTo);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+4
-3
@@ -24,14 +24,15 @@
|
|||||||
.createNarration(
|
.createNarration(
|
||||||
p_342179_ -> p_343088_.isUnbound()
|
p_342179_ -> p_343088_.isUnbound()
|
||||||
? Component.translatable("narrator.controls.unbound", p_343976_)
|
? Component.translatable("narrator.controls.unbound", p_343976_)
|
||||||
@@ -163,6 +_,7 @@
|
@@ -163,7 +_,7 @@
|
||||||
)
|
)
|
||||||
.build();
|
.build();
|
||||||
this.resetButton = Button.builder(RESET_BUTTON_TITLE, p_343650_ -> {
|
this.resetButton = Button.builder(RESET_BUTTON_TITLE, p_357685_ -> {
|
||||||
|
- p_343088_.setKey(p_343088_.getDefaultKey());
|
||||||
+ this.key.setToDefault();
|
+ this.key.setToDefault();
|
||||||
KeyBindsList.this.minecraft.options.setKey(p_343088_, p_343088_.getDefaultKey());
|
|
||||||
KeyBindsList.this.resetMappingAndUpdateButtons();
|
KeyBindsList.this.resetMappingAndUpdateButtons();
|
||||||
}).bounds(0, 0, 50, 20).createNarration(p_344192_ -> Component.translatable("narrator.controls.reset", p_343976_)).build();
|
}).bounds(0, 0, 50, 20).createNarration(p_344192_ -> Component.translatable("narrator.controls.reset", p_343976_)).build();
|
||||||
|
this.refreshEntry();
|
||||||
@@ -215,7 +_,7 @@
|
@@ -215,7 +_,7 @@
|
||||||
MutableComponent mutablecomponent = Component.empty();
|
MutableComponent mutablecomponent = Component.empty();
|
||||||
if (!this.key.isUnbound()) {
|
if (!this.key.isUnbound()) {
|
||||||
|
|||||||
+3
-3
@@ -9,15 +9,15 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
this.keyBindsList.resetMappingAndUpdateButtons();
|
this.keyBindsList.resetMappingAndUpdateButtons();
|
||||||
@@ -73,11 +_,14 @@
|
@@ -73,11 +_,12 @@
|
||||||
public boolean keyPressed(int p_342715_, int p_342862_, int p_345515_) {
|
public boolean keyPressed(int p_342715_, int p_342862_, int p_345515_) {
|
||||||
if (this.selectedKey != null) {
|
if (this.selectedKey != null) {
|
||||||
if (p_342715_ == 256) {
|
if (p_342715_ == 256) {
|
||||||
|
- this.selectedKey.setKey(InputConstants.UNKNOWN);
|
||||||
+ this.selectedKey.setKeyModifierAndCode(null, InputConstants.UNKNOWN);
|
+ this.selectedKey.setKeyModifierAndCode(null, InputConstants.UNKNOWN);
|
||||||
this.options.setKey(this.selectedKey, InputConstants.UNKNOWN);
|
|
||||||
} else {
|
} else {
|
||||||
|
- this.selectedKey.setKey(InputConstants.getKey(p_342715_, p_342862_));
|
||||||
+ this.selectedKey.setKeyModifierAndCode(null, InputConstants.getKey(p_342715_, p_342862_));
|
+ this.selectedKey.setKeyModifierAndCode(null, InputConstants.getKey(p_342715_, p_342862_));
|
||||||
this.options.setKey(this.selectedKey, InputConstants.getKey(p_342715_, p_342862_));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
+ if (p_342715_ == 256 || !net.minecraftforge.client.settings.KeyModifier.isKeyCodeModifier(this.selectedKey.getKey()))
|
+ if (p_342715_ == 256 || !net.minecraftforge.client.settings.KeyModifier.isKeyCodeModifier(this.selectedKey.getKey()))
|
||||||
|
|||||||
+2
-2
@@ -6,6 +6,6 @@
|
|||||||
p_100014_.setSelected(null);
|
p_100014_.setSelected(null);
|
||||||
- p_100015_.forEach(
|
- p_100015_.forEach(
|
||||||
+ p_100015_.filter(PackSelectionModel.Entry::notHidden).forEach(
|
+ p_100015_.filter(PackSelectionModel.Entry::notHidden).forEach(
|
||||||
p_340813_ -> {
|
p_357689_ -> {
|
||||||
TransferableSelectionList.PackEntry transferableselectionlist$packentry1 = new TransferableSelectionList.PackEntry(
|
TransferableSelectionList.PackEntry transferableselectionlist$packentry1 = new TransferableSelectionList.PackEntry(
|
||||||
this.minecraft, p_100014_, p_340813_
|
this.minecraft, p_100014_, p_357689_
|
||||||
-20
@@ -1,20 +0,0 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java
|
|
||||||
+++ b/net/minecraft/client/gui/screens/recipebook/RecipeBookComponent.java
|
|
||||||
@@ -115,7 +_,7 @@
|
|
||||||
this.initFilterButtonTextures();
|
|
||||||
this.tabButtons.clear();
|
|
||||||
|
|
||||||
- for (RecipeBookCategories recipebookcategories : RecipeBookCategories.getCategories(this.menu.getRecipeBookType())) {
|
|
||||||
+ for (RecipeBookCategories recipebookcategories : this.menu.getRecipeBookCategories()) {
|
|
||||||
this.tabButtons.add(new RecipeBookTabButton(recipebookcategories));
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -293,7 +_,7 @@
|
|
||||||
}
|
|
||||||
|
|
||||||
if (itemstack != null && this.minecraft.screen != null) {
|
|
||||||
- p_282776_.renderComponentTooltip(this.minecraft.font, Screen.getTooltipFromItem(this.minecraft, itemstack), p_282948_, p_283050_);
|
|
||||||
+ p_282776_.renderComponentTooltip(this.minecraft.font, Screen.getTooltipFromItem(this.minecraft, itemstack), p_282948_, p_283050_, itemstack);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+6
-6
@@ -1,14 +1,14 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
|
--- a/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
|
||||||
+++ b/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
|
+++ b/net/minecraft/client/gui/screens/worldselection/CreateWorldScreen.java
|
||||||
@@ -118,6 +_,7 @@
|
@@ -169,6 +_,7 @@
|
||||||
public static void openFresh(Minecraft p_232897_, @Nullable Screen p_232898_) {
|
) {
|
||||||
queueLoadScreen(p_232897_, PREPARING_WORLD_DATA);
|
queueLoadScreen(p_369292_, PREPARING_WORLD_DATA);
|
||||||
PackRepository packrepository = new PackRepository(new ServerPacksSource(p_232897_.directoryValidator()));
|
PackRepository packrepository = new PackRepository(new ServerPacksSource(p_369292_.directoryValidator()));
|
||||||
+ net.minecraftforge.event.ForgeEventFactory.addPackFindersServer(packrepository::addPackFinder);
|
+ net.minecraftforge.event.ForgeEventFactory.addPackFindersServer(packrepository::addPackFinder);
|
||||||
WorldLoader.InitConfig worldloader$initconfig = createDefaultLoadConfig(packrepository, WorldDataConfiguration.DEFAULT);
|
WorldLoader.InitConfig worldloader$initconfig = createDefaultLoadConfig(packrepository, WorldDataConfiguration.DEFAULT);
|
||||||
CompletableFuture<WorldCreationContext> completablefuture = WorldLoader.load(
|
CompletableFuture<WorldCreationContext> completablefuture = WorldLoader.load(
|
||||||
worldloader$initconfig,
|
worldloader$initconfig,
|
||||||
@@ -415,7 +_,7 @@
|
@@ -479,7 +_,7 @@
|
||||||
if (p_269627_) {
|
if (p_269627_) {
|
||||||
p_270552_.accept(this.uiState.getSettings().dataConfiguration());
|
p_270552_.accept(this.uiState.getSettings().dataConfiguration());
|
||||||
} else {
|
} else {
|
||||||
@@ -17,7 +17,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
Component.translatable("dataPack.validation.failed"),
|
Component.translatable("dataPack.validation.failed"),
|
||||||
@@ -533,6 +_,7 @@
|
@@ -593,6 +_,7 @@
|
||||||
if (path != null) {
|
if (path != null) {
|
||||||
if (this.tempDataPackRepository == null) {
|
if (this.tempDataPackRepository == null) {
|
||||||
this.tempDataPackRepository = ServerPacksSource.createPackRepository(path, this.packValidator);
|
this.tempDataPackRepository = ServerPacksSource.createPackRepository(path, this.packValidator);
|
||||||
|
|||||||
+6
-2
@@ -1,11 +1,15 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/worldselection/WorldCreationContext.java
|
--- a/net/minecraft/client/gui/screens/worldselection/WorldCreationContext.java
|
||||||
+++ b/net/minecraft/client/gui/screens/worldselection/WorldCreationContext.java
|
+++ b/net/minecraft/client/gui/screens/worldselection/WorldCreationContext.java
|
||||||
@@ -62,6 +_,10 @@
|
@@ -75,6 +_,14 @@
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
+ public WorldCreationContext withDataConfiguration(WorldDataConfiguration dataConfiguration) {
|
+ public WorldCreationContext withDataConfiguration(WorldDataConfiguration dataConfiguration) {
|
||||||
+ return new WorldCreationContext(this.options, this.datapackDimensions, this.selectedDimensions, this.worldgenRegistries, this.dataPackResources, dataConfiguration);
|
+ return new WorldCreationContext(this.options, this.datapackDimensions, this.selectedDimensions, this.worldgenRegistries, this.dataPackResources, dataConfiguration, this.initialWorldCreationOptions);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public WorldCreationContext withInitalOptions(InitialWorldCreationOptions initialWorldCreationOptions) {
|
||||||
|
+ return new WorldCreationContext(this.options, this.datapackDimensions, this.selectedDimensions, this.worldgenRegistries, this.dataPackResources, this.dataConfiguration, initialWorldCreationOptions);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
public RegistryAccess.Frozen worldgenLoadContext() {
|
public RegistryAccess.Frozen worldgenLoadContext() {
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
|
--- a/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
|
||||||
+++ b/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
|
+++ b/net/minecraft/client/gui/screens/worldselection/WorldCreationUiState.java
|
||||||
@@ -225,7 +_,7 @@
|
@@ -234,7 +_,7 @@
|
||||||
@Nullable
|
@Nullable
|
||||||
public PresetEditor getPresetEditor() {
|
public PresetEditor getPresetEditor() {
|
||||||
Holder<WorldPreset> holder = this.getWorldType().preset();
|
Holder<WorldPreset> holder = this.getWorldType().preset();
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
|
--- a/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
|
||||||
+++ b/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
|
+++ b/net/minecraft/client/gui/screens/worldselection/WorldOpenFlows.java
|
||||||
@@ -321,6 +_,8 @@
|
@@ -329,6 +_,8 @@
|
||||||
this.minecraft.forceSetScreen(new GenericMessageScreen(Component.translatable("selectWorld.resource_load")));
|
this.minecraft.forceSetScreen(new GenericMessageScreen(Component.translatable("selectWorld.resource_load")));
|
||||||
PackRepository packrepository = ServerPacksSource.createPackRepository(p_333651_);
|
PackRepository packrepository = ServerPacksSource.createPackRepository(p_333651_);
|
||||||
|
|
||||||
|
|||||||
+7
-7
@@ -8,16 +8,16 @@
|
|||||||
static final Component FROM_NEWER_TOOLTIP_1 = Component.translatable("selectWorld.tooltip.fromNewerVersion1").withStyle(ChatFormatting.RED);
|
static final Component FROM_NEWER_TOOLTIP_1 = Component.translatable("selectWorld.tooltip.fromNewerVersion1").withStyle(ChatFormatting.RED);
|
||||||
static final Component FROM_NEWER_TOOLTIP_2 = Component.translatable("selectWorld.tooltip.fromNewerVersion2").withStyle(ChatFormatting.RED);
|
static final Component FROM_NEWER_TOOLTIP_2 = Component.translatable("selectWorld.tooltip.fromNewerVersion2").withStyle(ChatFormatting.RED);
|
||||||
static final Component SNAPSHOT_TOOLTIP_1 = Component.translatable("selectWorld.tooltip.snapshot1").withStyle(ChatFormatting.GOLD);
|
static final Component SNAPSHOT_TOOLTIP_1 = Component.translatable("selectWorld.tooltip.snapshot1").withStyle(ChatFormatting.GOLD);
|
||||||
@@ -402,6 +_,7 @@
|
@@ -400,6 +_,7 @@
|
||||||
RenderSystem.enableBlend();
|
p_281612_.drawString(this.minecraft.font, s1, p_282820_ + 32 + 3, p_283181_ + 9 + 3, -8355712, false);
|
||||||
p_281612_.blit(this.icon.textureLocation(), p_282820_, p_283181_, 0.0F, 0.0F, 32, 32, 32, 32);
|
p_281612_.drawString(this.minecraft.font, component, p_282820_ + 32 + 3, p_283181_ + 9 + 9 + 3, -8355712, false);
|
||||||
RenderSystem.disableBlend();
|
p_281612_.blit(RenderType::guiTextured, this.icon.textureLocation(), p_282820_, p_283181_, 0.0F, 0.0F, 32, 32, 32, 32);
|
||||||
+ renderExperimentalWarning(p_281612_, p_283204_, p_283025_, p_283181_, p_282820_);
|
+ renderExperimentalWarning(p_281612_, p_283204_, p_283025_, p_283181_, p_282820_);
|
||||||
if (this.minecraft.options.touchscreen().get() || p_283396_) {
|
if (this.minecraft.options.touchscreen().get() || p_283396_) {
|
||||||
p_281612_.fill(p_282820_, p_283181_, p_282820_ + 32, p_283181_ + 32, -1601138544);
|
p_281612_.fill(p_282820_, p_283181_, p_282820_ + 32, p_283181_ + 32, -1601138544);
|
||||||
int j = p_283204_ - p_282820_;
|
int j = p_283204_ - p_282820_;
|
||||||
@@ -448,6 +_,19 @@
|
@@ -446,6 +_,19 @@
|
||||||
p_281612_.blitSprite(resourcelocation, p_282820_, p_283181_, 32, 32);
|
p_281612_.blitSprite(RenderType::guiTextured, resourcelocation, p_282820_, p_283181_, 32, 32);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+ }
|
+ }
|
||||||
@@ -26,7 +26,7 @@
|
|||||||
+ private void renderExperimentalWarning(GuiGraphics guiGraphics, int mouseX, int mouseY, int top, int left) {
|
+ private void renderExperimentalWarning(GuiGraphics guiGraphics, int mouseX, int mouseY, int top, int left) {
|
||||||
+ if (this.summary.isLifecycleExperimental()) {
|
+ if (this.summary.isLifecycleExperimental()) {
|
||||||
+ int leftStart = left + WorldSelectionList.this.getRowWidth();
|
+ int leftStart = left + WorldSelectionList.this.getRowWidth();
|
||||||
+ guiGraphics.blit(WorldSelectionList.FORGE_EXPERIMENTAL_WARNING_ICON, leftStart - 36, top, 0.0F, 0.0F, 32, 32, 32, 32);
|
+ guiGraphics.blit(RenderType::guiTextured, WorldSelectionList.FORGE_EXPERIMENTAL_WARNING_ICON, leftStart - 36, top, 0.0F, 0.0F, 32, 32, 32, 32);
|
||||||
+ if (WorldSelectionList.this.getEntryAtPosition(mouseX, mouseY) == this && mouseX > leftStart - 36 && mouseX < leftStart) {
|
+ if (WorldSelectionList.this.getEntryAtPosition(mouseX, mouseY) == this && mouseX > leftStart - 36 && mouseX < leftStart) {
|
||||||
+ var font = Minecraft.getInstance().font;
|
+ var font = Minecraft.getInstance().font;
|
||||||
+ List<net.minecraft.util.FormattedCharSequence> tooltip = font.split(Component.translatable("forge.experimentalsettings.tooltip"), 200);
|
+ List<net.minecraft.util.FormattedCharSequence> tooltip = font.split(Component.translatable("forge.experimentalsettings.tooltip"), 200);
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/net/minecraft/client/main/Main.java
|
--- a/net/minecraft/client/main/Main.java
|
||||||
+++ b/net/minecraft/client/main/Main.java
|
+++ b/net/minecraft/client/main/Main.java
|
||||||
@@ -111,8 +_,8 @@
|
@@ -120,8 +_,8 @@
|
||||||
CrashReport.preload();
|
CrashReport.preload();
|
||||||
logger = LogUtils.getLogger();
|
logger = LogUtils.getLogger();
|
||||||
s1 = "Bootstrap";
|
s1 = "Bootstrap";
|
||||||
@@ -9,4 +9,4 @@
|
|||||||
+ net.minecraftforge.fml.loading.BackgroundWaiter.runAndTick(Bootstrap::bootStrap, net.minecraftforge.fml.loading.FMLLoader.progressWindowTick);
|
+ net.minecraftforge.fml.loading.BackgroundWaiter.runAndTick(Bootstrap::bootStrap, net.minecraftforge.fml.loading.FMLLoader.progressWindowTick);
|
||||||
Bootstrap.validate();
|
Bootstrap.validate();
|
||||||
s1 = "Argument parsing";
|
s1 = "Argument parsing";
|
||||||
List<String> list = optionset.valuesOf(optionspec27);
|
List<String> list = optionset.valuesOf(optionspec29);
|
||||||
@@ -1,24 +1,24 @@
|
|||||||
--- a/net/minecraft/client/model/HumanoidModel.java
|
--- a/net/minecraft/client/model/HumanoidModel.java
|
||||||
+++ b/net/minecraft/client/model/HumanoidModel.java
|
+++ b/net/minecraft/client/model/HumanoidModel.java
|
||||||
@@ -308,6 +_,8 @@
|
@@ -259,6 +_,8 @@
|
||||||
case BRUSH:
|
case BRUSH:
|
||||||
this.rightArm.xRot = this.rightArm.xRot * 0.5F - (float) (Math.PI / 5);
|
this.rightArm.xRot = this.rightArm.xRot * 0.5F - (float) (Math.PI / 5);
|
||||||
this.rightArm.yRot = 0.0F;
|
this.rightArm.yRot = 0.0F;
|
||||||
+ default:
|
+ default:
|
||||||
+ this.rightArmPose.applyTransform(this, p_102876_, net.minecraft.world.entity.HumanoidArm.RIGHT);
|
+ p_366231_.applyTransform(this, p_362371_, net.minecraft.world.entity.HumanoidArm.RIGHT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -352,6 +_,8 @@
|
@@ -303,6 +_,8 @@
|
||||||
case BRUSH:
|
case BRUSH:
|
||||||
this.leftArm.xRot = this.leftArm.xRot * 0.5F - (float) (Math.PI / 5);
|
this.leftArm.xRot = this.leftArm.xRot * 0.5F - (float) (Math.PI / 5);
|
||||||
this.leftArm.yRot = 0.0F;
|
this.leftArm.yRot = 0.0F;
|
||||||
+ default:
|
+ default:
|
||||||
+ this.leftArmPose.applyTransform(this, p_102879_, net.minecraft.world.entity.HumanoidArm.LEFT);
|
+ p_370002_.applyTransform(this, p_363560_, net.minecraft.world.entity.HumanoidArm.LEFT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -451,7 +_,7 @@
|
@@ -381,7 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@OnlyIn(Dist.CLIENT)
|
@OnlyIn(Dist.CLIENT)
|
||||||
@@ -27,7 +27,7 @@
|
|||||||
EMPTY(false),
|
EMPTY(false),
|
||||||
ITEM(false),
|
ITEM(false),
|
||||||
BLOCK(false),
|
BLOCK(false),
|
||||||
@@ -467,10 +_,28 @@
|
@@ -397,10 +_,28 @@
|
||||||
|
|
||||||
private ArmPose(final boolean p_102896_) {
|
private ArmPose(final boolean p_102896_) {
|
||||||
this.twoHanded = p_102896_;
|
this.twoHanded = p_102896_;
|
||||||
@@ -51,8 +51,8 @@
|
|||||||
+ throw new IllegalStateException("Enum not extended");
|
+ throw new IllegalStateException("Enum not extended");
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ public <T extends LivingEntity> void applyTransform(HumanoidModel<T> model, T entity, net.minecraft.world.entity.HumanoidArm arm) {
|
+ public <T extends HumanoidRenderState> void applyTransform(HumanoidModel<T> model, T state, net.minecraft.world.entity.HumanoidArm arm) {
|
||||||
+ if (this.forgeArmPose != null) this.forgeArmPose.applyTransform(model, entity, arm);
|
+ if (this.forgeArmPose != null) this.forgeArmPose.applyTransform(model, state, arm);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
--- a/net/minecraft/client/model/geom/LayerDefinitions.java
|
--- a/net/minecraft/client/model/geom/LayerDefinitions.java
|
||||||
+++ b/net/minecraft/client/model/geom/LayerDefinitions.java
|
+++ b/net/minecraft/client/model/geom/LayerDefinitions.java
|
||||||
@@ -329,6 +_,7 @@
|
@@ -449,6 +_,7 @@
|
||||||
WoodType.values().forEach(p_171114_ -> builder.put(ModelLayers.createSignModelName(p_171114_), layerdefinition23));
|
builder.put(ModelLayers.createWallSignModelName(p_357774_), layerdefinition54);
|
||||||
LayerDefinition layerdefinition24 = HangingSignRenderer.createHangingSignLayer();
|
builder.put(ModelLayers.createHangingSignModelName(p_357774_), layerdefinition55);
|
||||||
WoodType.values().forEach(p_247864_ -> builder.put(ModelLayers.createHangingSignModelName(p_247864_), layerdefinition24));
|
});
|
||||||
+ net.minecraftforge.client.ForgeHooksClient.loadLayerDefinitions(builder);
|
+ net.minecraftforge.client.ForgeHooksClient.loadLayerDefinitions(builder);
|
||||||
ImmutableMap<ModelLayerLocation, LayerDefinition> immutablemap = builder.build();
|
ImmutableMap<ModelLayerLocation, LayerDefinition> immutablemap = builder.build();
|
||||||
List<ModelLayerLocation> list = ModelLayers.getKnownLocations().filter(p_171117_ -> !immutablemap.containsKey(p_171117_)).collect(Collectors.toList());
|
List<ModelLayerLocation> list = ModelLayers.getKnownLocations().filter(p_171117_ -> !immutablemap.containsKey(p_171117_)).collect(Collectors.toList());
|
||||||
|
|||||||
@@ -1,12 +1,18 @@
|
|||||||
--- a/net/minecraft/client/model/geom/ModelLayers.java
|
--- a/net/minecraft/client/model/geom/ModelLayers.java
|
||||||
+++ b/net/minecraft/client/model/geom/ModelLayers.java
|
+++ b/net/minecraft/client/model/geom/ModelLayers.java
|
||||||
@@ -229,11 +_,13 @@
|
@@ -301,15 +_,18 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ModelLayerLocation createSignModelName(WoodType p_171292_) {
|
public static ModelLayerLocation createStandingSignModelName(WoodType p_171292_) {
|
||||||
- return createLocation("sign/" + p_171292_.name(), "main");
|
- return createLocation("sign/standing/" + p_171292_.name(), "main");
|
||||||
+ ResourceLocation location = ResourceLocation.parse(p_171292_.name());
|
+ ResourceLocation location = ResourceLocation.parse(p_171292_.name());
|
||||||
+ return new ModelLayerLocation(ResourceLocation.fromNamespaceAndPath(location.getNamespace(), "sign/" + location.getPath()), "main");
|
+ return new ModelLayerLocation(ResourceLocation.fromNamespaceAndPath(location.getNamespace(), "sign/standing/" + location.getPath()), "main");
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ModelLayerLocation createWallSignModelName(WoodType p_363532_) {
|
||||||
|
- return createLocation("sign/wall/" + p_363532_.name(), "main");
|
||||||
|
+ ResourceLocation location = ResourceLocation.parse(p_363532_.name());
|
||||||
|
+ return new ModelLayerLocation(ResourceLocation.fromNamespaceAndPath(location.getNamespace(), "sign/wall/" + location.getPath()), "main");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static ModelLayerLocation createHangingSignModelName(WoodType p_252225_) {
|
public static ModelLayerLocation createHangingSignModelName(WoodType p_252225_) {
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
--- a/net/minecraft/client/multiplayer/ClientChunkCache.java
|
--- a/net/minecraft/client/multiplayer/ClientChunkCache.java
|
||||||
+++ b/net/minecraft/client/multiplayer/ClientChunkCache.java
|
+++ b/net/minecraft/client/multiplayer/ClientChunkCache.java
|
||||||
@@ -61,6 +_,7 @@
|
@@ -63,6 +_,7 @@
|
||||||
int i = this.storage.getIndex(p_298665_.x, p_298665_.z);
|
int i = this.storage.getIndex(p_298665_.x, p_298665_.z);
|
||||||
LevelChunk levelchunk = this.storage.getChunk(i);
|
LevelChunk levelchunk = this.storage.getChunk(i);
|
||||||
if (isValidChunk(levelchunk, p_298665_.x, p_298665_.z)) {
|
if (isValidChunk(levelchunk, p_298665_.x, p_298665_.z)) {
|
||||||
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.level.ChunkEvent.Unload(levelchunk));
|
+ net.minecraftforge.common.MinecraftForge.EVENT_BUS.post(new net.minecraftforge.event.level.ChunkEvent.Unload(levelchunk));
|
||||||
this.storage.replace(i, levelchunk, null);
|
this.storage.drop(i, levelchunk);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -121,6 +_,7 @@
|
@@ -123,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
this.level.onChunkLoaded(chunkpos);
|
this.level.onChunkLoaded(chunkpos);
|
||||||
|
|||||||
Loaded 100 of 923 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user