Compare commits

...
28 Commits
Author SHA1 Message Date
Jonathing 4952622785 1.19.4 RB 4
https://forums.minecraftforge.net/topic/154386-forge-454-minecraft-1194/
2025-03-04 16:44:50 -05:00
Jonathing ae82ec12d2 Cache this.useItem before running item break logic, Fixes #10344 (#10381) 2025-03-04 13:39:35 -08:00
Jonathing 99818c4fdd Add '#forge:chorus_additionally_grows_on' tag for similar mechanics to '#minecraft:azalea_grows_on' but for chorus (#10463) 2025-03-04 13:34:26 -08:00
JonathingandLexManos 0e9ba58f19 Speed up mod annotation scanning by ~30% (#10471)
Co-authored-by: LexManos <[email protected]>
2025-03-04 13:33:54 -08:00
Jonathing 5f5a9a8d2a Add fast graphics render type to block model jsons (#10399)
Make modded leaves behave like vanilla leaves by default (Fixes #10389)
2025-02-18 14:09:27 -08:00
Jonathing 3bba5bf4ec Backport even more future ResourceLocation methods (#10429) 2025-02-18 13:51:24 -08:00
Jonathing 8090d1d099 Ensure NetworkConstants is loaded before mod construction (#10447) 2025-02-18 13:51:08 -08:00
JonathingandPaint_Ninja 09cb6bd11e Add clientSideOnly feature to mods.toml (#10085) (backport of #9804 to 1.20.1) (#10366)
Co-authored-by: Paint_Ninja <[email protected]>
2025-02-18 13:50:42 -08:00
Jonathing d744f0b254 Fix issues in VillagerTrades.EmeraldsForVillagerTypeItem related to custom Villager Types (#10359)
Add VillagerType#registerBiomeType
Co-authored-by: Joseph T. McQuigg <[email protected]>
2025-01-27 20:25:22 -08:00
Jonathing 15c989bd77 Fix incorrect method reference in TntBlock.explode() (#10332) 2025-01-27 20:24:53 -08:00
Jonathing b022b84756 Fix issue with shields being disabled by an attacker (#10322) 2025-01-27 20:24:44 -08:00
Jonathing 5122b0bc3c Fix non-passengers being tickable without checking canUpdate() (#10305) 2025-01-22 13:54:20 -08:00
Jonathing 9b47c8647f Fix finalizeSpawn's return value not being used correctly (#10308) 2025-01-22 13:54:12 -08:00
Jonathing 5f47cf52fa Bump CoreMods to 5.2.4 (#10270) 2024-12-23 20:40:36 -08:00
Jonathing 550925b9c9 Allow mipmap lowering to be disabled (#10251) 2024-12-23 20:40:21 -08:00
Jonathing 8448cda699 Add optional fix of use item duration, disabled by default (#10245) 2024-12-23 20:22:56 -08:00
JonathingandPaint_Ninja f2887142bd Backport some Vanilla 1.21 ResourceLocation methods (#10240)
Co-authored-by: Paint_Ninja <[email protected]>
2024-12-23 20:05:07 -08:00
JonathingandPaint_Ninja b54d77bffb Deprecate @ObjectHolder, add a couple of fast-paths (#10227)
ConditionalRecipe still uses an ObjectHolder

Co-authored-by: Paint_Ninja <[email protected]>
2024-12-23 20:04:31 -08:00
Jonathing 4a90846be3 Disable clean on TeamCity (#10259) 2024-12-23 19:48:13 -08:00
Jonathing 0b9573a91f Bump JNA to 5.12.1 (#10187) 2024-11-26 12:29:04 -08:00
Jonathing 621d3f8494 [1.19.4] Bump CoreMods to 5.2 (#10131)
Full Changelog: https://gist.github.com/Jonathing/c3ad28b2a048ac839a7baba5417ee870

The key features are:
- ES6 language support
- Thoroughly updated ASMAPI, with full documentation
- Bug fixes (some optional for backwards-compatibility)
- Partial internal code cleanup
- Request CoreMods to not apply fix for ASMAPI.findFirstInstructionBefore by default
- Updated ASM to 9.7.1
- Updated Nashorn to 15.4
2024-11-08 18:19:04 -08:00
Paint_Ninja fb7e448ff1 Remove unneeded boat patch (backport of #10061 to 1.19.4) (#10102) 2024-10-06 18:06:48 -07:00
Paint_Ninja 23db859f86 Minor cleanup to ModListScreen and VersionChecker (backport of #9988 to 1.19.4) (#10104) 2024-09-12 14:09:33 +01:00
Paint_Ninja ffcf183f3f Cleanup FML Bindings (backport of #10004 to 1.19.4) (#10101) 2024-09-12 14:09:21 +01:00
Paint_NinjaandRealMangoRage 05fc73aa8d Optionally supply FMLJavaModLoadingContext as a param to mod constructors (backport of #10074 to 1.19.4) (#10103)
Co-authored-by: RealMangoRage <[email protected]>
2024-09-12 14:09:11 +01:00
Jonathingandthedarkcolour 6d94dd5306 Choose default JarJar mod file type based on parent JAR (#10024)
Co-authored-by: thedarkcolour <[email protected]>
2024-07-02 12:23:06 -07:00
JonathingandVen bfd3ed64a4 Fixed falling block entities not rendering as moving blocks (#10006) (#10019)
Co-authored-by: Ven <[email protected]>
2024-07-02 11:45:48 -07:00
Edouard127andLexManos cc5a9a43b9 Unlock wrapped registries when firing register events. (#10034)
Co-authored-by: LexManos <[email protected]>
2024-07-02 11:26:20 -07:00
65 changed files with 1174 additions and 239 deletions

No files matched your search

+58 -38
View File
@@ -27,6 +27,7 @@ plugins {
id 'com.github.ben-manes.versions' version '0.46.0' id 'com.github.ben-manes.versions' version '0.46.0'
id 'net.minecraftforge.gradleutils' version '[2.2,2.3)' id 'net.minecraftforge.gradleutils' version '[2.2,2.3)'
id 'eclipse' id 'eclipse'
id 'idea'
id 'de.undercouch.download' version '5.4.0' id 'de.undercouch.download' version '5.4.0'
id 'net.minecraftforge.gradle.patcher' version '[6.0,6.2)' apply false id 'net.minecraftforge.gradle.patcher' version '[6.0,6.2)' apply false
id 'net.minecraftforge.gradle.mcp' version '[6.0,6.2)' apply false id 'net.minecraftforge.gradle.mcp' version '[6.0,6.2)' apply false
@@ -50,12 +51,12 @@ ext {
MCP_VERSION = '20230314.122934' MCP_VERSION = '20230314.122934'
SPI_VERSION = '6.0.0' SPI_VERSION = '6.0.0'
ACCESSTRANSFORMERS_VERSION = '8.0.4' ACCESSTRANSFORMERS_VERSION = '8.0.4'
COREMODS_VERSION = '5.0.1' COREMODS_VERSION = '5.2.4'
EVENTBUS_VERSION = '6.0.3' EVENTBUS_VERSION = '6.0.3'
MODLAUNCHER_VERSION = '10.0.8' MODLAUNCHER_VERSION = '10.0.8'
SECUREJARHANDLER_VERSION = '2.1.6' SECUREJARHANDLER_VERSION = '2.1.6'
BOOTSTRAPLAUNCHER_VERSION = '1.1.2' BOOTSTRAPLAUNCHER_VERSION = '1.1.2'
ASM_VERSION = '9.7' ASM_VERSION = '9.7.1'
INSTALLER_VERSION = '2.2.+' INSTALLER_VERSION = '2.2.+'
MIXIN_VERSION = '0.8.5' MIXIN_VERSION = '0.8.5'
TERMINALCONSOLEAPPENDER_VERSION = '1.2.0' TERMINALCONSOLEAPPENDER_VERSION = '1.2.0'
@@ -218,45 +219,47 @@ project(':mcp') {
} }
} }
project(':clean') { if (!System.env.TEAMCITY_VERSION) {
evaluationDependsOn(':mcp') project(':clean') {
apply plugin: 'net.minecraftforge.gradle.patcher' evaluationDependsOn(':mcp')
tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything apply plugin: 'net.minecraftforge.gradle.patcher'
tasks.withType(AbstractPublishToMaven.class).forEach{tsk -> tsk.enabled = false } // We don't want to publish anything
dependencies { dependencies {
implementation 'net.minecraftforge:forgespi:' + SPI_VERSION implementation 'net.minecraftforge:forgespi:' + SPI_VERSION
} }
patcher { patcher {
parent = project(':mcp') parent = project(':mcp')
mcVersion = MC_VERSION mcVersion = MC_VERSION
patchedSrc = file('src/main/java') patchedSrc = file('src/main/java')
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
runs { runs {
clean_client { clean_client {
client true client true
taskName 'clean_client' taskName 'clean_client'
ideaModule "${rootProject.name}.${project.name}.main" ideaModule "${rootProject.name}.${project.name}.main"
main 'net.minecraft.client.main.Main' main 'net.minecraft.client.main.Main'
workingDirectory project.file('run') workingDirectory project.file('run')
args '--gameDir', '.' args '--gameDir', '.'
args '--version', MC_VERSION args '--version', MC_VERSION
args '--assetsDir', downloadAssets.output args '--assetsDir', downloadAssets.output
args '--assetIndex', '{asset_index}' args '--assetIndex', '{asset_index}'
args '--accessToken', '0' args '--accessToken', '0'
} }
clean_server { clean_server {
client false client false
taskName 'clean_server' taskName 'clean_server'
ideaModule "${rootProject.name}.${project.name}.main" ideaModule "${rootProject.name}.${project.name}.main"
main 'net.minecraft.server.Main' main 'net.minecraft.server.Main'
workingDirectory project.file('run') workingDirectory project.file('run')
}
} }
} }
} }
@@ -293,9 +296,11 @@ def sharedDeps = {
installer "org.jline:jline-reader:${JLINE_VERSION}" // Dep of TerminalConsoleAppender installer "org.jline:jline-reader:${JLINE_VERSION}" // Dep of TerminalConsoleAppender
installer "org.jline:jline-terminal:${JLINE_VERSION}" // Dep of TerminalConsoleAppender installer "org.jline:jline-terminal:${JLINE_VERSION}" // Dep of TerminalConsoleAppender
installer "org.spongepowered:mixin:${MIXIN_VERSION}" installer "org.spongepowered:mixin:${MIXIN_VERSION}"
installer 'org.openjdk.nashorn:nashorn-core:15.3' installer 'org.openjdk.nashorn:nashorn-core:15.4'
installer "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}" installer "net.minecraftforge:JarJarSelector:${JARJAR_VERSION}"
installer "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}" installer "net.minecraftforge:JarJarMetadata:${JARJAR_VERSION}"
installer 'net.java.dev.jna:jna:5.12.1'
installer 'net.java.dev.jna:jna-platform:5.12.1'
/* /*
installer 'org.lwjgl:lwjgl:3.2.2' installer 'org.lwjgl:lwjgl:3.2.2'
@@ -454,7 +459,7 @@ def sharedFmlonlyForge = { Project prj ->
// SecureJarHandler bootstrap values. // SecureJarHandler bootstrap values.
run.property 'ignoreList', prj.configurations.moduleonly.files.collect {it.name.replaceAll(/([-_]([.\d]*\d+)|\.jar$)/, '') }.join(',') + ",client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,${prj.name}-" run.property 'ignoreList', prj.configurations.moduleonly.files.collect {it.name.replaceAll(/([-_]([.\d]*\d+)|\.jar$)/, '') }.join(',') + ",client-extra,fmlcore,javafmllanguage,lowcodelanguage,mclanguage,${prj.name}-"
// FIXME: Without this jna doesn't work at runtime. Someone figure out why please? // FIXME: Without this jna doesn't work at runtime. Someone figure out why please?
run.property 'mergeModules', 'jna-5.10.0.jar,jna-platform-5.10.0.jar' run.property 'mergeModules', 'jna-5.12.1.jar,jna-platform-5.12.1.jar'
if (userdevRuns.contains(run)) { if (userdevRuns.contains(run)) {
run.property 'legacyClassPath.file', '{minecraft_classpath_file}' run.property 'legacyClassPath.file', '{minecraft_classpath_file}'
run.jvmArgs '-p', '{modules}' run.jvmArgs '-p', '{modules}'
@@ -880,7 +885,7 @@ project(':fmlonly') {
} }
project(':forge') { project(':forge') {
evaluationDependsOn(':clean') evaluationDependsOn(System.env.TEAMCITY_VERSION ? ':mcp' : ':clean')
apply plugin: 'java-library' apply plugin: 'java-library'
apply plugin: 'net.minecraftforge.gradle.patcher' apply plugin: 'net.minecraftforge.gradle.patcher'
apply plugin: 'org.cadixdev.licenser' apply plugin: 'org.cadixdev.licenser'
@@ -958,13 +963,19 @@ project(':forge') {
patcher { patcher {
excs.from file("$rootDir/src/main/resources/forge.exc") excs.from file("$rootDir/src/main/resources/forge.exc")
parent = project(':clean') parent = project(System.env.TEAMCITY_VERSION ? ':mcp' : ':clean')
patches = file("$rootDir/patches/minecraft") patches = file("$rootDir/patches/minecraft")
patchedSrc = file('src/main/java') patchedSrc = file('src/main/java')
srgPatches = true srgPatches = true
accessTransformers.from file("$rootDir/src/main/resources/META-INF/accesstransformer.cfg") accessTransformers.from file("$rootDir/src/main/resources/META-INF/accesstransformer.cfg")
sideAnnotationStrippers.from file("$rootDir/src/main/resources/forge.sas") sideAnnotationStrippers.from file("$rootDir/src/main/resources/forge.sas")
// the clean project provides these. if we're not using it, we need to provide them ourselves
if (System.env.TEAMCITY_VERSION) {
mappings channel: MAPPING_CHANNEL, version: MAPPING_VERSION
mcVersion = MC_VERSION
}
runs { runs {
forge_client { forge_client {
property 'eventbus.checkTypesOnDispatch', 'true' property 'eventbus.checkTypesOnDispatch', 'true'
@@ -1781,7 +1792,8 @@ project(':forge') {
//evaluationDependsOnChildren() //evaluationDependsOnChildren()
task setup() { //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above task setup() { //These must be strings so that we can do lazy resolution. Else we need evaluationDependsOnChildren above
dependsOn ':clean:extractMapped' if (!System.env.TEAMCITY_VERSION)
dependsOn ':clean:extractMapped'
if (symlinkValid) if (symlinkValid)
dependsOn ':fmlonly:extractMapped' dependsOn ':fmlonly:extractMapped'
dependsOn ':forge:extractMapped' dependsOn ':forge:extractMapped'
@@ -1798,3 +1810,11 @@ if (System.env.TEAMCITY_VERSION) {
} }
} }
} }
idea {
module {
// IntelliJ IDEA does not do this by itself anymore...
downloadJavadoc = true
downloadSources = true
}
}
+23 -5
View File
@@ -8,11 +8,9 @@ MinecraftForge
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.4 | Legacy |
| 1.19.2 | Legacy |
* [Download] * [Download]
* [Forum] * [Forum]
@@ -32,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].
@@ -64,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/
@@ -5,36 +5,36 @@
package net.minecraftforge.fml; package net.minecraftforge.fml;
import cpw.mods.modlauncher.util.ServiceLoaderUtils;
import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.config.IConfigEvent; import net.minecraftforge.fml.config.IConfigEvent;
import net.minecraftforge.fml.loading.FMLLoader; import net.minecraftforge.fml.loading.FMLLoader;
import java.util.ServiceConfigurationError;
import java.util.ServiceLoader; import java.util.ServiceLoader;
import java.util.function.Supplier; import java.util.function.Supplier;
public class Bindings { public class Bindings {
private static final Bindings INSTANCE = new Bindings(); private Bindings() {}
private final IBindingsProvider provider; /**
* The provider of the bindings
private Bindings() { * @implNote May also throw a {@link ServiceConfigurationError}
final var providers = ServiceLoaderUtils.streamServiceLoader(()->ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class), sce->{}).toList(); */
if (providers.size() != 1) { private static final IBindingsProvider PROVIDER = ServiceLoader.load(FMLLoader.getGameLayer(), IBindingsProvider.class)
throw new IllegalStateException("Could not find bindings provider"); .findFirst().orElseThrow(() -> new IllegalStateException("Could not find bindings provider"));
}
this.provider = providers.get(0);
}
/**
* @return A supplier of net.minecraftforge.common.MinecraftForge#EVENT_BUS
*/
public static Supplier<IEventBus> getForgeBus() { public static Supplier<IEventBus> getForgeBus() {
return INSTANCE.provider.getForgeBusSupplier(); return PROVIDER.getForgeBusSupplier();
} }
public static Supplier<I18NParser> getMessageParser() { public static Supplier<I18NParser> getMessageParser() {
return INSTANCE.provider.getMessageParser(); return PROVIDER.getMessageParser();
} }
public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() { public static Supplier<IConfigEvent.ConfigConfig> getConfigConfiguration() {
return INSTANCE.provider.getConfigConfiguration(); return PROVIDER.getConfigConfiguration();
} }
} }
@@ -9,6 +9,7 @@ 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.moddiscovery.ModFileInfo;
import net.minecraftforge.forgespi.language.IModInfo; import net.minecraftforge.forgespi.language.IModInfo;
import java.util.EnumMap; import java.util.EnumMap;
@@ -58,7 +59,8 @@ public abstract class ModContainer
this.modInfo = info; this.modInfo = info;
this.modLoadingStage = ModLoadingStage.CONSTRUCT; this.modLoadingStage = ModLoadingStage.CONSTRUCT;
final String displayTestString = info.getConfig().<String>getConfigElement("displayTest").orElse("MATCH_VERSION"); // missing defaults to DEFAULT type final String displayTestString = info.getConfig().<String>getConfigElement("displayTest")
.orElseGet(() -> (Boolean) info.getOwningFile().getFileProperties().getOrDefault(ModFileInfo.CLIENT_SIDE_ONLY_PROP, Boolean.FALSE) ? "IGNORE_ALL_VERSION" : "MATCH_VERSION");
Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) { Supplier<IExtensionPoint.DisplayTest> displayTestSupplier = switch (displayTestString) {
case "MATCH_VERSION" -> // default displaytest checks for version string match case "MATCH_VERSION" -> // default displaytest checks for version string match
() -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(), () -> new IExtensionPoint.DisplayTest(() -> this.modInfo.getVersion().toString(),
@@ -8,9 +8,7 @@ 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;
@@ -19,28 +17,45 @@ 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 Object languageExtension; private Object languageExtension;
private ModLoadingStage stage; private ModLoadingStage stage;
/**
* @deprecated Use the context provided by your language loader in your mod's constructor.
*/
@Deprecated(forRemoval = true, since = "1.21.1")
public static ModLoadingContext get() { public static ModLoadingContext get() {
return context.get(); return context.get();
} }
private ModContainer activeContainer; /**
* @deprecated Going to be moved to ForgeHooks for internal use.
*/
@Deprecated(forRemoval = true, since = "1.21.1")
public void setActiveContainer(final ModContainer container) { public void setActiveContainer(final ModContainer container) {
this.activeContainer = container; this.activeContainer = container;
this.languageExtension = container == null ? null : container.contextExtension.get(); this.languageExtension = container == null ? null : container.contextExtension.get();
} }
/**
* Going to be moved to ForgeHooks for internal use.
* @deprecated Override/Use {@link ModLoadingContext#getContainer()}
*/
@Deprecated(forRemoval = true, since = "1.21.1")
public ModContainer getActiveContainer() { public ModContainer getActiveContainer() {
return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer; return activeContainer == null ? ModList.get().getModContainerById("minecraft").orElseThrow(()->new RuntimeException("Where is minecraft???!")) : activeContainer;
} }
@Deprecated(forRemoval = true, since = "1.21.1")
public String getActiveNamespace() { public String getActiveNamespace() {
return activeContainer == null ? "minecraft" : activeContainer.getNamespace(); return activeContainer == null ? "minecraft" : activeContainer.getNamespace();
} }
public ModContainer getContainer() {
return getActiveContainer();
}
/** /**
* Register an {@link IExtensionPoint} with the mod container. * Register an {@link IExtensionPoint} with the mod container.
* @param point The extension point to register * @param point The extension point to register
@@ -48,7 +63,7 @@ public class ModLoadingContext
* @param <T> The type signature of the extension operator * @param <T> The type signature of the extension operator
*/ */
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) {
getActiveContainer().registerExtensionPoint(point, extension); getContainer().registerExtensionPoint(point, extension);
} }
/** /**
@@ -57,7 +72,7 @@ public class ModLoadingContext
* @param displayTest The {@link IExtensionPoint.DisplayTest} to register * @param displayTest The {@link IExtensionPoint.DisplayTest} to register
*/ */
public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) { public void registerDisplayTest(IExtensionPoint.DisplayTest displayTest) {
getActiveContainer().registerDisplayTest(() -> displayTest); getContainer().registerDisplayTest(() -> displayTest);
} }
/** /**
@@ -66,7 +81,7 @@ public class ModLoadingContext
* @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register * @param displayTest The {@link Supplier<IExtensionPoint.DisplayTest>} to register
*/ */
public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) { public void registerDisplayTest(Supplier<IExtensionPoint.DisplayTest> displayTest) {
getActiveContainer().registerDisplayTest(displayTest); getContainer().registerDisplayTest(displayTest);
} }
/** /**
@@ -76,7 +91,7 @@ public class ModLoadingContext
* @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate) * @see IExtensionPoint.DisplayTest#DisplayTest(String, BiPredicate)
*/ */
public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) { public void registerDisplayTest(String version, BiPredicate<String, Boolean> remoteVersionTest) {
getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest)); getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(version, remoteVersionTest));
} }
/** /**
@@ -86,29 +101,29 @@ public class ModLoadingContext
* @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate) * @see IExtensionPoint.DisplayTest#DisplayTest(Supplier, BiPredicate)
*/ */
public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) { public void registerDisplayTest(Supplier<String> suppliedVersion, BiPredicate<String, Boolean> remoteVersionTest) {
getActiveContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest)); getContainer().registerDisplayTest(new IExtensionPoint.DisplayTest(suppliedVersion, remoteVersionTest));
} }
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) { public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec) {
if (spec.isEmpty()) if (spec.isEmpty())
{ {
// This handles the case where a mod tries to register a config, without any options configured inside it. // This handles the case where a mod tries to register a config, without any options configured inside it.
LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getActiveContainer().getModId()); LOGGER.debug("Attempted to register an empty config for type {} on mod {}", type, getContainer().getModId());
return; return;
} }
getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer())); getContainer().addConfig(new ModConfig(type, spec, getContainer()));
} }
public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) { public void registerConfig(ModConfig.Type type, IConfigSpec<?> spec, String fileName) {
if (spec.isEmpty()) if (spec.isEmpty())
{ {
// This handles the case where a mod tries to register a config, without any options configured inside it. // This handles the case where a mod tries to register a config, without any options configured inside it.
LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getActiveContainer().getModId(), fileName); LOGGER.debug("Attempted to register an empty config for type {} on mod {} using file name {}", type, getContainer().getModId(), fileName);
return; return;
} }
getActiveContainer().addConfig(new ModConfig(type, spec, getActiveContainer(), fileName)); getContainer().addConfig(new ModConfig(type, spec, getContainer(), fileName));
} }
@@ -51,8 +51,8 @@ public class VersionChecker
BETA(), BETA(),
BETA_OUTDATED(6, true); BETA_OUTDATED(6, true);
final int sheetOffset; private final int sheetOffset;
final boolean draw, animated; private final boolean draw, animated;
Status() Status()
{ {
@@ -91,6 +91,9 @@ public class VersionChecker
return animated; return animated;
} }
public boolean isOutdated() {
return this == OUTDATED || this == BETA_OUTDATED;
}
} }
public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {} public record CheckResult(VersionChecker.Status status, ComparableVersion target, Map<ComparableVersion, String> changes, String url) {}
@@ -257,7 +260,7 @@ public class VersionChecker
LOGGER.warn("Failed to process update information", e); LOGGER.warn("Failed to process update information", e);
status = FAILED; status = FAILED;
} }
results.put(mod, new CheckResult(status, target, changes, display_url)); RESULTS.put(mod, new CheckResult(status, target, changes, display_url));
} }
}.start(); }.start();
} }
@@ -273,12 +276,12 @@ public class VersionChecker
return ret; return ret;
} }
private static Map<IModInfo, CheckResult> results = new ConcurrentHashMap<>(); private static final Map<IModInfo, CheckResult> RESULTS = new ConcurrentHashMap<>();
private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null); private static final CheckResult PENDING_CHECK = new CheckResult(PENDING, null, null, null);
public static CheckResult getResult(IModInfo mod) public static CheckResult getResult(IModInfo mod)
{ {
return results.getOrDefault(mod, PENDING_CHECK); return RESULTS.getOrDefault(mod, PENDING_CHECK);
} }
} }
@@ -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,7 +36,11 @@ 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.toMap(VanillaObjectHolderData::holderClass, Function.identity())); ).collect(Collectors.toMap(VanillaObjectHolderData::holderClass, Function.identity()));
private final String OBJECT_HOLDER = "Lnet/minecraftforge/registries/ObjectHolder;"; //Don't directly reference this to prevent class loading. 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 int PUBLIC_STATIC_FINAL_FLAGS = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
@Override @Override
public String name() { public String name() {
@@ -46,13 +51,30 @@ 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")
&& !internalName.equals("net/minecraftforge/common/crafting/ConditionalRecipe"))
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 boolean hasHolder(List<AnnotationNode> lst) private boolean hasHolder(List<AnnotationNode> lst) {
{
return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER)); return lst != null && lst.stream().anyMatch(n -> n.desc.equals(OBJECT_HOLDER));
} }
@@ -75,10 +97,9 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
{ {
final AtomicBoolean changes = new AtomicBoolean(); final AtomicBoolean changes = new AtomicBoolean();
//Must be public static finals, and non-array objects //Must be public static finals, and non-array objects
final int flags = Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL;
//Fix Annotated Fields before injecting from class level //Fix Annotated Fields before injecting from class level
classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f -> classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L") && hasHolder(f.visibleAnnotations)).forEach(f ->
{ {
int prev = f.access; int prev = f.access;
f.access &= ~Opcodes.ACC_FINAL; //Strip final f.access &= ~Opcodes.ACC_FINAL; //Strip final
@@ -88,7 +109,7 @@ public class ObjectHolderDefinalize implements ILaunchPluginService {
if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them! if (VANILLA_OBJECT_HOLDERS.containsKey(classType.getClassName())) //Class level, de-finalize all fields and add @ObjectHolder to them!
{ {
classNode.fields.stream().filter(f -> ((f.access & flags) == flags) && f.desc.startsWith("L")).forEach(f -> classNode.fields.stream().filter(f -> ((f.access & PUBLIC_STATIC_FINAL_FLAGS) == PUBLIC_STATIC_FINAL_FLAGS) && f.desc.startsWith("L")).forEach(f ->
{ {
int prev = f.access; int prev = f.access;
f.access &= ~Opcodes.ACC_FINAL; f.access &= ~Opcodes.ACC_FINAL;
@@ -66,6 +66,9 @@ public class FMLLoader
throw new IncompatibleEnvironmentException("Incompatible modlauncher found "+modLauncherPackage.getSpecificationVersion()); throw new IncompatibleEnvironmentException("Incompatible modlauncher found "+modLauncherPackage.getSpecificationVersion());
} }
// Allows us to communicate properties with other services through ModLauncher
setupBlackboardKeys();
accessTransformer = (AccessTransformerService) environment.findLaunchPlugin("accesstransformer").orElseThrow(()-> { accessTransformer = (AccessTransformerService) environment.findLaunchPlugin("accesstransformer").orElseThrow(()-> {
LOGGER.error(CORE, "Access Transformer library is missing, we need this to run"); LOGGER.error(CORE, "Access Transformer library is missing, we need this to run");
return new IncompatibleEnvironmentException("Missing AccessTransformer, cannot run"); return new IncompatibleEnvironmentException("Missing AccessTransformer, cannot run");
@@ -127,6 +130,12 @@ public class FMLLoader
} }
} }
private static void setupBlackboardKeys() {
LOGGER.debug(CORE, "Requesting CoreMods to not apply the fix for ASMAPI.findFirstInstructionBefore by default");
var blackboardKey = TypesafeMap.Key.getOrCreate(Launcher.INSTANCE.blackboard(), "coremods.use_old_findFirstInstructionBefore", Boolean.class);
Launcher.INSTANCE.blackboard().<Boolean>computeIfAbsent(blackboardKey, k -> true);
}
static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments) static void setupLaunchHandler(final IEnvironment environment, final Map<String, Object> arguments)
{ {
final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING"); final String launchTarget = environment.getProperty(IEnvironment.Keys.LAUNCHTARGET.get()).orElse("MISSING");
@@ -34,6 +34,11 @@ public abstract class AbstractModProvider implements IModProvider
protected static final String MANIFEST = "META-INF/MANIFEST.MF"; protected static final String MANIFEST = "META-INF/MANIFEST.MF";
protected IModLocator.ModFileOrException createMod(Path... path) { protected IModLocator.ModFileOrException createMod(Path... path) {
return this.createMod(getDefaultJarModType(), path);
}
// FORGE: Backporting artifact, the defaultType must be the first parameter since path is varargs
protected IModLocator.ModFileOrException createMod(String defaultType, Path... path) {
var mjm = new ModJarMetadata(); var mjm = new ModJarMetadata();
var sj = SecureJar.from( var sj = SecureJar.from(
Manifest::new, Manifest::new,
@@ -45,7 +50,7 @@ public abstract class AbstractModProvider implements IModProvider
IModFile mod; IModFile mod;
var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE); var type = sj.moduleDataProvider().getManifest().getMainAttributes().getValue(ModFile.TYPE);
if (type == null) { if (type == null) {
type = getDefaultJarModType(); type = defaultType;
} }
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);
@@ -81,7 +81,14 @@ public class JarInJarDependencyLocator extends AbstractJarFileDependencyLocator
final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile); final Map<String, ?> outerFsArgs = ImmutableMap.of("packagePath", pathInModFile);
final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs); final FileSystem zipFS = FileSystems.newFileSystem(filePathUri, outerFsArgs);
final Path pathInFS = zipFS.getPath("/"); final Path pathInFS = zipFS.getPath("/");
return Optional.of(createMod(pathInFS).file()); final IModFile.Type parentType = file.getType();
final String modType;
if (parentType == IModFile.Type.LIBRARY || parentType == IModFile.Type.LANGPROVIDER) {
modType = IModFile.Type.LIBRARY.name();
} else {
modType = IModFile.Type.GAMELIBRARY.name();
}
return Optional.of(createMod(modType, pathInFS).file());
} }
catch (Exception e) catch (Exception e)
{ {
@@ -12,6 +12,7 @@ import cpw.mods.modlauncher.Launcher;
import cpw.mods.modlauncher.api.IModuleLayerManager; import cpw.mods.modlauncher.api.IModuleLayerManager;
import cpw.mods.modlauncher.util.ServiceLoaderUtils; import cpw.mods.modlauncher.util.ServiceLoaderUtils;
import net.minecraftforge.fml.loading.EarlyLoadingException; import net.minecraftforge.fml.loading.EarlyLoadingException;
import net.minecraftforge.fml.loading.FMLLoader;
import net.minecraftforge.fml.loading.LogMarkers; import net.minecraftforge.fml.loading.LogMarkers;
import net.minecraftforge.fml.loading.UniqueModListBuilder; import net.minecraftforge.fml.loading.UniqueModListBuilder;
import net.minecraftforge.fml.loading.progress.StartupMessageManager; import net.minecraftforge.fml.loading.progress.StartupMessageManager;
@@ -20,6 +21,7 @@ import net.minecraftforge.forgespi.language.IModFileInfo;
import net.minecraftforge.forgespi.locating.IDependencyLocator; import net.minecraftforge.forgespi.locating.IDependencyLocator;
import net.minecraftforge.forgespi.locating.IModFile; import net.minecraftforge.forgespi.locating.IModFile;
import net.minecraftforge.forgespi.locating.IModLocator; import net.minecraftforge.forgespi.locating.IModLocator;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger; import org.slf4j.Logger;
import java.util.ArrayList; import java.util.ArrayList;
@@ -67,6 +69,7 @@ public class ModDiscoverer {
boolean successfullyLoadedMods = true; boolean successfullyLoadedMods = true;
List<IModFileInfo> brokenFiles = new ArrayList<>(); List<IModFileInfo> brokenFiles = new ArrayList<>();
boolean distIsDedicatedServer = FMLLoader.getDist().isDedicatedServer();
//Loop all mod locators to get the prime mods to load from. //Loop all mod locators to get the prime mods to load from.
for (IModLocator locator : modLocatorList) { for (IModLocator locator : modLocatorList) {
try { try {
@@ -84,8 +87,24 @@ public class ModDiscoverer {
if (!badModFiles.isEmpty()) { if (!badModFiles.isEmpty()) {
LOGGER.error(LogMarkers.SCAN, "Locator {} returned {} files which is are not ModFile instances! They will be skipped!", locator, badModFiles.size()); LOGGER.error(LogMarkers.SCAN, "Locator {} returned {} files which is are not ModFile instances! They will be skipped!", locator, badModFiles.size());
brokenFiles.addAll(badModFiles.stream().map(IModFile::getModFileInfo).toList()); brokenFiles.addAll(badModFiles.stream().map(IModFile::getModFileInfo).toList());
locatedFiles.removeAll(badModFiles);
} }
locatedFiles.removeAll(badModFiles);
if (distIsDedicatedServer) {
var clientOnlyModFiles = locatedFiles.stream()
.filter(file -> {
// some mod files can have null infos, like javafml, mclanguage, lowcode, and fmlcore
@Nullable var info = file.getModFileInfo();
return info != null && (Boolean) info.getFileProperties().getOrDefault(ModFileInfo.CLIENT_SIDE_ONLY_PROP, Boolean.FALSE);
})
.toList();
if (!clientOnlyModFiles.isEmpty()) {
LOGGER.warn(LogMarkers.SCAN, "Locator {} returned {} files which are client-side-only mods, but we're on a dedicated server. They will be skipped!", locator, clientOnlyModFiles.size());
locatedFiles.removeAll(clientOnlyModFiles);
}
}
LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} valid mod files", locator, locatedFiles.size()); LOGGER.debug(LogMarkers.SCAN, "Locator {} found {} valid mod files", locator, locatedFiles.size());
handleLocatedFiles(loadedFiles, locatedFiles); handleLocatedFiles(loadedFiles, locatedFiles);
} catch (InvalidModFileException imfe) { } catch (InvalidModFileException imfe) {
@@ -43,6 +43,10 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
private final String license; private final String license;
private final List<String> usesServices; private final List<String> usesServices;
public static final String CLIENT_SIDE_ONLY_PROP = "__FORGE_clientSideOnly";
private static final Map<String, Object> CLIENT_SIDE_ONLY_MAP = Map.of(CLIENT_SIDE_ONLY_PROP, Boolean.TRUE);
ModFileInfo(final ModFile modFile, final IConfigurable config) ModFileInfo(final ModFile modFile, final IConfigurable config)
{ {
this.modFile = modFile; this.modFile = modFile;
@@ -56,8 +60,21 @@ public class ModFileInfo implements IModFileInfo, IConfigurable
this.license = config.<String>getConfigElement("license") this.license = config.<String>getConfigElement("license")
.orElse(""); .orElse("");
this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack").orElse(false); this.showAsResourcePack = config.<Boolean>getConfigElement("showAsResourcePack").orElse(false);
boolean clientSideOnly = config.<Boolean>getConfigElement("clientSideOnly").orElse(false);
this.usesServices = config.<List<String>>getConfigElement("services").orElse(List.of()); this.usesServices = config.<List<String>>getConfigElement("services").orElse(List.of());
this.properties = config.<Map<String, Object>>getConfigElement("properties").orElse(Collections.emptyMap());
var maybeProps = config.<Map<String, Object>>getConfigElement("properties");
if (clientSideOnly) {
if (maybeProps.isPresent()) {
this.properties = new HashMap<>(maybeProps.get());
this.properties.put(CLIENT_SIDE_ONLY_PROP, Boolean.TRUE);
} else {
this.properties = CLIENT_SIDE_ONLY_MAP;
}
} else {
this.properties = maybeProps.orElse(Collections.emptyMap());
}
this.modFile.setFileProperties(this.properties); this.modFile.setFileProperties(this.properties);
this.issueURL = config.<String>getConfigElement("issueTrackerURL").map(StringUtils::toURL).orElse(null); this.issueURL = config.<String>getConfigElement("issueTrackerURL").map(StringUtils::toURL).orElse(null);
final List<? extends IConfigurable> modConfigs = config.getConfigList("mods"); final List<? extends IConfigurable> modConfigs = config.getConfigList("mods");
@@ -45,7 +45,7 @@ public class Scanner {
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
@@ -8,7 +8,7 @@ package net.minecraftforge.fml.javafmlmod;
import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.ModLoadingContext;
public class FMLJavaModLoadingContext public class FMLJavaModLoadingContext extends ModLoadingContext
{ {
private final FMLModContainer container; private final FMLModContainer container;
@@ -24,11 +24,18 @@ public class FMLJavaModLoadingContext
return container.getEventBus(); return container.getEventBus();
} }
@Override
public FMLModContainer getContainer() {
return container;
}
/** /**
* Helper to get the right instance from the {@link ModLoadingContext} correctly. * Helper to get the right instance from the {@link ModLoadingContext} correctly.
* @return The FMLJavaMod language specific extension from the ModLoadingContext * @return The FMLJavaMod language specific extension from the ModLoadingContext
*
* @deprecated use {@link FMLJavaModLoadingContext} in your mod constructor
*/ */
@Deprecated(forRemoval = true, since = "1.21.1")
public static FMLJavaModLoadingContext get() { public static FMLJavaModLoadingContext get() {
return ModLoadingContext.get().extension(); return ModLoadingContext.get().extension();
} }
@@ -21,6 +21,7 @@ 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 java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.util.Objects; import java.util.Objects;
import java.util.Optional; import java.util.Optional;
@@ -33,6 +34,7 @@ public class FMLModContainer extends ModContainer
private final IEventBus eventBus; private final IEventBus eventBus;
private Object modInstance; private Object modInstance;
private final Class<?> modClass; private final Class<?> modClass;
private final FMLJavaModLoadingContext context = new FMLJavaModLoadingContext(this);
public FMLModContainer(IModInfo info, String className, ModFileScanData modFileScanResults, ModuleLayer gameLayer) public FMLModContainer(IModInfo info, String className, ModFileScanData modFileScanResults, ModuleLayer gameLayer)
{ {
@@ -42,8 +44,7 @@ public class FMLModContainer extends ModContainer
activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod); activityMap.put(ModLoadingStage.CONSTRUCT, this::constructMod);
this.eventBus = BusBuilder.builder().setExceptionHandler(this::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build(); this.eventBus = BusBuilder.builder().setExceptionHandler(this::onEventFailed).setTrackPhases(false).markerType(IModBusEvent.class).useModLauncher().build();
this.configHandler = Optional.of(ce->this.eventBus.post(ce.self())); this.configHandler = Optional.of(ce->this.eventBus.post(ce.self()));
final FMLJavaModLoadingContext contextExtension = new FMLJavaModLoadingContext(this); this.contextExtension = () -> context;
this.contextExtension = () -> contextExtension;
try try
{ {
var layer = gameLayer.findModule(info.getOwningFile().moduleName()).orElseThrow(); var layer = gameLayer.findModule(info.getOwningFile().moduleName()).orElseThrow();
@@ -67,7 +68,13 @@ public class FMLModContainer extends ModContainer
try try
{ {
LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName()); LOGGER.trace(LOADING, "Loading mod instance {} of type {}", getModId(), modClass.getName());
this.modInstance = modClass.getDeclaredConstructor().newInstance(); Constructor<?> constructor;
try {
constructor = modClass.getDeclaredConstructor(context.getClass());
} catch (NoSuchMethodException | SecurityException exception) {
constructor = modClass.getDeclaredConstructor();
}
this.modInstance = constructor.getParameterCount() == 0 ? constructor.newInstance() : constructor.newInstance(context);
LOGGER.trace(LOADING, "Loaded mod instance {} of type {}", getModId(), modClass.getName()); LOGGER.trace(LOADING, "Loaded mod instance {} of type {}", getModId(), modClass.getName());
} }
catch (Throwable e) catch (Throwable e)
@@ -15,7 +15,6 @@ import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.event.server.ServerStartingEvent; import net.minecraftforge.event.server.ServerStartingEvent;
import net.minecraftforge.eventbus.api.IEventBus; import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ModLoadingContext;
import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.config.ModConfig; import net.minecraftforge.fml.config.ModConfig;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -44,9 +43,9 @@ public class ExampleMod
// Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path // Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path
public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties())); public static final RegistryObject<Item> EXAMPLE_BLOCK_ITEM = ITEMS.register("example_block", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties()));
public ExampleMod() public ExampleMod(FMLJavaModLoadingContext context)
{ {
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); IEventBus modEventBus = context.getModEventBus();
// Register the commonSetup method for modloading // Register the commonSetup method for modloading
modEventBus.addListener(this::commonSetup); modEventBus.addListener(this::commonSetup);
@@ -63,7 +62,7 @@ public class ExampleMod
modEventBus.addListener(this::addCreative); modEventBus.addListener(this::addCreative);
// Register our mod's ForgeConfigSpec so that Forge can create and load the config file for us // Register our mod's ForgeConfigSpec so that Forge can create and load the config file for us
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, Config.SPEC); context.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
} }
private void commonSetup(final FMLCommonSetupEvent event) private void commonSetup(final FMLCommonSetupEvent event)
+4 -1
View File
@@ -12,6 +12,9 @@ loaderVersion="${loader_version_range}" #mandatory This is typically bumped ever
license="${mod_license}" license="${mod_license}"
# A URL to refer people to when problems occur with this mod # A URL to refer people to when problems occur with this mod
#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional #issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional
# If your mod is purely client-side and has no multiplayer functionality (be it dedicated servers or Open to LAN),
# set this to true, and Forge will set the correct displayTest for you and skip loading your mod on dedicated servers.
#clientSideOnly=true #optional - defaults to false if absent
# A list of mods - how many allowed here is determined by the individual mod loader # A list of mods - how many allowed here is determined by the individual mod loader
[[mods]] #mandatory [[mods]] #mandatory
# The modid of the mod # The modid of the mod
@@ -36,7 +39,7 @@ authors="${mod_authors}" #optional
# IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component. # IGNORE_ALL_VERSION means that your mod will not cause a red X if it's present on the client or the server. This is a special case and should only be used if your mod has no server component.
# NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value. # NONE means that no display test is set on your mod. You need to do this yourself, see IExtensionPoint.DisplayTest for more information. You can define any scheme you wish with this value.
# IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself. # IMPORTANT NOTE: this is NOT an instruction as to which environments (CLIENT or DEDICATED SERVER) your mod loads on. Your mod should load (and maybe do nothing!) whereever it finds itself.
#displayTest="MATCH_VERSION" # MATCH_VERSION is the default if nothing is specified (#optional) #displayTest="MATCH_VERSION" # if nothing is specified, MATCH_VERSION is the default when clientSideOnly=false, otherwise IGNORE_ALL_VERSION when clientSideOnly=true (#optional)
# The description text for the mod (multi line!) (#mandatory) # The description text for the mod (multi line!) (#mandatory)
description='''${mod_description}''' description='''${mod_description}'''
@@ -52,16 +52,23 @@
public static RenderType m_109279_(ItemStack p_109280_, boolean p_109281_) { public static RenderType m_109279_(ItemStack p_109280_, boolean p_109281_) {
Item item = p_109280_.m_41720_(); Item item = p_109280_.m_41720_();
if (item instanceof BlockItem) { if (item instanceof BlockItem) {
@@ -362,8 +_,73 @@ @@ -362,11 +_,79 @@
} }
public static RenderType m_109287_(FluidState p_109288_) { public static RenderType m_109287_(FluidState p_109288_) {
- RenderType rendertype = f_109276_.get(p_109288_.m_76152_()); - RenderType rendertype = f_109276_.get(p_109288_.m_76152_());
+ RenderType rendertype = FLUID_RENDER_TYPES.get(net.minecraftforge.registries.ForgeRegistries.FLUIDS.getDelegateOrThrow(p_109288_.m_76152_())); + RenderType rendertype = FLUID_RENDER_TYPES.get(net.minecraftforge.registries.ForgeRegistries.FLUIDS.getDelegateOrThrow(p_109288_.m_76152_()));
return rendertype != null ? rendertype : RenderType.m_110451_(); return rendertype != null ? rendertype : RenderType.m_110451_();
}
public static void m_109291_(boolean p_109292_) {
f_109277_ = p_109292_;
+ } + }
+ +
+ // FORGE START + /** Forge: Check if we are running in {@linkplain net.minecraft.client.Minecraft#useFancyGraphics() fancy graphics} to account for fast graphics render types */
+ public static boolean isFancy() {
+ return f_109277_;
+ }
+ +
+ private static final net.minecraftforge.client.ChunkRenderTypeSet CUTOUT_MIPPED = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110457_()); + private static final net.minecraftforge.client.ChunkRenderTypeSet CUTOUT_MIPPED = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110457_());
+ private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110451_()); + private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID = net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110451_());
@@ -79,7 +86,7 @@
+ }); + });
+ +
+ /** @deprecated Use {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)}. */ + /** @deprecated Use {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)}. */
+ @Deprecated(forRemoval = true, since = "1.19") + @Deprecated(since = "1.21.4", forRemoval = true)
+ public static net.minecraftforge.client.ChunkRenderTypeSet getRenderLayers(BlockState state) { + public static net.minecraftforge.client.ChunkRenderTypeSet getRenderLayers(BlockState state) {
+ Block block = state.m_60734_(); + Block block = state.m_60734_();
+ if (block instanceof LeavesBlock) { + if (block instanceof LeavesBlock) {
@@ -90,20 +97,20 @@
+ } + }
+ +
+ /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */ + /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
+ @Deprecated(forRemoval = true, since = "1.19") + @Deprecated(since = "1.21.4", forRemoval = true)
+ public static void setRenderLayer(Block block, RenderType type) { + public static void setRenderLayer(Block block, RenderType type) {
+ com.google.common.base.Preconditions.checkArgument(type.getChunkLayerId() >= 0, "The argument must be a valid chunk render type returned by RenderType#chunkBufferLayers()."); + com.google.common.base.Preconditions.checkArgument(type.getChunkLayerId() >= 0, "The argument must be a valid chunk render type returned by RenderType#chunkBufferLayers().");
+ setRenderLayer(block, net.minecraftforge.client.ChunkRenderTypeSet.of(type)); + setRenderLayer(block, net.minecraftforge.client.ChunkRenderTypeSet.of(type));
+ } + }
+ +
+ /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */ + /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
+ @Deprecated(forRemoval = true, since = "1.19") + @Deprecated(since = "1.21.4", forRemoval = true)
+ public static synchronized void setRenderLayer(Block block, java.util.function.Predicate<RenderType> predicate) { + public static synchronized void setRenderLayer(Block block, java.util.function.Predicate<RenderType> predicate) {
+ setRenderLayer(block, createSetFromPredicate(predicate)); + setRenderLayer(block, createSetFromPredicate(predicate));
+ } + }
+ +
+ /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */ + /** @deprecated Set your render type in your block model's JSON (eg. {@code "render_type": "cutout"}) or override {@link net.minecraft.client.resources.model.BakedModel#getRenderTypes(BlockState, net.minecraft.util.RandomSource, net.minecraftforge.client.model.data.ModelData)} */
+ @Deprecated(forRemoval = true, since = "1.19") + @Deprecated(since = "1.21.4", forRemoval = true)
+ public static synchronized void setRenderLayer(Block block, net.minecraftforge.client.ChunkRenderTypeSet layers) { + public static synchronized void setRenderLayer(Block block, net.minecraftforge.client.ChunkRenderTypeSet layers) {
+ checkClientLoading(); + checkClientLoading();
+ BLOCK_RENDER_TYPES.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), layers); + BLOCK_RENDER_TYPES.put(net.minecraftforge.registries.ForgeRegistries.BLOCKS.getDelegateOrThrow(block), layers);
@@ -125,5 +132,4 @@
+ private static net.minecraftforge.client.ChunkRenderTypeSet createSetFromPredicate(java.util.function.Predicate<RenderType> predicate) { + private static net.minecraftforge.client.ChunkRenderTypeSet createSetFromPredicate(java.util.function.Predicate<RenderType> predicate) {
+ return net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110506_().stream().filter(predicate).toArray(RenderType[]::new)); + return net.minecraftforge.client.ChunkRenderTypeSet.of(RenderType.m_110506_().stream().filter(predicate).toArray(RenderType[]::new));
} }
}
public static void m_109291_(boolean p_109292_) {
@@ -1,13 +1,15 @@
--- a/net/minecraft/client/renderer/entity/FallingBlockRenderer.java --- a/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
+++ b/net/minecraft/client/renderer/entity/FallingBlockRenderer.java +++ b/net/minecraft/client/renderer/entity/FallingBlockRenderer.java
@@ -34,7 +_,9 @@ @@ -34,7 +_,11 @@
p_114637_.m_85836_(); p_114637_.m_85836_();
BlockPos blockpos = BlockPos.m_274561_(p_114634_.m_20185_(), p_114634_.m_20191_().f_82292_, p_114634_.m_20189_()); BlockPos blockpos = BlockPos.m_274561_(p_114634_.m_20185_(), p_114634_.m_20191_().f_82292_, p_114634_.m_20189_());
p_114637_.m_85837_(-0.5D, 0.0D, -0.5D); p_114637_.m_85837_(-0.5D, 0.0D, -0.5D);
- this.f_234617_.m_110937_().m_234379_(level, this.f_234617_.m_110910_(blockstate), blockstate, blockpos, p_114637_, p_114638_.m_6299_(ItemBlockRenderTypes.m_109293_(blockstate)), false, RandomSource.m_216327_(), blockstate.m_60726_(p_114634_.m_31978_()), OverlayTexture.f_118083_); - this.f_234617_.m_110937_().m_234379_(level, this.f_234617_.m_110910_(blockstate), blockstate, blockpos, p_114637_, p_114638_.m_6299_(ItemBlockRenderTypes.m_109293_(blockstate)), false, RandomSource.m_216327_(), blockstate.m_60726_(p_114634_.m_31978_()), OverlayTexture.f_118083_);
+ var model = this.f_234617_.m_110910_(blockstate); + var model = this.f_234617_.m_110910_(blockstate);
+ for (var renderType : model.getRenderTypes(blockstate, RandomSource.m_216335_(blockstate.m_60726_(p_114634_.m_31978_())), net.minecraftforge.client.model.data.ModelData.EMPTY)) + for (var renderType : model.getRenderTypes(blockstate, RandomSource.m_216335_(blockstate.m_60726_(p_114634_.m_31978_())), net.minecraftforge.client.model.data.ModelData.EMPTY)) {
+ renderType = net.minecraftforge.client.RenderTypeHelper.getMovingBlockRenderType(renderType);
+ this.f_234617_.m_110937_().tesselateBlock(level, model, blockstate, blockpos, p_114637_, p_114638_.m_6299_(renderType), false, RandomSource.m_216327_(), blockstate.m_60726_(p_114634_.m_31978_()), OverlayTexture.f_118083_, net.minecraftforge.client.model.data.ModelData.EMPTY, renderType); + this.f_234617_.m_110937_().tesselateBlock(level, model, blockstate, blockpos, p_114637_, p_114638_.m_6299_(renderType), false, RandomSource.m_216327_(), blockstate.m_60726_(p_114634_.m_31978_()), OverlayTexture.f_118083_, net.minecraftforge.client.model.data.ModelData.EMPTY, renderType);
+ }
p_114637_.m_85849_(); p_114637_.m_85849_();
super.m_7392_(p_114634_, p_114635_, p_114636_, p_114637_, p_114638_, p_114639_); super.m_7392_(p_114634_, p_114635_, p_114636_, p_114637_, p_114638_, p_114639_);
} }
@@ -5,7 +5,7 @@
int k1 = Mth.m_14173_(j1); int k1 = Mth.m_14173_(j1);
int l1; int l1;
- if (k1 < p_261919_) { - if (k1 < p_261919_) {
+ if (false) { // Forge: Do not lower the mipmap level + if (k1 < p_261919_ && net.minecraftforge.common.ForgeConfig.CLIENT.allowMipmapLowering()) { // Forge: Do not lower the mipmap level
f_244357_.warn("{}: dropping miplevel from {} to {}, because of minimum power of two: {}", this.f_244500_, p_261919_, k1, j1); f_244357_.warn("{}: dropping miplevel from {} to {}, because of minimum power of two: {}", this.f_244500_, p_261919_, k1, j1);
l1 = k1; l1 = k1;
} else { } else {
@@ -1,39 +1,81 @@
--- a/net/minecraft/client/resources/model/SimpleBakedModel.java --- a/net/minecraft/client/resources/model/SimpleBakedModel.java
+++ b/net/minecraft/client/resources/model/SimpleBakedModel.java +++ b/net/minecraft/client/resources/model/SimpleBakedModel.java
@@ -26,8 +_,17 @@ @@ -26,8 +_,44 @@
protected final TextureAtlasSprite f_119485_; protected final TextureAtlasSprite f_119485_;
protected final ItemTransforms f_119486_; protected final ItemTransforms f_119486_;
protected final ItemOverrides f_119487_; protected final ItemOverrides f_119487_;
+ /** Forge: Block render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} */
+ protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypes; + protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypes;
+ /** Forge: Block render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} */
+ protected final net.minecraftforge.client.ChunkRenderTypeSet blockRenderTypesFast;
+ /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} */
+ protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypes; + protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypes;
+ /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics} */
+ protected final List<net.minecraft.client.renderer.RenderType> itemRenderTypesFast;
+ /** Forge: Item render types to be used with {@linkplain net.minecraft.client.GraphicsStatus#FABULOUS fabulous graphics} */
+ protected final List<net.minecraft.client.renderer.RenderType> fabulousItemRenderTypes; + protected final List<net.minecraft.client.renderer.RenderType> fabulousItemRenderTypes;
+ /** Forge: If this model's {@linkplain #blockRenderTypes block render types} are rendering cutout, to account for older leaves model JSONs */
+ protected final boolean isRenderingCutout;
+ /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/ + /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
+ @Deprecated + @Deprecated
public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_) { public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_) {
+ this(p_119489_, p_119490_, p_119491_, p_119492_, p_119493_, p_119494_, p_119495_, p_119496_, net.minecraftforge.client.RenderTypeGroup.EMPTY); + this(p_119489_, p_119490_, p_119491_, p_119492_, p_119493_, p_119494_, p_119495_, p_119496_, net.minecraftforge.client.RenderTypeGroup.EMPTY);
+ } + }
+ +
+ /** @deprecated Forge: Use {@linkplain #SimpleBakedModel(List, Map, boolean, boolean, boolean, TextureAtlasSprite, ItemTransforms, ItemOverrides, net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup for fast graphics} **/
+ @Deprecated(forRemoval = true, since = "1.21.4")
+ public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_, net.minecraftforge.client.RenderTypeGroup renderTypes) { + public SimpleBakedModel(List<BakedQuad> p_119489_, Map<Direction, List<BakedQuad>> p_119490_, boolean p_119491_, boolean p_119492_, boolean p_119493_, TextureAtlasSprite p_119494_, ItemTransforms p_119495_, ItemOverrides p_119496_, net.minecraftforge.client.RenderTypeGroup renderTypes) {
+ this(p_119489_, p_119490_, p_119491_, p_119492_, p_119493_, p_119494_, p_119495_, p_119496_, renderTypes, net.minecraftforge.client.RenderTypeGroup.EMPTY);
+ }
+
+ /** Constructor with {@link net.minecraftforge.client.RenderTypeGroup RenderTypeGroup} for fancy and fast graphics. Preferred over {@link net.minecraft.client.renderer.ItemBlockRenderTypes#setRenderLayer(net.minecraft.world.level.block.Block, net.minecraft.client.renderer.RenderType) ItemBlockRenderTypes.setRenderLayer(Block, RenderType)}. */
+ public SimpleBakedModel(
+ List<BakedQuad> p_119489_,
+ Map<Direction, List<BakedQuad>> p_119490_,
+ boolean p_119491_,
+ boolean p_119492_,
+ boolean p_119493_,
+ TextureAtlasSprite p_119494_,
+ ItemTransforms p_119495_,
+ ItemOverrides p_119496_,
+ net.minecraftforge.client.RenderTypeGroup renderTypes,
+ net.minecraftforge.client.RenderTypeGroup renderTypesFast
+ ) {
this.f_119480_ = p_119489_; this.f_119480_ = p_119489_;
this.f_119481_ = p_119490_; this.f_119481_ = p_119490_;
this.f_119482_ = p_119491_; this.f_119482_ = p_119491_;
@@ -36,6 +_,9 @@ @@ -36,6 +_,15 @@
this.f_119485_ = p_119494_; this.f_119485_ = p_119494_;
this.f_119486_ = p_119495_; this.f_119486_ = p_119495_;
this.f_119487_ = p_119496_; this.f_119487_ = p_119496_;
+ this.blockRenderTypes = !renderTypes.isEmpty() ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypes.block()) : null; +
+ this.itemRenderTypes = !renderTypes.isEmpty() ? List.of(renderTypes.entity()) : null; + boolean hasRenderTypes = renderTypes != null && !renderTypes.isEmpty();
+ this.fabulousItemRenderTypes = !renderTypes.isEmpty() ? List.of(renderTypes.entityFabulous()) : null; + boolean hasRenderTypesFast = renderTypesFast != null && !renderTypesFast.isEmpty();
+ this.blockRenderTypes = hasRenderTypes ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypes.block()) : null;
+ this.blockRenderTypesFast = hasRenderTypesFast ? net.minecraftforge.client.ChunkRenderTypeSet.of(renderTypesFast.block()) : null;
+ this.itemRenderTypes = hasRenderTypes ? List.of(renderTypes.entity()) : null;
+ this.itemRenderTypesFast = hasRenderTypesFast ? List.of(renderTypesFast.entity()) : null;
+ this.fabulousItemRenderTypes = hasRenderTypes ? List.of(renderTypes.entityFabulous()) : null;
+ this.isRenderingCutout = hasRenderTypes && (renderTypes.block() == net.minecraft.client.renderer.RenderType.m_110463_() || renderTypes.block() == net.minecraft.client.renderer.RenderType.m_110457_());
} }
public List<BakedQuad> m_213637_(@Nullable BlockState p_235054_, @Nullable Direction p_235055_, RandomSource p_235056_) { public List<BakedQuad> m_213637_(@Nullable BlockState p_235054_, @Nullable Direction p_235055_, RandomSource p_235056_) {
@@ -70,6 +_,25 @@ @@ -70,6 +_,40 @@
return this.f_119487_; return this.f_119487_;
} }
+ private static final net.minecraftforge.client.ChunkRenderTypeSet SOLID_BLOCK = net.minecraftforge.client.ChunkRenderTypeSet.of(net.minecraft.client.renderer.RenderType.m_110451_());
+ private static final List<net.minecraft.client.renderer.RenderType> SOLID_BLOCK_ITEM = List.of(net.minecraft.client.renderer.RenderType.m_110451_());
+
+ @Override + @Override
+ public net.minecraftforge.client.ChunkRenderTypeSet getRenderTypes(@org.jetbrains.annotations.NotNull BlockState state, @org.jetbrains.annotations.NotNull RandomSource rand, @org.jetbrains.annotations.NotNull net.minecraftforge.client.model.data.ModelData data) { + public net.minecraftforge.client.ChunkRenderTypeSet getRenderTypes(@org.jetbrains.annotations.NotNull BlockState state, @org.jetbrains.annotations.NotNull RandomSource rand, @org.jetbrains.annotations.NotNull net.minecraftforge.client.model.data.ModelData data) {
+ if (!net.minecraft.client.renderer.ItemBlockRenderTypes.isFancy()) {
+ if (blockRenderTypesFast != null)
+ return blockRenderTypesFast;
+ if (isRenderingCutout && state.m_60734_() instanceof net.minecraft.world.level.block.LeavesBlock)
+ return SOLID_BLOCK;
+ }
+ if (blockRenderTypes != null) + if (blockRenderTypes != null)
+ return blockRenderTypes; + return blockRenderTypes;
+ return BakedModel.super.getRenderTypes(state, rand, data); + return BakedModel.super.getRenderTypes(state, rand, data);
@@ -42,11 +84,17 @@
+ @Override + @Override
+ public List<net.minecraft.client.renderer.RenderType> getRenderTypes(net.minecraft.world.item.ItemStack itemStack, boolean fabulous) { + public List<net.minecraft.client.renderer.RenderType> getRenderTypes(net.minecraft.world.item.ItemStack itemStack, boolean fabulous) {
+ if (!fabulous) { + if (!fabulous) {
+ if (!net.minecraft.client.renderer.ItemBlockRenderTypes.isFancy()) {
+ if (itemRenderTypesFast != null)
+ return itemRenderTypesFast;
+ if (isRenderingCutout && itemStack.m_41720_() instanceof net.minecraft.world.item.BlockItem blockItem && blockItem.m_40614_() instanceof net.minecraft.world.level.block.LeavesBlock)
+ return SOLID_BLOCK_ITEM;
+ }
+ if (itemRenderTypes != null) + if (itemRenderTypes != null)
+ return itemRenderTypes; + return itemRenderTypes;
+ } else { + } else {
+ if (fabulousItemRenderTypes != null) + if (fabulousItemRenderTypes != null)
+ return fabulousItemRenderTypes; + return fabulousItemRenderTypes;
+ } + }
+ return BakedModel.super.getRenderTypes(itemStack, fabulous); + return BakedModel.super.getRenderTypes(itemStack, fabulous);
+ } + }
@@ -54,22 +102,50 @@
@OnlyIn(Dist.CLIENT) @OnlyIn(Dist.CLIENT)
public static class Builder { public static class Builder {
private final List<BakedQuad> f_119508_ = Lists.newArrayList(); private final List<BakedQuad> f_119508_ = Lists.newArrayList();
@@ -116,11 +_,17 @@ @@ -116,11 +_,45 @@
return this; return this;
} }
+ /** @deprecated Forge: Use {@linkplain #build(net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/ + /** @deprecated Forge: Use {@linkplain #build(net.minecraftforge.client.RenderTypeGroup) variant with RenderTypeGroup} **/
+ @Deprecated + @Deprecated
public BakedModel m_119533_() { public BakedModel m_119533_() {
+ return build(net.minecraftforge.client.RenderTypeGroup.EMPTY); + return build(net.minecraftforge.client.RenderTypeGroup.EMPTY, net.minecraftforge.client.RenderTypeGroup.EMPTY);
+ } + }
+ +
+ /**
+ * Builds with the render type to be used for this model, which will be used for any graphics setting.
+ * <p>
+ * If you need to set a specific render type for
+ * {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}, consider using
+ * {@link #build(net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup)
+ * renderTypes(RenderTypeGroup, RenderTypeGroup)} instead which allows choosing render types for both fancy and
+ * fast graphics.
+ *
+ * @apiNote If this model is for {@linkplain net.minecraft.world.level.block.LeavesBlock leaves} and if the
+ * given render type is either {@linkplain net.minecraft.client.renderer.RenderType#cutout() cutout} or
+ * {@linkplain net.minecraft.client.renderer.RenderType#cutoutMipped() cutout mipped}, it will be overridden
+ * with {@linkplain net.minecraft.client.renderer.RenderType#solid() solid} when fast graphics is enabled.
+ * @see #build(net.minecraftforge.client.RenderTypeGroup, net.minecraftforge.client.RenderTypeGroup)
+ * renderTypes(RenderTypeGroup, RenderTypeGroup)
+ */
+ public BakedModel build(net.minecraftforge.client.RenderTypeGroup renderTypes) { + public BakedModel build(net.minecraftforge.client.RenderTypeGroup renderTypes) {
+ return this.build(renderTypes, net.minecraftforge.client.RenderTypeGroup.EMPTY);
+ }
+
+ /**
+ * Builds with the render types to be used for this model: one for
+ * {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics} and one for
+ * {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}.
+ *
+ * @see #build(net.minecraftforge.client.RenderTypeGroup)
+ */
+ public BakedModel build(net.minecraftforge.client.RenderTypeGroup renderTypes, net.minecraftforge.client.RenderTypeGroup renderTypesFast) {
if (this.f_119512_ == null) { if (this.f_119512_ == null) {
throw new RuntimeException("Missing particle!"); throw new RuntimeException("Missing particle!");
} else { } else {
- return new SimpleBakedModel(this.f_119508_, this.f_119509_, this.f_119511_, this.f_119513_, this.f_119514_, this.f_119512_, this.f_119515_, this.f_119510_); - return new SimpleBakedModel(this.f_119508_, this.f_119509_, this.f_119511_, this.f_119513_, this.f_119514_, this.f_119512_, this.f_119515_, this.f_119510_);
+ return new SimpleBakedModel(this.f_119508_, this.f_119509_, this.f_119511_, this.f_119513_, this.f_119514_, this.f_119512_, this.f_119515_, this.f_119510_, renderTypes); + // Forge: Account for render types in model JSONs
+ return new SimpleBakedModel(this.f_119508_, this.f_119509_, this.f_119511_, this.f_119513_, this.f_119514_, this.f_119512_, this.f_119515_, this.f_119510_, renderTypes, renderTypesFast);
} }
} }
} }
@@ -1,5 +1,29 @@
--- a/net/minecraft/resources/ResourceLocation.java --- a/net/minecraft/resources/ResourceLocation.java
+++ b/net/minecraft/resources/ResourceLocation.java +++ b/net/minecraft/resources/ResourceLocation.java
@@ -34,6 +_,8 @@
this.f_135805_ = p_249394_;
}
+ /** @deprecated Forge: Consider using {@link #fromNamespaceAndPath(String, String)} instead, as Mojang made this constructor private in 1.21 */
+ @Deprecated(forRemoval = true, since = "1.20.6")
public ResourceLocation(String p_135811_, String p_135812_) {
this(m_245413_(p_135811_, p_135812_), m_245185_(p_135811_, p_135812_), (ResourceLocation.Dummy)null);
}
@@ -42,10 +_,14 @@
this(p_135814_[0], p_135814_[1]);
}
+ /** @deprecated Forge: Consider using {@link #parse(String)} instead, as Mojang made this constructor private in 1.21 */
+ @Deprecated(forRemoval = true, since = "1.20.6")
public ResourceLocation(String p_135809_) {
this(m_135832_(p_135809_, ':'));
}
+ /** @deprecated Forge: Consider using {@link #bySeparator(String, char)} instead, as Mojang removed this method in 1.21 */
+ @Deprecated(forRemoval = true, since = "1.20.6")
public static ResourceLocation m_135822_(String p_135823_, char p_135824_) {
return new ResourceLocation(m_135832_(p_135823_, p_135824_));
}
@@ -143,6 +_,12 @@ @@ -143,6 +_,12 @@
return i; return i;
} }
@@ -13,3 +37,55 @@
public String m_179910_() { public String m_179910_() {
return this.toString().replace('/', '_').replace(':', '_'); return this.toString().replace('/', '_').replace(':', '_');
} }
@@ -243,6 +_,51 @@
public JsonElement serialize(ResourceLocation p_135855_, Type p_135856_, JsonSerializationContext p_135857_) {
return new JsonPrimitive(p_135855_.toString());
+ }
+ }
+
+ /** Forge: This is a backported method from 1.21, and is the replacement for {@link #ResourceLocation(String, String)}. */
+ public static ResourceLocation fromNamespaceAndPath(String namespace, String path) {
+ return new ResourceLocation(namespace, path);
+ }
+
+ /** Forge: This is a backported method from 1.21, and is the replacement for {@link #ResourceLocation(String)}. */
+ public static ResourceLocation parse(String location) {
+ return new ResourceLocation(location);
+ }
+
+ /**
+ * Forge: This is a backported method from 1.21, and acts as an alternative to using {@link #parse(String)}. If you
+ * know for sure you are going to be using the {@linkplain #DEFAULT_NAMESPACE default namespace}
+ * ({@code "minecraft"}), use this.
+ */
+ public static ResourceLocation withDefaultNamespace(String path) {
+ return new ResourceLocation(f_179908_, m_245185_(f_179908_, path), null);
+ }
+
+ /** Forge: This is a backported method from 1.21, and is the replacement for {@link #of(String, char)}. */
+ public static ResourceLocation bySeparator(String location, char separator) {
+ return m_135822_(location, separator);
+ }
+
+ /**
+ * Forge: This is a backported method from 1.21, and is the same as {@link #bySeparator(String, char)} but returns
+ * {@code null} if a resource location cannot be created.
+ */
+ public static @Nullable ResourceLocation tryBySeparator(String location, char separator) {
+ int i = location.indexOf(separator);
+ if (i >= 0) {
+ String s = location.substring(i + 1);
+ if (!m_135841_(s)) {
+ return null;
+ } else if (i != 0) {
+ String s1 = location.substring(0, i);
+ return m_135843_(s1) ? new ResourceLocation(s1, s, null) : null;
+ } else {
+ return new ResourceLocation(f_179908_, s, null);
+ }
+ } else {
+ return m_135841_(location) ? new ResourceLocation(f_179908_, location, null) : null;
}
}
}
@@ -1,10 +1,15 @@
--- a/net/minecraft/server/Bootstrap.java --- a/net/minecraft/server/Bootstrap.java
+++ b/net/minecraft/server/Bootstrap.java +++ b/net/minecraft/server/Bootstrap.java
@@ -47,6 +_,8 @@ @@ -47,6 +_,13 @@
DispenseItemBehavior.m_123402_(); DispenseItemBehavior.m_123402_();
CauldronInteraction.m_175649_(); CauldronInteraction.m_175649_();
BuiltInRegistries.m_257498_(); BuiltInRegistries.m_257498_();
+ net.minecraftforge.registries.GameData.vanillaSnapshot(); + net.minecraftforge.registries.GameData.vanillaSnapshot();
+ // Forge: Hacky fix to ensure that NetworkConstants is loaded before mods are constructed.
+ // Many older mods use network internals that shouldn't be used, yet are exposed so they get used anyways.
+ // This can cause class-loading issues with ForgeMod loading NetworkConstants and HandshakeResolver.
+ // To ensure that doesn't happen, we load it here and now. This is not an issue in 1.20.2 and newer.
+ net.minecraftforge.network.NetworkHooks.init();
+ if (false) // skip redirectOutputToLog, Forge already redirects stdout and stderr output to log so that they print with more context + if (false) // skip redirectOutputToLog, Forge already redirects stdout and stderr output to log so that they print with more context
m_135890_(); m_135890_();
} }
@@ -84,6 +84,14 @@
} }
} }
@@ -659,6 +_,7 @@
return BuiltInRegistries.f_256780_.m_7981_(p_8648_.m_6095_()).toString();
});
profilerfiller.m_6174_("tickNonPassenger");
+ if (p_8648_.canUpdate())
p_8648_.m_8119_();
this.m_46473_().m_7238_();
@@ -678,6 +_,7 @@ @@ -678,6 +_,7 @@
return BuiltInRegistries.f_256780_.m_7981_(p_8664_.m_6095_()).toString(); return BuiltInRegistries.f_256780_.m_7981_(p_8664_.m_6095_()).toString();
}); });
@@ -564,7 +564,7 @@
ItemStack itemstack = this.m_21120_(p_21159_); ItemStack itemstack = this.m_21120_(p_21159_);
if (!itemstack.m_41619_() && !this.m_6117_()) { if (!itemstack.m_41619_() && !this.m_6117_()) {
+ int duration = net.minecraftforge.event.ForgeEventFactory.onItemUseStart(this, itemstack, itemstack.m_41779_()); + int duration = net.minecraftforge.event.ForgeEventFactory.onItemUseStart(this, itemstack, itemstack.m_41779_());
+ if (duration <= 0) return; + if (duration < net.minecraftforge.common.ForgeConfig.SERVER.getUseItemDuration()) return;
this.f_20935_ = itemstack; this.f_20935_ = itemstack;
- this.f_20936_ = itemstack.m_41779_(); - this.f_20936_ = itemstack.m_41779_();
+ this.f_20936_ = duration; + this.f_20936_ = duration;
@@ -0,0 +1,21 @@
--- a/net/minecraft/world/entity/npc/VillagerTrades.java
+++ b/net/minecraft/world/entity/npc/VillagerTrades.java
@@ -152,6 +_,7 @@
private final int f_35667_;
public EmeraldsForVillagerTypeItem(int p_35669_, int p_35670_, int p_35671_, Map<VillagerType, Item> p_35672_) {
+ if (false) // FORGE: Modders can add custom villager types, so remove this validation
BuiltInRegistries.f_256934_.m_123024_().filter((p_35680_) -> {
return !p_35672_.containsKey(p_35680_);
}).findAny().ifPresent((p_258962_) -> {
@@ -166,7 +_,9 @@
@Nullable
public MerchantOffer m_213663_(Entity p_219685_, RandomSource p_219686_) {
if (p_219685_ instanceof VillagerDataHolder) {
- ItemStack itemstack = new ItemStack(this.f_35664_.get(((VillagerDataHolder)p_219685_).m_7141_().m_35560_()), this.f_35665_);
+ Item item = this.f_35664_.get(((VillagerDataHolder)p_219685_).m_7141_().m_35560_());
+ if (item == null) return null; // FORGE: Account for modded villager types by returning null if there is no trade
+ ItemStack itemstack = new ItemStack(item, this.f_35665_);
return new MerchantOffer(itemstack, new ItemStack(Items.f_42616_), this.f_35666_, this.f_35667_, 0.05F);
} else {
return null;
@@ -0,0 +1,12 @@
--- a/net/minecraft/world/entity/npc/VillagerType.java
+++ b/net/minecraft/world/entity/npc/VillagerType.java
@@ -67,4 +_,9 @@
public static VillagerType m_204073_(Holder<Biome> p_204074_) {
return p_204074_.m_203543_().map(f_35827_::get).orElse(f_35821_);
}
+
+ /** FORGE: Registers the VillagerType that will spawn in the given biome. This method should be called during FMLCommonSetupEvent using event.enqueueWork() */
+ public static void registerBiomeType(ResourceKey<Biome> biomeKey, VillagerType villagerType) {
+ f_35827_.put(biomeKey, villagerType);
+ }
}
@@ -135,15 +135,23 @@
if (!this.f_19853_.f_46443_) { if (!this.f_19853_.f_46443_) {
this.m_36246_(Stats.f_12982_.m_12902_(this.f_20935_.m_41720_())); this.m_36246_(Stats.f_12982_.m_12902_(this.f_20935_.m_41720_()));
} }
@@ -864,6 +_,8 @@ @@ -862,10 +_,15 @@
if (p_36383_ >= 3.0F) {
int i = 1 + Mth.m_14143_(p_36383_);
InteractionHand interactionhand = this.m_7655_(); InteractionHand interactionhand = this.m_7655_();
+ // FORGE: cache this.useItem -- if this.stopUsingItem() is called, it will be set to ItemStack.EMPTY
+ ItemStack currentItem = this.f_20935_;
this.f_20935_.m_41622_(i, this, (p_219739_) -> { this.f_20935_.m_41622_(i, this, (p_219739_) -> {
p_219739_.m_21190_(interactionhand); p_219739_.m_21190_(interactionhand);
+ net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(this, this.f_20935_, interactionhand); + net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(this, this.f_20935_, interactionhand);
+ m_5810_(); // Forge: fix MC-168573 + if (this.f_20935_ == currentItem) m_5810_(); // Forge: fix MC-168573
}); });
if (this.f_20935_.m_41619_()) { - if (this.f_20935_.m_41619_()) {
+ // FORGE: use cached item since this.useItem could be ItemStack.EMPTY
+ if (currentItem.m_41619_()) {
if (interactionhand == InteractionHand.MAIN_HAND) { if (interactionhand == InteractionHand.MAIN_HAND) {
this.m_8061_(EquipmentSlot.MAINHAND, ItemStack.f_41583_);
} else {
@@ -882,10 +_,13 @@ @@ -882,10 +_,13 @@
protected void m_6475_(DamageSource p_36312_, float p_36313_) { protected void m_6475_(DamageSource p_36312_, float p_36313_) {
@@ -63,20 +63,3 @@
} }
protected int m_213801_() { protected int m_213801_() {
@@ -858,6 +_,16 @@
public boolean m_5842_() {
return this.f_38279_ == Boat.Status.UNDER_WATER || this.f_38279_ == Boat.Status.UNDER_FLOWING_WATER;
+ }
+
+ // Forge: Fix MC-119811 by instantly completing lerp on board
+ @Override
+ protected void m_20348_(Entity passenger) {
+ super.m_20348_(passenger);
+ if (this.m_6109_() && this.f_38267_ > 0) {
+ this.f_38267_ = 0;
+ this.m_19890_(this.f_38268_, this.f_38269_, this.f_38270_, (float)this.f_38271_, (float)this.f_38272_);
+ }
}
public ItemStack m_142340_() {
@@ -15,7 +15,7 @@
ItemStack itemstack = p_40529_.m_43722_(); ItemStack itemstack = p_40529_.m_43722_();
Optional<BlockState> optional3 = Optional.empty(); Optional<BlockState> optional3 = Optional.empty();
if (optional.isPresent()) { if (optional.isPresent()) {
@@ -71,9 +_,20 @@ @@ -71,9 +_,25 @@
} }
} }
@@ -34,5 +34,10 @@
+ @Override + @Override
+ public boolean canPerformAction(ItemStack stack, net.minecraftforge.common.ToolAction toolAction) { + public boolean canPerformAction(ItemStack stack, net.minecraftforge.common.ToolAction toolAction) {
+ return net.minecraftforge.common.ToolActions.DEFAULT_AXE_ACTIONS.contains(toolAction); + return net.minecraftforge.common.ToolActions.DEFAULT_AXE_ACTIONS.contains(toolAction);
+ }
+
+ @Override
+ public boolean canDisableShield(ItemStack stack, ItemStack shield, net.minecraft.world.entity.LivingEntity entity, net.minecraft.world.entity.LivingEntity attacker) {
+ return true;
} }
} }
@@ -1,6 +1,6 @@
--- a/net/minecraft/world/level/block/ChorusFlowerBlock.java --- a/net/minecraft/world/level/block/ChorusFlowerBlock.java
+++ b/net/minecraft/world/level/block/ChorusFlowerBlock.java +++ b/net/minecraft/world/level/block/ChorusFlowerBlock.java
@@ -43,7 +_,7 @@ @@ -43,11 +_,11 @@
BlockPos blockpos = p_220982_.m_7494_(); BlockPos blockpos = p_220982_.m_7494_();
if (p_220981_.m_46859_(blockpos) && blockpos.m_123342_() < p_220981_.m_151558_()) { if (p_220981_.m_46859_(blockpos) && blockpos.m_123342_() < p_220981_.m_151558_()) {
int i = p_220980_.m_61143_(f_51647_); int i = p_220980_.m_61143_(f_51647_);
@@ -9,6 +9,20 @@
boolean flag = false; boolean flag = false;
boolean flag1 = false; boolean flag1 = false;
BlockState blockstate = p_220981_.m_8055_(p_220982_.m_7495_()); BlockState blockstate = p_220981_.m_8055_(p_220982_.m_7495_());
- if (blockstate.m_60713_(Blocks.f_50259_)) {
+ if (blockstate.m_60713_(Blocks.f_50259_) || blockstate.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
flag = true;
} else if (blockstate.m_60713_(this.f_51648_)) {
int j = 1;
@@ -55,7 +_,7 @@
for(int k = 0; k < 4; ++k) {
BlockState blockstate1 = p_220981_.m_8055_(p_220982_.m_6625_(j + 1));
if (!blockstate1.m_60713_(this.f_51648_)) {
- if (blockstate1.m_60713_(Blocks.f_50259_)) {
+ if (blockstate1.m_60713_(Blocks.f_50259_) || blockstate1.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
flag1 = true;
}
break;
@@ -99,7 +_,7 @@ @@ -99,7 +_,7 @@
} else { } else {
this.m_51658_(p_220981_, p_220982_); this.m_51658_(p_220981_, p_220982_);
@@ -18,3 +32,12 @@
} }
} }
} }
@@ -134,7 +_,7 @@
public boolean m_7898_(BlockState p_51683_, LevelReader p_51684_, BlockPos p_51685_) {
BlockState blockstate = p_51684_.m_8055_(p_51685_.m_7495_());
- if (!blockstate.m_60713_(this.f_51648_) && !blockstate.m_60713_(Blocks.f_50259_)) {
+ if (!blockstate.m_60713_(this.f_51648_) && !blockstate.m_60713_(Blocks.f_50259_) && !blockstate.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
if (!blockstate.m_60795_()) {
return false;
} else {
@@ -0,0 +1,36 @@
--- a/net/minecraft/world/level/block/ChorusPlantBlock.java
+++ b/net/minecraft/world/level/block/ChorusPlantBlock.java
@@ -30,7 +_,7 @@
BlockState blockstate3 = p_51711_.m_8055_(p_51712_.m_122029_());
BlockState blockstate4 = p_51711_.m_8055_(p_51712_.m_122019_());
BlockState blockstate5 = p_51711_.m_8055_(p_51712_.m_122024_());
- return this.m_49966_().m_61124_(f_55153_, Boolean.valueOf(blockstate.m_60713_(this) || blockstate.m_60713_(Blocks.f_50491_) || blockstate.m_60713_(Blocks.f_50259_))).m_61124_(f_55152_, Boolean.valueOf(blockstate1.m_60713_(this) || blockstate1.m_60713_(Blocks.f_50491_))).m_61124_(f_55148_, Boolean.valueOf(blockstate2.m_60713_(this) || blockstate2.m_60713_(Blocks.f_50491_))).m_61124_(f_55149_, Boolean.valueOf(blockstate3.m_60713_(this) || blockstate3.m_60713_(Blocks.f_50491_))).m_61124_(f_55150_, Boolean.valueOf(blockstate4.m_60713_(this) || blockstate4.m_60713_(Blocks.f_50491_))).m_61124_(f_55151_, Boolean.valueOf(blockstate5.m_60713_(this) || blockstate5.m_60713_(Blocks.f_50491_)));
+ return this.m_49966_().m_61124_(f_55153_, Boolean.valueOf(blockstate.m_60713_(this) || blockstate.m_60713_(Blocks.f_50491_) || blockstate.m_60713_(Blocks.f_50259_) || blockstate.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON))).m_61124_(f_55152_, Boolean.valueOf(blockstate1.m_60713_(this) || blockstate1.m_60713_(Blocks.f_50491_))).m_61124_(f_55148_, Boolean.valueOf(blockstate2.m_60713_(this) || blockstate2.m_60713_(Blocks.f_50491_))).m_61124_(f_55149_, Boolean.valueOf(blockstate3.m_60713_(this) || blockstate3.m_60713_(Blocks.f_50491_))).m_61124_(f_55150_, Boolean.valueOf(blockstate4.m_60713_(this) || blockstate4.m_60713_(Blocks.f_50491_))).m_61124_(f_55151_, Boolean.valueOf(blockstate5.m_60713_(this) || blockstate5.m_60713_(Blocks.f_50491_)));
}
public BlockState m_7417_(BlockState p_51728_, Direction p_51729_, BlockState p_51730_, LevelAccessor p_51731_, BlockPos p_51732_, BlockPos p_51733_) {
@@ -38,7 +_,7 @@
p_51731_.m_186460_(p_51732_, this, 1);
return super.m_7417_(p_51728_, p_51729_, p_51730_, p_51731_, p_51732_, p_51733_);
} else {
- boolean flag = p_51730_.m_60713_(this) || p_51730_.m_60713_(Blocks.f_50491_) || p_51729_ == Direction.DOWN && p_51730_.m_60713_(Blocks.f_50259_);
+ boolean flag = p_51730_.m_60713_(this) || p_51730_.m_60713_(Blocks.f_50491_) || p_51729_ == Direction.DOWN && (p_51730_.m_60713_(Blocks.f_50259_) || p_51730_.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON));
return p_51728_.m_61124_(f_55154_.get(p_51729_), Boolean.valueOf(flag));
}
}
@@ -63,13 +_,13 @@
}
BlockState blockstate2 = p_51725_.m_8055_(blockpos.m_7495_());
- if (blockstate2.m_60713_(this) || blockstate2.m_60713_(Blocks.f_50259_)) {
+ if (blockstate2.m_60713_(this) || blockstate2.m_60713_(Blocks.f_50259_) || blockstate2.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON)) {
return true;
}
}
}
- return blockstate.m_60713_(this) || blockstate.m_60713_(Blocks.f_50259_);
+ return blockstate.m_60713_(this) || blockstate.m_60713_(Blocks.f_50259_) || blockstate.m_204336_(net.minecraftforge.common.Tags.Blocks.CHORUS_ADDITIONALLY_GROWS_ON);
}
protected void m_7926_(StateDefinition.Builder<Block, BlockState> p_51735_) {
@@ -38,12 +38,12 @@
} }
} }
+ @Deprecated //Forge: Prefer using IForgeBlock#catchFire + @Deprecated //Forge: Prefer using IForgeBlock#onCaughtFire
public static void m_57433_(Level p_57434_, BlockPos p_57435_) { public static void m_57433_(Level p_57434_, BlockPos p_57435_) {
m_57436_(p_57434_, p_57435_, (LivingEntity)null); m_57436_(p_57434_, p_57435_, (LivingEntity)null);
} }
+ @Deprecated //Forge: Prefer using IForgeBlock#catchFire + @Deprecated //Forge: Prefer using IForgeBlock#onCaughtFire
private static void m_57436_(Level p_57437_, BlockPos p_57438_, @Nullable LivingEntity p_57439_) { private static void m_57436_(Level p_57437_, BlockPos p_57438_, @Nullable LivingEntity p_57439_) {
if (!p_57437_.f_46443_) { if (!p_57437_.f_46443_) {
PrimedTnt primedtnt = new PrimedTnt(p_57437_, (double)p_57438_.m_123341_() + 0.5D, (double)p_57438_.m_123342_(), (double)p_57438_.m_123343_() + 0.5D, p_57439_); PrimedTnt primedtnt = new PrimedTnt(p_57437_, (double)p_57438_.m_123341_() + 0.5D, (double)p_57438_.m_123342_(), (double)p_57438_.m_123343_() + 0.5D, p_57439_);
+5 -2
View File
@@ -29,11 +29,14 @@ include 'javafmllanguage'
include 'lowcodelanguage' include 'lowcodelanguage'
include ':mcp' include ':mcp'
include ':clean'
include ':fmlonly' include ':fmlonly'
include ':forge' include ':forge'
project(":mcp").projectDir = file("projects/mcp") project(":mcp").projectDir = file("projects/mcp")
project(":clean").projectDir = file("projects/clean")
project(":fmlonly").projectDir = file("projects/fmlonly") project(":fmlonly").projectDir = file("projects/fmlonly")
project(":forge").projectDir = file("projects/forge") project(":forge").projectDir = file("projects/forge")
if (!System.env.TEAMCITY_VERSION) {
include ':clean'
project(":clean").projectDir = file("projects/clean")
}
@@ -0,0 +1,5 @@
{
"values": [
"#forge:end_stones"
]
}
@@ -15,6 +15,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.blaze3d.vertex.VertexConsumer; import com.mojang.blaze3d.vertex.VertexConsumer;
import com.mojang.datafixers.util.Either; import com.mojang.datafixers.util.Either;
import net.minecraft.ChatFormatting; import net.minecraft.ChatFormatting;
import it.unimi.dsi.fastutil.objects.Object2BooleanOpenHashMap;
import net.minecraft.FileUtil; import net.minecraft.FileUtil;
import net.minecraft.client.Camera; import net.minecraft.client.Camera;
import net.minecraft.client.KeyMapping; import net.minecraft.client.KeyMapping;
@@ -92,7 +93,9 @@ import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.ai.attributes.AttributeInstance; import net.minecraft.world.entity.ai.attributes.AttributeInstance;
import net.minecraft.world.entity.player.Player; import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.tooltip.TooltipComponent; import net.minecraft.world.inventory.tooltip.TooltipComponent;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemDisplayContext; import net.minecraft.world.item.ItemDisplayContext;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.ItemStackLinkedSet; import net.minecraft.world.item.ItemStackLinkedSet;
@@ -100,7 +103,9 @@ import net.minecraft.world.item.crafting.RecipeManager;
import net.minecraft.world.level.BlockAndTintGetter; import net.minecraft.world.level.BlockAndTintGetter;
import net.minecraft.world.level.GameType; import net.minecraft.world.level.GameType;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.LeavesBlock;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.FluidState; import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.level.material.FogType; import net.minecraft.world.level.material.FogType;
@@ -17,6 +17,7 @@ import java.util.function.Function;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.logging.LogUtils;
import net.minecraft.client.gui.narration.NarrationElementOutput; import net.minecraft.client.gui.narration.NarrationElementOutput;
import net.minecraft.client.renderer.GameRenderer; import net.minecraft.client.renderer.GameRenderer;
import net.minecraft.server.packs.resources.IoSupplier; import net.minecraft.server.packs.resources.IoSupplier;
@@ -26,8 +27,6 @@ import net.minecraftforge.client.gui.widget.ScrollPanel;
import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo; import net.minecraftforge.fml.loading.moddiscovery.ModFileInfo;
import net.minecraftforge.resource.PathPackResources; import net.minecraftforge.resource.PathPackResources;
import org.apache.commons.lang3.tuple.Pair; import org.apache.commons.lang3.tuple.Pair;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.maven.artifact.versioning.ComparableVersion; import org.apache.maven.artifact.versioning.ComparableVersion;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
@@ -60,11 +59,12 @@ import net.minecraftforge.forgespi.language.IModInfo;
import net.minecraft.locale.Language; import net.minecraft.locale.Language;
import net.minecraft.network.chat.Component; import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.Style; import net.minecraft.network.chat.Style;
import org.slf4j.Logger;
public class ModListScreen extends Screen public class ModListScreen extends Screen
{ {
private static String stripControlCodes(String value) { return net.minecraft.util.StringUtil.stripColor(value); } private static String stripControlCodes(String value) { return net.minecraft.util.StringUtil.stripColor(value); }
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogUtils.getLogger();
private enum SortType implements Comparator<IModInfo> private enum SortType implements Comparator<IModInfo>
{ {
NORMAL, NORMAL,
@@ -87,7 +87,7 @@ public class ModListScreen extends Screen
private static final int PADDING = 6; private static final int PADDING = 6;
private Screen parentScreen; private final Screen parentScreen;
private ModListWidget modList; private ModListWidget modList;
private InfoPanel modInfo; private InfoPanel modInfo;
@@ -98,7 +98,7 @@ public class ModListScreen extends Screen
private Button configButton, openModsFolderButton, doneButton; private Button configButton, openModsFolderButton, doneButton;
private int buttonMargin = 1; private int buttonMargin = 1;
private int numButtons = SortType.values().length; private final int numButtons = SortType.values().length;
private String lastFilterText = ""; private String lastFilterText = "";
private EditBox search; private EditBox search;
@@ -265,10 +265,19 @@ public class ModListScreen extends Screen
int y = this.height - 20 - PADDING; int y = this.height - 20 - PADDING;
int fullButtonHeight = PADDING + 20 + PADDING; int fullButtonHeight = PADDING + 20 + PADDING;
doneButton = Button.builder(Component.translatable("gui.done"), b -> ModListScreen.this.onClose()).bounds(((listWidth + PADDING + this.width - doneButtonWidth) / 2), y, doneButtonWidth, 20).build(); doneButton = Button.builder(Component.translatable("gui.done"), b -> ModListScreen.this.onClose())
openModsFolderButton = Button.builder(Component.translatable("fml.menu.mods.openmodsfolder"), b -> Util.getPlatform().openFile(FMLPaths.MODSDIR.get().toFile())).bounds(6, y, this.listWidth, 20).build(); .bounds(((listWidth + PADDING + this.width - doneButtonWidth) / 2), y, doneButtonWidth, 20)
.build();
openModsFolderButton = Button.builder(Component.translatable("fml.menu.mods.openmodsfolder"), b -> Util.getPlatform().openFile(FMLPaths.MODSDIR.get().toFile()))
.bounds(6, y, this.listWidth, 20)
.build();
y -= 20 + PADDING; y -= 20 + PADDING;
configButton = Button.builder(Component.translatable("fml.menu.mods.config"), b -> ModListScreen.this.displayModConfig()).bounds(6, y, this.listWidth, 20).build(); configButton = Button.builder(Component.translatable("fml.menu.mods.config"), b -> ModListScreen.this.displayModConfig())
.bounds(6, y, this.listWidth, 20)
.build();
y -= 14 + PADDING; y -= 14 + PADDING;
search = new EditBox(getFontRenderer(), PADDING + 1, y, listWidth - 2, 14, Component.translatable("fml.menu.mods.search")); search = new EditBox(getFontRenderer(), PADDING + 1, y, listWidth - 2, 14, Component.translatable("fml.menu.mods.search"));
@@ -289,11 +298,20 @@ public class ModListScreen extends Screen
final int width = listWidth / numButtons; final int width = listWidth / numButtons;
int x = PADDING; int x = PADDING;
addRenderableWidget(SortType.NORMAL.button = Button.builder(SortType.NORMAL.getButtonText(), b -> resortMods(SortType.NORMAL)).bounds(x, PADDING, width - buttonMargin, 20).build()); addRenderableWidget(SortType.NORMAL.button = Button.builder(SortType.NORMAL.getButtonText(), b -> resortMods(SortType.NORMAL))
.bounds(x, PADDING, width - buttonMargin, 20)
.build());
x += width + buttonMargin; x += width + buttonMargin;
addRenderableWidget(SortType.A_TO_Z.button = Button.builder(SortType.A_TO_Z.getButtonText(), b -> resortMods(SortType.A_TO_Z)).bounds(x, PADDING, width - buttonMargin, 20).build()); addRenderableWidget(SortType.A_TO_Z.button = Button.builder(SortType.A_TO_Z.getButtonText(), b -> resortMods(SortType.A_TO_Z))
.bounds(x, PADDING, width - buttonMargin, 20)
.build());
x += width + buttonMargin; x += width + buttonMargin;
addRenderableWidget(SortType.Z_TO_A.button = Button.builder(SortType.Z_TO_A.getButtonText(), b -> resortMods(SortType.Z_TO_A)).bounds(x, PADDING, width - buttonMargin, 20).build()); addRenderableWidget(SortType.Z_TO_A.button = Button.builder(SortType.Z_TO_A.getButtonText(), b -> resortMods(SortType.Z_TO_A))
.bounds(x, PADDING, width - buttonMargin, 20)
.build());
resortMods(SortType.NORMAL); resortMods(SortType.NORMAL);
updateCache(); updateCache();
} }
@@ -303,7 +321,9 @@ public class ModListScreen extends Screen
if (selected == null) return; if (selected == null) return;
try try
{ {
ConfigScreenHandler.getScreenFactoryFor(selected.getInfo()).map(f->f.apply(this.minecraft, this)).ifPresent(newScreen -> this.minecraft.setScreen(newScreen)); ConfigScreenHandler.getScreenFactoryFor(selected.getInfo())
.map(f -> f.apply(this.minecraft, this))
.ifPresent(newScreen -> this.minecraft.setScreen(newScreen));
} }
catch (final Exception e) catch (final Exception e)
{ {
@@ -330,7 +350,10 @@ public class ModListScreen extends Screen
modList.refreshList(); modList.refreshList();
if (selected != null) if (selected != null)
{ {
selected = modList.children().stream().filter(e -> e.getInfo() == selected.getInfo()).findFirst().orElse(null); selected = modList.children().stream()
.filter(e -> e.getInfo() == selected.getInfo())
.findFirst()
.orElse(null);
updateCache(); updateCache();
} }
sorted = true; sorted = true;
@@ -339,7 +362,9 @@ public class ModListScreen extends Screen
public <T extends ObjectSelectionList.Entry<T>> void buildModList(Consumer<T> modListViewConsumer, Function<IModInfo, T> newEntry) public <T extends ObjectSelectionList.Entry<T>> void buildModList(Consumer<T> modListViewConsumer, Function<IModInfo, T> newEntry)
{ {
mods.forEach(mod->modListViewConsumer.accept(newEntry.apply(mod))); for (IModInfo mod : mods) {
modListViewConsumer.accept(newEntry.apply(mod));
}
} }
private void reloadMods() private void reloadMods()
@@ -451,7 +476,7 @@ public class ModListScreen extends Screen
else else
lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.childmods", selectedMod.getOwningFile().getMods().stream().map(IModInfo::getDisplayName).collect(Collectors.joining(",")))); lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.childmods", selectedMod.getOwningFile().getMods().stream().map(IModInfo::getDisplayName).collect(Collectors.joining(","))));
if (vercheck.status() == VersionChecker.Status.OUTDATED || vercheck.status() == VersionChecker.Status.BETA_OUTDATED) if (vercheck.status().isOutdated())
lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.updateavailable", vercheck.url() == null ? "" : vercheck.url())); lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.updateavailable", vercheck.url() == null ? "" : vercheck.url()));
lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.license", ((ModFileInfo) selectedMod.getOwningFile()).getLicense())); lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.license", ((ModFileInfo) selectedMod.getOwningFile()).getLicense()));
lines.add(null); lines.add(null);
@@ -467,7 +492,7 @@ public class ModListScreen extends Screen
} }
*/ */
if ((vercheck.status() == VersionChecker.Status.OUTDATED || vercheck.status() == VersionChecker.Status.BETA_OUTDATED) && vercheck.changes().size() > 0) if (vercheck.status().isOutdated() && !vercheck.changes().isEmpty())
{ {
lines.add(null); lines.add(null);
lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.changelogheader")); lines.add(ForgeI18n.parseMessage("fml.menu.mods.info.changelogheader"));
@@ -27,7 +27,7 @@ public class ModListWidget extends ObjectSelectionList<ModListWidget.ModEntry>
private static final ResourceLocation VERSION_CHECK_ICONS = new ResourceLocation(ForgeVersion.MOD_ID, "textures/gui/version_check_icons.png"); private static final ResourceLocation VERSION_CHECK_ICONS = new ResourceLocation(ForgeVersion.MOD_ID, "textures/gui/version_check_icons.png");
private final int listWidth; private final int listWidth;
private ModListScreen parent; private final ModListScreen parent;
public ModListWidget(ModListScreen parent, int listWidth, int top, int bottom) public ModListWidget(ModListScreen parent, int listWidth, int top, int bottom)
{ {
@@ -133,8 +133,8 @@ public class ClientModLoader
{ {
boolean anyOutdated = ModList.get().getMods().stream() boolean anyOutdated = ModList.get().getMods().stream()
.map(VersionChecker::getResult) .map(VersionChecker::getResult)
.map(result -> result.status()) .map(VersionChecker.CheckResult::status)
.anyMatch(status -> status == VersionChecker.Status.OUTDATED || status == VersionChecker.Status.BETA_OUTDATED); .anyMatch(VersionChecker.Status::isOutdated);
return anyOutdated ? VersionChecker.Status.OUTDATED : null; return anyOutdated ? VersionChecker.Status.OUTDATED : null;
} }
@@ -257,6 +257,7 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
private final ItemTransforms transforms; private final ItemTransforms transforms;
private TextureAtlasSprite particle; private TextureAtlasSprite particle;
private RenderTypeGroup lastRenderTypes = RenderTypeGroup.EMPTY; private RenderTypeGroup lastRenderTypes = RenderTypeGroup.EMPTY;
private RenderTypeGroup lastRenderTypesFast = RenderTypeGroup.EMPTY;
private Builder(boolean isAmbientOcclusion, boolean isGui3d, boolean isSideLit, TextureAtlasSprite particle, ItemOverrides overrides, ItemTransforms transforms) private Builder(boolean isAmbientOcclusion, boolean isGui3d, boolean isSideLit, TextureAtlasSprite particle, ItemOverrides overrides, ItemTransforms transforms)
{ {
@@ -270,27 +271,38 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
public void addLayer(BakedModel model) public void addLayer(BakedModel model)
{ {
flushQuads(null); flushQuads(RenderTypeGroup.EMPTY, RenderTypeGroup.EMPTY);
children.add(model); children.add(model);
} }
private void addLayer(RenderTypeGroup renderTypes, List<BakedQuad> quads) private void addLayer(RenderTypeGroup renderTypes, List<BakedQuad> quads)
{ {
var modelBuilder = IModelBuilder.of(isAmbientOcclusion, isSideLit, isGui3d, transforms, overrides, particle, renderTypes); this.addLayer(renderTypes, RenderTypeGroup.EMPTY, quads);
}
private void addLayer(RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast, List<BakedQuad> quads)
{
var modelBuilder = IModelBuilder.of(isAmbientOcclusion, isSideLit, isGui3d, transforms, overrides, particle, renderTypes, renderTypesFast);
quads.forEach(modelBuilder::addUnculledFace); quads.forEach(modelBuilder::addUnculledFace);
children.add(modelBuilder.build()); children.add(modelBuilder.build());
} }
private void flushQuads(RenderTypeGroup renderTypes) private void flushQuads(RenderTypeGroup renderTypes)
{
this.flushQuads(renderTypes, RenderTypeGroup.EMPTY);
}
private void flushQuads(RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast)
{ {
if (!Objects.equals(renderTypes, lastRenderTypes)) if (!Objects.equals(renderTypes, lastRenderTypes))
{ {
if (quads.size() > 0) if (quads.size() > 0)
{ {
addLayer(lastRenderTypes, quads); addLayer(lastRenderTypes, lastRenderTypesFast, quads);
quads.clear(); quads.clear();
} }
lastRenderTypes = renderTypes; lastRenderTypes = renderTypes;
lastRenderTypesFast = renderTypesFast;
} }
} }
@@ -302,14 +314,24 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
public Builder addQuads(RenderTypeGroup renderTypes, BakedQuad... quadsToAdd) public Builder addQuads(RenderTypeGroup renderTypes, BakedQuad... quadsToAdd)
{ {
flushQuads(renderTypes); return this.addQuads(renderTypes, RenderTypeGroup.EMPTY, quadsToAdd);
}
public Builder addQuads(RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast, BakedQuad... quadsToAdd)
{
flushQuads(renderTypes, renderTypesFast);
Collections.addAll(quads, quadsToAdd); Collections.addAll(quads, quadsToAdd);
return this; return this;
} }
public Builder addQuads(RenderTypeGroup renderTypes, Collection<BakedQuad> quadsToAdd) public Builder addQuads(RenderTypeGroup renderTypes, Collection<BakedQuad> quadsToAdd)
{ {
flushQuads(renderTypes); return this.addQuads(renderTypes, RenderTypeGroup.EMPTY, quadsToAdd);
}
public Builder addQuads(RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast, Collection<BakedQuad> quadsToAdd)
{
flushQuads(renderTypes, renderTypesFast);
quads.addAll(quadsToAdd); quads.addAll(quadsToAdd);
return this; return this;
} }
@@ -318,7 +340,7 @@ public class CompositeModel implements IUnbakedGeometry<CompositeModel>
{ {
if (quads.size() > 0) if (quads.size() > 0)
{ {
addLayer(lastRenderTypes, quads); addLayer(lastRenderTypes, lastRenderTypesFast, quads);
} }
var childrenBuilder = ImmutableMap.<String, BakedModel>builder(); var childrenBuilder = ImmutableMap.<String, BakedModel>builder();
var itemPassesBuilder = ImmutableList.<BakedModel>builder(); var itemPassesBuilder = ImmutableList.<BakedModel>builder();
@@ -63,7 +63,7 @@ public class EmptyModel extends SimpleUnbakedGeometry<EmptyModel>
public Baked() public Baked()
{ {
super(List.of(), Map.of(), false, false, false, UnitTextureAtlasSprite.INSTANCE, ItemTransforms.NO_TRANSFORMS, ItemOverrides.EMPTY, RenderTypeGroup.EMPTY); super(List.of(), Map.of(), false, false, false, UnitTextureAtlasSprite.INSTANCE, ItemTransforms.NO_TRANSFORMS, ItemOverrides.EMPTY, RenderTypeGroup.EMPTY, RenderTypeGroup.EMPTY);
} }
@Override @Override
@@ -73,6 +73,12 @@ public class ExtendedBlockModelDeserializer extends BlockModel.Deserializer
model.customData.setRenderTypeHint(new ResourceLocation(renderTypeHintName)); model.customData.setRenderTypeHint(new ResourceLocation(renderTypeHintName));
} }
if (jsonobject.has("render_type_fast"))
{
var renderTypeHintName = GsonHelper.getAsString(jsonobject, "render_type_fast");
model.customData.setRenderTypeFastHint(new ResourceLocation(renderTypeHintName));
}
if (jsonobject.has("visibility")) if (jsonobject.has("visibility"))
{ {
JsonObject visibility = GsonHelper.getAsJsonObject(jsonobject, "visibility"); JsonObject visibility = GsonHelper.getAsJsonObject(jsonobject, "visibility");
@@ -34,6 +34,16 @@ public interface IModelBuilder<T extends IModelBuilder<T>>
return new Simple(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides, particle, renderTypes); return new Simple(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides, particle, renderTypes);
} }
/**
* Creates a new model builder that uses the provided attributes in the final baked model.
*/
static IModelBuilder<?> of(boolean hasAmbientOcclusion, boolean usesBlockLight, boolean isGui3d,
ItemTransforms transforms, ItemOverrides overrides, TextureAtlasSprite particle,
RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast)
{
return new Simple(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides, particle, renderTypes, renderTypesFast);
}
/** /**
* Creates a new model builder that collects quads to the provided list, returning * Creates a new model builder that collects quads to the provided list, returning
* {@linkplain EmptyModel#BAKED an empty model} if you call {@link #build()}. * {@linkplain EmptyModel#BAKED an empty model} if you call {@link #build()}.
@@ -53,13 +63,22 @@ public interface IModelBuilder<T extends IModelBuilder<T>>
{ {
private final SimpleBakedModel.Builder builder; private final SimpleBakedModel.Builder builder;
private final RenderTypeGroup renderTypes; private final RenderTypeGroup renderTypes;
private final RenderTypeGroup renderTypesFast;
private Simple(boolean hasAmbientOcclusion, boolean usesBlockLight, boolean isGui3d, private Simple(boolean hasAmbientOcclusion, boolean usesBlockLight, boolean isGui3d,
ItemTransforms transforms, ItemOverrides overrides, TextureAtlasSprite particle, ItemTransforms transforms, ItemOverrides overrides, TextureAtlasSprite particle,
RenderTypeGroup renderTypes) RenderTypeGroup renderTypes)
{
this(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides, particle, renderTypes, RenderTypeGroup.EMPTY);
}
private Simple(boolean hasAmbientOcclusion, boolean usesBlockLight, boolean isGui3d,
ItemTransforms transforms, ItemOverrides overrides, TextureAtlasSprite particle,
RenderTypeGroup renderTypes, RenderTypeGroup renderTypesFast)
{ {
this.builder = new SimpleBakedModel.Builder(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides).particle(particle); this.builder = new SimpleBakedModel.Builder(hasAmbientOcclusion, usesBlockLight, isGui3d, transforms, overrides).particle(particle);
this.renderTypes = renderTypes; this.renderTypes = renderTypes;
this.renderTypesFast = renderTypesFast;
} }
@Override @Override
@@ -80,7 +99,7 @@ public interface IModelBuilder<T extends IModelBuilder<T>>
@Override @Override
public BakedModel build() public BakedModel build()
{ {
return builder.build(renderTypes); return builder.build(renderTypes, renderTypesFast);
} }
} }
@@ -45,12 +45,19 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
private ImmutableList<Material> textures; private ImmutableList<Material> textures;
private final Int2ObjectMap<ForgeFaceData> layerData; private final Int2ObjectMap<ForgeFaceData> layerData;
private final Int2ObjectMap<ResourceLocation> renderTypeNames; private final Int2ObjectMap<ResourceLocation> renderTypeNames;
private final Int2ObjectMap<ResourceLocation> renderTypeNamesFast;
private ItemLayerModel(@Nullable ImmutableList<Material> textures, Int2ObjectMap<ForgeFaceData> layerData, Int2ObjectMap<ResourceLocation> renderTypeNames) private ItemLayerModel(@Nullable ImmutableList<Material> textures, Int2ObjectMap<ForgeFaceData> layerData, Int2ObjectMap<ResourceLocation> renderTypeNames)
{
this(textures, layerData, renderTypeNames, new Int2ObjectOpenHashMap<>());
}
private ItemLayerModel(@Nullable ImmutableList<Material> textures, Int2ObjectMap<ForgeFaceData> layerData, Int2ObjectMap<ResourceLocation> renderTypeNames, Int2ObjectMap<ResourceLocation> renderTypeNamesFast)
{ {
this.textures = textures; this.textures = textures;
this.layerData = layerData; this.layerData = layerData;
this.renderTypeNames = renderTypeNames; this.renderTypeNames = renderTypeNames;
this.renderTypeNamesFast = renderTypeNamesFast;
} }
@Override @Override
@@ -82,7 +89,9 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
var quads = UnbakedGeometryHelper.bakeElements(unbaked, $ -> sprite, modelState, modelLocation); var quads = UnbakedGeometryHelper.bakeElements(unbaked, $ -> sprite, modelState, modelLocation);
var renderTypeName = renderTypeNames.get(i); var renderTypeName = renderTypeNames.get(i);
var renderTypes = renderTypeName != null ? context.getRenderType(renderTypeName) : null; var renderTypes = renderTypeName != null ? context.getRenderType(renderTypeName) : null;
builder.addQuads(renderTypes != null ? renderTypes : normalRenderTypes, quads); var renderTypeNameFast = renderTypeNamesFast.get(i);
var renderTypesFast = renderTypeNameFast != null ? context.getRenderType(renderTypeNameFast) : null;
builder.addQuads(renderTypes != null ? renderTypes : normalRenderTypes, renderTypesFast != null ? renderTypesFast : RenderTypeGroup.EMPTY, quads);
} }
return builder.build(); return builder.build();
@@ -108,16 +117,35 @@ public class ItemLayerModel implements IUnbakedGeometry<ItemLayerModel>
} }
} }
var renderTypeNamesFast = new Int2ObjectOpenHashMap<ResourceLocation>();
if (jsonObject.has("render_types_fast"))
{
var renderTypes = jsonObject.getAsJsonObject("render_types_fast");
for (Map.Entry<String, JsonElement> entry : renderTypes.entrySet())
{
var renderType = new ResourceLocation(entry.getKey());
for (var layer : entry.getValue().getAsJsonArray())
if (renderTypeNamesFast.put(layer.getAsInt(), renderType) != null)
throw new JsonParseException("Registered duplicate fast graphics render type for layer " + layer);
}
}
var emissiveLayers = new Int2ObjectArrayMap<ForgeFaceData>(); var emissiveLayers = new Int2ObjectArrayMap<ForgeFaceData>();
if(jsonObject.has("forge_data")) if(jsonObject.has("forge_data"))
{ {
JsonObject forgeData = jsonObject.get("forge_data").getAsJsonObject(); JsonObject forgeData = jsonObject.get("forge_data").getAsJsonObject();
readLayerData(forgeData, "layers", renderTypeNames, emissiveLayers, false); readLayerData(forgeData, "layers", renderTypeNames, renderTypeNamesFast, emissiveLayers, false);
} }
return new ItemLayerModel(null, emissiveLayers, renderTypeNames); return new ItemLayerModel(null, emissiveLayers, renderTypeNames, renderTypeNamesFast);
} }
protected void readLayerData(JsonObject jsonObject, String name, Int2ObjectOpenHashMap<ResourceLocation> renderTypeNames, Int2ObjectMap<ForgeFaceData> layerData, boolean logWarning) protected void readLayerData(JsonObject jsonObject, String name, Int2ObjectOpenHashMap<ResourceLocation> renderTypeNames, Int2ObjectMap<ForgeFaceData> layerData, boolean logWarning)
{
this.readLayerData(jsonObject, name, renderTypeNames, new Int2ObjectOpenHashMap<>(), layerData, logWarning);
}
@Deprecated(forRemoval = true, since = "1.21.4")
protected void readLayerData(JsonObject jsonObject, String name, Int2ObjectOpenHashMap<ResourceLocation> renderTypeNames, Int2ObjectOpenHashMap<ResourceLocation> renderTypeNamesFast, Int2ObjectMap<ForgeFaceData> layerData, boolean logWarning)
{ {
if (!jsonObject.has(name)) if (!jsonObject.has(name))
{ {
@@ -251,6 +251,42 @@ public abstract class BlockStateProvider implements DataProvider {
models().cubeColumnHorizontal(name(block) + "_horizontal", side, end).renderType(renderType)); models().cubeColumnHorizontal(name(block) + "_horizontal", side, end).renderType(renderType));
} }
public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, String renderType, String renderTypeFast) {
axisBlockWithRenderTypeAndFast(block, blockTexture(block), renderType, renderTypeFast);
}
public void logBlockWithRenderTypeAndFast(RotatedPillarBlock block, String renderType, String renderTypeFast) {
axisBlockWithRenderTypeAndFast(block, blockTexture(block), extend(blockTexture(block), "_top"), renderType, renderTypeFast);
}
public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation baseName, String renderType, String renderTypeFast) {
axisBlockWithRenderTypeAndFast(block, extend(baseName, "_side"), extend(baseName, "_end"), renderType, renderTypeFast);
}
public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation side, ResourceLocation end, String renderType, String renderTypeFast) {
axisBlock(block,
models().cubeColumn(name(block), side, end).renderType(renderType, renderTypeFast),
models().cubeColumnHorizontal(name(block) + "_horizontal", side, end).renderType(renderType, renderTypeFast));
}
public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation renderType, ResourceLocation renderTypeFast) {
axisBlockWithRenderTypeAndFast(block, blockTexture(block), renderType, renderTypeFast);
}
public void logBlockWithRenderType(RotatedPillarBlock block, ResourceLocation renderType, ResourceLocation renderTypeFast) {
axisBlockWithRenderTypeAndFast(block, blockTexture(block), extend(blockTexture(block), "_top"), renderType, renderTypeFast);
}
public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation baseName, ResourceLocation renderType, ResourceLocation renderTypeFast) {
axisBlockWithRenderTypeAndFast(block, extend(baseName, "_side"), extend(baseName, "_end"), renderType, renderTypeFast);
}
public void axisBlockWithRenderTypeAndFast(RotatedPillarBlock block, ResourceLocation side, ResourceLocation end, ResourceLocation renderType, ResourceLocation renderTypeFast) {
axisBlock(block,
models().cubeColumn(name(block), side, end).renderType(renderType, renderTypeFast),
models().cubeColumnHorizontal(name(block) + "_horizontal", side, end).renderType(renderType, renderTypeFast));
}
public void axisBlock(RotatedPillarBlock block, ModelFile vertical, ModelFile horizontal) { public void axisBlock(RotatedPillarBlock block, ModelFile vertical, ModelFile horizontal) {
getVariantBuilder(block) getVariantBuilder(block)
.partialState().with(RotatedPillarBlock.AXIS, Axis.Y) .partialState().with(RotatedPillarBlock.AXIS, Axis.Y)
@@ -382,6 +418,38 @@ public abstract class BlockStateProvider implements DataProvider {
stairsBlockInternalWithRenderType(block, name + "_stairs", side, bottom, top, renderType); stairsBlockInternalWithRenderType(block, name + "_stairs", side, bottom, top, renderType);
} }
public void stairsBlockWithRenderTypeAndFast(StairBlock block, ResourceLocation texture, String renderType, String renderTypeFast) {
stairsBlockWithRenderTypeAndFast(block, texture, texture, texture, renderType, renderTypeFast);
}
public void stairsBlockWithRenderTypeAndFast(StairBlock block, String name, ResourceLocation texture, String renderType, String renderTypeFast) {
stairsBlockWithRenderTypeAndFast(block, name, texture, texture, texture, renderType, renderTypeFast);
}
public void stairsBlockWithRenderTypeAndFast(StairBlock block, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, String renderType, String renderTypeFast) {
stairsBlockInternalWithRenderTypeAndFast(block, key(block).toString(), side, bottom, top, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
}
public void stairsBlockWithRenderTypeAndFast(StairBlock block, String name, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, String renderType, String renderTypeFast) {
stairsBlockInternalWithRenderTypeAndFast(block, name + "_stairs", side, bottom, top, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
}
public void stairsBlockWithRenderTypeAndFast(StairBlock block, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
stairsBlockWithRenderTypeAndFast(block, texture, texture, texture, renderType, renderTypeFast);
}
public void stairsBlockWithRenderTypeAndFast(StairBlock block, String name, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
stairsBlockWithRenderTypeAndFast(block, name, texture, texture, texture, renderType, renderTypeFast);
}
public void stairsBlockWithRenderTypeAndFast(StairBlock block, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
stairsBlockInternalWithRenderTypeAndFast(block, key(block).toString(), side, bottom, top, renderType, renderTypeFast);
}
public void stairsBlockWithRenderTypeAndFast(StairBlock block, String name, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
stairsBlockInternalWithRenderTypeAndFast(block, name + "_stairs", side, bottom, top, renderType, renderTypeFast);
}
private void stairsBlockInternal(StairBlock block, String baseName, ResourceLocation side, ResourceLocation bottom, ResourceLocation top) { private void stairsBlockInternal(StairBlock block, String baseName, ResourceLocation side, ResourceLocation bottom, ResourceLocation top) {
ModelFile stairs = models().stairs(baseName, side, bottom, top); ModelFile stairs = models().stairs(baseName, side, bottom, top);
ModelFile stairsInner = models().stairsInner(baseName + "_inner", side, bottom, top); ModelFile stairsInner = models().stairsInner(baseName + "_inner", side, bottom, top);
@@ -396,6 +464,13 @@ public abstract class BlockStateProvider implements DataProvider {
stairsBlock(block, stairs, stairsInner, stairsOuter); stairsBlock(block, stairs, stairsInner, stairsOuter);
} }
private void stairsBlockInternalWithRenderTypeAndFast(StairBlock block, String baseName, ResourceLocation side, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
ModelFile stairs = models().stairs(baseName, side, bottom, top).renderType(renderType, renderTypeFast);
ModelFile stairsInner = models().stairsInner(baseName + "_inner", side, bottom, top).renderType(renderType, renderTypeFast);
ModelFile stairsOuter = models().stairsOuter(baseName + "_outer", side, bottom, top).renderType(renderType, renderTypeFast);
stairsBlock(block, stairs, stairsInner, stairsOuter);
}
public void stairsBlock(StairBlock block, ModelFile stairs, ModelFile stairsInner, ModelFile stairsOuter) { public void stairsBlock(StairBlock block, ModelFile stairs, ModelFile stairsInner, ModelFile stairsOuter) {
getVariantBuilder(block) getVariantBuilder(block)
.forAllStatesExcept(state -> { .forAllStatesExcept(state -> {
@@ -533,6 +608,32 @@ public abstract class BlockStateProvider implements DataProvider {
models().fenceSide(name + "_fence_side", texture).renderType(renderType)); models().fenceSide(name + "_fence_side", texture).renderType(renderType));
} }
public void fenceBlockWithRenderTypeAndFast(FenceBlock block, ResourceLocation texture, String renderType, String renderTypeFast) {
String baseName = key(block).toString();
fourWayBlock(block,
models().fencePost(baseName + "_post", texture).renderType(renderType, renderTypeFast),
models().fenceSide(baseName + "_side", texture).renderType(renderType, renderTypeFast));
}
public void fenceBlockWithRenderTypeAndFast(FenceBlock block, String name, ResourceLocation texture, String renderType, String renderTypeFast) {
fourWayBlock(block,
models().fencePost(name + "_fence_post", texture).renderType(renderType, renderTypeFast),
models().fenceSide(name + "_fence_side", texture).renderType(renderType, renderTypeFast));
}
public void fenceBlockWithRenderTypeAndFast(FenceBlock block, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
String baseName = key(block).toString();
fourWayBlock(block,
models().fencePost(baseName + "_post", texture).renderType(renderType, renderTypeFast),
models().fenceSide(baseName + "_side", texture).renderType(renderType, renderTypeFast));
}
public void fenceBlockWithRenderTypeAndFast(FenceBlock block, String name, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
fourWayBlock(block,
models().fencePost(name + "_fence_post", texture).renderType(renderType, renderTypeFast),
models().fenceSide(name + "_fence_side", texture).renderType(renderType, renderTypeFast));
}
public void fenceGateBlock(FenceGateBlock block, ResourceLocation texture) { public void fenceGateBlock(FenceGateBlock block, ResourceLocation texture) {
fenceGateBlockInternal(block, key(block).toString(), texture); fenceGateBlockInternal(block, key(block).toString(), texture);
} }
@@ -557,6 +658,22 @@ public abstract class BlockStateProvider implements DataProvider {
fenceGateBlockInternalWithRenderType(block, name + "_fence_gate", texture, renderType); fenceGateBlockInternalWithRenderType(block, name + "_fence_gate", texture, renderType);
} }
public void fenceGateBlockWithRenderTypeAndFast(FenceGateBlock block, ResourceLocation texture, String renderType, String renderTypeFast) {
fenceGateBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
}
public void fenceGateBlockWithRenderTypeAndFast(FenceGateBlock block, String name, ResourceLocation texture, String renderType, String renderTypeFast) {
fenceGateBlockInternalWithRenderTypeAndFast(block, name + "_fence_gate", texture, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
}
public void fenceGateBlockWithRenderTypeAndFast(FenceGateBlock block, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
fenceGateBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, renderType, renderTypeFast);
}
public void fenceGateBlockWithRenderTypeAndFast(FenceGateBlock block, String name, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
fenceGateBlockInternalWithRenderTypeAndFast(block, name + "_fence_gate", texture, renderType, renderTypeFast);
}
private void fenceGateBlockInternal(FenceGateBlock block, String baseName, ResourceLocation texture) { private void fenceGateBlockInternal(FenceGateBlock block, String baseName, ResourceLocation texture) {
ModelFile gate = models().fenceGate(baseName, texture); ModelFile gate = models().fenceGate(baseName, texture);
ModelFile gateOpen = models().fenceGateOpen(baseName + "_open", texture); ModelFile gateOpen = models().fenceGateOpen(baseName + "_open", texture);
@@ -573,6 +690,14 @@ public abstract class BlockStateProvider implements DataProvider {
fenceGateBlock(block, gate, gateOpen, gateWall, gateWallOpen); fenceGateBlock(block, gate, gateOpen, gateWall, gateWallOpen);
} }
private void fenceGateBlockInternalWithRenderTypeAndFast(FenceGateBlock block, String baseName, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
ModelFile gate = models().fenceGate(baseName, texture).renderType(renderType, renderTypeFast);
ModelFile gateOpen = models().fenceGateOpen(baseName + "_open", texture).renderType(renderType, renderTypeFast);
ModelFile gateWall = models().fenceGateWall(baseName + "_wall", texture).renderType(renderType, renderTypeFast);
ModelFile gateWallOpen = models().fenceGateWallOpen(baseName + "_wall_open", texture).renderType(renderType, renderTypeFast);
fenceGateBlock(block, gate, gateOpen, gateWall, gateWallOpen);
}
public void fenceGateBlock(FenceGateBlock block, ModelFile gate, ModelFile gateOpen, ModelFile gateWall, ModelFile gateWallOpen) { public void fenceGateBlock(FenceGateBlock block, ModelFile gate, ModelFile gateOpen, ModelFile gateWall, ModelFile gateWallOpen) {
getVariantBuilder(block).forAllStatesExcept(state -> { getVariantBuilder(block).forAllStatesExcept(state -> {
ModelFile model = gate; ModelFile model = gate;
@@ -614,6 +739,22 @@ public abstract class BlockStateProvider implements DataProvider {
wallBlockInternalWithRenderType(block, name + "_wall", texture, renderType); wallBlockInternalWithRenderType(block, name + "_wall", texture, renderType);
} }
public void wallBlockWithRenderTypeAndFast(WallBlock block, ResourceLocation texture, String renderType, String renderTypeFast) {
wallBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
}
public void wallBlockWithRenderTypeAndFast(WallBlock block, String name, ResourceLocation texture, String renderType, String renderTypeFast) {
wallBlockInternalWithRenderTypeAndFast(block, name + "_wall", texture, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
}
public void wallBlockWithRenderTypeAndFast(WallBlock block, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
wallBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, renderType, renderTypeFast);
}
public void wallBlockWithRenderTypeAndFast(WallBlock block, String name, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
wallBlockInternalWithRenderTypeAndFast(block, name + "_wall", texture, renderType, renderTypeFast);
}
private void wallBlockInternal(WallBlock block, String baseName, ResourceLocation texture) { private void wallBlockInternal(WallBlock block, String baseName, ResourceLocation texture) {
wallBlock(block, models().wallPost(baseName + "_post", texture), wallBlock(block, models().wallPost(baseName + "_post", texture),
models().wallSide(baseName + "_side", texture), models().wallSide(baseName + "_side", texture),
@@ -626,6 +767,12 @@ public abstract class BlockStateProvider implements DataProvider {
models().wallSideTall(baseName + "_side_tall", texture).renderType(renderType)); models().wallSideTall(baseName + "_side_tall", texture).renderType(renderType));
} }
private void wallBlockInternalWithRenderTypeAndFast(WallBlock block, String baseName, ResourceLocation texture, ResourceLocation renderType, ResourceLocation renderTypeFast) {
wallBlock(block, models().wallPost(baseName + "_post", texture).renderType(renderType, renderTypeFast),
models().wallSide(baseName + "_side", texture).renderType(renderType, renderTypeFast),
models().wallSideTall(baseName + "_side_tall", texture).renderType(renderType, renderTypeFast));
}
public static final ImmutableMap<Direction, Property<WallSide>> WALL_PROPS = ImmutableMap.<Direction, Property<WallSide>>builder() public static final ImmutableMap<Direction, Property<WallSide>> WALL_PROPS = ImmutableMap.<Direction, Property<WallSide>>builder()
.put(Direction.EAST, BlockStateProperties.EAST_WALL) .put(Direction.EAST, BlockStateProperties.EAST_WALL)
.put(Direction.NORTH, BlockStateProperties.NORTH_WALL) .put(Direction.NORTH, BlockStateProperties.NORTH_WALL)
@@ -678,6 +825,22 @@ public abstract class BlockStateProvider implements DataProvider {
paneBlockInternalWithRenderType(block, name + "_pane", pane, edge, renderType); paneBlockInternalWithRenderType(block, name + "_pane", pane, edge, renderType);
} }
public void paneBlockWithRenderTypeAndFast(IronBarsBlock block, ResourceLocation pane, ResourceLocation edge, String renderType, String renderTypeFast) {
paneBlockInternalWithRenderTypeAndFast(block, key(block).toString(), pane, edge, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
}
public void paneBlockWithRenderTypeAndFast(IronBarsBlock block, String name, ResourceLocation pane, ResourceLocation edge, String renderType, String renderTypeFast) {
paneBlockInternalWithRenderTypeAndFast(block, name + "_pane", pane, edge, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
}
public void paneBlockWithRenderTypeAndFast(IronBarsBlock block, ResourceLocation pane, ResourceLocation edge, ResourceLocation renderType, ResourceLocation renderTypeFast) {
paneBlockInternalWithRenderTypeAndFast(block, key(block).toString(), pane, edge, renderType, renderTypeFast);
}
public void paneBlockWithRenderTypeAndFast(IronBarsBlock block, String name, ResourceLocation pane, ResourceLocation edge, ResourceLocation renderType, ResourceLocation renderTypeFast) {
paneBlockInternalWithRenderTypeAndFast(block, name + "_pane", pane, edge, renderType, renderTypeFast);
}
private void paneBlockInternal(IronBarsBlock block, String baseName, ResourceLocation pane, ResourceLocation edge) { private void paneBlockInternal(IronBarsBlock block, String baseName, ResourceLocation pane, ResourceLocation edge) {
ModelFile post = models().panePost(baseName + "_post", pane, edge); ModelFile post = models().panePost(baseName + "_post", pane, edge);
ModelFile side = models().paneSide(baseName + "_side", pane, edge); ModelFile side = models().paneSide(baseName + "_side", pane, edge);
@@ -696,6 +859,15 @@ public abstract class BlockStateProvider implements DataProvider {
paneBlock(block, post, side, sideAlt, noSide, noSideAlt); paneBlock(block, post, side, sideAlt, noSide, noSideAlt);
} }
private void paneBlockInternalWithRenderTypeAndFast(IronBarsBlock block, String baseName, ResourceLocation pane, ResourceLocation edge, ResourceLocation renderType, ResourceLocation renderTypeFast) {
ModelFile post = models().panePost(baseName + "_post", pane, edge).renderType(renderType, renderTypeFast);
ModelFile side = models().paneSide(baseName + "_side", pane, edge).renderType(renderType, renderTypeFast);
ModelFile sideAlt = models().paneSideAlt(baseName + "_side_alt", pane, edge).renderType(renderType, renderTypeFast);
ModelFile noSide = models().paneNoSide(baseName + "_noside", pane).renderType(renderType, renderTypeFast);
ModelFile noSideAlt = models().paneNoSideAlt(baseName + "_noside_alt", pane).renderType(renderType, renderTypeFast);
paneBlock(block, post, side, sideAlt, noSide, noSideAlt);
}
public void paneBlock(IronBarsBlock block, ModelFile post, ModelFile side, ModelFile sideAlt, ModelFile noSide, ModelFile noSideAlt) { public void paneBlock(IronBarsBlock block, ModelFile post, ModelFile side, ModelFile sideAlt, ModelFile noSide, ModelFile noSideAlt) {
MultiPartBlockStateBuilder builder = getMultipartBuilder(block) MultiPartBlockStateBuilder builder = getMultipartBuilder(block)
.part().modelFile(post).addModel().end(); .part().modelFile(post).addModel().end();
@@ -735,6 +907,22 @@ public abstract class BlockStateProvider implements DataProvider {
doorBlockInternalWithRenderType(block, name + "_door", bottom, top, renderType); doorBlockInternalWithRenderType(block, name + "_door", bottom, top, renderType);
} }
public void doorBlockWithRenderTypeAndFast(DoorBlock block, ResourceLocation bottom, ResourceLocation top, String renderType, String renderTypeFast) {
doorBlockInternalWithRenderTypeAndFast(block, key(block).toString(), bottom, top, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
}
public void doorBlockWithRenderTypeAndFast(DoorBlock block, String name, ResourceLocation bottom, ResourceLocation top, String renderType, String renderTypeFast) {
doorBlockInternalWithRenderTypeAndFast(block, name + "_door", bottom, top, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
}
public void doorBlockWithRenderTypeAndFast(DoorBlock block, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
doorBlockInternalWithRenderTypeAndFast(block, key(block).toString(), bottom, top, renderType, renderTypeFast);
}
public void doorBlockWithRenderTypeAndFast(DoorBlock block, String name, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
doorBlockInternalWithRenderTypeAndFast(block, name + "_door", bottom, top, renderType, renderTypeFast);
}
private void doorBlockInternal(DoorBlock block, String baseName, ResourceLocation bottom, ResourceLocation top) { private void doorBlockInternal(DoorBlock block, String baseName, ResourceLocation bottom, ResourceLocation top) {
ModelFile bottomLeft = models().doorBottomLeft(baseName + "_bottom_left", bottom, top); ModelFile bottomLeft = models().doorBottomLeft(baseName + "_bottom_left", bottom, top);
ModelFile bottomLeftOpen = models().doorBottomLeftOpen(baseName + "_bottom_left_open", bottom, top); ModelFile bottomLeftOpen = models().doorBottomLeftOpen(baseName + "_bottom_left_open", bottom, top);
@@ -759,6 +947,18 @@ public abstract class BlockStateProvider implements DataProvider {
doorBlock(block, bottomLeft, bottomLeftOpen, bottomRight, bottomRightOpen, topLeft, topLeftOpen, topRight, topRightOpen); doorBlock(block, bottomLeft, bottomLeftOpen, bottomRight, bottomRightOpen, topLeft, topLeftOpen, topRight, topRightOpen);
} }
private void doorBlockInternalWithRenderTypeAndFast(DoorBlock block, String baseName, ResourceLocation bottom, ResourceLocation top, ResourceLocation renderType, ResourceLocation renderTypeFast) {
ModelFile bottomLeft = models().doorBottomLeft(baseName + "_bottom_left", bottom, top).renderType(renderType, renderTypeFast);
ModelFile bottomLeftOpen = models().doorBottomLeftOpen(baseName + "_bottom_left_open", bottom, top).renderType(renderType, renderTypeFast);
ModelFile bottomRight = models().doorBottomRight(baseName + "_bottom_right", bottom, top).renderType(renderType, renderTypeFast);
ModelFile bottomRightOpen = models().doorBottomRightOpen(baseName + "_bottom_right_open", bottom, top).renderType(renderType, renderTypeFast);
ModelFile topLeft = models().doorTopLeft(baseName + "_top_left", bottom, top).renderType(renderType, renderTypeFast);
ModelFile topLeftOpen = models().doorTopLeftOpen(baseName + "_top_left_open", bottom, top).renderType(renderType, renderTypeFast);
ModelFile topRight = models().doorTopRight(baseName + "_top_right", bottom, top).renderType(renderType, renderTypeFast);
ModelFile topRightOpen = models().doorTopRightOpen(baseName + "_top_right_open", bottom, top).renderType(renderType, renderTypeFast);
doorBlock(block, bottomLeft, bottomLeftOpen, bottomRight, bottomRightOpen, topLeft, topLeftOpen, topRight, topRightOpen);
}
public void doorBlock(DoorBlock block, ModelFile bottomLeft, ModelFile bottomLeftOpen, ModelFile bottomRight, ModelFile bottomRightOpen, ModelFile topLeft, ModelFile topLeftOpen, ModelFile topRight, ModelFile topRightOpen) { public void doorBlock(DoorBlock block, ModelFile bottomLeft, ModelFile bottomLeftOpen, ModelFile bottomRight, ModelFile bottomRightOpen, ModelFile topLeft, ModelFile topLeftOpen, ModelFile topRight, ModelFile topRightOpen) {
getVariantBuilder(block).forAllStatesExcept(state -> { getVariantBuilder(block).forAllStatesExcept(state -> {
int yRot = ((int) state.getValue(DoorBlock.FACING).toYRot()) + 90; int yRot = ((int) state.getValue(DoorBlock.FACING).toYRot()) + 90;
@@ -825,6 +1025,22 @@ public abstract class BlockStateProvider implements DataProvider {
trapdoorBlockInternalWithRenderType(block, name + "_trapdoor", texture, orientable, renderType); trapdoorBlockInternalWithRenderType(block, name + "_trapdoor", texture, orientable, renderType);
} }
public void trapdoorBlockWithRenderTypeAndFast(TrapDoorBlock block, ResourceLocation texture, boolean orientable, String renderType, String renderTypeFast) {
trapdoorBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, orientable, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
}
public void trapdoorBlockWithRenderTypeAndFast(TrapDoorBlock block, String name, ResourceLocation texture, boolean orientable, String renderType, String renderTypeFast) {
trapdoorBlockInternalWithRenderTypeAndFast(block, name + "_trapdoor", texture, orientable, ResourceLocation.tryParse(renderType), ResourceLocation.tryParse(renderTypeFast));
}
public void trapdoorBlockWithRenderTypeAndFast(TrapDoorBlock block, ResourceLocation texture, boolean orientable, ResourceLocation renderType, ResourceLocation renderTypeFast) {
trapdoorBlockInternalWithRenderTypeAndFast(block, key(block).toString(), texture, orientable, renderType, renderTypeFast);
}
public void trapdoorBlockWithRenderTypeAndFast(TrapDoorBlock block, String name, ResourceLocation texture, boolean orientable, ResourceLocation renderType, ResourceLocation renderTypeFast) {
trapdoorBlockInternalWithRenderTypeAndFast(block, name + "_trapdoor", texture, orientable, renderType, renderTypeFast);
}
private void trapdoorBlockInternal(TrapDoorBlock block, String baseName, ResourceLocation texture, boolean orientable) { private void trapdoorBlockInternal(TrapDoorBlock block, String baseName, ResourceLocation texture, boolean orientable) {
ModelFile bottom = orientable ? models().trapdoorOrientableBottom(baseName + "_bottom", texture) : models().trapdoorBottom(baseName + "_bottom", texture); ModelFile bottom = orientable ? models().trapdoorOrientableBottom(baseName + "_bottom", texture) : models().trapdoorBottom(baseName + "_bottom", texture);
ModelFile top = orientable ? models().trapdoorOrientableTop(baseName + "_top", texture) : models().trapdoorTop(baseName + "_top", texture); ModelFile top = orientable ? models().trapdoorOrientableTop(baseName + "_top", texture) : models().trapdoorTop(baseName + "_top", texture);
@@ -839,6 +1055,13 @@ public abstract class BlockStateProvider implements DataProvider {
trapdoorBlock(block, bottom, top, open, orientable); trapdoorBlock(block, bottom, top, open, orientable);
} }
private void trapdoorBlockInternalWithRenderTypeAndFast(TrapDoorBlock block, String baseName, ResourceLocation texture, boolean orientable, ResourceLocation renderType, ResourceLocation renderTypeFast) {
ModelFile bottom = orientable ? models().trapdoorOrientableBottom(baseName + "_bottom", texture).renderType(renderType, renderTypeFast) : models().trapdoorBottom(baseName + "_bottom", texture).renderType(renderType, renderTypeFast);
ModelFile top = orientable ? models().trapdoorOrientableTop(baseName + "_top", texture).renderType(renderType, renderTypeFast) : models().trapdoorTop(baseName + "_top", texture).renderType(renderType, renderTypeFast);
ModelFile open = orientable ? models().trapdoorOrientableOpen(baseName + "_open", texture).renderType(renderType, renderTypeFast) : models().trapdoorOpen(baseName + "_open", texture).renderType(renderType, renderTypeFast);
trapdoorBlock(block, bottom, top, open, orientable);
}
public void trapdoorBlock(TrapDoorBlock block, ModelFile bottom, ModelFile top, ModelFile open, boolean orientable) { public void trapdoorBlock(TrapDoorBlock block, ModelFile bottom, ModelFile top, ModelFile open, boolean orientable) {
getVariantBuilder(block).forAllStatesExcept(state -> { getVariantBuilder(block).forAllStatesExcept(state -> {
int xRot = 0; int xRot = 0;
@@ -60,6 +60,7 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
protected final ExistingFileHelper existingFileHelper; protected final ExistingFileHelper existingFileHelper;
protected String renderType = null; protected String renderType = null;
protected String renderTypeFast = null;
protected boolean ambientOcclusion = true; protected boolean ambientOcclusion = true;
protected GuiLight guiLight = null; protected GuiLight guiLight = null;
@@ -149,12 +150,17 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
} }
/** /**
* Set the render type for this model. * Set the render type for this model. Any render types to be used must be registered via
* {@link net.minecraftforge.client.event.RegisterNamedRenderTypesEvent RegisterNamedRenderTypesEvent}.
* <p>
* Consider using {@linkplain #renderType(String, String)} if you need to set a render type for
* {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}.
* *
* @param renderType the render type. Must be registered via * @param renderType the render type
* {@link net.minecraftforge.client.event.RegisterNamedRenderTypesEvent}
* @return this builder * @return this builder
* @throws NullPointerException if {@code renderType} is {@code null} *
* @throws NullPointerException if {@code renderType} is {@code null}
* @see #renderType(String, String)
*/ */
public T renderType(String renderType) { public T renderType(String renderType) {
Preconditions.checkNotNull(renderType, "Render type must not be null"); Preconditions.checkNotNull(renderType, "Render type must not be null");
@@ -162,16 +168,56 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
} }
/** /**
* Set the render type for this model. * Set the render types for this model. Any render types to be used must be registered via
* {@link net.minecraftforge.client.event.RegisterNamedRenderTypesEvent RegisterNamedRenderTypesEvent}.
* *
* @param renderType the render type. Must be registered via * @param renderType the render type for {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics}
* {@link net.minecraftforge.client.event.RegisterNamedRenderTypesEvent} * @param renderTypeFast the render type for {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}
* @return this builder * @return this builder
* @throws NullPointerException if {@code renderType} is {@code null} *
* @throws NullPointerException if {@code renderType} is {@code null}
*/
public T renderType(String renderType, String renderTypeFast) {
Preconditions.checkNotNull(renderType, "Render type must not be null");
Preconditions.checkNotNull(renderTypeFast, "Render type for fast graphics must not be null");
return renderType(new ResourceLocation(renderType), new ResourceLocation(renderTypeFast));
}
/**
* Set the render type for this model. Any render types to be used must be registered via
* {@link net.minecraftforge.client.event.RegisterNamedRenderTypesEvent RegisterNamedRenderTypesEvent}.
* <p>
* Consider using {@linkplain #renderType(ResourceLocation, ResourceLocation)} if you need to set a render type for
* {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}.
*
* @param renderType the render type
* @return this builder
*
* @throws NullPointerException if {@code renderType} is {@code null}
* @see #renderType(ResourceLocation, ResourceLocation)
*/ */
public T renderType(ResourceLocation renderType) { public T renderType(ResourceLocation renderType) {
Preconditions.checkNotNull(renderType, "Render type must not be null"); Preconditions.checkNotNull(renderType, "Render type must not be null");
this.renderType = renderType.toString(); this.renderType = renderType.toString();
this.renderTypeFast = null;
return self();
}
/**
* Set the render types for this model. Any render types to be used must be registered via
* {@link net.minecraftforge.client.event.RegisterNamedRenderTypesEvent RegisterNamedRenderTypesEvent}.
*
* @param renderType the render type for {@linkplain net.minecraft.client.GraphicsStatus#FANCY fancy graphics}
* @param renderTypeFast the render type for {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics}
* @return this builder
*
* @throws NullPointerException if {@code renderType} is {@code null}
*/
public T renderType(ResourceLocation renderType, ResourceLocation renderTypeFast) {
Preconditions.checkNotNull(renderType, "Render type must not be null");
Preconditions.checkNotNull(renderTypeFast, "Render type for fast graphics must not be null");
this.renderType = renderType.toString();
this.renderTypeFast = renderTypeFast.toString();
return self(); return self();
} }
@@ -256,6 +302,10 @@ public class ModelBuilder<T extends ModelBuilder<T>> extends ModelFile {
root.addProperty("render_type", this.renderType); root.addProperty("render_type", this.renderType);
} }
if (this.renderTypeFast != null) {
root.addProperty("render_type_fast", this.renderTypeFast);
}
Map<ItemDisplayContext, ItemTransform> transforms = this.transforms.build(); Map<ItemDisplayContext, ItemTransform> transforms = this.transforms.build();
if (!transforms.isEmpty()) { if (!transforms.isEmpty()) {
JsonObject display = new JsonObject(); JsonObject display = new JsonObject();
@@ -368,6 +368,11 @@ public abstract class ModelProvider<T extends ModelBuilder<T>> implements DataPr
return singleTexture(name, BLOCK_FOLDER + "/carpet", "wool", wool); return singleTexture(name, BLOCK_FOLDER + "/carpet", "wool", wool);
} }
public T leaves(String name, ResourceLocation texture) {
return singleTexture(name, BLOCK_FOLDER + "/leaves", "all", texture)
.renderType("cutout_mipped", "solid");
}
/** /**
* {@return a model builder that's not directly saved to disk. Meant for use in custom model loaders.} * {@return a model builder that's not directly saved to disk. Meant for use in custom model loaders.}
*/ */
@@ -33,6 +33,7 @@ public class ItemLayerModelBuilder<T extends ModelBuilder<T>> extends CustomLoad
private final Int2ObjectMap<ForgeFaceData> faceData = new Int2ObjectOpenHashMap<>(); private final Int2ObjectMap<ForgeFaceData> faceData = new Int2ObjectOpenHashMap<>();
private final Map<ResourceLocation, IntSet> renderTypes = new LinkedHashMap<>(); private final Map<ResourceLocation, IntSet> renderTypes = new LinkedHashMap<>();
private final Map<ResourceLocation, IntSet> renderTypesFast = new LinkedHashMap<>();
private final IntSet layersWithRenderTypes = new IntOpenHashSet(); private final IntSet layersWithRenderTypes = new IntOpenHashSet();
protected ItemLayerModelBuilder(T parent, ExistingFileHelper existingFileHelper) protected ItemLayerModelBuilder(T parent, ExistingFileHelper existingFileHelper)
@@ -115,6 +116,23 @@ public class ItemLayerModelBuilder<T extends ModelBuilder<T>> extends CustomLoad
return renderType(asLoc, layers); return renderType(asLoc, layers);
} }
public ItemLayerModelBuilder<T> renderType(String renderType, String renderTypeFast, int... layers)
{
Preconditions.checkNotNull(renderType, "Render type must not be null");
Preconditions.checkNotNull(renderTypeFast, "Fast graphics render type must not be null");
ResourceLocation asLoc;
if (renderType.contains(":"))
asLoc = new ResourceLocation(renderType);
else
asLoc = new ResourceLocation(parent.getLocation().getNamespace(), renderType);
ResourceLocation asLocFast;
if (renderTypeFast.contains(":"))
asLocFast = new ResourceLocation(renderTypeFast);
else
asLocFast = new ResourceLocation(parent.getLocation().getNamespace(), renderTypeFast);
return renderType(asLoc, asLocFast, layers);
}
/** /**
* Set the render type for a set of layers. * Set the render type for a set of layers.
* *
@@ -144,6 +162,25 @@ public class ItemLayerModelBuilder<T extends ModelBuilder<T>> extends CustomLoad
return this; return this;
} }
public ItemLayerModelBuilder<T> renderType(ResourceLocation renderType, ResourceLocation renderTypeFast, int... layers)
{
Preconditions.checkNotNull(renderType, "Render type must not be null");
Preconditions.checkNotNull(renderTypeFast, "Fast graphics render type must not be null");
Preconditions.checkNotNull(layers, "Layers must not be null");
Preconditions.checkArgument(layers.length > 0, "At least one layer must be specified");
Preconditions.checkArgument(Arrays.stream(layers).allMatch(i -> i >= 0), "All layers must be >= 0");
var alreadyAssigned = Arrays.stream(layers).filter(layersWithRenderTypes::contains).toArray();
Preconditions.checkArgument(alreadyAssigned.length == 0, "Attempted to re-assign layer render types: " + Arrays.toString(alreadyAssigned));
var renderTypeLayers = renderTypes.computeIfAbsent(renderType, $ -> new IntOpenHashSet());
var renderTypeFastLayers = renderTypesFast.computeIfAbsent(renderType, $ -> new IntOpenHashSet());
Arrays.stream(layers).forEach(layer -> {
renderTypeLayers.add(layer);
renderTypeFastLayers.add(layer);
layersWithRenderTypes.add(layer);
});
return this;
}
@Override @Override
public JsonObject toJson(JsonObject json) public JsonObject toJson(JsonObject json)
{ {
@@ -168,6 +205,14 @@ public class ItemLayerModelBuilder<T extends ModelBuilder<T>> extends CustomLoad
}); });
json.add("render_types", renderTypes); json.add("render_types", renderTypes);
JsonObject renderTypesFast = new JsonObject();
this.renderTypesFast.forEach((renderTypeFast, layers) -> {
JsonArray array = new JsonArray();
layers.intStream().sorted().forEach(array::add);
renderTypesFast.add(renderTypeFast.toString(), array);
});
json.add("render_types_fast", renderTypesFast);
return json; return json;
} }
} }
@@ -41,6 +41,8 @@ public class BlockGeometryBakingContext implements IGeometryBakingContext
private Transformation rootTransform; private Transformation rootTransform;
@Nullable @Nullable
private ResourceLocation renderTypeHint; private ResourceLocation renderTypeHint;
@Nullable
private ResourceLocation renderTypeFastHint;
private boolean gui3d = true; private boolean gui3d = true;
@ApiStatus.Internal @ApiStatus.Internal
@@ -137,11 +139,25 @@ public class BlockGeometryBakingContext implements IGeometryBakingContext
return owner.parent != null ? owner.parent.customData.getRenderTypeHint() : null; return owner.parent != null ? owner.parent.customData.getRenderTypeHint() : null;
} }
@Nullable
@Override
public ResourceLocation getRenderTypeFastHint()
{
if (renderTypeFastHint != null)
return renderTypeFastHint;
return owner.parent != null ? owner.parent.customData.getRenderTypeFastHint() : null;
}
public void setRenderTypeHint(ResourceLocation renderTypeHint) public void setRenderTypeHint(ResourceLocation renderTypeHint)
{ {
this.renderTypeHint = renderTypeHint; this.renderTypeHint = renderTypeHint;
} }
public void setRenderTypeFastHint(ResourceLocation renderTypeFastHint)
{
this.renderTypeFastHint = renderTypeFastHint;
}
public void setGui3d(boolean gui3d) public void setGui3d(boolean gui3d)
{ {
this.gui3d = gui3d; this.gui3d = gui3d;
@@ -153,6 +169,7 @@ public class BlockGeometryBakingContext implements IGeometryBakingContext
this.rootTransform = other.rootTransform; this.rootTransform = other.rootTransform;
this.visibilityData.copyFrom(other.visibilityData); this.visibilityData.copyFrom(other.visibilityData);
this.renderTypeHint = other.renderTypeHint; this.renderTypeHint = other.renderTypeHint;
this.renderTypeFastHint = other.renderTypeFastHint;
this.gui3d = other.gui3d; this.gui3d = other.gui3d;
} }
@@ -75,6 +75,13 @@ public interface IGeometryBakingContext
@Nullable @Nullable
ResourceLocation getRenderTypeHint(); ResourceLocation getRenderTypeHint();
/**
* @return a hint of the render type this model should use while using the
* {@linkplain net.minecraft.client.GraphicsStatus#FAST fast graphics status}. Custom loaders may ignore this.
*/
@Nullable
default ResourceLocation getRenderTypeFastHint() { return null; }
/** /**
* Queries the visibility of a component of this model. * Queries the visibility of a component of this model.
* *
@@ -30,8 +30,10 @@ public abstract class SimpleUnbakedGeometry<T extends SimpleUnbakedGeometry<T>>
var renderTypeHint = context.getRenderTypeHint(); var renderTypeHint = context.getRenderTypeHint();
var renderTypes = renderTypeHint != null ? context.getRenderType(renderTypeHint) : RenderTypeGroup.EMPTY; var renderTypes = renderTypeHint != null ? context.getRenderType(renderTypeHint) : RenderTypeGroup.EMPTY;
var renderTypeFastHint = context.getRenderTypeFastHint();
var renderTypesFast = renderTypeFastHint != null ? context.getRenderType(renderTypeFastHint) : RenderTypeGroup.EMPTY;
IModelBuilder<?> builder = IModelBuilder.of(context.useAmbientOcclusion(), context.useBlockLight(), context.isGui3d(), IModelBuilder<?> builder = IModelBuilder.of(context.useAmbientOcclusion(), context.useBlockLight(), context.isGui3d(),
context.getTransforms(), overrides, particle, renderTypes); context.getTransforms(), overrides, particle, renderTypes, renderTypesFast);
addQuads(context, builder, baker, spriteGetter, modelState, modelLocation); addQuads(context, builder, baker, spriteGetter, modelState, modelLocation);
@@ -54,6 +54,8 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
private final Transformation rootTransform; private final Transformation rootTransform;
@Nullable @Nullable
private final ResourceLocation renderTypeHint; private final ResourceLocation renderTypeHint;
@Nullable
private final ResourceLocation renderTypeFastHint;
private final BiPredicate<String, Boolean> visibilityTest; private final BiPredicate<String, Boolean> visibilityTest;
private StandaloneGeometryBakingContext(ResourceLocation modelName, Predicate<String> materialCheck, private StandaloneGeometryBakingContext(ResourceLocation modelName, Predicate<String> materialCheck,
@@ -72,6 +74,28 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
this.transforms = transforms; this.transforms = transforms;
this.rootTransform = rootTransform; this.rootTransform = rootTransform;
this.renderTypeHint = renderTypeHint; this.renderTypeHint = renderTypeHint;
this.renderTypeFastHint = null;
this.visibilityTest = visibilityTest;
}
private StandaloneGeometryBakingContext(ResourceLocation modelName, Predicate<String> materialCheck,
Function<String, Material> materialLookup, boolean isGui3d,
boolean useBlockLight, boolean useAmbientOcclusion,
ItemTransforms transforms, Transformation rootTransform,
@Nullable ResourceLocation renderTypeHint,
@Nullable ResourceLocation renderTypeFastHint,
BiPredicate<String, Boolean> visibilityTest)
{
this.modelName = modelName;
this.materialCheck = materialCheck;
this.materialLookup = materialLookup;
this.isGui3d = isGui3d;
this.useBlockLight = useBlockLight;
this.useAmbientOcclusion = useAmbientOcclusion;
this.transforms = transforms;
this.rootTransform = rootTransform;
this.renderTypeHint = renderTypeHint;
this.renderTypeFastHint = renderTypeFastHint;
this.visibilityTest = visibilityTest; this.visibilityTest = visibilityTest;
} }
@@ -130,6 +154,13 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
return renderTypeHint; return renderTypeHint;
} }
@Nullable
@Override
public ResourceLocation getRenderTypeFastHint()
{
return renderTypeFastHint;
}
@Override @Override
public boolean isComponentVisible(String component, boolean fallback) public boolean isComponentVisible(String component, boolean fallback)
{ {
@@ -158,6 +189,8 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
private Transformation rootTransform = Transformation.identity(); private Transformation rootTransform = Transformation.identity();
@Nullable @Nullable
private ResourceLocation renderTypeHint; private ResourceLocation renderTypeHint;
@Nullable
private ResourceLocation renderTypeFastHint;
private BiPredicate<String, Boolean> visibilityTest = (c, def) -> def; private BiPredicate<String, Boolean> visibilityTest = (c, def) -> def;
private Builder() private Builder()
@@ -174,6 +207,7 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
this.transforms = parent.getTransforms(); this.transforms = parent.getTransforms();
this.rootTransform = parent.getRootTransform(); this.rootTransform = parent.getRootTransform();
this.renderTypeHint = parent.getRenderTypeHint(); this.renderTypeHint = parent.getRenderTypeHint();
this.renderTypeFastHint = parent.getRenderTypeFastHint();
this.visibilityTest = parent::isComponentVisible; this.visibilityTest = parent::isComponentVisible;
} }
@@ -232,6 +266,13 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
return this; return this;
} }
public Builder withRenderTypeHint(ResourceLocation renderTypeHint, ResourceLocation renderTypeFastHint)
{
this.renderTypeHint = renderTypeHint;
this.renderTypeFastHint = renderTypeFastHint;
return this;
}
public Builder withVisibleComponents(Object2BooleanMap<String> parts) public Builder withVisibleComponents(Object2BooleanMap<String> parts)
{ {
this.visibilityTest = parts::getOrDefault; this.visibilityTest = parts::getOrDefault;
@@ -240,7 +281,7 @@ public class StandaloneGeometryBakingContext implements IGeometryBakingContext
public StandaloneGeometryBakingContext build(ResourceLocation modelName) public StandaloneGeometryBakingContext build(ResourceLocation modelName)
{ {
return new StandaloneGeometryBakingContext(modelName, materialCheck, materialLookup, isGui3d, useBlockLight, useAmbientOcclusion, transforms, rootTransform, renderTypeHint, visibilityTest); return new StandaloneGeometryBakingContext(modelName, materialCheck, materialLookup, isGui3d, useBlockLight, useAmbientOcclusion, transforms, rootTransform, renderTypeHint, renderTypeFastHint, visibilityTest);
} }
} }
} }
@@ -32,6 +32,8 @@ public class ForgeConfig {
public final BooleanValue advertiseDedicatedServerToLan; public final BooleanValue advertiseDedicatedServerToLan;
public final BooleanValue useItemWithDurationZero;
Server(ForgeConfigSpec.Builder builder) { Server(ForgeConfigSpec.Builder builder) {
builder.comment("Server configuration settings") builder.comment("Server configuration settings")
.push("server"); .push("server");
@@ -76,8 +78,17 @@ public class ForgeConfig {
.translation("forge.configgui.advertiseDedicatedServerToLan") .translation("forge.configgui.advertiseDedicatedServerToLan")
.define("advertiseDedicatedServerToLan", true); .define("advertiseDedicatedServerToLan", true);
useItemWithDurationZero = builder
.comment("Set this to true to enable living entities to use items with durations of 0. Fixes being able to use Eyes of Ender repeatedly by holding down the use button. Disabled by default as it could change interactions with items of existing mods.")
.translation("forge.configgui.useItemWithDurationZero")
.define("useItemWithDurationZero", false);
builder.pop(); builder.pop();
} }
public final int getUseItemDuration() {
return useItemWithDurationZero.get() ? 0 : 1;
}
} }
/** /**
@@ -133,6 +144,8 @@ public class ForgeConfig {
@Deprecated(since = "1.20.1", forRemoval = true) // Config option ignored. @Deprecated(since = "1.20.1", forRemoval = true) // Config option ignored.
public final BooleanValue compressLanIPv6Addresses; public final BooleanValue compressLanIPv6Addresses;
public final BooleanValue allowMipmapLowering;
Client(ForgeConfigSpec.Builder builder) { Client(ForgeConfigSpec.Builder builder) {
builder.comment("Client only settings, mostly things related to rendering") builder.comment("Client only settings, mostly things related to rendering")
.push("client"); .push("client");
@@ -164,8 +177,17 @@ public class ForgeConfig {
.translation("forge.configgui.compressLanIPv6Addresses") .translation("forge.configgui.compressLanIPv6Addresses")
.define("compressLanIPv6Addresses", true); .define("compressLanIPv6Addresses", true);
allowMipmapLowering = builder
.comment("When enabled, Forge will allow mipmaps to be lowered in real-time. This is the default behavior in vanilla. Use this if you experience issues with resource packs that use textures lower than 8x8.")
.translation("forge.configgui.allowMipmapLowering")
.define("allowMipmapLowering", false);
builder.pop(); builder.pop();
} }
public final boolean allowMipmapLowering() {
return clientSpec.isLoaded() ? allowMipmapLowering.get() : allowMipmapLowering.getDefault();
}
} }
static final ForgeConfigSpec clientSpec; static final ForgeConfigSpec clientSpec;
@@ -425,7 +425,7 @@ public class ForgeMod
enableMilkFluid = true; enableMilkFluid = true;
} }
public ForgeMod() public ForgeMod(FMLJavaModLoadingContext context)
{ {
LOGGER.info(FORGEMOD,"Forge mod loading, version {}, for MC {} with MCP {}", ForgeVersion.getVersion(), MCPVersion.getMCVersion(), MCPVersion.getMCPVersion()); LOGGER.info(FORGEMOD,"Forge mod loading, version {}, for MC {} with MCP {}", ForgeVersion.getVersion(), MCPVersion.getMCVersion(), MCPVersion.getMCPVersion());
INSTANCE = this; INSTANCE = this;
@@ -436,11 +436,10 @@ public class ForgeMod
return uuid.toString(); return uuid.toString();
}); });
LOGGER.debug(FORGEMOD, "Loading Network data for FML net version: {}", NetworkConstants.init());
CrashReportCallables.registerCrashCallable("FML", ForgeVersion::getSpec); CrashReportCallables.registerCrashCallable("FML", ForgeVersion::getSpec);
CrashReportCallables.registerCrashCallable("Forge", ()->ForgeVersion.getGroup()+":"+ForgeVersion.getVersion()); CrashReportCallables.registerCrashCallable("Forge", ()->ForgeVersion.getGroup()+":"+ForgeVersion.getVersion());
final IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus(); final IEventBus modEventBus = context.getModEventBus();
// Forge-provided datapack registries // Forge-provided datapack registries
modEventBus.addListener((DataPackRegistryEvent.NewRegistry event) -> { modEventBus.addListener((DataPackRegistryEvent.NewRegistry event) -> {
event.dataPackRegistry(ForgeRegistries.Keys.BIOME_MODIFIERS, BiomeModifier.DIRECT_CODEC); event.dataPackRegistry(ForgeRegistries.Keys.BIOME_MODIFIERS, BiomeModifier.DIRECT_CODEC);
@@ -461,13 +460,13 @@ public class ForgeMod
VANILLA_FLUID_TYPES.register(modEventBus); VANILLA_FLUID_TYPES.register(modEventBus);
MinecraftForge.EVENT_BUS.addListener(this::serverStopping); MinecraftForge.EVENT_BUS.addListener(this::serverStopping);
MinecraftForge.EVENT_BUS.addListener(this::missingSoundMapping); MinecraftForge.EVENT_BUS.addListener(this::missingSoundMapping);
ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ForgeConfig.clientSpec); context.registerConfig(ModConfig.Type.CLIENT, ForgeConfig.clientSpec);
ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, ForgeConfig.serverSpec); context.registerConfig(ModConfig.Type.SERVER, ForgeConfig.serverSpec);
ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ForgeConfig.commonSpec); context.registerConfig(ModConfig.Type.COMMON, ForgeConfig.commonSpec);
modEventBus.register(ForgeConfig.class); modEventBus.register(ForgeConfig.class);
ForgeDeferredRegistriesSetup.setup(modEventBus); ForgeDeferredRegistriesSetup.setup(modEventBus);
// Forge does not display problems when the remote is not matching. // Forge does not display problems when the remote is not matching.
ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, ()->new IExtensionPoint.DisplayTest(()->"ANY", (remote, isServer)-> true)); context.registerDisplayTest(IExtensionPoint.DisplayTest.IGNORE_ALL_VERSION);
StartupMessageManager.addModMessage("Forge version "+ForgeVersion.getVersion()); StartupMessageManager.addModMessage("Forge version "+ForgeVersion.getVersion());
MinecraftForge.EVENT_BUS.addListener(VillagerTradingManager::loadTrades); MinecraftForge.EVENT_BUS.addListener(VillagerTradingManager::loadTrades);
@@ -27,12 +27,10 @@ import java.util.function.Function;
public class MinecraftForge public class MinecraftForge
{ {
/** /**
* The core Forge EventBusses, all events for Forge will be fired on these, * The EventBus for all the Forge Events.
* you should use this to register all your listeners. *
* This replaces every register*Handler() function in the old version of Forge. * Events marked with {@link net.minecraftforge.fml.event.IModBusEvent}
* TERRAIN_GEN_BUS for terrain gen events * belong on the ModBus and not this bus
* ORE_GEN_BUS for ore gen events
* EVENT_BUS for everything else
*/ */
public static final IEventBus EVENT_BUS = BusBuilder.builder().startShutdown().useModLauncher().build(); public static final IEventBus EVENT_BUS = BusBuilder.builder().startShutdown().useModLauncher().build();
@@ -82,36 +80,4 @@ public class MinecraftForge
() -> new ConfigScreenHandler.ConfigScreenFactory(screenFunction) () -> new ConfigScreenHandler.ConfigScreenFactory(screenFunction)
); );
} }
/*
public static void preloadCrashClasses(ASMDataTable table, String modID, Set<String> classes)
{
//Find all ICrashReportDetail's handlers and preload them.
List<String> all = Lists.newArrayList();
for (ASMData asm : table.getAll(ICrashReportDetail.class.getName().replace('.', '/')))
all.add(asm.getClassName());
for (ASMData asm : table.getAll(ICrashCallable.class.getName().replace('.', '/')))
all.add(asm.getClassName());
all.retainAll(classes);
if (all.size() == 0)
return;
ForgeMod.log.debug("Preloading CrashReport Classes");
Collections.sort(all); //Sort it because I like pretty output ;)
for (String name : all)
{
ForgeMod.log.debug("\t{}", name);
try
{
Class.forName(name.replace('/', '.'), false, MinecraftForge.class.getClassLoader());
}
catch (Exception e)
{
LOGGER.error("Could not find class for name '{}'.", name, e);
}
}
}
*/
} }
@@ -43,6 +43,7 @@ public class Tags
public static final TagKey<Block> CHESTS_ENDER = tag("chests/ender"); public static final TagKey<Block> CHESTS_ENDER = tag("chests/ender");
public static final TagKey<Block> CHESTS_TRAPPED = tag("chests/trapped"); public static final TagKey<Block> CHESTS_TRAPPED = tag("chests/trapped");
public static final TagKey<Block> CHESTS_WOODEN = tag("chests/wooden"); public static final TagKey<Block> CHESTS_WOODEN = tag("chests/wooden");
public static final TagKey<Block> CHORUS_ADDITIONALLY_GROWS_ON = tag("chorus_additionally_grows_on");
public static final TagKey<Block> COBBLESTONE = tag("cobblestone"); public static final TagKey<Block> COBBLESTONE = tag("cobblestone");
public static final TagKey<Block> COBBLESTONE_NORMAL = tag("cobblestone/normal"); public static final TagKey<Block> COBBLESTONE_NORMAL = tag("cobblestone/normal");
public static final TagKey<Block> COBBLESTONE_INFESTED = tag("cobblestone/infested"); public static final TagKey<Block> COBBLESTONE_INFESTED = tag("cobblestone/infested");
@@ -43,6 +43,7 @@ public final class ForgeBlockTagsProvider extends BlockTagsProvider
tag(CHESTS_ENDER).add(Blocks.ENDER_CHEST); tag(CHESTS_ENDER).add(Blocks.ENDER_CHEST);
tag(CHESTS_TRAPPED).add(Blocks.TRAPPED_CHEST); tag(CHESTS_TRAPPED).add(Blocks.TRAPPED_CHEST);
tag(CHESTS_WOODEN).add(Blocks.CHEST, Blocks.TRAPPED_CHEST); tag(CHESTS_WOODEN).add(Blocks.CHEST, Blocks.TRAPPED_CHEST);
tag(CHORUS_ADDITIONALLY_GROWS_ON).addTags(END_STONES);
tag(COBBLESTONE).addTags(COBBLESTONE_NORMAL, COBBLESTONE_INFESTED, COBBLESTONE_MOSSY, COBBLESTONE_DEEPSLATE); tag(COBBLESTONE).addTags(COBBLESTONE_NORMAL, COBBLESTONE_INFESTED, COBBLESTONE_MOSSY, COBBLESTONE_DEEPSLATE);
tag(COBBLESTONE_NORMAL).add(Blocks.COBBLESTONE); tag(COBBLESTONE_NORMAL).add(Blocks.COBBLESTONE);
tag(COBBLESTONE_INFESTED).add(Blocks.INFESTED_COBBLESTONE); tag(COBBLESTONE_INFESTED).add(Blocks.INFESTED_COBBLESTONE);
@@ -683,7 +683,7 @@ public interface IForgeItem
*/ */
default boolean canDisableShield(ItemStack stack, ItemStack shield, LivingEntity entity, LivingEntity attacker) default boolean canDisableShield(ItemStack stack, ItemStack shield, LivingEntity entity, LivingEntity attacker)
{ {
return this instanceof AxeItem; return attacker.canDisableShield();
} }
/** /**
@@ -230,10 +230,10 @@ public class ForgeEventFactory
if (!cancel) if (!cancel)
{ {
mob.finalizeSpawn(level, event.getDifficulty(), event.getSpawnType(), event.getSpawnData(), event.getSpawnTag()); return mob.finalizeSpawn(level, event.getDifficulty(), event.getSpawnType(), event.getSpawnData(), event.getSpawnTag());
} }
return cancel ? null : event.getSpawnData(); return null;
} }
/** /**
@@ -46,7 +46,7 @@ public class LivingEntityUseItemEvent extends LivingEvent
* Drinking Potions/Milk * Drinking Potions/Milk
* Guarding with a sword * Guarding with a sword
* *
* Cancel the event, or set the duration or {@literal <=} 0 to prevent it from processing. * Cancel the event, or set the duration or {@literal <} 0 to prevent it from processing.
* *
*/ */
@Cancelable @Cancelable
@@ -47,6 +47,11 @@ public class NetworkHooks
{ {
private static final Logger LOGGER = LogManager.getLogger(); private static final Logger LOGGER = LogManager.getLogger();
public static void init()
{
LOGGER.debug("Loading Network data for FML net version: {}", NetworkConstants.init());
}
public static String getFMLVersion(final String ip) public static String getFMLVersion(final String ip)
{ {
return ip.contains("\0") ? Objects.equals(ip.split("\0")[1], NetworkConstants.NETVERSION) ? NetworkConstants.NETVERSION : ip.split("\0")[1] : NetworkConstants.NOVERSION; return ip.contains("\0") ? Objects.equals(ip.split("\0")[1], NetworkConstants.NETVERSION) ? NetworkConstants.NETVERSION : ip.split("\0")[1] : NetworkConstants.NOVERSION;
@@ -790,11 +790,17 @@ public class ForgeRegistry<V> implements IForgeRegistryInternal<V>, IForgeRegist
public void freeze() public void freeze()
{ {
this.isFrozen = true; this.isFrozen = true;
var wrapper = this.getWrapper();
if (wrapper != null)
wrapper.locked = true;
} }
public void unfreeze() public void unfreeze()
{ {
this.isFrozen = false; this.isFrozen = false;
var wrapper = this.getWrapper();
if (wrapper != null)
wrapper.locked = false;
} }
void dump(ResourceLocation name) void dump(ResourceLocation name)
@@ -16,7 +16,19 @@ import java.lang.annotation.Target;
/** /**
* ObjectHolder can be used to automatically populate public static final fields with entries * ObjectHolder can be used to automatically populate public static final fields with entries
* from the registry. These values can then be referred within mod code directly. * from the registry. These values can then be referred within mod code directly.
* @deprecated Use {@link DeferredRegister} or {@link RegistryObject} instead. Refer to the MDK for more detailed examples.
* <br>
* Example usage of alternatives:
* <pre>{@code
* // To register something
* public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
* public static final RegistryObject<Item> EXAMPLE_ITEM = ITEMS.register("example_item", () -> new Item(new Item.Properties()));
*
* // To get a RegistryObject that you didn't register yourself:
* public static final RegistryObject<Block> DIRT = RegistryObject.create(new ResourceLocation("dirt"), ForgeRegistries.BLOCKS);
* }</pre>
*/ */
@Deprecated(since = "1.21.4", forRemoval = true)
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD) @Target(ElementType.FIELD)
public @interface ObjectHolder public @interface ObjectHolder
@@ -91,6 +91,9 @@ public class ObjectHolderRegistry
.filter(a -> OBJECT_HOLDER.equals(a.annotationType()) || MOD.equals(a.annotationType())) .filter(a -> OBJECT_HOLDER.equals(a.annotationType()) || MOD.equals(a.annotationType()))
.toList(); .toList();
if (annotations.stream().noneMatch(a -> OBJECT_HOLDER.equals(a.annotationType())))
return; // No object holders found, skip the rest of the processing
Map<Type, String> classModIds = Maps.newHashMap(); Map<Type, String> classModIds = Maps.newHashMap();
Map<Type, Class<?>> classCache = Maps.newHashMap(); Map<Type, Class<?>> classCache = Maps.newHashMap();
@@ -170,6 +170,8 @@
"forge.configgui.skipEmptyShapelessCheck": "Skip checking for empty ingredients in Shapeless Recipe Deserialization", "forge.configgui.skipEmptyShapelessCheck": "Skip checking for empty ingredients in Shapeless Recipe Deserialization",
"forge.configgui.forceSystemNanoTime.tooltip": "Force the use of System.nanoTime instead of glfwGetTime as the main client Time provider.", "forge.configgui.forceSystemNanoTime.tooltip": "Force the use of System.nanoTime instead of glfwGetTime as the main client Time provider.",
"forge.configgui.forceSystemNanoTime": "Force System.nanoTime", "forge.configgui.forceSystemNanoTime": "Force System.nanoTime",
"forge.configgui.useItemWithDurationZero": "Allow Use Item with Duration of 0",
"forge.configgui.useItemWithDurationZero.tooltip": "Set this to true to enable living entities to use items with durations of 0. Fixes being able to use Eyes of Ender repeatedly by holding down the use button. Disabled by default as it could change interactions with items of existing mods.",
"forge.configgui.zoomInMissingModelTextInGui.tooltip": "Toggle off to make missing model text in the gui fit inside the slot.", "forge.configgui.zoomInMissingModelTextInGui.tooltip": "Toggle off to make missing model text in the gui fit inside the slot.",
"forge.configgui.zoomInMissingModelTextInGui": "Zoom in Missing model text in the GUI", "forge.configgui.zoomInMissingModelTextInGui": "Zoom in Missing model text in the GUI",
@@ -185,6 +187,8 @@
"forge.configgui.selectiveResourceReloadEnabled": "Enable Selective Resource Loading", "forge.configgui.selectiveResourceReloadEnabled": "Enable Selective Resource Loading",
"forge.configgui.showLoadWarnings.tooltip": "When enabled, Forge will show any warnings that occurred during loading.", "forge.configgui.showLoadWarnings.tooltip": "When enabled, Forge will show any warnings that occurred during loading.",
"forge.configgui.showLoadWarnings": "Show Load Warnings", "forge.configgui.showLoadWarnings": "Show Load Warnings",
"forge.configgui.allowMipmapLowering.tooltip": "When enabled, Forge will allow mipmaps to be lowered in real-time. This is the default behavior in vanilla. Use this if you experience issues with resource packs that use textures lower than 8x8.",
"forge.configgui.allowMipmapLowering": "Allow mipmap lowering",
"forge.configgui.disableVersionCheck.tooltip": "Set to true to disable Forge version check mechanics. Forge queries a small json file on our server for version information. For more details see the ForgeVersion class in our github.", "forge.configgui.disableVersionCheck.tooltip": "Set to true to disable Forge version check mechanics. Forge queries a small json file on our server for version information. For more details see the ForgeVersion class in our github.",
"forge.configgui.disableVersionCheck": "Disable Forge Version Check", "forge.configgui.disableVersionCheck": "Disable Forge Version Check",