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:
committed 2022-12-08 01:45:22 -06:00
1 parent 617ecb7ad3
commit 8255d7aed3
726 files changed
+7615 -6653

No files matched your search

@@ -7,6 +7,7 @@ package net.minecraftforge.debug;
import net.minecraft.network.chat.Component;
import net.minecraft.server.packs.PackType;
import net.minecraft.server.packs.PathPackResources;
import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
import net.minecraft.server.packs.repository.Pack;
import net.minecraft.server.packs.repository.PackSource;
@@ -14,38 +15,32 @@ import net.minecraftforge.event.AddPackFindersEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.ModList;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.resource.PathPackResources;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import java.io.IOException;
@Mod(AddPackFinderEventTest.MODID)
@Mod.EventBusSubscriber(modid=AddPackFinderEventTest.MODID, bus= Mod.EventBusSubscriber.Bus.MOD)
public class AddPackFinderEventTest
{
private static final boolean ENABLE = false;
public static final String MODID = "add_pack_finders_test";
public AddPackFinderEventTest() {
if (!ENABLE)
return;
FMLJavaModLoadingContext.get().getModEventBus().register(this);
}
@SubscribeEvent
public static void addPackFinders(AddPackFindersEvent event)
public void addPackFinders(AddPackFindersEvent event)
{
try
if (event.getPackType() == PackType.CLIENT_RESOURCES)
{
if (event.getPackType() == PackType.CLIENT_RESOURCES)
{
var resourcePath = ModList.get().getModFileById(MODID).getFile().findResource("test_nested_resource_pack");
var pack = new PathPackResources(ModList.get().getModFileById(MODID).getFile().getFileName() + ":" + resourcePath, resourcePath);
var metadataSection = pack.getMetadataSection(PackMetadataSection.SERIALIZER);
if (metadataSection != null)
{
event.addRepositorySource((packConsumer, packConstructor) ->
packConsumer.accept(packConstructor.create(
"builtin/add_pack_finders_test", Component.literal("display name"), false,
() -> pack, metadataSection, Pack.Position.BOTTOM, PackSource.BUILT_IN, false)));
}
}
}
catch(IOException ex)
{
throw new RuntimeException(ex);
var resourcePath = ModList.get().getModFileById(MODID).getFile().findResource("test_nested_resource_pack");
var pack = Pack.readMetaAndCreate("builtin/add_pack_finders_test", Component.literal("display name"), false,
(path) -> new PathPackResources(path, resourcePath, false), PackType.CLIENT_RESOURCES, Pack.Position.BOTTOM, PackSource.BUILT_IN);
event.addRepositorySource((packConsumer) -> packConsumer.accept(pack));
}
}
}
@@ -0,0 +1,89 @@
/*
* Copyright (c) Forge Development LLC and contributors
* SPDX-License-Identifier: LGPL-2.1-only
*/
package net.minecraftforge.debug;
import java.util.List;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.Blocks;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@Mod(CreativeModeTabTest.MOD_ID)
public class CreativeModeTabTest
{
public static final String MOD_ID = "creative_mode_tab_test";
private static final boolean ENABLED = true;
private static CreativeModeTab LOGS;
private static CreativeModeTab STONE;
public CreativeModeTabTest()
{
if (!ENABLED)
return;
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
modEventBus.addListener(CreativeModeTabTest::onCreativeModeTabRegister);
modEventBus.addListener(CreativeModeTabTest::onCreativeModeTabBuildContents);
}
private static void onCreativeModeTabRegister(CreativeModeTabEvent.Register event)
{
LOGS = event.registerCreativeModeTab(new ResourceLocation(MOD_ID, "logs"), builder -> builder.icon(() -> new ItemStack(Blocks.ACACIA_LOG))
.title(Component.literal("Logs"))
.withLabelColor(0x00FF00)
.displayItems((features, output, hasPermissions) -> {
output.accept(new ItemStack(Blocks.ACACIA_LOG));
output.accept(new ItemStack(Blocks.BIRCH_LOG));
output.accept(new ItemStack(Blocks.DARK_OAK_LOG));
output.accept(new ItemStack(Blocks.JUNGLE_LOG));
output.accept(new ItemStack(Blocks.OAK_LOG));
output.accept(new ItemStack(Blocks.SPRUCE_LOG));
}));
STONE = event.registerCreativeModeTab(new ResourceLocation(MOD_ID, "stone"), List.of(CreativeModeTabs.BUILDING_BLOCKS), List.of(), builder -> builder.icon(() -> new ItemStack(Blocks.STONE))
.title(Component.literal("Stone"))
.withLabelColor(0x0000FF)
.displayItems((features, output, hasPermissions) -> {
output.accept(new ItemStack(Blocks.STONE));
output.accept(new ItemStack(Blocks.GRANITE));
output.accept(new ItemStack(Blocks.DIORITE));
output.accept(new ItemStack(Blocks.ANDESITE));
}));
}
private static void onCreativeModeTabBuildContents(CreativeModeTabEvent.BuildContents event)
{
if (event.getTab() == LOGS)
{
event.register((flags, builder, hasPermissions) -> {
builder.accept(new ItemStack(Blocks.STRIPPED_ACACIA_LOG), ItemStack.EMPTY, new ItemStack(Blocks.ACACIA_LOG));
builder.accept(new ItemStack(Blocks.STRIPPED_BIRCH_LOG), ItemStack.EMPTY, new ItemStack(Blocks.BIRCH_LOG));
builder.accept(new ItemStack(Blocks.STRIPPED_DARK_OAK_LOG), ItemStack.EMPTY, new ItemStack(Blocks.DARK_OAK_LOG));
builder.accept(new ItemStack(Blocks.STRIPPED_JUNGLE_LOG), ItemStack.EMPTY, new ItemStack(Blocks.JUNGLE_LOG));
builder.accept(new ItemStack(Blocks.STRIPPED_OAK_LOG), ItemStack.EMPTY, new ItemStack(Blocks.OAK_LOG));
builder.accept(new ItemStack(Blocks.STRIPPED_SPRUCE_LOG), ItemStack.EMPTY, new ItemStack(Blocks.SPRUCE_LOG));
});
}
if (event.getTab() == STONE)
{
event.register((flags, builder, hasPermissions) -> {
builder.accept(new ItemStack(Blocks.SMOOTH_STONE), new ItemStack(Blocks.GRANITE), new ItemStack(Blocks.STONE));
builder.accept(new ItemStack(Blocks.POLISHED_GRANITE), new ItemStack(Blocks.DIORITE), new ItemStack(Blocks.GRANITE));
builder.accept(new ItemStack(Blocks.POLISHED_DIORITE), new ItemStack(Blocks.ANDESITE), new ItemStack(Blocks.DIORITE));
builder.accept(new ItemStack(Blocks.POLISHED_ANDESITE), ItemStack.EMPTY, new ItemStack(Blocks.ANDESITE));
});
}
}
}
@@ -5,16 +5,17 @@
package net.minecraftforge.debug;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraftforge.common.util.ForgeSoundType;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
@@ -22,6 +23,9 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import java.util.Optional;
import java.util.function.Consumer;
@Mod(CustomSoundTypeTest.MODID)
public class CustomSoundTypeTest
{
@@ -32,14 +36,14 @@ public class CustomSoundTypeTest
private static final DeferredRegister<SoundEvent> SOUND_EVENTS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, MODID);
private static final RegistryObject<SoundEvent> TEST_STEP_EVENT = SOUND_EVENTS.register("test_step",
() -> new SoundEvent(new ResourceLocation(MODID, "block.sound_type_test.step")));
() -> SoundEvent.createVariableRangeEvent(new ResourceLocation(MODID, "block.sound_type_test.step")));
private static final SoundType TEST_SOUND_TYPE = new ForgeSoundType(1.0F, 1.0F, TEST_STEP_EVENT, TEST_STEP_EVENT, TEST_STEP_EVENT, TEST_STEP_EVENT, TEST_STEP_EVENT);
private static final RegistryObject<Block> TEST_STEP_BLOCK = BLOCKS.register("test_block",
() -> new Block(BlockBehaviour.Properties.of(Material.WOOD).sound(TEST_SOUND_TYPE)));
private static final RegistryObject<Item> TEST_STEP_BLOCK_ITEM = ITEMS.register("test_block",
() -> new BlockItem(TEST_STEP_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
() -> new BlockItem(TEST_STEP_BLOCK.get(), new Item.Properties()));
public CustomSoundTypeTest()
{
@@ -47,5 +51,7 @@ public class CustomSoundTypeTest
BLOCKS.register(modEventBus);
ITEMS.register(modEventBus);
SOUND_EVENTS.register(modEventBus);
modEventBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.INGREDIENTS, TEST_STEP_BLOCK_ITEM.get()));
}
}
@@ -20,6 +20,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
@@ -29,9 +30,12 @@ import com.google.gson.JsonNull;
import com.google.gson.JsonPrimitive;
import net.minecraft.Util;
import net.minecraft.advancements.critereon.InventoryChangeTrigger;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.CachedOutput;
import net.minecraft.data.PackOutput;
import net.minecraft.data.advancements.AdvancementProvider;
import net.minecraft.data.recipes.ShapelessRecipeBuilder;
import net.minecraft.data.advancements.AdvancementSubProvider;
import net.minecraft.data.recipes.*;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.chat.Component;
import net.minecraft.sounds.SoundEvents;
@@ -48,8 +52,7 @@ import net.minecraftforge.common.crafting.PartialNBTIngredient;
import net.minecraftforge.common.crafting.DifferenceIngredient;
import net.minecraftforge.common.crafting.IntersectionIngredient;
import net.minecraftforge.common.crafting.StrictNBTIngredient;
import net.minecraftforge.common.data.SoundDefinition;
import net.minecraftforge.common.data.SoundDefinitionsProvider;
import net.minecraftforge.common.data.*;
import net.minecraftforge.registries.ForgeRegistries;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.logging.log4j.LogManager;
@@ -74,11 +77,7 @@ import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.renderer.block.model.ItemTransform;
import net.minecraft.client.renderer.block.model.Variant;
import net.minecraft.client.renderer.block.model.BlockModel.GuiLight;
import net.minecraft.data.tags.BlockTagsProvider;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.recipes.FinishedRecipe;
import net.minecraft.data.recipes.RecipeProvider;
import net.minecraft.data.recipes.ShapedRecipeBuilder;
import net.minecraft.world.item.enchantment.Enchantments;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.item.Items;
@@ -99,8 +98,6 @@ import net.minecraftforge.client.model.generators.VariantBlockStateBuilder;
import net.minecraftforge.common.crafting.ConditionalAdvancement;
import net.minecraftforge.common.crafting.ConditionalRecipe;
import net.minecraftforge.common.crafting.conditions.IConditionBuilder;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.common.data.LanguageProvider;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
@@ -136,6 +133,8 @@ public class DataGeneratorTest
.create();
DataGenerator gen = event.getGenerator();
PackOutput packOutput = gen.getPackOutput();
CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
gen.addProvider(event.includeClient(), new Lang(gen));
// Let blockstate provider see generated item models by passing its existing file helper
@@ -144,20 +143,20 @@ public class DataGeneratorTest
gen.addProvider(event.includeClient(), new BlockStates(gen, itemModels.existingFileHelper));
gen.addProvider(event.includeClient(), new SoundDefinitions(gen, event.getExistingFileHelper()));
gen.addProvider(event.includeServer(), new Recipes(gen));
gen.addProvider(event.includeServer(), new Tags(gen, event.getExistingFileHelper()));
gen.addProvider(event.includeServer(), new Advancements(gen, event.getExistingFileHelper()));
gen.addProvider(event.includeServer(), new Recipes(packOutput));
gen.addProvider(event.includeServer(), new Tags(packOutput, lookupProvider, event.getExistingFileHelper()));
gen.addProvider(event.includeServer(), new Advancements(packOutput, lookupProvider, event.getExistingFileHelper()));
}
public static class Recipes extends RecipeProvider implements IConditionBuilder
{
public Recipes(DataGenerator gen)
public Recipes(PackOutput gen)
{
super(gen);
}
@Override
protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer)
protected void buildRecipes(Consumer<FinishedRecipe> consumer)
{
// conditional recipe
ResourceLocation ID = new ResourceLocation("data_gen_test", "conditional");
@@ -171,7 +170,7 @@ public class DataGeneratorTest
)
)
.addRecipe(
ShapedRecipeBuilder.shaped(Blocks.DIAMOND_BLOCK, 64)
ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, Blocks.DIAMOND_BLOCK, 64)
.pattern("XXX")
.pattern("XXX")
.pattern("XXX")
@@ -214,7 +213,7 @@ public class DataGeneratorTest
)
)
.addRecipe(
ShapedRecipeBuilder.shaped(Blocks.DIAMOND_BLOCK, 64)
ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, Blocks.DIAMOND_BLOCK, 64)
.pattern("XXX")
.pattern("XXX")
.pattern("XXX")
@@ -231,7 +230,7 @@ public class DataGeneratorTest
tagEmpty(ItemTags.PLANKS)
)
.addRecipe(
ShapedRecipeBuilder.shaped(Blocks.NETHERITE_BLOCK, 1)
ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, Blocks.NETHERITE_BLOCK, 1)
.pattern("XX")
.pattern("XX")
.define('X', Blocks.DIAMOND_BLOCK)
@@ -245,7 +244,7 @@ public class DataGeneratorTest
)
)
.addRecipe(
ShapedRecipeBuilder.shaped(Blocks.NETHERITE_BLOCK, 9)
ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, Blocks.NETHERITE_BLOCK, 9)
.pattern("XX")
.pattern("XX")
.define('X', Blocks.DIAMOND_BLOCK)
@@ -264,14 +263,14 @@ public class DataGeneratorTest
stack.setDamageValue(3);
return stack;
}));
ShapelessRecipeBuilder.shapeless(Items.GOLDEN_PICKAXE)
ShapelessRecipeBuilder.shapeless(RecipeCategory.TOOLS, Items.GOLDEN_PICKAXE)
.requires(nbtIngredient)
.unlockedBy("has_pickaxe", has(Items.IRON_PICKAXE))
.save(consumer, new ResourceLocation("data_gen_test", "exact_nbt_ingredient"));
// ingredient tests
// contains NBT match - should match a stone pickaxe that lost 3 durability, regardless of setting its name
ShapelessRecipeBuilder.shapeless(Items.IRON_PICKAXE)
ShapelessRecipeBuilder.shapeless(RecipeCategory.TOOLS, Items.IRON_PICKAXE)
.requires(PartialNBTIngredient.of(Items.STONE_PICKAXE, Util.make(() ->
{
CompoundTag nbt = new CompoundTag();
@@ -282,7 +281,7 @@ public class DataGeneratorTest
.save(consumer, new ResourceLocation("data_gen_test", "contains_nbt_ingredient_single_item"));
// contains NBT match - should match a wood, stone, or iron pickaxe that was named "Diamond Pickaxe", regardless of damage
ShapelessRecipeBuilder.shapeless(Items.DIAMOND_PICKAXE)
ShapelessRecipeBuilder.shapeless(RecipeCategory.TOOLS, Items.DIAMOND_PICKAXE)
.requires(PartialNBTIngredient.of(Util.make(() ->
{
CompoundTag nbt = new CompoundTag();
@@ -295,7 +294,7 @@ public class DataGeneratorTest
.save(consumer, new ResourceLocation("data_gen_test", "contains_nbt_ingredient_item_set"));
// intersection - should match all non-flammable planks
ShapedRecipeBuilder.shaped(Blocks.NETHERRACK)
ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, Blocks.NETHERRACK)
.pattern("###")
.pattern("###")
.pattern(" # ")
@@ -304,7 +303,7 @@ public class DataGeneratorTest
.save(consumer, new ResourceLocation("data_gen_test", "intersection_ingredient"));
// difference - should match all flammable fences
ShapedRecipeBuilder.shaped(Items.FLINT_AND_STEEL)
ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, Items.FLINT_AND_STEEL)
.pattern(" # ")
.pattern("###")
.pattern(" # ")
@@ -313,7 +312,7 @@ public class DataGeneratorTest
.save(consumer, new ResourceLocation("data_gen_test", "difference_ingredient"));
// compound - should match planks, logs, or bedrock
ShapedRecipeBuilder.shaped(Blocks.DIRT)
ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, Blocks.DIRT)
.pattern("###")
.pattern(" # ")
.define('#', CompoundIngredient.of(Ingredient.of(ItemTags.PLANKS), Ingredient.of(ItemTags.LOGS), Ingredient.of(Blocks.BEDROCK)))
@@ -321,7 +320,7 @@ public class DataGeneratorTest
.save(consumer, new ResourceLocation("data_gen_test", "compound_ingredient_only_vanilla"));
// compound - should match planks, logs, or a stone pickaxe with 3 damage
ShapedRecipeBuilder.shaped(Blocks.GOLD_BLOCK)
ShapedRecipeBuilder.shaped(RecipeCategory.BUILDING_BLOCKS, Blocks.GOLD_BLOCK)
.pattern("#")
.pattern("#")
.define('#', CompoundIngredient.of(Ingredient.of(ItemTags.PLANKS), Ingredient.of(ItemTags.LOGS), nbtIngredient))
@@ -405,13 +404,13 @@ public class DataGeneratorTest
}
@Override
public void run(CachedOutput cache) throws IOException
public CompletableFuture<?> run(CachedOutput cache)
{
super.run(cache);
test();
return CompletableFuture.runAsync(this::test);
}
private void test() throws IOException
private void test()
{
final JsonObject generated;
try
@@ -422,10 +421,15 @@ public class DataGeneratorTest
{
throw new RuntimeException("Unable to test for errors due to reflection error", e);
}
final JsonObject actual = GSON.fromJson(
this.helper.getResource(new ResourceLocation("sounds.json"), PackType.CLIENT_RESOURCES).openAsReader(),
JsonObject.class
);
final JsonObject actual;
try {
actual = GSON.fromJson(
this.helper.getResource(new ResourceLocation("sounds.json"), PackType.CLIENT_RESOURCES).openAsReader(),
JsonObject.class
);
} catch (IOException e) {
throw new RuntimeException("Unable to test for errors due to missing sounds.json", e);
}
final JsonObject filtered = new JsonObject();
generated.entrySet().forEach(it -> filtered.add(it.getKey(), Optional.ofNullable(actual.get(it.getKey())).orElseGet(JsonNull::new)));
@@ -553,13 +557,13 @@ public class DataGeneratorTest
public static class Tags extends BlockTagsProvider
{
public Tags(DataGenerator gen, ExistingFileHelper existingFileHelper)
public Tags(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper)
{
super(gen, MODID, existingFileHelper);
super(output, lookupProvider, MODID, existingFileHelper);
}
@Override
protected void addTags()
protected void addTags(HolderLookup.Provider provider)
{
tag(BlockTags.create(new ResourceLocation(MODID, "test")))
.add(Blocks.DIAMOND_BLOCK)
@@ -651,7 +655,7 @@ public class DataGeneratorTest
);
@Override
public void run(CachedOutput cache) throws IOException
public CompletableFuture<?> run(CachedOutput cache)
{
super.run(cache);
List<String> errors = testModelResults(this.generatedModels, existingFileHelper, IGNORED_MODELS.stream().map(s -> new ResourceLocation(MODID, folder + "/" + s)).collect(Collectors.toSet()));
@@ -662,6 +666,8 @@ public class DataGeneratorTest
}
throw new AssertionError("Generated item models differed from vanilla equivalents, check above errors.");
}
return CompletableFuture.allOf();
}
@Override
@@ -831,7 +837,7 @@ public class DataGeneratorTest
private List<String> errors = new ArrayList<>();
@Override
public void run(CachedOutput cache) throws IOException
public CompletableFuture<?> run(CachedOutput cache)
{
super.run(cache);
this.errors.addAll(testModelResults(models().generatedModels, models().existingFileHelper, Sets.union(IGNORED_MODELS, CUSTOM_MODELS)));
@@ -860,6 +866,8 @@ public class DataGeneratorTest
}
throw new AssertionError("Generated blockstates/models differed from vanilla equivalents, check above errors.");
}
return CompletableFuture.allOf();
}
private void compareVariantBlockstates(Block block, JsonObject generated, JsonObject vanilla) {
@@ -1011,49 +1019,57 @@ public class DataGeneratorTest
public static class Advancements extends AdvancementProvider
{
public Advancements(DataGenerator generatorIn, ExistingFileHelper fileHelper)
public Advancements(PackOutput output, CompletableFuture<HolderLookup.Provider> providerCompletableFuture, ExistingFileHelper existingFileHelper)
{
super(generatorIn, fileHelper);
super(output, providerCompletableFuture, List.of(new Provider(existingFileHelper)));
}
@Override
protected void registerAdvancements(Consumer<Advancement> consumer, ExistingFileHelper fileHelper)
{
Advancement.Builder.advancement().display(Items.DIRT,
Component.translatable(Items.DIRT.getDescriptionId()),
Component.translatable("dirt_description"),
new ResourceLocation("textures/gui/advancements/backgrounds/stone.png"),
FrameType.TASK,
true,
true,
false)
.addCriterion("has_dirt", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIRT))
.save(consumer, new ResourceLocation(MODID, "obtain_dirt"), fileHelper);
private static class Provider implements AdvancementSubProvider {
Advancement.Builder.advancement().display(Items.DIAMOND_BLOCK,
Component.translatable(Items.DIAMOND_BLOCK.getDescriptionId()),
Component.literal("You obtained a DiamondBlock"),
new ResourceLocation("textures/gui/advancements/backgrounds/stone.png"),
FrameType.CHALLENGE,
true,
true,
false)
.addCriterion("obtained_diamond_block", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIAMOND_BLOCK))
.save(consumer, new ResourceLocation("obtain_diamond_block"), fileHelper);
private final ExistingFileHelper fileHelper;
Advancement.Builder.advancement()
.display(Blocks.GRASS_BLOCK,
Component.translatable("advancements.story.root.title"),
Component.literal("Changed Description"),
new ResourceLocation("textures/gui/advancements/backgrounds/stone.png"),
FrameType.TASK,
false,
false,
false)
.addCriterion("crafting_table", InventoryChangeTrigger.TriggerInstance.hasItems(Blocks.CRAFTING_TABLE))
.save(consumer, new ResourceLocation("story/root"), fileHelper);
private Provider(ExistingFileHelper fileHelper) {
this.fileHelper = fileHelper;
}
// This should cause an error because of the parent not existing
@Override
public void generate(HolderLookup.Provider registries, Consumer<Advancement> consumer) {
Advancement.Builder.advancement().display(Items.DIRT,
Component.translatable(Items.DIRT.getDescriptionId()),
Component.translatable("dirt_description"),
new ResourceLocation("textures/gui/advancements/backgrounds/stone.png"),
FrameType.TASK,
true,
true,
false)
.addCriterion("has_dirt", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIRT))
.save(consumer, new ResourceLocation(MODID, "obtain_dirt"), fileHelper);
Advancement.Builder.advancement().display(Items.DIAMOND_BLOCK,
Component.translatable(Items.DIAMOND_BLOCK.getDescriptionId()),
Component.literal("You obtained a DiamondBlock"),
new ResourceLocation("textures/gui/advancements/backgrounds/stone.png"),
FrameType.CHALLENGE,
true,
true,
false)
.addCriterion("obtained_diamond_block", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIAMOND_BLOCK))
.save(consumer, new ResourceLocation("obtain_diamond_block"), fileHelper);
Advancement.Builder.advancement()
.display(Blocks.GRASS_BLOCK,
Component.translatable("advancements.story.root.title"),
Component.literal("Changed Description"),
new ResourceLocation("textures/gui/advancements/backgrounds/stone.png"),
FrameType.TASK,
false,
false,
false)
.addCriterion("crafting_table", InventoryChangeTrigger.TriggerInstance.hasItems(Blocks.CRAFTING_TABLE))
.save(consumer, new ResourceLocation("story/root"), fileHelper);
// This should cause an error because of the parent not existing
/* Advancement.Builder.advancement().display(Blocks.COBBLESTONE,
new TranslationTextComponent(Items.COBBLESTONE.getDescriptionId()),
new StringTextComponent("You got cobblestone"),
@@ -1066,17 +1082,18 @@ public class DataGeneratorTest
.parent(new ResourceLocation("not_there/not_here"))
.save(consumer, new ResourceLocation("illegal_parent"), fileHelper);*/
Advancement.Builder.advancement().display(Blocks.COBBLESTONE,
Component.translatable(Items.COBBLESTONE.getDescriptionId()),
Component.literal("You got cobblestone"),
new ResourceLocation("textures/gui/advancements/backgrounds/stone.png"),
FrameType.TASK,
false,
false,
false)
.addCriterion("get_cobbleStone", InventoryChangeTrigger.TriggerInstance.hasItems(Items.COBBLESTONE))
.parent(new ResourceLocation("forge", "dummy_parent"))
.save(consumer, new ResourceLocation("good_parent"), fileHelper);
Advancement.Builder.advancement().display(Blocks.COBBLESTONE,
Component.translatable(Items.COBBLESTONE.getDescriptionId()),
Component.literal("You got cobblestone"),
new ResourceLocation("textures/gui/advancements/backgrounds/stone.png"),
FrameType.TASK,
false,
false,
false)
.addCriterion("get_cobbleStone", InventoryChangeTrigger.TriggerInstance.hasItems(Items.COBBLESTONE))
.parent(new ResourceLocation("forge", "dummy_parent"))
.save(consumer, new ResourceLocation("good_parent"), fileHelper);
}
}
}
@@ -5,19 +5,16 @@
package net.minecraftforge.debug;
import java.util.List;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
import net.minecraft.core.Holder;
import net.minecraft.core.Registry;
import net.minecraft.data.worldgen.features.OreFeatures;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.TagKey;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.crafting.RecipeType;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraft.world.level.levelgen.structure.templatesystem.PosRuleTestType;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.event.server.ServerStartedEvent;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -27,7 +24,6 @@ import net.minecraft.world.level.material.Material;
import net.minecraft.data.DataGenerator;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.eventbus.api.IEventBus;
@@ -52,18 +48,18 @@ public class DeferredRegistryTest {
private static final DeferredRegister<Object> DOESNT_EXIST_REG = DeferredRegister.createOptional(new ResourceLocation(MODID, "doesnt_exist"), MODID);
private static final DeferredRegister<RecipeType<?>> RECIPE_TYPES = DeferredRegister.create(ForgeRegistries.RECIPE_TYPES, MODID);
// Vanilla Registry - filled directly after all RegistryEvent.Register events are fired
private static final DeferredRegister<PosRuleTestType<?>> POS_RULE_TEST_TYPES = DeferredRegister.create(Registry.POS_RULE_TEST_REGISTRY, MODID);
//private static final DeferredRegister<PosRuleTestType<?>> POS_RULE_TEST_TYPES = DeferredRegister.create(Registry.POS_RULE_TEST_REGISTRY, MODID);
// Vanilla Builtin Registry - filled directly after all RegistryEvent.Register events are fired
private static final DeferredRegister<PlacedFeature> PLACED_FEATURES = DeferredRegister.create(Registry.PLACED_FEATURE_REGISTRY, MODID);
//private static final DeferredRegister<PlacedFeature> PLACED_FEATURES = DeferredRegister.create(Registry.PLACED_FEATURE_REGISTRY, MODID);
private static final RegistryObject<Block> BLOCK = BLOCKS.register("test", () -> new Block(Block.Properties.of(Material.STONE)));
private static final RegistryObject<Item> ITEM = ITEMS .register("test", () -> new BlockItem(BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS)));
private static final RegistryObject<Item> ITEM = ITEMS .register("test", () -> new BlockItem(BLOCK.get(), new Item.Properties()));
private static final RegistryObject<Custom> CUSTOM = CUSTOMS.register("test", () -> new Custom(){});
// Should never be created as the registry doesn't exist - this should silently fail and remain empty
private static final RegistryObject<Object> DOESNT_EXIST = DOESNT_EXIST_REG.register("test", Object::new);
private static final RegistryObject<RecipeType<?>> RECIPE_TYPE = RECIPE_TYPES.register("test", () -> new RecipeType<>() {});
private static final RegistryObject<PosRuleTestType<?>> POS_RULE_TEST_TYPE = POS_RULE_TEST_TYPES.register("test", () -> () -> null);
private static final RegistryObject<PlacedFeature> PLACED_FEATURE = PLACED_FEATURES.register("test", () -> new PlacedFeature(Holder.hackyErase(OreFeatures.ORE_DIORITE), List.of()));
//private static final RegistryObject<PosRuleTestType<?>> POS_RULE_TEST_TYPE = POS_RULE_TEST_TYPES.register("test", () -> () -> null);
//private static final RegistryObject<PlacedFeature> PLACED_FEATURE = PLACED_FEATURES.register("test", () -> new PlacedFeature(Holder.hackyErase(OreFeatures.ORE_DIORITE), List.of()));
private static final TagKey<Custom> CUSTOM_TAG_KEY = CUSTOMS.createOptionalTagKey("test_tag", Set.of(CUSTOM));
private static final Supplier<IForgeRegistry<Custom>> CUSTOM_REG = CUSTOMS.makeRegistry(() ->
@@ -77,11 +73,13 @@ public class DeferredRegistryTest {
ITEMS.register(modBus);
CUSTOMS.register(modBus);
RECIPE_TYPES.register(modBus);
POS_RULE_TEST_TYPES.register(modBus);
PLACED_FEATURES.register(modBus);
//POS_RULE_TEST_TYPES.register(modBus);
//PLACED_FEATURES.register(modBus);
modBus.addListener(this::gatherData);
MinecraftForge.EVENT_BUS.addListener(this::serverStarted);
modBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.INGREDIENTS, ITEM.get()));
}
public void serverStarted(ServerStartedEvent event)
@@ -93,8 +91,8 @@ public class DeferredRegistryTest {
if (DOESNT_EXIST.isPresent())
throw new IllegalStateException("DeferredRegistryTest#DOESNT_EXIST should not be present!");
RECIPE_TYPE.get();
POS_RULE_TEST_TYPE.get();
PLACED_FEATURE.get();
//POS_RULE_TEST_TYPE.get();
//PLACED_FEATURE.get();
}
public void gatherData(GatherDataEvent event) {
@@ -7,6 +7,7 @@ package net.minecraftforge.debug;
import net.minecraft.core.NonNullList;
import net.minecraft.network.chat.Component;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.effect.MobEffectCategory;
import net.minecraft.world.effect.MobEffectInstance;
@@ -18,7 +19,9 @@ import net.minecraft.world.item.Items;
import net.minecraft.world.item.SuspiciousStewItem;
import net.minecraft.world.item.alchemy.PotionUtils;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -30,6 +33,7 @@ import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.List;
import java.util.function.Consumer;
/**
* Registers 255 mob effects that log every tick on the client.
@@ -51,28 +55,6 @@ public class ManyMobEffectsTest
private static final Logger LOGGER = LogManager.getLogger();
private static final CreativeModeTab CREATIVE_TAB = new CreativeModeTab(MODID)
{
@Override
public ItemStack makeIcon()
{
return new ItemStack(Items.POTION);
}
@Override
public void fillItemList(NonNullList<ItemStack> stacks)
{
super.fillItemList(stacks);
var stack = new ItemStack(Items.POTION);
PotionUtils.setCustomEffects(stack, List.of(new MobEffectInstance(LAST_EFFECT.get(), 1000)));
stacks.add(stack);
stack = new ItemStack(Items.SUSPICIOUS_STEW);
SuspiciousStewItem.saveMobEffect(stack, LAST_EFFECT.get(), 1000);
stacks.add(stack);
}
};
private static final DeferredRegister<MobEffect> MOB_EFFECTS = DeferredRegister.create(ForgeRegistries.MOB_EFFECTS, MODID);
private static final RegistryObject<MobEffect> LAST_EFFECT;
@@ -109,6 +91,17 @@ public class ManyMobEffectsTest
IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus();
MOB_EFFECTS.register(modBus);
MinecraftForge.EVENT_BUS.addListener(ManyMobEffectsTest::mobInteract);
modBus.addListener((CreativeModeTabEvent.Register event) -> event.registerCreativeModeTab(new ResourceLocation(MODID, "many_mob_effects_test"), builder -> builder.withSearchBar()
.icon(() -> new ItemStack(Items.POTION))
.displayItems((flags, output, isOperator) -> {
var stack = new ItemStack(Items.POTION);
PotionUtils.setCustomEffects(stack, List.of(new MobEffectInstance(LAST_EFFECT.get(), 1000)));
output.accept(stack);
stack = new ItemStack(Items.SUSPICIOUS_STEW);
SuspiciousStewItem.saveMobEffect(stack, LAST_EFFECT.get(), 1000);
output.accept(stack);
})));
}
private static void mobInteract(PlayerInteractEvent.EntityInteract event)
@@ -5,13 +5,14 @@
package net.minecraftforge.debug;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.tags.BlockTagsProvider;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.TagKey;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraftforge.common.data.BlockTagsProvider;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
@@ -36,17 +37,17 @@ public class RemoveTagDatagenTest
DataGenerator generator = event.getGenerator();
ExistingFileHelper helper = event.getExistingFileHelper();
generator.addProvider(true, new BlockTagsProvider(generator, MODID, helper)
generator.addProvider(true, new BlockTagsProvider(generator.getPackOutput(), event.getLookupProvider(), MODID, helper)
{
@SuppressWarnings("unchecked")
@Override
protected void addTags()
protected void addTags(HolderLookup.Provider provider)
{
this.tag(TEST_TAG)
.remove(ForgeRegistries.BLOCKS.getKey(Blocks.DIRT))
.remove(ForgeRegistries.BLOCKS.getKey(Blocks.OAK_DOOR), ForgeRegistries.BLOCKS.getKey(Blocks.DARK_OAK_DOOR))
.remove(Blocks.ANVIL)
.remove(Blocks.BASALT, Blocks.POLISHED_BASALT)
.remove(ForgeRegistries.BLOCKS.getKey(Blocks.ANVIL))
.remove(ForgeRegistries.BLOCKS.getKey(Blocks.BASALT), ForgeRegistries.BLOCKS.getKey(Blocks.POLISHED_ANDESITE))
.remove(BlockTags.BEEHIVES)
.remove(BlockTags.BANNERS, BlockTags.BEDS);
}
@@ -19,6 +19,7 @@ import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -29,6 +30,7 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import java.util.Locale;
import java.util.function.Consumer;
@Mod("be_onload_test")
public class BlockEntityOnLoadTest
@@ -41,7 +43,7 @@ public class BlockEntityOnLoadTest
private static final DeferredRegister<BlockEntityType<?>> BE_TYPES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, "be_onload_test");
private static final RegistryObject<Block> TEST_BLOCK = BLOCKS.register("be_onload_testblock", () -> new TestBlock(Properties.of(Material.DECORATION, MaterialColor.SAND)));
private static final RegistryObject<Item> TEST_BLOCK_ITEM = ITEMS.register("be_onload_testblock", () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)));
private static final RegistryObject<Item> TEST_BLOCK_ITEM = ITEMS.register("be_onload_testblock", () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties()));
private static final RegistryObject<BlockEntityType<TestBlockEntity>> TEST_BE_TYPE = BE_TYPES.register("be_onload_testbe", () -> BlockEntityType.Builder.of(TestBlockEntity::new, TEST_BLOCK.get()).build(null));
public BlockEntityOnLoadTest()
@@ -52,6 +54,8 @@ public class BlockEntityOnLoadTest
BLOCKS.register(modBus);
ITEMS.register(modBus);
BE_TYPES.register(modBus);
modBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.BUILDING_BLOCKS, TEST_BLOCK_ITEM.get()));
}
}
@@ -7,15 +7,11 @@ package net.minecraftforge.debug.block;
import net.minecraft.client.model.SkullModel;
import net.minecraft.client.model.geom.ModelLayerLocation;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
import net.minecraft.client.renderer.blockentity.SignRenderer;
import net.minecraft.client.renderer.blockentity.SkullBlockRenderer;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Rarity;
import net.minecraft.world.item.StandingAndWallBlockItem;
import net.minecraft.world.item.*;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.SkullBlock;
import net.minecraft.world.level.block.WallSkullBlock;
@@ -26,12 +22,9 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.event.EntityRenderersEvent;
import net.minecraftforge.common.ForgeConfig.Client;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.Lazy;
import net.minecraftforge.debug.block.CustomSignsTest.CustomSignBlockEntity;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -42,6 +35,8 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import java.util.function.Consumer;
/**
* Adds a blaze head block and item to test the event for registering a custom skull model and to demonstrate the proper way to register a custom mob skull.
*
@@ -57,7 +52,7 @@ public class CustomHeadTest
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, MODID);
private static final RegistryObject<Block> BLAZE_HEAD = BLOCKS.register("blaze_head", () -> new CustomSkullBlock(SkullType.BLAZE, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0F)));
private static final RegistryObject<Block> BLAZE_HEAD_WALL = BLOCKS.register("blaze_wall_head", () -> new CustomWallSkullBlock(SkullType.BLAZE, BlockBehaviour.Properties.of(Material.DECORATION).strength(1.0F).lootFrom(BLAZE_HEAD)));
private static final RegistryObject<Item> BLAZE_HEAD_ITEM = ITEMS.register("blaze_head", () -> new StandingAndWallBlockItem(BLAZE_HEAD.get(), BLAZE_HEAD_WALL.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS).rarity(Rarity.UNCOMMON)));
private static final RegistryObject<Item> BLAZE_HEAD_ITEM = ITEMS.register("blaze_head", () -> new StandingAndWallBlockItem(BLAZE_HEAD.get(), BLAZE_HEAD_WALL.get(), new Item.Properties().rarity(Rarity.UNCOMMON), Direction.DOWN));
private static final RegistryObject<BlockEntityType<CustomSkullBlockEntity>> CUSTOM_SKULL = BLOCK_ENTITIES.register("custom_skull", () -> BlockEntityType.Builder.of(CustomSkullBlockEntity::new, BLAZE_HEAD.get(), BLAZE_HEAD_WALL.get()).build(null));
public CustomHeadTest()
@@ -66,6 +61,8 @@ public class CustomHeadTest
BLOCKS.register(modBus);
ITEMS.register(modBus);
BLOCK_ENTITIES.register(modBus);
modBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.BUILDING_BLOCKS, BLAZE_HEAD_ITEM.get()));
}
private static class CustomSkullBlock extends SkullBlock
@@ -7,16 +7,17 @@ package net.minecraftforge.debug.block;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
import net.minecraft.core.BlockPos;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.level.material.Material;
import net.minecraft.client.renderer.Sheets;
import net.minecraft.client.renderer.blockentity.SignRenderer;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.SignItem;
import net.minecraft.world.level.block.entity.SignBlockEntity;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
@@ -34,6 +35,8 @@ import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.properties.WoodType;
import java.util.function.Consumer;
@Mod(CustomSignsTest.MODID)
public class CustomSignsTest
{
@@ -47,7 +50,7 @@ public class CustomSignsTest
public static final RegistryObject<CustomWallSignBlock> TEST_WALL_SIGN = BLOCKS.register("test_wall_sign", () -> new CustomWallSignBlock(Properties.of(Material.WOOD).noCollission().strength(1.0F).sound(SoundType.WOOD), CustomSignsTest.TEST_WOOD_TYPE));
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
public static final RegistryObject<SignItem> TEST_SIGN = ITEMS.register("test_sign", () -> new SignItem((new Item.Properties()).stacksTo(16).tab(CreativeModeTab.TAB_DECORATIONS), TEST_STANDING_SIGN.get(), TEST_WALL_SIGN.get()));
public static final RegistryObject<SignItem> TEST_SIGN = ITEMS.register("test_sign", () -> new SignItem((new Item.Properties()).stacksTo(16), TEST_STANDING_SIGN.get(), TEST_WALL_SIGN.get()));
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITY_TYPES, MODID);
public static final RegistryObject<BlockEntityType<CustomSignBlockEntity>> CUSTOM_SIGN = BLOCK_ENTITIES.register("custom_sign", () -> BlockEntityType.Builder.of(CustomSignBlockEntity::new, TEST_WALL_SIGN.get(), TEST_STANDING_SIGN.get()).build(null));
@@ -63,6 +66,8 @@ public class CustomSignsTest
eventBus.addListener(this::clientSetup);
eventBus.addListener(this::commonSetup);
eventBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.BUILDING_BLOCKS, TEST_SIGN.get()));
}
}
@@ -7,7 +7,6 @@ package net.minecraftforge.debug.block;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.block.model.*;
@@ -45,6 +44,7 @@ import net.minecraftforge.client.model.geometry.IGeometryBakingContext;
import net.minecraftforge.client.model.geometry.IGeometryLoader;
import net.minecraftforge.client.model.geometry.IUnbakedGeometry;
import net.minecraftforge.common.util.ConcatenatedListView;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -56,6 +56,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.*;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -72,7 +73,7 @@ public class FullPotsAccessorDemo
private static final RegistryObject<Block> DIORITE_POT = BLOCKS.register("diorite_pot", DioriteFlowerPotBlock::new);
private static final RegistryObject<Item> DIORITE_POT_ITEM = ITEMS.register(
"diorite_pot",
() -> new BlockItem(DIORITE_POT.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC))
() -> new BlockItem(DIORITE_POT.get(), new Item.Properties())
);
private static final RegistryObject<BlockEntityType<DioriteFlowerPotBlockEntity>> DIORITE_POT_BLOCK_ENTITY = BLOCK_ENTITIES.register(
"diorite_pot",
@@ -87,6 +88,8 @@ public class FullPotsAccessorDemo
BLOCKS.register(bus);
ITEMS.register(bus);
BLOCK_ENTITIES.register(bus);
bus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.INGREDIENTS, DIORITE_POT_ITEM.get()));
}
}
@@ -256,15 +259,8 @@ public class FullPotsAccessorDemo
private record DioritePotModelGeometry(UnbakedModel wrappedModel) implements IUnbakedGeometry<DioritePotModelGeometry>
{
@Override
public BakedModel bake(IGeometryBakingContext context, ModelBakery bakery, Function<net.minecraft.client.resources.model.Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation)
{
return new DioritePotModel(wrappedModel.bake(bakery, spriteGetter, modelState, modelLocation));
}
@Override
public Collection<net.minecraft.client.resources.model.Material> getMaterials(IGeometryBakingContext context, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
return wrappedModel.getMaterials(modelGetter, missingTextureErrors);
public BakedModel bake(IGeometryBakingContext context, ModelBaker baker, Function<net.minecraft.client.resources.model.Material, TextureAtlasSprite> spriteGetter, ModelState modelState, ItemOverrides overrides, ResourceLocation modelLocation) {
return new DioritePotModel(wrappedModel.bake(baker, spriteGetter, modelState, modelLocation));
}
}
@@ -299,8 +295,8 @@ public class FullPotsAccessorDemo
return potModel.getQuads(potState, face, rand, ModelData.EMPTY, renderType)
.stream()
.filter(q -> !q.getSprite().getName().equals(POT_TEXTURE))
.filter(q -> !q.getSprite().getName().equals(DIRT_TEXTURE))
.filter(q -> !q.getSprite().contents().name().equals(POT_TEXTURE))
.filter(q -> !q.getSprite().contents().name().equals(DIRT_TEXTURE))
.collect(Collectors.toList());
}
@@ -7,8 +7,10 @@ package net.minecraftforge.debug.block;
import java.util.List;
import java.util.Locale;
import java.util.function.Consumer;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.Blocks;
@@ -20,7 +22,6 @@ import net.minecraft.data.DataGenerator;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.core.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.Level;
@@ -28,6 +29,7 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.event.level.PistonEvent;
import net.minecraftforge.event.level.PistonEvent.PistonMoveType;
import net.minecraftforge.eventbus.api.IEventBus;
@@ -55,10 +57,8 @@ public class PistonEventTest
private static DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
private static DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
private static RegistryObject<Block> shiftOnMove = BLOCKS.register(blockName, () -> new Block(Block.Properties.of(Material.STONE)));
static {
ITEMS.register(blockName, () -> new BlockItem(shiftOnMove.get(), new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS)));
}
private static RegistryObject<Block> SHIFT_ON_MOVE = BLOCKS.register(blockName, () -> new Block(Block.Properties.of(Material.STONE)));
private static RegistryObject<Item> SHIFT_ON_MOVE_ITEM = ITEMS.register(blockName, () -> new BlockItem(SHIFT_ON_MOVE.get(), new Item.Properties()));
public PistonEventTest()
{
@@ -66,6 +66,8 @@ public class PistonEventTest
BLOCKS.register(modBus);
ITEMS.register(modBus);
modBus.addListener(this::gatherData);
modBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.BUILDING_BLOCKS, SHIFT_ON_MOVE_ITEM.get()));
}
@SubscribeEvent
@@ -104,10 +106,10 @@ public class PistonEventTest
// Make the block move up and out of the way so long as it won't replace the piston
BlockPos pushedBlockPos = event.getFaceOffsetPos();
if (world.getBlockState(pushedBlockPos).getBlock() == shiftOnMove.get() && event.getDirection() != Direction.DOWN)
if (world.getBlockState(pushedBlockPos).getBlock() == SHIFT_ON_MOVE.get() && event.getDirection() != Direction.DOWN)
{
world.setBlockAndUpdate(pushedBlockPos, Blocks.AIR.defaultBlockState());
world.setBlockAndUpdate(pushedBlockPos.above(), shiftOnMove.get().defaultBlockState());
world.setBlockAndUpdate(pushedBlockPos.above(), SHIFT_ON_MOVE.get().defaultBlockState());
}
// Block pushing cobblestone (directly, indirectly works)
@@ -154,9 +156,9 @@ public class PistonEventTest
@Override
protected void registerStatesAndModels()
{
ModelFile model = models().cubeAll(shiftOnMove.getId().getPath(), mcLoc("block/furnace_top"));
simpleBlock(shiftOnMove.get(), model);
simpleBlockItem(shiftOnMove.get(), model);
ModelFile model = models().cubeAll(SHIFT_ON_MOVE.getId().getPath(), mcLoc("block/furnace_top"));
simpleBlock(SHIFT_ON_MOVE.get(), model);
simpleBlockItem(SHIFT_ON_MOVE.get(), model);
}
}
@@ -8,7 +8,7 @@ package net.minecraftforge.debug.block;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
@@ -16,6 +16,7 @@ import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.entity.FurnaceBlockEntity;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -24,6 +25,8 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import org.jetbrains.annotations.Nullable;
import java.util.function.Consumer;
@Mod(RedstoneSidedConnectivityTest.MODID)
public class RedstoneSidedConnectivityTest
{
@@ -35,7 +38,7 @@ public class RedstoneSidedConnectivityTest
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
private static final RegistryObject<Block> TEST_REDSTONE_BLOCK = BLOCKS.register(BLOCK_ID, EastRedstoneBlock::new);
private static final RegistryObject<Item> TEST_REDSTONE_BLOCKITEM = ITEMS.register(BLOCK_ID, () -> new BlockItem(TEST_REDSTONE_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS)));
private static final RegistryObject<Item> TEST_REDSTONE_BLOCKITEM = ITEMS.register(BLOCK_ID, () -> new BlockItem(TEST_REDSTONE_BLOCK.get(), new Item.Properties()));
public RedstoneSidedConnectivityTest()
{
@@ -45,6 +48,8 @@ public class RedstoneSidedConnectivityTest
IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus();
BLOCKS.register(modBus);
ITEMS.register(modBus);
modBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.BUILDING_BLOCKS, TEST_REDSTONE_BLOCKITEM.get()));
}
private static class EastRedstoneBlock extends Block
@@ -6,11 +6,12 @@
package net.minecraftforge.debug.client;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.material.Material;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -18,12 +19,16 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import java.util.function.Consumer;
/**
* Test mod that demos disabling ambient occlusion on specific faces of "elements" models.
*/
@Mod(AmbientOcclusionElementsTest.MOD_ID)
public class AmbientOcclusionElementsTest
{
private static final boolean ENABLED = false;
public static final String MOD_ID = "ambient_occlusion_elements_test";
private static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MOD_ID);
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
@@ -32,15 +37,21 @@ public class AmbientOcclusionElementsTest
public static final RegistryObject<Block> AO_BLOCK_NO_SHADE = BLOCKS.register("ambient_occlusion_no_shade", () -> new Block(BlockBehaviour.Properties.of(Material.STONE)));
public static final RegistryObject<Block> NO_AO_BLOCK_SHADE = BLOCKS.register("no_ambient_occlusion_shade", () -> new Block(BlockBehaviour.Properties.of(Material.STONE)));
public static final RegistryObject<Block> NO_AO_BLOCK_NO_SHADE = BLOCKS.register("no_ambient_occlusion_no_shade", () -> new Block(BlockBehaviour.Properties.of(Material.STONE)));
public static final RegistryObject<Item> AO_BLOCK_SHADE_ITEM = ITEMS.register("ambient_occlusion_shade", () -> new BlockItem(AO_BLOCK_SHADE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)));
public static final RegistryObject<Item> AO_BLOCK_NO_SHADE_ITEM = ITEMS.register("ambient_occlusion_no_shade", () -> new BlockItem(AO_BLOCK_NO_SHADE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)));
public static final RegistryObject<Item> NO_AO_BLOCK_SHADE_ITEM = ITEMS.register("no_ambient_occlusion_shade", () -> new BlockItem(NO_AO_BLOCK_SHADE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)));
public static final RegistryObject<Item> NO_AO_BLOCK_NO_SHADE_ITEM = ITEMS.register("no_ambient_occlusion_no_shade", () -> new BlockItem(NO_AO_BLOCK_NO_SHADE.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)));
public static final RegistryObject<Item> AO_BLOCK_SHADE_ITEM = ITEMS.register("ambient_occlusion_shade", () -> new BlockItem(AO_BLOCK_SHADE.get(), new Item.Properties()));
public static final RegistryObject<Item> AO_BLOCK_NO_SHADE_ITEM = ITEMS.register("ambient_occlusion_no_shade", () -> new BlockItem(AO_BLOCK_NO_SHADE.get(), new Item.Properties()));
public static final RegistryObject<Item> NO_AO_BLOCK_SHADE_ITEM = ITEMS.register("no_ambient_occlusion_shade", () -> new BlockItem(NO_AO_BLOCK_SHADE.get(), new Item.Properties()));
public static final RegistryObject<Item> NO_AO_BLOCK_NO_SHADE_ITEM = ITEMS.register("no_ambient_occlusion_no_shade", () -> new BlockItem(NO_AO_BLOCK_NO_SHADE.get(), new Item.Properties()));
public AmbientOcclusionElementsTest()
{
if (!ENABLED)
return;
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
BLOCKS.register(modEventBus);
ITEMS.register(modEventBus);
modEventBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.BUILDING_BLOCKS,
AO_BLOCK_SHADE_ITEM.get(), AO_BLOCK_NO_SHADE_ITEM.get(), NO_AO_BLOCK_SHADE_ITEM.get(), NO_AO_BLOCK_NO_SHADE_ITEM.get()));
}
}
@@ -5,7 +5,6 @@
package net.minecraftforge.debug.client;
import com.mojang.math.Vector3d;
import net.minecraft.client.Minecraft;
import net.minecraft.client.resources.sounds.AbstractSoundInstance;
import net.minecraft.client.resources.sounds.Sound;
@@ -16,15 +16,11 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.item.ArmorItem;
import net.minecraft.world.item.ArmorMaterial;
import net.minecraft.world.item.ArmorMaterials;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.*;
import net.minecraft.world.item.Item.Properties;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.client.extensions.common.IClientItemExtensions;
import net.minecraftforge.common.util.Lazy;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -43,15 +39,18 @@ public class CustomArmorModelTest
static final String MOD_ID = "custom_armor_model_test";
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
// demonstrates custom non-humanoid model
private static final RegistryObject<Item> RED_LEGGINGS = ITEMS.register("red_leggings", () -> new TintedArmorItem(ArmorMaterials.DIAMOND, EquipmentSlot.LEGS, new Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC)));
private static final RegistryObject<Item> RED_LEGGINGS = ITEMS.register("red_leggings", () -> new TintedArmorItem(ArmorMaterials.DIAMOND, EquipmentSlot.LEGS, new Properties().stacksTo(1)));
// demonstrates the properties are copied from the vanilla model
private static final RegistryObject<Item> ENDERMAN_CHESTPLATE = ITEMS.register("enderman_chestplate", () -> new EndermanArmorItem(ArmorMaterials.GOLD, EquipmentSlot.CHEST, new Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC)));
private static final RegistryObject<Item> ENDERMAN_BOOTS = ITEMS.register("enderman_boots", () -> new EndermanArmorItem(ArmorMaterials.GOLD, EquipmentSlot.FEET, new Properties().stacksTo(1).tab(CreativeModeTab.TAB_MISC)));
private static final RegistryObject<Item> ENDERMAN_CHESTPLATE = ITEMS.register("enderman_chestplate", () -> new EndermanArmorItem(ArmorMaterials.GOLD, EquipmentSlot.CHEST, new Properties().stacksTo(1)));
private static final RegistryObject<Item> ENDERMAN_BOOTS = ITEMS.register("enderman_boots", () -> new EndermanArmorItem(ArmorMaterials.GOLD, EquipmentSlot.FEET, new Properties().stacksTo(1)));
public CustomArmorModelTest()
{
final IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(modBus);
modBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.INGREDIENTS,
RED_LEGGINGS.get(), ENDERMAN_CHESTPLATE.get(), ENDERMAN_BOOTS.get()));
}
private static class TintedArmorItem extends ArmorItem
@@ -8,13 +8,15 @@ package net.minecraftforge.debug.client;
import java.util.Random;
import com.mojang.blaze3d.platform.NativeImage;
import net.minecraft.client.renderer.texture.TextureAtlas;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.texture.Tickable;
import net.minecraft.client.renderer.texture.*;
import net.minecraft.client.resources.metadata.animation.AnimationMetadataSection;
import net.minecraft.client.resources.metadata.animation.FrameSize;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.server.packs.resources.Resource;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.world.item.Item;
import net.minecraftforge.client.event.RegisterTextureAtlasSpriteLoadersEvent;
import net.minecraftforge.client.textures.ForgeTextureMetadata;
import net.minecraftforge.client.textures.ITextureAtlasSpriteLoader;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -23,6 +25,7 @@ import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@Mod(CustomTASTest.MOD_ID)
public class CustomTASTest
@@ -52,27 +55,48 @@ public class CustomTASTest
private static class TasLoader implements ITextureAtlasSpriteLoader
{
@Override
@NotNull
public TextureAtlasSprite load(TextureAtlas atlas, ResourceManager resourceManager, TextureAtlasSprite.Info textureInfo, Resource resource, int atlasWidth, int atlasHeight, int spriteX, int spriteY, int mipmapLevel, NativeImage image)
{
return new TextureAtlasSprite(
atlas, textureInfo, mipmapLevel, atlasWidth, atlasHeight, spriteX, spriteY, image
)
{
private final Random random = new Random();
public SpriteContents loadContents(ResourceLocation name, Resource resource, FrameSize frameSize, NativeImage image, AnimationMetadataSection animationMeta, ForgeTextureMetadata forgeMeta) {
final class TASSpriteContents extends SpriteContents {
public TASSpriteContents(ResourceLocation p_249787_, FrameSize p_251031_, NativeImage p_252131_, AnimationMetadataSection p_250432_, @Nullable ForgeTextureMetadata forgeMeta) {
super(p_249787_, p_251031_, p_252131_, p_250432_, forgeMeta);
}
@Override
public Tickable getAnimationTicker()
{
return this::tick;
public @NotNull SpriteTicker createTicker() {
return new Ticker();
}
private void tick()
{
this.mainImage[0].fillRect(0, 0, 16, 16, 0xFF000000 | random.nextInt(0xFFFFFF));
this.uploadFirstFrame();
class Ticker implements SpriteTicker {
final Random random = new Random();
@Override
public void tickAndUpload(int p_248847_, int p_250486_) {
TASSpriteContents.this.byMipLevel[0].fillRect(0, 0, 16, 16, 0xFF000000 | random.nextInt(0xFFFFFF));
TASSpriteContents.this.uploadFirstFrame(p_248847_, p_250486_);
}
@Override
public void close() {
}
}
};
}
return new TASSpriteContents(name, frameSize, image, animationMeta, forgeMeta);
}
@Override
public @NotNull TextureAtlasSprite makeSprite(ResourceLocation atlasName, SpriteContents contents, int atlasWidth, int atlasHeight, int spriteX, int spriteY, int mipmapLevel) {
final class TASSprite extends TextureAtlasSprite {
public TASSprite(ResourceLocation p_250211_, SpriteContents p_248526_, int p_248950_, int p_249741_, int p_248672_, int p_248637_) {
super(p_250211_, p_248526_, p_248950_, p_249741_, p_248672_, p_248637_);
}
}
return new TASSprite(atlasName, contents, atlasWidth, atlasHeight, spriteX, spriteY);
}
}
@@ -12,9 +12,7 @@ import net.minecraft.ChatFormatting;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.Font;
import net.minecraft.client.gui.GuiComponent;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.font.FontManager;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
import net.minecraft.client.renderer.entity.ItemRenderer;
import net.minecraft.network.chat.Component;
@@ -23,18 +21,14 @@ import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.inventory.tooltip.TooltipComponent;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.TooltipFlag;
import net.minecraft.world.item.*;
import net.minecraft.world.level.Level;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.RegisterClientTooltipComponentFactoriesEvent;
import net.minecraftforge.client.event.RenderTooltipEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -44,10 +38,9 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import org.jetbrains.annotations.Nullable;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.function.Consumer;
@Mod(CustomTooltipTest.ID)
public class CustomTooltipTest
@@ -59,18 +52,20 @@ public class CustomTooltipTest
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, ID);
static final RegistryObject<Item> CUSTOM_ITEM = ITEMS.register(
"test_item",
() -> new CustomItemWithTooltip(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
() -> new CustomItemWithTooltip(new Item.Properties())
);
public CustomTooltipTest()
{
if (ENABLED) {
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
if (FMLEnvironment.dist.isClient())
{
MinecraftForge.EVENT_BUS.register(ClientEventHandler.class);
FMLJavaModLoadingContext.get().getModEventBus().register(ClientModBusEventHandler.class);
modEventBus.register(ClientModBusEventHandler.class);
}
ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
ITEMS.register(modEventBus);
modEventBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.INGREDIENTS, CUSTOM_ITEM.get()));
}
}
@@ -117,10 +112,10 @@ public class CustomTooltipTest
@Override
public InteractionResultHolder<ItemStack> use(Level level, Player player, InteractionHand hand)
{
if (level.isClientSide)
/* if (level.isClientSide) Update to 1.19.3: Disable screen tests since logic for tooltips on buttons has changed massively!
{
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> TooltipTestScreen::show);
}
}*/
return InteractionResultHolder.success(player.getItemInHand(hand));
}
@@ -187,7 +182,9 @@ public class CustomTooltipTest
}
static class TooltipTestScreen extends Screen
/* Disabled on update to 1.19.3: Tooltips have changed massively, and mojang now handles them differently
static class TooltipTestScreen extends Screen
{
private ItemStack testStack = ItemStack.EMPTY;
@@ -213,19 +210,20 @@ public class CustomTooltipTest
@Override
protected void init()
{
addRenderableWidget(new Button(10, 10, 200, 20, Component.literal("Toggle Stack: EMPTY"), button -> {
addRenderableWidget(Button.builder(Component.literal("Toggle Stack: EMPTY"), button -> {
this.testStack = this.testStack.isEmpty() ? new ItemStack(Items.APPLE) : ItemStack.EMPTY;
button.setMessage(Component.literal("Toggle Stack: " + (testStack.isEmpty() ? "EMPTY" : "Apple")));
}));
addRenderableWidget(new Button(220, 10, 200, 20, Component.literal("Toggle Font: null"), button -> {
}).pos(10, 10).size(200,20).build());
addRenderableWidget(Button.builder(Component.literal("Toggle Font: null"), button -> {
this.testFont = this.testFont == null ? ClientModBusEventHandler.customFont : null;
button.setMessage(Component.literal("Toggle Font: " + (testFont == null ? "null" : "customFont")));
}));
}).pos(220, 10).size(200,20).build());
// * must have stack context
// # must have custom font
List<Map.Entry<String, Button.OnTooltip>> tooltipTests = Arrays.asList(
List<Map.Entry<String, Tooltip>> tooltipTests = Arrays.asList(
Map.entry(" 1 * ", this::test1),
Map.entry(" 2 * ", this::test2),
Map.entry(" 3 #", this::test3),
@@ -330,6 +328,6 @@ public class CustomTooltipTest
{
renderComponentTooltip(poseStack, List.of(Component.literal("test")), mouseX, mouseY, this.testFont, ItemStack.EMPTY);
}
}
}*/
}
@@ -6,11 +6,12 @@
package net.minecraftforge.debug.client;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.material.Material;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -29,12 +30,14 @@ public class EmissiveElementsTest
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
public static final RegistryObject<Block> TEST_BLOCK = BLOCKS.register("emissive", () -> new Block(BlockBehaviour.Properties.of(Material.STONE)));
public static final RegistryObject<Item> TEST_BLOCK_ITEM = ITEMS.register("emissive", () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)));
public static final RegistryObject<Item> TEST_BLOCK_ITEM = ITEMS.register("emissive", () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties()));
public EmissiveElementsTest()
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
BLOCKS.register(modEventBus);
ITEMS.register(modEventBus);
modEventBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.BUILDING_BLOCKS, TEST_BLOCK_ITEM.get()));
}
}
@@ -21,6 +21,8 @@ import java.util.Random;
@Mod(GuiLayeringTest.MODID)
public class GuiLayeringTest
{
private static final boolean ENABLED = false;
private static final Random RANDOM = new Random();
public static final String MODID = "gui_layer_test";
@@ -30,14 +32,15 @@ public class GuiLayeringTest
@SubscribeEvent
public static void guiOpen(ScreenEvent.Init event)
{
if (event.getScreen() instanceof AbstractContainerScreen)
if (event.getScreen() instanceof AbstractContainerScreen && ENABLED)
{
event.addListener(new Button(2, 2, 150, 20, Component.literal("Test Gui Layering"), btn -> {
event.addListener(Button.builder(Component.literal("Test Gui Layering"), btn -> {
Minecraft.getInstance().pushGuiLayer(new TestLayer(Component.literal("LayerScreen")));
}));
event.addListener(new Button(2, 25, 150, 20, Component.literal("Test Gui Normal"), btn -> {
}).pos(2,2).size(150, 20).build());
event.addListener(Button.builder(Component.literal("Test Gui Normal"), btn -> {
Minecraft.getInstance().setScreen(new TestLayer(Component.literal("LayerScreen")));
}));
}).pos(2, 25).size(150, 20).build());
}
}
@@ -72,9 +75,9 @@ public class GuiLayeringTest
xoff = RANDOM.nextInt(xoff);
yoff = RANDOM.nextInt(yoff);
this.addRenderableWidget(new Button(xoff, yoff + buttonSpacing * (cnt++), buttonWidth, buttonHeight, Component.literal("Push New Layer"), this::pushLayerButton));
this.addRenderableWidget(new Button(xoff, yoff + buttonSpacing * (cnt++), buttonWidth, buttonHeight, Component.literal("Pop Current Layer"), this::popLayerButton));
this.addRenderableWidget(new Button(xoff, yoff + buttonSpacing * (cnt++), buttonWidth, buttonHeight, Component.literal("Close entire stack"), this::closeStack));
this.addRenderableWidget(Button.builder(Component.literal("Push New Layer"), this::pushLayerButton).pos(xoff, yoff + buttonSpacing * (cnt++)).size(buttonWidth, buttonHeight).build());
this.addRenderableWidget(Button.builder(Component.literal("Pop Current Layer"), this::popLayerButton).pos(xoff, yoff + buttonSpacing * (cnt++)).size(buttonWidth, buttonHeight).build());
this.addRenderableWidget(Button.builder(Component.literal("Close entire stack"), this::closeStack).pos(xoff, yoff + buttonSpacing * (cnt++)).size(buttonWidth, buttonHeight).build());
}
private void closeStack(Button button)
@@ -5,16 +5,13 @@
package net.minecraftforge.debug.client.model;
import net.minecraft.world.item.*;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.context.BlockPlaceContext;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.core.BlockPos;
@@ -22,6 +19,7 @@ import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraft.world.phys.shapes.Shapes;
import net.minecraft.world.level.BlockGetter;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
@@ -30,6 +28,8 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import org.jetbrains.annotations.Nullable;
import java.util.function.Consumer;
@Mod(CompositeModelTest.MODID)
public class CompositeModelTest
{
@@ -72,7 +72,7 @@ public class CompositeModelTest
);
public static RegistryObject<Item> composite_item = ITEMS.register("composite_block", () ->
new BlockItem(composite_block.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)) {
new BlockItem(composite_block.get(), new Item.Properties()) {
@Override
public boolean canEquip(ItemStack stack, EquipmentSlot armorType, Entity entity)
{
@@ -87,5 +87,7 @@ public class CompositeModelTest
BLOCKS.register(modEventBus);
ITEMS.register(modEventBus);
modEventBus.addListener((CreativeModeTabEvent.BuildContents event) -> event.registerSimple(CreativeModeTabs.INGREDIENTS, composite_item.get()));
}
}
@@ -40,6 +40,7 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.EntityRenderersEvent;
import net.minecraftforge.client.model.generators.*;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -49,6 +50,8 @@ import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import org.jetbrains.annotations.Nullable;
import java.util.function.Consumer;
/*
* Test mod for the custom transform types feature.
* This test mod adds an item that should be held in the main hand, while another item is in the offhand.
@@ -117,7 +120,7 @@ public class CustomTransformTypeTest
public static final RegistryObject<BlockEntityType<ItemHangerBlockEntity>>
ITEM_HANGER_BE = BLOCK_ENTITY_TYPES.register("item_hanger", () -> BlockEntityType.Builder.of(ItemHangerBlockEntity::new, ITEM_HANGER_BLOCK.get()).build(null));
public static final RegistryObject<Item>
ITEM_HANGER_ITEM = ITEMS.register("item_hanger", () -> new ItemHangerItem(ITEM_HANGER_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
ITEM_HANGER_ITEM = ITEMS.register("item_hanger", () -> new ItemHangerItem(ITEM_HANGER_BLOCK.get(), new Item.Properties()));
public CustomTransformTypeTest()
{
@@ -126,6 +129,13 @@ public class CustomTransformTypeTest
BLOCKS.register(modBus);
BLOCK_ENTITY_TYPES.register(modBus);
ITEMS.register(modBus);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(ITEM_HANGER_ITEM.get());
});
}
});
}
public void gatherData(GatherDataEvent event)
@@ -5,8 +5,9 @@
package net.minecraftforge.debug.client.model;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
@@ -14,22 +15,32 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import java.util.function.Consumer;
@Mod(DynBucketModelTest.MODID)
public class DynBucketModelTest
{
public static final boolean ENABLE = false; // TODO fix
public static final String MODID = "dyn_bucket_model_test";
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
public static final RegistryObject<Item> DRIP_BUCKET = ITEMS.register("drip_bucket", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public static final RegistryObject<Item> LAVA_OBSIDIAN = ITEMS.register("lava_obsidian", () -> new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public static final RegistryObject<Item> DRIP_BUCKET = ITEMS.register("drip_bucket", () -> new Item(new Item.Properties()));
public static final RegistryObject<Item> LAVA_OBSIDIAN = ITEMS.register("lava_obsidian", () -> new Item(new Item.Properties()));
public DynBucketModelTest()
{
if (ENABLE)
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(modEventBus);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(DRIP_BUCKET.get());
output.accept(LAVA_OBSIDIAN.get());
});
}
});
}
}
}
@@ -5,9 +5,7 @@
package net.minecraftforge.debug.client.model;
import com.mojang.math.Quaternion;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.resources.model.BakedModel;
@@ -20,7 +18,7 @@ import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
@@ -36,6 +34,7 @@ import net.minecraftforge.client.model.BakedModelWrapper;
import net.minecraftforge.client.model.IQuadTransformer;
import net.minecraftforge.client.model.data.ModelData;
import net.minecraftforge.client.model.data.ModelProperty;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -45,9 +44,12 @@ import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.joml.Quaternionf;
import org.joml.Vector3f;
import java.util.List;
import java.util.Set;
import java.util.function.Consumer;
/**
* Test mod that demos most Forge-provided model loaders in a single block + item, as well as in-JSON render states
@@ -75,7 +77,7 @@ public class MegaModelTest
private static final String REG_NAME = "test_block";
public static final RegistryObject<Block> TEST_BLOCK = BLOCKS.register(REG_NAME, TestBlock::new);
public static final RegistryObject<Item> TEST_BLOCK_ITEM = ITEMS.register(REG_NAME, () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_DECORATIONS)));
public static final RegistryObject<Item> TEST_BLOCK_ITEM = ITEMS.register(REG_NAME, () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties()));
public static final RegistryObject<BlockEntityType<?>> TEST_BLOCK_ENTITY = BLOCK_ENTITIES.register(REG_NAME, () -> new BlockEntityType<>(
TestBlock.Entity::new, Set.of(TEST_BLOCK.get()), null
));
@@ -86,6 +88,12 @@ public class MegaModelTest
BLOCKS.register(modEventBus);
ITEMS.register(modEventBus);
BLOCK_ENTITIES.register(modEventBus);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.BUILDING_BLOCKS) {
onBuildContents.register((p_259204_, p_259752_, p_260123_) -> p_259752_.accept(TEST_BLOCK_ITEM.get()));
}
});
}
@Mod.EventBusSubscriber(value = Dist.CLIENT, modid = MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD)
@@ -143,9 +151,9 @@ public class MegaModelTest
{
return ModelData.builder().with(TestData.PROPERTY, new TestData(new Transformation(
new Vector3f(0, y * 0.2f, 0),
Quaternion.ONE,
new Quaternionf(1f, 1f, 1f, 1f),
Transformation.identity().getScale(),
Quaternion.ONE
new Quaternionf(1f, 1f, 1f, 1f)
))).build();
}
}
@@ -5,21 +5,25 @@
package net.minecraftforge.debug.client.model;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.material.Material;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.ItemBlockRenderTypes;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.ObjectHolder;
import net.minecraftforge.registries.RegisterEvent;
import java.util.function.Consumer;
@Mod(MultiLayerModelTest.MODID)
public class MultiLayerModelTest
{
@@ -48,7 +52,14 @@ public class MultiLayerModelTest
{
if (!ENABLED || !event.getRegistryKey().equals(ForgeRegistries.Keys.ITEMS))
return;
event.register(ForgeRegistries.Keys.ITEMS, blockId, () -> new BlockItem(TEST_BLOCK, new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
event.register(ForgeRegistries.Keys.ITEMS, blockId, () -> new BlockItem(TEST_BLOCK, new Item.Properties()));
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(TEST_BLOCK.asItem());
});
}
});
}
@SubscribeEvent
@@ -7,8 +7,9 @@ package net.minecraftforge.debug.client.model;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.block.model.BakedQuad;
import net.minecraft.client.resources.model.ModelBaker;
import net.minecraft.world.item.*;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
@@ -38,6 +39,7 @@ import net.minecraftforge.client.model.generators.loaders.SeparateTransformsMode
import net.minecraftforge.client.model.geometry.SimpleUnbakedGeometry;
import net.minecraftforge.client.model.pipeline.QuadBakingVertexConsumer;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
@@ -46,19 +48,11 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Function;
import net.minecraft.client.renderer.block.model.ItemTransforms;
import net.minecraft.client.resources.model.ModelBakery;
import net.minecraft.client.resources.model.ModelState;
import net.minecraft.client.resources.model.UnbakedModel;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.context.BlockPlaceContext;
import org.jetbrains.annotations.Nullable;
@@ -95,7 +89,7 @@ public class NewModelLoaderTest
);
public static RegistryObject<Item> obj_item = ITEMS.register("obj_block", () ->
new BlockItem(obj_block.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)) {
new BlockItem(obj_block.get(), new Item.Properties()) {
@Override
public boolean canEquip(ItemStack stack, EquipmentSlot armorType, Entity entity)
{
@@ -105,23 +99,23 @@ public class NewModelLoaderTest
);
public static RegistryObject<Item> custom_transforms = ITEMS.register("custom_transforms", () ->
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
new Item(new Item.Properties())
);
public static RegistryObject<Item> custom_vanilla_loader = ITEMS.register("custom_vanilla_loader", () ->
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
new Item(new Item.Properties())
);
public static RegistryObject<Item> custom_loader = ITEMS.register("custom_loader", () ->
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
new Item(new Item.Properties())
);
public static RegistryObject<Item> item_layers = ITEMS.register("item_layers", () ->
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
new Item(new Item.Properties())
);
public static RegistryObject<Item> separate_perspective = ITEMS.register("separate_perspective", () ->
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
new Item(new Item.Properties())
);
public NewModelLoaderTest()
@@ -133,6 +127,20 @@ public class NewModelLoaderTest
modEventBus.addListener(this::modelRegistry);
modEventBus.addListener(this::datagen);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(obj_item.get());
output.accept(custom_transforms.get());
output.accept(custom_vanilla_loader.get());
output.accept(custom_loader.get());
output.accept(item_layers.get());
output.accept(separate_perspective.get());
});
}
});
}
public void modelRegistry(ModelEvent.RegisterGeometryLoaders event)
@@ -152,8 +160,7 @@ public class NewModelLoaderTest
static class TestModel extends SimpleUnbakedGeometry<TestModel>
{
@Override
protected void addQuads(IGeometryBakingContext owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function< net.minecraft.client.resources.model.Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
protected void addQuads(IGeometryBakingContext owner, IModelBuilder<?> modelBuilder, ModelBaker baker, Function<net.minecraft.client.resources.model.Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation) {
TextureAtlasSprite texture = spriteGetter.apply(owner.getMaterial("particle"));
var quadBaker = new QuadBakingVertexConsumer.Buffered();
@@ -168,12 +175,6 @@ public class NewModelLoaderTest
modelBuilder.addUnculledFace(quadBaker.getQuad());
}
@Override
public Collection< net.minecraft.client.resources.model.Material> getMaterials(IGeometryBakingContext context, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
return Collections.singleton(context.getMaterial("particle"));
}
}
private void datagen(GatherDataEvent event)
@@ -6,9 +6,11 @@
package net.minecraftforge.debug.client.model;
import java.util.List;
import java.util.function.Consumer;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.util.RandomSource;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
@@ -18,18 +20,16 @@ import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import com.mojang.math.Quaternion;
import com.mojang.math.Transformation;
import com.mojang.math.Vector3f;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.ModelEvent;
import net.minecraftforge.client.model.IQuadTransformer;
import net.minecraftforge.client.model.IDynamicBakedModel;
import net.minecraftforge.client.model.data.ModelData;
import net.minecraftforge.common.util.TransformationHelper;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.registries.RegistryObject;
@@ -38,6 +38,8 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import org.jetbrains.annotations.Nullable;
import org.joml.Quaternionf;
import org.joml.Vector3f;
@Mod(TRSRTransformerTest.MODID)
public class TRSRTransformerTest {
@@ -47,13 +49,19 @@ public class TRSRTransformerTest {
private static final RegistryObject<Block> TEST_BLOCK = BLOCKS.register("test", () -> new Block(Block.Properties.of(Material.STONE)));
@SuppressWarnings("unused")
private static final RegistryObject<Item> TEST_ITEM = ITEMS.register("test", () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
private static final RegistryObject<Item> TEST_ITEM = ITEMS.register("test", () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties()));
public TRSRTransformerTest() {
final IEventBus mod = FMLJavaModLoadingContext.get().getModEventBus();
DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> mod.addListener(this::onModelBake));
BLOCKS.register(mod);
ITEMS.register(mod);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.BUILDING_BLOCKS) {
onBuildContents.register((p_259204_, p_259752_, p_260123_) -> p_259752_.accept(TEST_ITEM.get()));
}
});
}
public void onModelBake(ModelEvent.BakingCompleted e) {
@@ -73,7 +81,7 @@ public class TRSRTransformerTest {
@Override
public List<BakedQuad> getQuads(@Nullable BlockState state, @Nullable Direction side, RandomSource rand, ModelData data, @Nullable RenderType renderType) {
Quaternion rot = TransformationHelper.quatFromXYZ(new Vector3f(0, 45, 0), true);
Quaternionf rot = TransformationHelper.quatFromXYZ(new Vector3f(0, 45, 0), true);
Vector3f translation = new Vector3f(0, 0.33f, 0);
Transformation trans = new Transformation(translation, rot, null, null).blockCenterToCorner();
@@ -7,13 +7,13 @@ package net.minecraftforge.debug.client.rendering;
import java.util.Map;
import com.mojang.math.Transformation;
import net.minecraftforge.common.util.TransformationHelper;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.google.common.collect.ImmutableMap;
import com.mojang.blaze3d.vertex.PoseStack;
import com.mojang.math.Matrix4f;
import com.mojang.math.Quaternion;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.LightTexture;
@@ -43,6 +43,8 @@ import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLEnvironment;
import org.joml.Matrix4f;
import org.joml.Quaternionf;
/**
* This mod is testing the use of {@link RenderLevelStageEvent} and is a modifaction of a pre-existing test mod that used the old
@@ -185,13 +187,11 @@ public class RenderableTest
var map = ImmutableMap.<String, Matrix4f>builder();
var left = new Matrix4f();
left.setIdentity();
left.multiply(Quaternion.fromYXZ(0, 0, (float)Math.sin(time * 0.4) * 0.1f));
left.rotation((float)Math.sin(time * 0.4) * 0.1f, 0, 0, 1);
map.put("object_1", left);
var right = new Matrix4f();
right.setIdentity();
right.multiply(Quaternion.fromYXZ(0, 0, -(float)Math.sin(time * 0.4) * 0.1f));
right.rotation(-(float)Math.sin(time * 0.4) * 0.1f, 0, 0, 1);
map.put("object_9", right);
var transforms = CompositeRenderable.Transforms.of(map.build());
@@ -48,24 +48,24 @@ public class ShaderResourcesTest
modEventBus.addListener(ClientInit::registerShaders);
}
public static void registerShaders(final RegisterShadersEvent event)
{
if (!ENABLE)
return;
try
{
event.registerShader(
new ShaderInstance(
event.getResourceManager(),
event.getResourceProvider(),
new ResourceLocation(MODID, "vertex_cubemap"),
DefaultVertexFormat.POSITION),
shader ->
{
LOGGER.info("Completely loaded shader {} with no issues", shader.getName());
});
LOGGER.info("Loaded registered shaders with no exceptions");
}
catch (IOException e)
@@ -8,14 +8,17 @@ package net.minecraftforge.debug.entity;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import java.util.function.Consumer;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BiomeTags;
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraftforge.common.ForgeMod;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegisterEvent;
import org.apache.logging.log4j.LogManager;
@@ -31,7 +34,6 @@ import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.AttributeModifier.Operation;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Rarity;
import net.minecraft.world.level.Level;
import net.minecraft.server.level.ServerLevel;
@@ -117,7 +119,15 @@ public class GravityAttributeTest
public void registerItems(RegisterEvent event)
{
event.register(ForgeRegistries.Keys.ITEMS, helper -> helper.register("gravity_stick",
new ItemGravityStick(new Properties().tab(CreativeModeTab.TAB_TOOLS).rarity(Rarity.RARE))));
new ItemGravityStick(new Properties().rarity(Rarity.RARE))));
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.TOOLS_AND_UTILITIES) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(ForgeRegistries.ITEMS.getValue(new ResourceLocation("gravity_attribute_test", "gravity_stick")));
});
}
});
}
public static class ItemGravityStick extends Item
@@ -8,6 +8,7 @@ package net.minecraftforge.debug.entity;
import net.minecraft.client.renderer.entity.PigRenderer;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.network.protocol.Packet;
import net.minecraft.network.protocol.game.ClientGamePacketListener;
import net.minecraft.network.protocol.game.ClientboundAddEntityPacket;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.Entity;
@@ -178,7 +179,7 @@ public class PartEntityTest
return this == entity || this.parent == entity;
}
public Packet<?> getAddEntityPacket()
public Packet<ClientGamePacketListener> getAddEntityPacket()
{
throw new UnsupportedOperationException();
}
@@ -12,11 +12,9 @@ import net.minecraft.world.InteractionHand;
import net.minecraft.world.entity.HumanoidArm;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.food.FoodProperties;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.UseAnim;
import net.minecraft.world.item.*;
import net.minecraftforge.client.extensions.common.IClientItemExtensions;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
@@ -39,11 +37,18 @@ public class ItemUseAnimationTest
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
private static final RegistryObject<Item> THING = ITEMS.register("thing", () -> new ThingItem(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).food(new FoodProperties.Builder().nutrition(4).alwaysEat().build())));
private static final RegistryObject<Item> THING = ITEMS.register("thing", () -> new ThingItem(new Item.Properties().food(new FoodProperties.Builder().nutrition(4).alwaysEat().build())));
public ItemUseAnimationTest()
{
ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.COMBAT) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(THING.get());
});
}
});
}
private static class ThingItem extends Item
@@ -11,11 +11,8 @@ import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.SwordItem;
import net.minecraft.world.item.Tier;
import net.minecraft.world.item.Tiers;
import net.minecraft.world.item.*;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -24,6 +21,7 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import java.util.UUID;
import java.util.function.Consumer;
/**
* Tests if the patch to PlayerEntity to make it utilize Attributes.ATTACK_KNOCKBACK works
@@ -41,13 +39,20 @@ public class PlayerAttackKnockbackTest {
static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
static RegistryObject<Item> KNOCKBACK_SWORD = ITEMS.register("knockback_sword", () ->
new KnockbackSwordItem(Tiers.IRON, 3, -2.4F, ATTACK_KNOCKBACK_VALUE, (new Item.Properties()).tab(CreativeModeTab.TAB_COMBAT))
new KnockbackSwordItem(Tiers.IRON, 3, -2.4F, ATTACK_KNOCKBACK_VALUE, (new Item.Properties()))
);
public PlayerAttackKnockbackTest()
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(modEventBus);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.COMBAT) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(KNOCKBACK_SWORD.get());
});
}
});
}
static class KnockbackSwordItem extends SwordItem {
@@ -7,7 +7,6 @@ package net.minecraftforge.debug.fluid;
import com.mojang.blaze3d.shaders.FogShape;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.math.Vector3f;
import net.minecraft.client.Camera;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientLevel;
@@ -15,10 +14,7 @@ import net.minecraft.client.renderer.FogRenderer;
import net.minecraft.client.renderer.ItemBlockRenderTypes;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.BucketItem;
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.LiquidBlock;
@@ -31,6 +27,7 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
import net.minecraftforge.client.event.RegisterColorHandlersEvent;
import net.minecraftforge.common.ForgeMod;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fluids.FluidInteractionRegistry;
import net.minecraftforge.fluids.FluidType;
@@ -46,6 +43,7 @@ import net.minecraftforge.registries.RegistryObject;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import org.joml.Vector3f;
import java.util.function.Consumer;
import java.util.stream.Stream;
@@ -158,7 +156,7 @@ public class FluidTypeTest
private static final RegistryObject<LiquidBlock> TEST_FLUID_BLOCK = BLOCKS.register("test_fluid_block", () ->
new LiquidBlock(TEST_FLUID, BlockBehaviour.Properties.of(Material.WATER).noCollission().strength(100.0F).noLootTable()));
private static final RegistryObject<Item> TEST_FLUID_BUCKET = ITEMS.register("test_fluid_bucket", () ->
new BucketItem(TEST_FLUID, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1).tab(CreativeModeTab.TAB_MISC)));
new BucketItem(TEST_FLUID, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1)));
public FluidTypeTest()
{
@@ -177,6 +175,17 @@ public class FluidTypeTest
modEventBus.addListener(this::commonSetup);
DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> new FluidTypeTestClient(modEventBus));
FMLJavaModLoadingContext.get().getModEventBus().addListener(new Consumer<CreativeModeTabEvent.BuildContents>() {
@Override
public void accept(CreativeModeTabEvent.BuildContents onBuildContents) {
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
onBuildContents.register((flags, output, permission) -> {
output.accept(new ItemStack(TEST_FLUID_BUCKET.get()));
});
}
}
});
}
}
@@ -5,6 +5,7 @@
package net.minecraftforge.debug.fluid;
import net.minecraft.world.item.*;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
@@ -13,6 +14,7 @@ import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.LevelAccessor;
import net.minecraftforge.client.extensions.common.IClientFluidTypeExtensions;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.fluids.DispenseFluidContainer;
import net.minecraftforge.fluids.FluidType;
import org.apache.commons.lang3.Validate;
@@ -33,12 +35,6 @@ import net.minecraftforge.registries.ForgeRegistries;
import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.BucketItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.DispenserBlock;
@@ -116,7 +112,7 @@ public class NewFluidTest
new LiquidBlock(test_fluid, Properties.of(Material.WATER).noCollission().strength(100.0F).noLootTable())
);
public static RegistryObject<Item> test_fluid_bucket = ITEMS.register("test_fluid_bucket", () ->
new BucketItem(test_fluid, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1).tab(CreativeModeTab.TAB_MISC))
new BucketItem(test_fluid, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1))
);
// WARNING: this doesn't allow "any fluid", only the fluid from this test mod!
@@ -124,7 +120,7 @@ public class NewFluidTest
new FluidloggableBlock(Properties.of(Material.WOOD).noCollission().strength(100.0F).noLootTable())
);
public static RegistryObject<Item> fluidloggable_blockitem = ITEMS.register("fluidloggable_block", () ->
new BlockItem(fluidloggable_block.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC))
new BlockItem(fluidloggable_block.get(), new Item.Properties())
);
public NewFluidTest()
@@ -139,6 +135,15 @@ public class NewFluidTest
ITEMS.register(modEventBus);
FLUID_TYPES.register(modEventBus);
FLUIDS.register(modEventBus);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(fluidloggable_blockitem.get());
output.accept(test_fluid_bucket.get());
});
}
});
}
}
@@ -7,6 +7,7 @@ package net.minecraftforge.debug.item;
import net.minecraft.client.model.geom.EntityModelSet;
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
import net.minecraft.world.item.*;
import net.minecraft.world.level.block.DispenserBlock;
import net.minecraft.client.Minecraft;
import net.minecraft.client.player.AbstractClientPlayer;
@@ -19,6 +20,7 @@ import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.gameevent.GameEvent;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
@@ -29,25 +31,30 @@ import net.minecraftforge.registries.ForgeRegistries;
import net.minecraft.world.item.Item.Properties;
import net.minecraft.world.item.ArmorItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import org.jetbrains.annotations.Nullable;
import java.util.function.Consumer;
@Mod(CustomElytraTest.MOD_ID)
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, modid = CustomElytraTest.MOD_ID)
public class CustomElytraTest
{
public static final String MOD_ID = "custom_elytra_test";
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
private static final RegistryObject<Item> TEST_ELYTRA = ITEMS.register("test_elytra",() -> new CustomElytra(new Properties().durability(100).tab(CreativeModeTab.TAB_MISC)));
private static final RegistryObject<Item> TEST_ELYTRA = ITEMS.register("test_elytra",() -> new CustomElytra(new Properties().durability(100)));
public CustomElytraTest()
{
final IEventBus modBus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(modBus);
modBus.addListener(this::onClientSetup);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(TEST_ELYTRA.get());
});
}
});
}
private void onClientSetup(FMLClientSetupEvent event)
@@ -7,10 +7,11 @@ package net.minecraftforge.debug.item;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.MobBucketItem;
import net.minecraft.world.level.material.Fluids;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -18,6 +19,8 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import java.util.function.Consumer;
@Mod(CustomMobBucketTest.MODID)
public class CustomMobBucketTest
{
@@ -30,7 +33,7 @@ public class CustomMobBucketTest
() -> EntityType.COW,
() -> Fluids.WATER,
() -> SoundEvents.BUCKET_EMPTY_FISH,
(new Item.Properties()).stacksTo(1).tab(CreativeModeTab.TAB_MISC)));
(new Item.Properties()).stacksTo(1)));
public CustomMobBucketTest()
{
@@ -38,6 +41,13 @@ public class CustomMobBucketTest
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(modEventBus);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(COW_BUCKET.get());
});
}
});
}
}
}
@@ -8,30 +8,37 @@ package net.minecraftforge.debug.item;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResultHolder;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.UseAnim;
import net.minecraft.world.item.*;
import net.minecraft.world.level.Level;
import net.minecraftforge.common.ToolAction;
import net.minecraftforge.common.ToolActions;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.registries.DeferredRegister;
import java.util.function.Consumer;
@Mod("custom_shield_test")
public class CustomShieldTest
{
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, "custom_shield_test");
private static final RegistryObject<CustomShieldItem> CUSTOM_SHIELD_ITEM = ITEMS.register("custom_shield",
() -> new CustomShieldItem((new Item.Properties()).durability(336).tab(CreativeModeTab.TAB_COMBAT)));
() -> new CustomShieldItem((new Item.Properties()).durability(336)));
public CustomShieldTest()
{
ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.COMBAT) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(CUSTOM_SHIELD_ITEM.get());
});
}
});
}
private static class CustomShieldItem extends Item
@@ -8,6 +8,8 @@ package net.minecraftforge.debug.item;
import net.minecraft.world.entity.monster.EnderMan;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.item.*;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
@@ -15,11 +17,7 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraft.world.item.ArmorItem;
import net.minecraft.world.item.ArmorMaterials;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import java.util.function.Consumer;
@Mod(EnderMaskTest.MODID)
public class EnderMaskTest
@@ -28,7 +26,7 @@ public class EnderMaskTest
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
public static RegistryObject<Item> ender_mask = ITEMS.register("ender_mask", () ->
new ArmorItem(ArmorMaterials.LEATHER, EquipmentSlot.HEAD, (new Item.Properties().tab(CreativeModeTab.TAB_MISC)))
new ArmorItem(ArmorMaterials.LEATHER, EquipmentSlot.HEAD, (new Item.Properties()))
{
@Override
public boolean isEnderMask(ItemStack stack, Player player, EnderMan endermanEntity)
@@ -42,5 +40,12 @@ public class EnderMaskTest
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(modEventBus);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(ender_mask.get());
});
}
});
}
}
@@ -6,6 +6,8 @@
package net.minecraftforge.debug.item;
import java.util.Map;
import java.util.function.Consumer;
import net.minecraft.client.renderer.entity.PigRenderer;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.MobCategory;
@@ -13,12 +15,13 @@ import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
import net.minecraft.world.entity.animal.Pig;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.Item;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.EntityRenderersEvent;
import net.minecraftforge.common.ForgeMod;
import net.minecraftforge.common.ForgeSpawnEggItem;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.event.entity.EntityAttributeCreationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -41,7 +44,7 @@ public class ForgeSpawnEggItemTest
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
private static final RegistryObject<ForgeSpawnEggItem> EGG = ITEMS.register("test_spawn_egg", () ->
new ForgeSpawnEggItem(ENTITY, 0x0000FF, 0xFF0000, new Item.Properties().tab(CreativeModeTab.TAB_MISC))
new ForgeSpawnEggItem(ENTITY, 0x0000FF, 0xFF0000, new Item.Properties())
);
public ForgeSpawnEggItemTest()
@@ -52,6 +55,13 @@ public class ForgeSpawnEggItemTest
ENTITIES.register(FMLJavaModLoadingContext.get().getModEventBus());
FMLJavaModLoadingContext.get().getModEventBus().register(this);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(EGG.get());
});
}
});
}
}
@@ -12,9 +12,10 @@ import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.entity.ai.attributes.AttributeModifier;
import net.minecraft.world.entity.ai.attributes.AttributeModifier.Operation;
import net.minecraft.world.entity.ai.attributes.Attributes;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
@@ -22,7 +23,7 @@ import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import org.jetbrains.annotations.NotNull;
import java.util.Set;
import java.util.function.Consumer;
@Mod(HiddenTooltipPartsTest.MOD_ID)
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE, modid = HiddenTooltipPartsTest.MOD_ID)
@@ -32,11 +33,18 @@ public class HiddenTooltipPartsTest
public static final boolean ENABLED = true;
private static final AttributeModifier MODIFIER = new AttributeModifier(MOD_ID, 10f, Operation.ADDITION);
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
private static final RegistryObject<Item> TEST_ITEM = ITEMS.register("test_item", () -> new TestItem(new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
private static final RegistryObject<Item> TEST_ITEM = ITEMS.register("test_item", () -> new TestItem(new Item.Properties()));
public HiddenTooltipPartsTest()
{
ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(TEST_ITEM.get());
});
}
});
}
static class TestItem extends Item
@@ -27,7 +27,7 @@ public class MusicDiscTest
private static final DeferredRegister<SoundEvent> SOUND_EVENTS = DeferredRegister.create(ForgeRegistries.SOUND_EVENTS, MOD_ID);
private static final RegistryObject<SoundEvent> TEST_SOUND_EVENT = SOUND_EVENTS.register("test_sound_event",
() -> new SoundEvent(new ResourceLocation(MOD_ID, "test_sound_event")));
() -> SoundEvent.createVariableRangeEvent(new ResourceLocation(MOD_ID, "test_sound_event")));
private static final RegistryObject<Item> TEST_MUSIC_DISC = ITEMS.register("test_music_disc",
() -> new RecordItem(1, TEST_SOUND_EVENT, new Item.Properties().stacksTo(1).rarity(Rarity.EPIC), 20));
@@ -7,11 +7,8 @@ package net.minecraftforge.debug.item;
import net.minecraft.client.renderer.item.ItemProperties;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.BowItem;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.CrossbowItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.*;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -20,6 +17,8 @@ import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import java.util.function.Consumer;
@Mod(RangedMobsUseModdedWeaponsTest.MOD_ID)
public class RangedMobsUseModdedWeaponsTest {
@@ -34,10 +33,10 @@ public class RangedMobsUseModdedWeaponsTest {
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
private static final RegistryObject<Item> MODDED_BOW = ITEMS.register("modded_bow", () ->
new BowItem(new Item.Properties().tab(CreativeModeTab.TAB_COMBAT).defaultDurability(384))
new BowItem(new Item.Properties().defaultDurability(384))
);
private static final RegistryObject<Item> MODDED_CROSSBOW = ITEMS.register("modded_crossbow", () ->
new CrossbowItem(new Item.Properties().tab(CreativeModeTab.TAB_COMBAT).defaultDurability(326))
new CrossbowItem(new Item.Properties().defaultDurability(326))
);
public RangedMobsUseModdedWeaponsTest()
@@ -46,6 +45,14 @@ public class RangedMobsUseModdedWeaponsTest {
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(modEventBus);
modEventBus.addListener(this::onClientSetup);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.COMBAT) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(MODDED_BOW.get());
output.accept(MODDED_CROSSBOW.get());
});
}
});
}
}
@@ -7,13 +7,8 @@ package net.minecraftforge.debug.item;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.monster.EnderMan;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ArmorItem;
import net.minecraft.world.item.ArmorMaterials;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.*;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -21,6 +16,8 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import java.util.function.Consumer;
@Mod(SnowBootsTest.MODID)
public class SnowBootsTest
{
@@ -28,7 +25,7 @@ public class SnowBootsTest
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
public static RegistryObject<Item> snow_boots = ITEMS.register("snow_boots", () ->
new ArmorItem(ArmorMaterials.DIAMOND, EquipmentSlot.FEET, (new Item.Properties().tab(CreativeModeTab.TAB_MISC)))
new ArmorItem(ArmorMaterials.DIAMOND, EquipmentSlot.FEET, (new Item.Properties()))
{
@Override
public boolean canWalkOnPowderedSnow(ItemStack stack, LivingEntity wearer) {
@@ -41,5 +38,12 @@ public class SnowBootsTest
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(modEventBus);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.COMBAT) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(snow_boots.get());
});
}
});
}
}
@@ -5,13 +5,14 @@
package net.minecraftforge.debug.item;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.loot.BlockLoot;
import net.minecraft.data.loot.BlockLootSubProvider;
import net.minecraft.data.loot.LootTableProvider;
import net.minecraft.data.tags.BlockTagsProvider;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.BlockTags;
import net.minecraft.tags.TagKey;
import net.minecraft.world.flag.FeatureFlags;
import net.minecraft.world.item.*;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.level.block.Block;
@@ -19,10 +20,6 @@ import net.minecraft.world.level.block.state.BlockBehaviour;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.storage.loot.LootTable;
import net.minecraft.world.level.storage.loot.LootTables;
import net.minecraft.world.level.storage.loot.ValidationContext;
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet;
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ItemModelProvider;
@@ -30,7 +27,9 @@ import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.client.model.generators.ModelFile.UncheckedModelFile;
import net.minecraftforge.common.ForgeTier;
import net.minecraftforge.common.TierSortingRegistry;
import net.minecraftforge.common.data.BlockTagsProvider;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -41,15 +40,11 @@ import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import java.util.List;
import java.util.Map;
import java.util.function.BiConsumer;
import java.util.Set;
import java.util.function.Consumer;
import java.util.function.Supplier;
import java.util.stream.Collectors;
import com.google.common.collect.ImmutableList;
import com.mojang.datafixers.util.Pair;
@Mod(TagBasedToolTypesTest.MODID)
public class TagBasedToolTypesTest
{
@@ -69,10 +64,10 @@ public class TagBasedToolTypesTest
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
@SuppressWarnings("unused")
private static final RegistryObject<Item> ORE_ITEM = ITEMS.register(STONE.getId().getPath(), () -> new BlockItem(STONE.get(), (new Item.Properties()).tab(CreativeModeTab.TAB_BUILDING_BLOCKS)));
private static final RegistryObject<Item> ORE_ITEM = ITEMS.register(STONE.getId().getPath(), () -> new BlockItem(STONE.get(), (new Item.Properties())));
private static final RegistryObject<Item> TOOL = ITEMS.register("test_tool", () ->
{
return new DiggerItem(1, 1, MY_TIER, MINEABLE_TAG, new Item.Properties().tab(CreativeModeTab.TAB_TOOLS))
return new DiggerItem(1, 1, MY_TIER, MINEABLE_TAG, new Item.Properties())
{
@Override
public float getDestroySpeed(ItemStack stack, BlockState state)
@@ -102,6 +97,22 @@ public class TagBasedToolTypesTest
BLOCKS.register(modEventBus);
ITEMS.register(modEventBus);
modEventBus.addListener(this::gatherData);
FMLJavaModLoadingContext.get().getModEventBus().addListener(new Consumer<CreativeModeTabEvent.BuildContents>() {
@Override
public void accept(CreativeModeTabEvent.BuildContents onBuildContents) {
if (onBuildContents.getTab() == CreativeModeTabs.TOOLS_AND_UTILITIES) {
onBuildContents.register((flags, output, permission) -> {
output.accept(TOOL.get());
});
} else if (onBuildContents.getTab() == CreativeModeTabs.BUILDING_BLOCKS) {
onBuildContents.register((flags, output, permission) -> {
output.accept(ORE_ITEM.get());
});
}
}
});
}
@SubscribeEvent
@@ -110,47 +121,35 @@ public class TagBasedToolTypesTest
DataGenerator gen = event.getGenerator();
ExistingFileHelper existing = event.getExistingFileHelper();
gen.addProvider(event.includeServer(), new BlockTagsProvider(gen, MODID, existing)
gen.addProvider(event.includeServer(), new BlockTagsProvider(gen.getPackOutput(), event.getLookupProvider(), MODID, existing)
{
@Override
protected void addTags()
{
protected void addTags(HolderLookup.Provider registry) {
this.tag(MINEABLE_TAG).add(STONE.get());
this.tag(REQUIRES_TAG).add(STONE.get());
}
});
gen.addProvider(event.includeServer(), new LootTableProvider(gen)
{
@Override
protected void validate(Map<ResourceLocation, LootTable> map, ValidationContext validationtracker)
final class TestBlockLootProvider extends BlockLootSubProvider {
public TestBlockLootProvider()
{
map.forEach((name, table) -> LootTables.validate(validationtracker, name, table));
super(Set.of(), FeatureFlags.REGISTRY.allFlags());
}
@Override
protected List<Pair<Supplier<Consumer<BiConsumer<ResourceLocation, LootTable.Builder>>>, LootContextParamSet>> getTables()
protected Iterable<Block> getKnownBlocks()
{
return ImmutableList.of(Pair.of(() ->
{
return new BlockLoot()
{
@Override
protected Iterable<Block> getKnownBlocks()
{
return BLOCKS.getEntries().stream().map(Supplier::get).collect(Collectors.toList());
}
@Override
protected void addTables()
{
this.dropSelf(STONE.get());
}
};
}, LootContextParamSets.BLOCK));
return BLOCKS.getEntries().stream().map(Supplier::get).collect(Collectors.toList());
}
});
@Override
protected void generate()
{
this.dropSelf(STONE.get());
}
}
gen.addProvider(event.includeServer(), new LootTableProvider(event.getGenerator().getPackOutput(), Set.of(), List.of(new LootTableProvider.SubProviderEntry(TestBlockLootProvider::new, LootContextParamSets.BLOCK))));
gen.addProvider(event.includeClient(), new BlockStateProvider(gen, MODID, existing)
{
@@ -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);
}
}
@@ -131,13 +131,6 @@ public class RecipeBookTestScreen extends AbstractContainerScreen<RecipeBookTest
this.recipeBookComponent.recipesUpdated();
}
@Override
public void removed()
{
this.recipeBookComponent.removed();
super.removed();
}
@Override
public RecipeBookComponent getRecipeBookComponent()
{
@@ -3,6 +3,11 @@
* SPDX-License-Identifier: LGPL-2.1-only
*/
/*
TODO: 1.19.3: Datagen went async for registries and holder lookups!
package net.minecraftforge.debug.world;
import java.util.List;
@@ -51,6 +56,7 @@ import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
*/
/**
* <p>This tests the following features and requirements of biome modifier jsons::</p>
* <ul>
@@ -62,7 +68,8 @@ import net.minecraftforge.registries.RegistryObject;
* <p>If the biome modifiers are applied correctly, then badlands biomes should generate large basalt columns,
* spawn magma cubes, have red-colored water, and be snowy. Additionally, biomes in the is_forest tag are missing
* oak trees, pine trees, and skeletons.</p>
*/
*//*
@Mod(BiomeModifierTest.MODID)
public class BiomeModifierTest
{
@@ -195,3 +202,4 @@ public class BiomeModifierTest
}
}
}
*/
@@ -5,19 +5,7 @@
package net.minecraftforge.debug.world;
import com.sun.jna.Structure;
import net.minecraft.data.BuiltinRegistries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import java.util.HashMap;
import java.util.Optional;
/**
* To see the effects of this test mod you must create a new world then teleport to the custom
@@ -9,18 +9,20 @@ import com.mojang.datafixers.util.Pair;
import it.unimi.dsi.fastutil.longs.LongSet;
import java.util.Map;
import java.util.UUID;
import java.util.function.Consumer;
import net.minecraft.world.item.CreativeModeTabs;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.ChunkPos;
import net.minecraft.world.level.Level;
import net.minecraft.server.level.ServerLevel;
import net.minecraftforge.common.world.ForgeChunkManager;
import net.minecraftforge.event.CreativeModeTabEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.RegistryObject;
import net.minecraftforge.fml.common.Mod;
@@ -41,7 +43,7 @@ public class ForgeChunkManagerTest
private static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
private static final RegistryObject<Block> CHUNK_LOADER_BLOCK = BLOCKS.register("chunk_loader", () -> new ChunkLoaderBlock(Properties.of(Material.STONE)));
private static final RegistryObject<Item> CHUNK_LOADER_ITEM = ITEMS.register("chunk_loader", () -> new BlockItem(CHUNK_LOADER_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
private static final RegistryObject<Item> CHUNK_LOADER_ITEM = ITEMS.register("chunk_loader", () -> new BlockItem(CHUNK_LOADER_BLOCK.get(), new Item.Properties()));
public ForgeChunkManagerTest()
{
@@ -49,6 +51,13 @@ public class ForgeChunkManagerTest
modEventBus.addListener(this::commonSetup);
BLOCKS.register(modEventBus);
ITEMS.register(modEventBus);
FMLJavaModLoadingContext.get().getModEventBus().addListener((Consumer<CreativeModeTabEvent.BuildContents>) onBuildContents -> {
if (onBuildContents.getTab() == CreativeModeTabs.INGREDIENTS) {
onBuildContents.register((flags, output, permissions) -> {
output.accept(CHUNK_LOADER_ITEM.get());
});
}
});
}
private void commonSetup(FMLCommonSetupEvent event)
@@ -15,6 +15,7 @@ import net.minecraft.core.HolderSet;
import net.minecraft.core.Registry;
import net.minecraft.core.RegistryAccess;
import net.minecraft.core.RegistryCodecs;
import net.minecraft.core.registries.Registries;
import net.minecraft.data.DataGenerator;
import net.minecraft.data.DataProvider;
import net.minecraft.resources.RegistryOps;
@@ -49,7 +50,7 @@ import org.apache.logging.log4j.Logger;
@Mod(StructureModifierTest.MODID)
public class StructureModifierTest
{
private static final Codec<HolderSet<Structure>> STRUCTURE_LIST_CODEC = RegistryCodecs.homogeneousList(Registry.STRUCTURE_REGISTRY, Structure.DIRECT_CODEC);
private static final Codec<HolderSet<Structure>> STRUCTURE_LIST_CODEC = RegistryCodecs.homogeneousList(Registries.STRUCTURE, Structure.DIRECT_CODEC);
public static final Logger LOGGER = LogManager.getLogger();
public static final String MODID = "structure_modifiers_test";
public static final boolean ENABLED = true;
@@ -77,7 +78,9 @@ public class StructureModifierTest
private void onGatherData(GatherDataEvent event)
{
// Example of how to datagen datapack registry objects.
/* TODO: During the update to 1.19.3 data providers got partially turned into async executions. Creating a registry ops requires this.
// Example of how to datagen datapack registry objects.
DataGenerator generator = event.getGenerator();
final RegistryOps<JsonElement> ops = RegistryOps.create(JsonOps.INSTANCE, RegistryAccess.BUILTIN.get());
@@ -91,7 +94,7 @@ public class StructureModifierTest
DataProvider structureModifierProvider =
JsonCodecProvider.forDatapackRegistry(generator, event.getExistingFileHelper(), MODID, ops, ForgeRegistries.Keys.STRUCTURE_MODIFIERS,
Map.of(MODIFY_STRONGHOLD_RL, structureModifier));
generator.addProvider(event.includeServer(), structureModifierProvider);
generator.addProvider(event.includeServer(), structureModifierProvider);*/
}
public record TestModifier(HolderSet<Structure> structures, MobCategory category, MobSpawnSettings.SpawnerData spawn)