mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-19 03:49:14 +00:00
Forge 1.19.3
Created a CreativeModeTabEvent to register creative mode tabs and populate entries per tab Moved datapack registries to DataPackRegistryEvent.NewRegistry event instead of tying them to ForgeRegistry Made it easier for mods to datagen datapack builtin entries with DatapackBuiltinEntriesProvider Provided access to lookupProvider for datagen Updated dependencies to match versions used by vanilla and update JarJar to 0.3.18 Added a test mod for the new CreativeModeTabEvent Throws better error message for Forge registries in tag datagen Deleted ForgeRegistryTagsProvider Updated ClientChatReceivedEvent and ServerChatEvent for Mojang changes Added patches for both sign related methods in ModelLayers Changed RegisterShadersEvent to use ResourceProvider Migrated old Mojang math types to JOML Co-authored-by: Marc Hermans <[email protected]> Co-authored-by: LexManos <[email protected]> Co-authored-by: sciwhiz12 <[email protected]> Co-authored-by: coehlrich <[email protected]>
This commit is contained in:
1 parent
617ecb7ad3
commit
8255d7aed3
726 files changed
+7615
-6653
No files matched your search
@@ -5,28 +5,24 @@
|
||||
|
||||
package net.minecraftforge.debug.misc;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.util.Locale;
|
||||
|
||||
import net.minecraft.data.CachedOutput;
|
||||
import org.slf4j.Logger;
|
||||
|
||||
import com.google.gson.Gson;
|
||||
import com.google.gson.GsonBuilder;
|
||||
import com.google.gson.JsonElement;
|
||||
import com.mojang.logging.LogUtils;
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.JsonOps;
|
||||
|
||||
import java.nio.file.Path;
|
||||
import java.util.Locale;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.player.LocalPlayer;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.core.Registry;
|
||||
import net.minecraft.core.RegistryAccess;
|
||||
import net.minecraft.data.CachedOutput;
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraft.data.DataProvider;
|
||||
import net.minecraft.data.HashCache;
|
||||
import net.minecraft.resources.RegistryOps;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
@@ -34,17 +30,16 @@ import net.minecraft.server.packs.PackType;
|
||||
import net.minecraft.tags.TagKey;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.data.event.GatherDataEvent;
|
||||
import net.minecraftforge.event.TagsUpdatedEvent;
|
||||
import net.minecraftforge.event.server.ServerStartingEvent;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.fml.loading.FMLEnvironment;
|
||||
import net.minecraftforge.fml.util.thread.EffectiveSide;
|
||||
import net.minecraftforge.data.event.GatherDataEvent;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.RegistryBuilder;
|
||||
import net.minecraftforge.registries.DataPackRegistryEvent;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
import org.slf4j.Logger;
|
||||
|
||||
/**
|
||||
* <p>This test class shows an example of how to register unsynced and synced datapack registries,
|
||||
@@ -58,7 +53,7 @@ import net.minecraftforge.registries.RegistryObject;
|
||||
* <li><code>data/data_pack_registries_test/tags/data_pack_registries_test/syncable/test.json</code></li>
|
||||
* </ul>
|
||||
*/
|
||||
@Mod(DataPackRegistriesTest.MODID)
|
||||
//@Mod(DataPackRegistriesTest.MODID)
|
||||
public class DataPackRegistriesTest
|
||||
{
|
||||
private static final boolean ENABLED = true;
|
||||
@@ -66,7 +61,8 @@ public class DataPackRegistriesTest
|
||||
private static final Logger LOGGER = LogUtils.getLogger();
|
||||
private static final ResourceLocation TEST_RL = new ResourceLocation(MODID, "test");
|
||||
|
||||
private final RegistryObject<Unsyncable> datagenTestObject;
|
||||
//TODO: Fix datapack generation for it.
|
||||
private final RegistryObject<Unsyncable> datagenTestObject = null;
|
||||
|
||||
public DataPackRegistriesTest()
|
||||
{
|
||||
@@ -76,23 +72,10 @@ public class DataPackRegistriesTest
|
||||
final IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus();
|
||||
final IEventBus forgeBus = MinecraftForge.EVENT_BUS;
|
||||
|
||||
// Deferred Registers can be created for datapack registries in static init or mod constructor.
|
||||
// (We'll do it in mod constructor, as when doing the ENABLED check it's less verbose than static init.)
|
||||
// As with static registries, any mod can make a Deferred Register for a given datapack registry,
|
||||
// but only one mod can register the internal registry with makeRegistry.
|
||||
final DeferredRegister<Unsyncable> unsyncables = DeferredRegister.create(Unsyncable.REGISTRY_KEY, MODID);
|
||||
final DeferredRegister<Syncable> syncables = DeferredRegister.create(Syncable.REGISTRY_KEY, MODID);
|
||||
|
||||
// RegistryBuilder#dataPackRegistry marks the registry as a datapack registry rather than a static registry.
|
||||
unsyncables.makeRegistry(() -> new RegistryBuilder<Unsyncable>().disableSaving().dataPackRegistry(Unsyncable.DIRECT_CODEC));
|
||||
// The overload of #dataPackRegistry that takes a second codec marks the datapack registry as syncable.
|
||||
syncables.makeRegistry(() -> new RegistryBuilder<Syncable>().disableSaving().dataPackRegistry(Syncable.DIRECT_CODEC, Syncable.DIRECT_CODEC));
|
||||
|
||||
// Datapack registry elements can be datagenerated, but they must be registered as builtin objects first.
|
||||
this.datagenTestObject = unsyncables.register("datagen_test", () -> new Unsyncable("Datagen Success"));
|
||||
|
||||
unsyncables.register(modBus);
|
||||
syncables.register(modBus);
|
||||
modBus.addListener((DataPackRegistryEvent.NewRegistry event) -> {
|
||||
event.dataPackRegistry(ResourceKey.createRegistryKey(new ResourceLocation(MODID, "unsyncable")), Unsyncable.DIRECT_CODEC);
|
||||
event.dataPackRegistry(ResourceKey.createRegistryKey(new ResourceLocation(MODID, "syncable")), Syncable.DIRECT_CODEC, Syncable.DIRECT_CODEC);
|
||||
});
|
||||
|
||||
modBus.addListener(this::onGatherData);
|
||||
forgeBus.addListener(this::onServerStarting);
|
||||
@@ -109,33 +92,32 @@ public class DataPackRegistriesTest
|
||||
// Objects to be datagenerated must be registered (e.g. via DeferredRegister above).
|
||||
// This outputs to data/data_pack_registries_test/data_pack_registries_test/unsyncable/datagen_test.json
|
||||
final DataGenerator generator = event.getGenerator();
|
||||
final Path outputFolder = generator.getOutputFolder();
|
||||
final RegistryOps<JsonElement> ops = RegistryOps.create(JsonOps.INSTANCE, RegistryAccess.BUILTIN.get());
|
||||
final Path outputFolder = generator.getPackOutput().getOutputFolder();
|
||||
final CompletableFuture<HolderLookup.Provider> providerCompletableFuture = event.getLookupProvider();
|
||||
final Gson gson = new GsonBuilder().setPrettyPrinting().create();
|
||||
final ResourceLocation registryId = Unsyncable.REGISTRY_KEY.location();
|
||||
final ResourceLocation id = this.datagenTestObject.getId();
|
||||
final Unsyncable element = this.datagenTestObject.get();
|
||||
final Unsyncable element = new Unsyncable("Datagen Success");
|
||||
final String pathString = String.join("/", PackType.SERVER_DATA.getDirectory(), id.getNamespace(), registryId.getNamespace(), registryId.getPath(), id.getPath()+".json");
|
||||
final Path path = outputFolder.resolve(pathString);
|
||||
|
||||
generator.addProvider(event.includeServer(), new DataProvider()
|
||||
{
|
||||
@Override
|
||||
public void run(final CachedOutput cache) throws IOException
|
||||
public CompletableFuture<?> run(final CachedOutput cache)
|
||||
{
|
||||
Unsyncable.DIRECT_CODEC.encodeStart(ops, element)
|
||||
.resultOrPartial(msg -> LOGGER.error("Failed to encode {}: {}", path, msg)) // Log error on encode failure.
|
||||
.ifPresent(json -> // Output to file on encode success.
|
||||
{
|
||||
try
|
||||
{
|
||||
DataProvider.saveStable(cache, json, path);
|
||||
}
|
||||
catch (IOException e) // The throws can't deal with this exception, because we're inside the ifPresent.
|
||||
{
|
||||
LOGGER.error("Failed to save " + pathString, e);
|
||||
}
|
||||
});
|
||||
return providerCompletableFuture.thenCompose(provider -> {
|
||||
final RegistryOps<JsonElement> ops = RegistryOps.create(JsonOps.INSTANCE, provider);
|
||||
|
||||
Unsyncable.DIRECT_CODEC.encodeStart(ops, element)
|
||||
.resultOrPartial(msg -> LOGGER.error("Failed to encode {}: {}", path, msg)) // Log error on encode failure.
|
||||
.ifPresent(json -> // Output to file on encode success.
|
||||
{
|
||||
DataProvider.saveStable(cache, json, path);
|
||||
});
|
||||
|
||||
return CompletableFuture.allOf();
|
||||
});
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -12,10 +12,7 @@ import net.minecraft.gametest.framework.GameTestGenerator;
|
||||
import net.minecraft.gametest.framework.GameTestHelper;
|
||||
import net.minecraft.gametest.framework.TestFunction;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.item.BlockItem;
|
||||
import net.minecraft.world.item.CreativeModeTab;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.world.level.block.EntityBlock;
|
||||
@@ -31,6 +28,7 @@ import net.minecraftforge.common.capabilities.ForgeCapabilities;
|
||||
import net.minecraftforge.common.util.LazyOptional;
|
||||
import net.minecraftforge.energy.EnergyStorage;
|
||||
import net.minecraftforge.energy.IEnergyStorage;
|
||||
import net.minecraftforge.event.CreativeModeTabEvent;
|
||||
import net.minecraftforge.event.RegisterGameTestsEvent;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
@@ -44,6 +42,7 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.function.Consumer;
|
||||
|
||||
@Mod(GameTestTest.MODID)
|
||||
public class GameTestTest
|
||||
@@ -57,7 +56,7 @@ public class GameTestTest
|
||||
() -> new EnergyBlock(Properties.of(Material.STONE, MaterialColor.STONE)));
|
||||
@SuppressWarnings("unused")
|
||||
private static final RegistryObject<Item> ENERGY_BLOCK_ITEM = ITEMS.register("energy_block",
|
||||
() -> new BlockItem(ENERGY_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
|
||||
() -> new BlockItem(ENERGY_BLOCK.get(), new Item.Properties()));
|
||||
private static final RegistryObject<BlockEntityType<EnergyBlockEntity>> ENERGY_BLOCK_ENTITY = BLOCK_ENTITIES.register("energy",
|
||||
() -> BlockEntityType.Builder.of(EnergyBlockEntity::new, ENERGY_BLOCK.get()).build(null));
|
||||
|
||||
@@ -71,6 +70,14 @@ public class GameTestTest
|
||||
BLOCKS.register(modBus);
|
||||
ITEMS.register(modBus);
|
||||
BLOCK_ENTITIES.register(modBus);
|
||||
|
||||
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
|
||||
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
|
||||
onBuildContents.register((flags, output, permissions) -> {
|
||||
output.accept(ENERGY_BLOCK_ITEM.get());
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ public class ModMismatchTest
|
||||
if (REGISTER_REGISTRY_ENTRY && FMLEnvironment.dist == Dist.DEDICATED_SERVER)
|
||||
{
|
||||
IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
|
||||
SOUND_EVENTS.register("mismatching_sound_event", () -> new SoundEvent(new ResourceLocation(MOD_ID, "server.connect.fail")));
|
||||
SOUND_EVENTS.register("mismatching_sound_event", () -> SoundEvent.createVariableRangeEvent(new ResourceLocation(MOD_ID, "server.connect.fail")));
|
||||
SOUND_EVENTS.register(eventBus);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user