mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 04:32:15 +00:00
Global Loot Modifiers
This commit is contained in:
63 files changed
+1058
-1502
No files matched your search
@@ -1,158 +0,0 @@
|
||||
/*
|
||||
* 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.core.registries.Registries;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraft.world.item.CreativeModeTab;
|
||||
import net.minecraft.world.item.CreativeModeTab.TabVisibility;
|
||||
import net.minecraft.world.item.CreativeModeTabs;
|
||||
import net.minecraft.world.item.DyeColor;
|
||||
import net.minecraft.world.item.DyeItem;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.level.ItemLike;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraftforge.event.BuildCreativeModeTabContentsEvent;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.registries.RegisterEvent;
|
||||
|
||||
@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 final ResourceKey<CreativeModeTab> LOGS = ResourceKey.create(Registries.CREATIVE_MODE_TAB, new ResourceLocation(MOD_ID, "logs"));
|
||||
private static final ResourceKey<CreativeModeTab> STONE = ResourceKey.create(Registries.CREATIVE_MODE_TAB, new ResourceLocation(MOD_ID, "stone"));
|
||||
|
||||
public CreativeModeTabTest()
|
||||
{
|
||||
if (!ENABLED)
|
||||
return;
|
||||
|
||||
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
|
||||
|
||||
modEventBus.addListener(CreativeModeTabTest::onCreativeModeTabRegister);
|
||||
modEventBus.addListener(CreativeModeTabTest::onCreativeModeTabBuildContents);
|
||||
}
|
||||
|
||||
private static void onCreativeModeTabRegister(RegisterEvent event)
|
||||
{
|
||||
event.register(Registries.CREATIVE_MODE_TAB, helper -> {
|
||||
helper.register(LOGS, CreativeModeTab.builder().icon(() -> new ItemStack(Blocks.ACACIA_LOG))
|
||||
.title(Component.literal("Logs"))
|
||||
.withLabelColor(0x00FF00)
|
||||
.displayItems((params, output) -> {
|
||||
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));
|
||||
})
|
||||
.build());
|
||||
helper.register(STONE, CreativeModeTab.builder().icon(() -> new ItemStack(Blocks.STONE))
|
||||
.title(Component.literal("Stone"))
|
||||
.withLabelColor(0x0000FF)
|
||||
.displayItems((params, output) -> {
|
||||
output.accept(new ItemStack(Blocks.STONE));
|
||||
output.accept(new ItemStack(Blocks.GRANITE));
|
||||
output.accept(new ItemStack(Blocks.DIORITE));
|
||||
output.accept(new ItemStack(Blocks.ANDESITE));
|
||||
})
|
||||
.withTabsAfter(CreativeModeTabs.BUILDING_BLOCKS)
|
||||
.build());
|
||||
|
||||
helper.register(new ResourceLocation(MOD_ID, "colors"), CreativeModeTab.builder().title(Component.literal("Colors"))
|
||||
.displayItems((params, output) ->
|
||||
{
|
||||
for (DyeColor color : DyeColor.values())
|
||||
{
|
||||
output.accept(DyeItem.byColor(color));
|
||||
}
|
||||
})
|
||||
.withTabFactory(CreativeModeColorTab::new)
|
||||
.withTabsBefore(CreativeModeTabs.COLORED_BLOCKS)
|
||||
.build()
|
||||
);
|
||||
|
||||
List<Block> blocks = List.of(Blocks.GRANITE, Blocks.DIORITE, Blocks.ANDESITE, Blocks.COBBLESTONE);
|
||||
for (int i = 0; i < blocks.size(); i++)
|
||||
{
|
||||
Block block = blocks.get(i);
|
||||
helper.register(new ResourceLocation(MOD_ID, "dummy" + i), CreativeModeTab.builder()
|
||||
.title(Component.literal("Dummy " + i))
|
||||
.icon(() -> new ItemStack(block))
|
||||
.displayItems((params, output) -> output.accept(block))
|
||||
.build()
|
||||
);
|
||||
}
|
||||
|
||||
//final ResourceLocation custom_tabs_image = new ResourceLocation(MOD_ID, "textures/gui/container/creative_inventory/custom_tabs.png");
|
||||
helper.register(new ResourceLocation(MOD_ID, "with_tabs_image"), CreativeModeTab.builder()
|
||||
.title(Component.translatable("itemGroup.with_tabs_image"))
|
||||
.icon(() -> new ItemStack(Blocks.BRICKS))
|
||||
.displayItems((params, output) -> output.accept(Blocks.BRICKS))
|
||||
//.withTabsImage(custom_tabs_image)
|
||||
.build());
|
||||
});
|
||||
}
|
||||
|
||||
private static ItemStack i(ItemLike item) { return new ItemStack(item); }
|
||||
|
||||
private static void onCreativeModeTabBuildContents(BuildCreativeModeTabContentsEvent event)
|
||||
{
|
||||
var entries = event.getEntries();
|
||||
var vis = TabVisibility.PARENT_AND_SEARCH_TABS;
|
||||
if (event.getTabKey() == LOGS)
|
||||
{
|
||||
entries.putAfter(i(Blocks.ACACIA_LOG), i(Blocks.STRIPPED_ACACIA_LOG), vis);
|
||||
entries.putAfter(i(Blocks.BIRCH_LOG), i(Blocks.STRIPPED_BIRCH_LOG), vis);
|
||||
entries.putAfter(i(Blocks.DARK_OAK_LOG), i(Blocks.STRIPPED_DARK_OAK_LOG), vis);
|
||||
entries.putAfter(i(Blocks.JUNGLE_LOG), i(Blocks.STRIPPED_JUNGLE_LOG), vis);
|
||||
entries.putAfter(i(Blocks.OAK_LOG), i(Blocks.STRIPPED_OAK_LOG), vis);
|
||||
entries.putAfter(i(Blocks.SPRUCE_LOG), i(Blocks.STRIPPED_SPRUCE_LOG), vis);
|
||||
}
|
||||
|
||||
if (event.getTabKey() == STONE)
|
||||
{
|
||||
entries.putBefore(i(Blocks.STONE), i(Blocks.SMOOTH_STONE), vis);
|
||||
entries.putBefore(i(Blocks.GRANITE), i(Blocks.POLISHED_GRANITE), vis);
|
||||
entries.putBefore(i(Blocks.DIORITE), i(Blocks.POLISHED_DIORITE), vis);
|
||||
entries.putBefore(i(Blocks.ANDESITE), i(Blocks.POLISHED_ANDESITE), vis);
|
||||
}
|
||||
}
|
||||
|
||||
private static class CreativeModeColorTab extends CreativeModeTab
|
||||
{
|
||||
private final ItemStack[] iconItems;
|
||||
|
||||
public CreativeModeColorTab(CreativeModeTab.Builder builder)
|
||||
{
|
||||
super(builder);
|
||||
|
||||
DyeColor[] colors = DyeColor.values();
|
||||
iconItems = new ItemStack[colors.length];
|
||||
for (int i = 0; i < colors.length; i++)
|
||||
{
|
||||
iconItems[i] = new ItemStack(DyeItem.byColor(colors[i]));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getIconItem()
|
||||
{
|
||||
int idx = (int)(System.currentTimeMillis() / 1200) % iconItems.length;
|
||||
return iconItems[idx];
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -4,13 +4,12 @@
|
||||
*/
|
||||
|
||||
package net.minecraftforge.debug;
|
||||
/*
|
||||
|
||||
import java.io.IOException;
|
||||
import java.lang.reflect.Field;
|
||||
import java.lang.reflect.Method;
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
import java.util.Iterator;
|
||||
@@ -22,7 +21,6 @@ import java.util.Optional;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.function.Consumer;
|
||||
import java.util.function.Function;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.IntStream;
|
||||
import java.util.stream.Stream;
|
||||
@@ -30,25 +28,23 @@ import java.util.stream.Stream;
|
||||
import com.google.gson.JsonNull;
|
||||
import com.google.gson.JsonPrimitive;
|
||||
import net.minecraft.DetectedVersion;
|
||||
import net.minecraft.Util;
|
||||
import net.minecraft.advancements.critereon.InventoryChangeTrigger;
|
||||
import net.minecraft.core.*;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.core.Holder;
|
||||
import net.minecraft.core.HolderGetter;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.core.RegistrySetBuilder;
|
||||
import net.minecraft.core.particles.ParticleTypes;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.data.CachedOutput;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.data.metadata.PackMetadataGenerator;
|
||||
import net.minecraft.data.recipes.*;
|
||||
import net.minecraft.data.worldgen.BootstapContext;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.chat.Component;
|
||||
import net.minecraft.resources.ResourceKey;
|
||||
import net.minecraft.server.packs.metadata.pack.PackMetadataSection;
|
||||
import net.minecraft.sounds.SoundEvents;
|
||||
import net.minecraft.tags.ItemTags;
|
||||
import net.minecraft.world.item.ItemDisplayContext;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.crafting.Ingredient;
|
||||
import net.minecraft.world.level.biome.Biome;
|
||||
import net.minecraft.world.level.biome.TheEndBiomeSource;
|
||||
import net.minecraft.world.level.block.ButtonBlock;
|
||||
@@ -61,11 +57,6 @@ import net.minecraft.world.level.dimension.DimensionType;
|
||||
import net.minecraft.world.level.dimension.LevelStem;
|
||||
import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
|
||||
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
|
||||
import net.minecraftforge.common.crafting.CompoundIngredient;
|
||||
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.*;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import org.apache.commons.lang3.tuple.Triple;
|
||||
@@ -85,7 +76,7 @@ import com.google.gson.JsonElement;
|
||||
import com.google.gson.JsonObject;
|
||||
|
||||
import net.minecraft.advancements.Advancement;
|
||||
import net.minecraft.advancements.AdvancementRewards;
|
||||
import net.minecraft.advancements.AdvancementHolder;
|
||||
import net.minecraft.advancements.FrameType;
|
||||
import net.minecraft.client.renderer.block.model.ItemTransforms;
|
||||
import net.minecraft.client.renderer.block.model.ItemTransform;
|
||||
@@ -108,9 +99,6 @@ import net.minecraftforge.client.model.generators.ModelFile;
|
||||
import net.minecraftforge.client.model.generators.ModelFile.UncheckedModelFile;
|
||||
import net.minecraftforge.client.model.generators.MultiPartBlockStateBuilder;
|
||||
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.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
|
||||
@@ -130,8 +118,7 @@ import net.minecraft.world.level.block.TrapDoorBlock;
|
||||
@SuppressWarnings("deprecation")
|
||||
@Mod(DataGeneratorTest.MODID)
|
||||
@Mod.EventBusSubscriber(bus = Bus.MOD)
|
||||
public class DataGeneratorTest
|
||||
{
|
||||
public class DataGeneratorTest {
|
||||
static final String MODID = "data_gen_test";
|
||||
|
||||
private static Gson GSON = null;
|
||||
@@ -144,24 +131,24 @@ public class DataGeneratorTest
|
||||
.add(Registries.LEVEL_STEM, DataGeneratorTest::levelStem);
|
||||
|
||||
@SubscribeEvent
|
||||
public static void gatherData(GatherDataEvent event)
|
||||
{
|
||||
public static void gatherData(GatherDataEvent event) {
|
||||
GSON = new GsonBuilder()
|
||||
.registerTypeAdapter(Variant.class, new Variant.Deserializer())
|
||||
.registerTypeAdapter(ItemTransforms.class, new ItemTransforms.Deserializer())
|
||||
.registerTypeAdapter(ItemTransform.class, new ItemTransform.Deserializer())
|
||||
.create();
|
||||
.registerTypeAdapter(Variant.class, new Variant.Deserializer())
|
||||
.registerTypeAdapter(ItemTransforms.class, new ItemTransforms.Deserializer())
|
||||
.registerTypeAdapter(ItemTransform.class, new ItemTransform.Deserializer())
|
||||
.create();
|
||||
|
||||
DataGenerator gen = event.getGenerator();
|
||||
PackOutput packOutput = gen.getPackOutput();
|
||||
CompletableFuture<HolderLookup.Provider> lookupProvider = event.getLookupProvider();
|
||||
|
||||
gen.addProvider(true, new PackMetadataGenerator(packOutput)
|
||||
.add(PackMetadataSection.TYPE, new PackMetadataSection(
|
||||
Component.literal("Forge tests resource pack"),
|
||||
DetectedVersion.BUILT_IN.getPackVersion(PackType.CLIENT_RESOURCES),
|
||||
Arrays.stream(PackType.values()).collect(Collectors.toMap(Function.identity(), DetectedVersion.BUILT_IN::getPackVersion))
|
||||
))
|
||||
.add(PackMetadataSection.TYPE, new PackMetadataSection(
|
||||
Component.literal("Forge tests resource pack"),
|
||||
DetectedVersion.BUILT_IN.getPackVersion(PackType.CLIENT_RESOURCES),
|
||||
Optional.empty()
|
||||
//Arrays.stream(PackType.values()).collect(Collectors.toMap(Function.identity(), DetectedVersion.BUILT_IN::getPackVersion))
|
||||
))
|
||||
);
|
||||
gen.addProvider(event.includeClient(), new Lang(packOutput));
|
||||
// Let blockstate provider see generated item models by passing its existing file helper
|
||||
@@ -171,7 +158,7 @@ public class DataGeneratorTest
|
||||
gen.addProvider(event.includeClient(), new SoundDefinitions(packOutput, event.getExistingFileHelper()));
|
||||
gen.addProvider(event.includeClient(), new ParticleDescriptions(packOutput, event.getExistingFileHelper()));
|
||||
|
||||
gen.addProvider(event.includeServer(), new Recipes(packOutput));
|
||||
//gen.addProvider(event.includeServer(), new Recipes(packOutput));
|
||||
gen.addProvider(event.includeServer(), new Tags(packOutput, lookupProvider, event.getExistingFileHelper()));
|
||||
gen.addProvider(event.includeServer(), new ForgeAdvancementProvider(packOutput, lookupProvider, event.getExistingFileHelper(), List.of(new Advancements())));
|
||||
gen.addProvider(event.includeServer(), new DatapackBuiltinEntriesProvider(packOutput, lookupProvider, BUILDER, Set.of(MODID)));
|
||||
@@ -187,6 +174,7 @@ public class DataGeneratorTest
|
||||
context.register(TEST_LEVEL_STEM, levelStem);
|
||||
}
|
||||
|
||||
/*
|
||||
public static class Recipes extends RecipeProvider implements IConditionBuilder
|
||||
{
|
||||
public Recipes(PackOutput gen)
|
||||
@@ -367,6 +355,7 @@ public class DataGeneratorTest
|
||||
.save(consumer, new ResourceLocation("data_gen_test", "compound_ingredient_custom_types"));
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
public static class SoundDefinitions extends SoundDefinitionsProvider
|
||||
{
|
||||
@@ -1059,12 +1048,9 @@ public class DataGeneratorTest
|
||||
}
|
||||
}
|
||||
|
||||
private static class Advancements implements ForgeAdvancementProvider.AdvancementGenerator
|
||||
{
|
||||
|
||||
private static class Advancements implements ForgeAdvancementProvider.AdvancementGenerator {
|
||||
@Override
|
||||
public void generate(HolderLookup.Provider registries, Consumer<Advancement> saver, ExistingFileHelper existingFileHelper)
|
||||
{
|
||||
public void generate(HolderLookup.Provider registries, Consumer<AdvancementHolder> saver, ExistingFileHelper existingFileHelper) {
|
||||
Advancement.Builder.advancement().display(Items.DIRT,
|
||||
Component.translatable(Items.DIRT.getDescriptionId()),
|
||||
Component.translatable("dirt_description"),
|
||||
@@ -1074,7 +1060,7 @@ public class DataGeneratorTest
|
||||
true,
|
||||
false)
|
||||
.addCriterion("has_dirt", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIRT))
|
||||
.save(saver, new ResourceLocation(MODID, "obtain_dirt"), existingFileHelper);
|
||||
.save(saver, new ResourceLocation(MODID, "obtain_dirt"));
|
||||
|
||||
Advancement.Builder.advancement().display(Items.DIAMOND_BLOCK,
|
||||
Component.translatable(Items.DIAMOND_BLOCK.getDescriptionId()),
|
||||
@@ -1085,7 +1071,7 @@ public class DataGeneratorTest
|
||||
true,
|
||||
false)
|
||||
.addCriterion("obtained_diamond_block", InventoryChangeTrigger.TriggerInstance.hasItems(Items.DIAMOND_BLOCK))
|
||||
.save(saver, new ResourceLocation("obtain_diamond_block"), existingFileHelper);
|
||||
.save(saver, new ResourceLocation("obtain_diamond_block"));
|
||||
|
||||
Advancement.Builder.advancement()
|
||||
.display(Blocks.GRASS_BLOCK,
|
||||
@@ -1097,7 +1083,7 @@ public class DataGeneratorTest
|
||||
false,
|
||||
false)
|
||||
.addCriterion("crafting_table", InventoryChangeTrigger.TriggerInstance.hasItems(Blocks.CRAFTING_TABLE))
|
||||
.save(saver, new ResourceLocation("story/root"), existingFileHelper);
|
||||
.save(saver, new ResourceLocation("story/root"));
|
||||
|
||||
// This should cause an error because of the parent not existing
|
||||
/* Advancement.Builder.advancement().display(Blocks.COBBLESTONE,
|
||||
@@ -1111,7 +1097,7 @@ public class DataGeneratorTest
|
||||
.addCriterion("get_cobbleStone", InventoryChangeTrigger.Instance.hasItems(Items.COBBLESTONE))
|
||||
.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()),
|
||||
@@ -1123,7 +1109,7 @@ public class DataGeneratorTest
|
||||
false)
|
||||
.addCriterion("get_cobbleStone", InventoryChangeTrigger.TriggerInstance.hasItems(Items.COBBLESTONE))
|
||||
.parent(new ResourceLocation("forge", "dummy_parent"))
|
||||
.save(saver, new ResourceLocation("good_parent"), existingFileHelper);
|
||||
.save(saver, new ResourceLocation("good_parent"));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1266,4 +1252,3 @@ public class DataGeneratorTest
|
||||
return model.replaceAll("^\\w+:", "minecraft:");
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -4,7 +4,8 @@
|
||||
*/
|
||||
|
||||
package net.minecraftforge.debug.fluid;
|
||||
/*
|
||||
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.*;
|
||||
import net.minecraft.world.level.material.MapColor;
|
||||
import net.minecraft.world.level.material.FluidState;
|
||||
@@ -59,41 +60,33 @@ public class NewFluidTest {
|
||||
public static final DeferredRegister<FluidType> FLUID_TYPES = DeferredRegister.create(ForgeRegistries.Keys.FLUID_TYPES, MODID);
|
||||
public static final DeferredRegister<Fluid> FLUIDS = DeferredRegister.create(ForgeRegistries.FLUIDS, MODID);
|
||||
|
||||
private static ForgeFlowingFluid.Properties makeProperties()
|
||||
{
|
||||
private static ForgeFlowingFluid.Properties makeProperties() {
|
||||
return new ForgeFlowingFluid.Properties(test_fluid_type, test_fluid, test_fluid_flowing)
|
||||
.bucket(TEST_FLUID_BUCKET).block(test_fluid_block);
|
||||
}
|
||||
|
||||
public static RegistryObject<FluidType> test_fluid_type = FLUID_TYPES.register("test_fluid", () -> new FluidType(FluidType.Properties.create())
|
||||
{
|
||||
public static RegistryObject<FluidType> test_fluid_type = FLUID_TYPES.register("test_fluid", () -> new FluidType(FluidType.Properties.create()) {
|
||||
@Override
|
||||
public void initializeClient(Consumer<IClientFluidTypeExtensions> consumer)
|
||||
{
|
||||
consumer.accept(new IClientFluidTypeExtensions()
|
||||
{
|
||||
public void initializeClient(Consumer<IClientFluidTypeExtensions> consumer) {
|
||||
consumer.accept(new IClientFluidTypeExtensions() {
|
||||
@Override
|
||||
public ResourceLocation getStillTexture()
|
||||
{
|
||||
public ResourceLocation getStillTexture() {
|
||||
return FLUID_STILL;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResourceLocation getFlowingTexture()
|
||||
{
|
||||
public ResourceLocation getFlowingTexture() {
|
||||
return FLUID_FLOWING;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@Override
|
||||
public ResourceLocation getOverlayTexture()
|
||||
{
|
||||
public ResourceLocation getOverlayTexture() {
|
||||
return FLUID_OVERLAY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getTintColor()
|
||||
{
|
||||
public int getTintColor() {
|
||||
return 0x3F1080FF;
|
||||
}
|
||||
});
|
||||
@@ -122,10 +115,8 @@ public class NewFluidTest {
|
||||
new BlockItem(fluidloggable_block.get(), new Item.Properties())
|
||||
);
|
||||
|
||||
public NewFluidTest()
|
||||
{
|
||||
if (ENABLE)
|
||||
{
|
||||
public NewFluidTest() {
|
||||
if (ENABLE) {
|
||||
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
|
||||
|
||||
modEventBus.addListener(this::loadComplete);
|
||||
@@ -138,17 +129,14 @@ public class NewFluidTest {
|
||||
}
|
||||
}
|
||||
|
||||
private void addCreative(BuildCreativeModeTabContentsEvent event)
|
||||
{
|
||||
if (event.getTabKey() == CreativeModeTabs.INGREDIENTS)
|
||||
{
|
||||
private void addCreative(BuildCreativeModeTabContentsEvent event) {
|
||||
if (event.getTabKey() == CreativeModeTabs.INGREDIENTS) {
|
||||
event.accept(FLUID_LOGGABLE_BLOCK_ITEM);
|
||||
event.accept(TEST_FLUID_BUCKET);
|
||||
}
|
||||
}
|
||||
|
||||
public void loadComplete(FMLLoadCompleteEvent event)
|
||||
{
|
||||
public void loadComplete(FMLLoadCompleteEvent event) {
|
||||
// some sanity checks
|
||||
BlockState state = Fluids.WATER.defaultFluidState().createLegacyBlock();
|
||||
BlockState state2 = Fluids.WATER.getFluidType().getBlockForFluidState(null,null,Fluids.WATER.defaultFluidState());
|
||||
@@ -159,30 +147,27 @@ public class NewFluidTest {
|
||||
}
|
||||
|
||||
// WARNING: this doesn't allow "any fluid", only the fluid from this test mod!
|
||||
private static class FluidloggableBlock extends Block implements SimpleWaterloggedBlock
|
||||
{
|
||||
private static class FluidloggableBlock extends Block implements SimpleWaterloggedBlock {
|
||||
public static final BooleanProperty FLUIDLOGGED = BooleanProperty.create("fluidlogged");
|
||||
|
||||
public FluidloggableBlock(Properties properties)
|
||||
{
|
||||
public FluidloggableBlock(Properties properties) {
|
||||
super(properties);
|
||||
registerDefaultState(getStateDefinition().any().setValue(FLUIDLOGGED, false));
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder)
|
||||
{
|
||||
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder) {
|
||||
builder.add(FLUIDLOGGED);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean canPlaceLiquid(BlockGetter worldIn, BlockPos pos, BlockState state, Fluid fluidIn) {
|
||||
public boolean canPlaceLiquid(@Nullable Player player, BlockGetter worldIn, BlockPos pos, BlockState state, Fluid fluidIn) {
|
||||
return !state.getValue(FLUIDLOGGED) && fluidIn == test_fluid.get();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean placeLiquid(LevelAccessor worldIn, BlockPos pos, BlockState state, FluidState fluidStateIn) {
|
||||
if (canPlaceLiquid(worldIn, pos, state, fluidStateIn.getType())) {
|
||||
if (canPlaceLiquid(null, worldIn, pos, state, fluidStateIn.getType())) {
|
||||
if (!worldIn.isClientSide()) {
|
||||
worldIn.setBlock(pos, state.setValue(FLUIDLOGGED, true), 3);
|
||||
worldIn.scheduleTick(pos, fluidStateIn.getType(), fluidStateIn.getType().getTickDelay(worldIn));
|
||||
@@ -195,7 +180,7 @@ public class NewFluidTest {
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack pickupBlock(LevelAccessor worldIn, BlockPos pos, BlockState state) {
|
||||
public ItemStack pickupBlock(@Nullable Player player, LevelAccessor worldIn, BlockPos pos, BlockState state) {
|
||||
if (state.getValue(FLUIDLOGGED)) {
|
||||
worldIn.setBlock(pos, state.setValue(FLUIDLOGGED, false), 3);
|
||||
return new ItemStack(TEST_FLUID_BUCKET.get());
|
||||
@@ -208,5 +193,4 @@ public class NewFluidTest {
|
||||
return state.getValue(FLUIDLOGGED) ? test_fluid.get().defaultFluidState() : Fluids.EMPTY.defaultFluidState();
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
}
|
||||
-280
@@ -1,280 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) Forge Development LLC and contributors
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
package net.minecraftforge.debug.gameplay.loot;
|
||||
/*
|
||||
import com.google.common.base.Suppliers;
|
||||
import com.mojang.serialization.Codec;
|
||||
import com.mojang.serialization.codecs.RecordCodecBuilder;
|
||||
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
|
||||
import net.minecraft.advancements.critereon.EnchantmentPredicate;
|
||||
import net.minecraft.advancements.critereon.ItemPredicate;
|
||||
import net.minecraft.advancements.critereon.MinMaxBounds;
|
||||
import net.minecraft.core.registries.Registries;
|
||||
import net.minecraft.util.ExtraCodecs;
|
||||
import net.minecraft.world.level.block.Blocks;
|
||||
import net.minecraft.data.DataGenerator;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.world.item.enchantment.Enchantment;
|
||||
import net.minecraft.world.item.enchantment.Enchantment.Rarity;
|
||||
import net.minecraft.world.item.enchantment.EnchantmentHelper;
|
||||
import net.minecraft.world.item.enchantment.EnchantmentCategory;
|
||||
import net.minecraft.world.item.enchantment.Enchantments;
|
||||
import net.minecraft.world.entity.EquipmentSlot;
|
||||
import net.minecraft.world.SimpleContainer;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.Items;
|
||||
import net.minecraft.world.item.crafting.SmeltingRecipe;
|
||||
import net.minecraft.world.item.crafting.RecipeType;
|
||||
import net.minecraft.world.level.storage.loot.LootContext;
|
||||
import net.minecraft.world.level.storage.loot.LootParams;
|
||||
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSet;
|
||||
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
|
||||
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
|
||||
import net.minecraft.world.level.storage.loot.LootTable;
|
||||
import net.minecraft.world.level.storage.loot.predicates.LootItemBlockStatePropertyCondition;
|
||||
import net.minecraft.world.level.storage.loot.predicates.LootItemCondition;
|
||||
import net.minecraft.world.level.storage.loot.predicates.MatchTool;
|
||||
import net.minecraft.resources.ResourceLocation;
|
||||
import net.minecraftforge.common.data.GlobalLootModifierProvider;
|
||||
import net.minecraftforge.common.loot.IGlobalLootModifier;
|
||||
import net.minecraftforge.common.loot.LootModifier;
|
||||
import net.minecraftforge.common.loot.LootTableIdCondition;
|
||||
import net.minecraftforge.eventbus.api.SubscribeEvent;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
import net.minecraftforge.fml.common.Mod;
|
||||
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
|
||||
import net.minecraftforge.data.event.GatherDataEvent;
|
||||
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
|
||||
import net.minecraftforge.items.ItemHandlerHelper;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
@Mod(GlobalLootModifiersTest.MODID)
|
||||
public class GlobalLootModifiersTest {
|
||||
public static final String MODID = "global_loot_test";
|
||||
public static final boolean ENABLE = true;
|
||||
|
||||
public GlobalLootModifiersTest()
|
||||
{
|
||||
if(ENABLE)
|
||||
{
|
||||
GLM.register(FMLJavaModLoadingContext.get().getModEventBus());
|
||||
ENCHANTS.register(FMLJavaModLoadingContext.get().getModEventBus());
|
||||
}
|
||||
}
|
||||
|
||||
private static final DeferredRegister<Codec<? extends IGlobalLootModifier>> GLM = DeferredRegister.create(ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, MODID);
|
||||
private static final DeferredRegister<Enchantment> ENCHANTS = DeferredRegister.create(ForgeRegistries.ENCHANTMENTS, MODID);
|
||||
|
||||
private static final RegistryObject<Codec<DungeonLootEnhancerModifier>> DUNGEON_LOOT = GLM.register("dungeon_loot", DungeonLootEnhancerModifier.CODEC);
|
||||
private static final RegistryObject<Codec<SmeltingEnchantmentModifier>> SMELTING = GLM.register("smelting", SmeltingEnchantmentModifier.CODEC);
|
||||
private static final RegistryObject<Codec<WheatSeedsConverterModifier>> WHEATSEEDS = GLM.register("wheat_harvest", WheatSeedsConverterModifier.CODEC);
|
||||
private static final RegistryObject<Codec<SilkTouchTestModifier>> SILKTOUCH = GLM.register("silk_touch_bamboo", SilkTouchTestModifier.CODEC);
|
||||
private static final RegistryObject<Enchantment> SMELT = ENCHANTS.register("smelt", () -> new SmelterEnchantment(Rarity.UNCOMMON, EnchantmentCategory.DIGGER, EquipmentSlot.MAINHAND));
|
||||
|
||||
@EventBusSubscriber(modid = MODID, bus = EventBusSubscriber.Bus.MOD)
|
||||
public static class EventHandlers {
|
||||
@SubscribeEvent
|
||||
public static void runData(GatherDataEvent event)
|
||||
{
|
||||
if(ENABLE)
|
||||
event.getGenerator().addProvider(event.includeServer(), new DataProvider(event.getGenerator().getPackOutput(), MODID));
|
||||
}
|
||||
}
|
||||
|
||||
private static class DataProvider extends GlobalLootModifierProvider
|
||||
{
|
||||
public DataProvider(PackOutput output, String modid)
|
||||
{
|
||||
super(output, modid);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void start()
|
||||
{
|
||||
add("smelting", new SmeltingEnchantmentModifier(
|
||||
new LootItemCondition[]{
|
||||
MatchTool.toolMatches(
|
||||
ItemPredicate.Builder.item().hasEnchantment(
|
||||
new EnchantmentPredicate(SMELT.get(), MinMaxBounds.Ints.atLeast(1))))
|
||||
.build()
|
||||
})
|
||||
);
|
||||
|
||||
add("wheat_harvest", new WheatSeedsConverterModifier(
|
||||
new LootItemCondition[] {
|
||||
MatchTool.toolMatches(ItemPredicate.Builder.item().of(Items.SHEARS)).build(),
|
||||
LootItemBlockStatePropertyCondition.hasBlockStateProperties(Blocks.WHEAT).build()
|
||||
},
|
||||
3, Items.WHEAT_SEEDS, Items.WHEAT)
|
||||
);
|
||||
|
||||
add("dungeon_loot", new DungeonLootEnhancerModifier(
|
||||
new LootItemCondition[] { LootTableIdCondition.builder(new ResourceLocation("chests/simple_dungeon")).build() },
|
||||
2)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private static class SmelterEnchantment extends Enchantment {
|
||||
protected SmelterEnchantment(Rarity rarityIn, EnchantmentCategory typeIn, EquipmentSlot... slots) {
|
||||
super(rarityIn, typeIn, slots);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The smelting enchantment causes this modifier to be invoked, via the smelting loot_modifier json
|
||||
*
|
||||
* /
|
||||
private static class SmeltingEnchantmentModifier extends LootModifier {
|
||||
public static final Supplier<Codec<SmeltingEnchantmentModifier>> CODEC = Suppliers.memoize(() -> RecordCodecBuilder.create(inst -> codecStart(inst).apply(inst, SmeltingEnchantmentModifier::new)));
|
||||
|
||||
public SmeltingEnchantmentModifier(LootItemCondition[] conditionsIn) {
|
||||
super(conditionsIn);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public ObjectArrayList<ItemStack> doApply(ObjectArrayList<ItemStack> generatedLoot, LootContext context) {
|
||||
ObjectArrayList<ItemStack> ret = new ObjectArrayList<ItemStack>();
|
||||
generatedLoot.forEach((stack) -> ret.add(smelt(stack, context)));
|
||||
return ret;
|
||||
}
|
||||
|
||||
private static ItemStack smelt(ItemStack stack, LootContext context) {
|
||||
var mgr = context.getLevel().getRecipeManager();
|
||||
var reg = context.getLevel().registryAccess();
|
||||
return mgr
|
||||
.getRecipeFor(RecipeType.SMELTING, new SimpleContainer(stack), context.getLevel())
|
||||
.map(holder -> holder.value())
|
||||
.map(recipe -> recipe.getResultItem(reg))
|
||||
.filter(itemStack -> !itemStack.isEmpty())
|
||||
.map(itemStack -> ItemHandlerHelper.copyStackWithSize(itemStack, stack.getCount() * itemStack.getCount()))
|
||||
.orElse(stack);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Codec<? extends IGlobalLootModifier> codec() {
|
||||
return CODEC.get();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* When harvesting blocks with bamboo, this modifier is invoked, via the silk_touch_bamboo loot_modifier json
|
||||
*
|
||||
* /
|
||||
private static class SilkTouchTestModifier extends LootModifier {
|
||||
public static final Supplier<Codec<SilkTouchTestModifier>> CODEC = Suppliers.memoize(() -> RecordCodecBuilder.create(inst -> codecStart(inst).apply(inst, SilkTouchTestModifier::new)));
|
||||
|
||||
public SilkTouchTestModifier(LootItemCondition[] conditionsIn) {
|
||||
super(conditionsIn);
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public ObjectArrayList<ItemStack> doApply(ObjectArrayList<ItemStack> generatedLoot, LootContext context) {
|
||||
ItemStack ctxTool = context.getParamOrNull(LootContextParams.TOOL);
|
||||
//return early if silk-touch is already applied (otherwise we'll get stuck in an infinite loop).
|
||||
if(ctxTool == null || EnchantmentHelper.getItemEnchantmentLevel(Enchantments.SILK_TOUCH, ctxTool) > 0) return generatedLoot;
|
||||
ItemStack fakeTool = ctxTool.copy();
|
||||
fakeTool.enchant(Enchantments.SILK_TOUCH, 1);
|
||||
LootParams.Builder builder = new LootParams.Builder(context.getLevel());
|
||||
builder.withParameter(LootContextParams.TOOL, fakeTool);
|
||||
LootTable loottable = context.getLevel().getServer().getLootData().getLootTable(context.getParamOrNull(LootContextParams.BLOCK_STATE).getBlock().getLootTable());
|
||||
return loottable.getRandomItems(builder.create(LootContextParamSets.EMPTY)); // TODO - porting: we need an AT
|
||||
}
|
||||
|
||||
@Override
|
||||
public Codec<? extends IGlobalLootModifier> codec() {
|
||||
return CODEC.get();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* When harvesting wheat with shears, this modifier is invoked via the wheat_harvest loot_modifier json<br/>
|
||||
* This modifier checks how many seeds were harvested and turns X seeds into Y wheat (3:1)
|
||||
*
|
||||
* /
|
||||
private static class WheatSeedsConverterModifier extends LootModifier {
|
||||
public static final Supplier<Codec<WheatSeedsConverterModifier>> CODEC = Suppliers.memoize(() -> RecordCodecBuilder.create(inst -> codecStart(inst).and(
|
||||
inst.group(
|
||||
Codec.INT.fieldOf("numSeeds").forGetter(m -> m.numSeedsToConvert),
|
||||
ForgeRegistries.ITEMS.getCodec().fieldOf("seedItem").forGetter(m -> m.itemToCheck),
|
||||
ForgeRegistries.ITEMS.getCodec().fieldOf("replacement").forGetter(m -> m.itemReward)
|
||||
)).apply(inst, WheatSeedsConverterModifier::new)
|
||||
));
|
||||
|
||||
private final int numSeedsToConvert;
|
||||
private final Item itemToCheck;
|
||||
private final Item itemReward;
|
||||
public WheatSeedsConverterModifier(LootItemCondition[] conditionsIn, int numSeeds, Item itemCheck, Item reward) {
|
||||
super(conditionsIn);
|
||||
numSeedsToConvert = numSeeds;
|
||||
itemToCheck = itemCheck;
|
||||
itemReward = reward;
|
||||
}
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public ObjectArrayList<ItemStack> doApply(ObjectArrayList<ItemStack> generatedLoot, LootContext context) {
|
||||
//
|
||||
// Additional conditions can be checked, though as much as possible should be parameterized via JSON data.
|
||||
// It is better to write a new ILootCondition implementation than to do things here.
|
||||
//
|
||||
int numSeeds = 0;
|
||||
for(ItemStack stack : generatedLoot) {
|
||||
if(stack.getItem() == itemToCheck)
|
||||
numSeeds+=stack.getCount();
|
||||
}
|
||||
if(numSeeds >= numSeedsToConvert) {
|
||||
generatedLoot.removeIf(x -> x.getItem() == itemToCheck);
|
||||
generatedLoot.add(new ItemStack(itemReward, (numSeeds/numSeedsToConvert)));
|
||||
numSeeds = numSeeds%numSeedsToConvert;
|
||||
if(numSeeds > 0)
|
||||
generatedLoot.add(new ItemStack(itemToCheck, numSeeds));
|
||||
}
|
||||
return generatedLoot;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Codec<? extends IGlobalLootModifier> codec() {
|
||||
return CODEC.get();
|
||||
}
|
||||
}
|
||||
|
||||
private static class DungeonLootEnhancerModifier extends LootModifier {
|
||||
public static final Supplier<Codec<DungeonLootEnhancerModifier>> CODEC = Suppliers.memoize(() -> RecordCodecBuilder.create(inst -> codecStart(inst)
|
||||
.and(ExtraCodecs.POSITIVE_INT.optionalFieldOf("multiplication_factor", 2).forGetter(m -> m.multiplicationFactor))
|
||||
.apply(inst, DungeonLootEnhancerModifier::new)
|
||||
));
|
||||
|
||||
private final int multiplicationFactor;
|
||||
|
||||
public DungeonLootEnhancerModifier(final LootItemCondition[] conditionsIn, final int multiplicationFactor) {
|
||||
super(conditionsIn);
|
||||
this.multiplicationFactor = multiplicationFactor;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected ObjectArrayList<ItemStack> doApply(ObjectArrayList<ItemStack> generatedLoot, LootContext context) {
|
||||
return generatedLoot.stream()
|
||||
.map(ItemStack::copy)
|
||||
.peek(stack -> stack.setCount(Math.min(stack.getMaxStackSize(), stack.getCount() * this.multiplicationFactor)))
|
||||
.collect(Collectors.toCollection(ObjectArrayList::new));
|
||||
}
|
||||
|
||||
@Override
|
||||
public Codec<? extends IGlobalLootModifier> codec() {
|
||||
return CODEC.get();
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
@@ -1,11 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) Forge Development LLC and contributors
|
||||
* SPDX-License-Identifier: LGPL-2.1-only
|
||||
*/
|
||||
|
||||
@ParametersAreNonnullByDefault
|
||||
@MethodsReturnNonnullByDefault
|
||||
package net.minecraftforge.debug.gameplay.loot;
|
||||
|
||||
import javax.annotation.ParametersAreNonnullByDefault;
|
||||
import net.minecraft.MethodsReturnNonnullByDefault;
|
||||
Reference in new issue
Block a user