Update to 1.17

Update to Official classnames
Patchwork
Make the game compile and run
Merge in the new HUD overlay API
Merge in the new render properties API
PEEL
Use Gradle 7.2 snapshot to fix eclipse integration bug in 7.1, Would use 7.0 but FG needs 7.1 for some reason.
New FML installer
Update to 1.17.1

Co-authored-by: LexManos <[email protected]>
Co-authored-by: SizableShrimp <[email protected]>
Co-authored-by: cpw <[email protected]>
Co-authored-by: Curle <[email protected]>
Co-authored-by: Unnoen <[email protected]>
Co-authored-by: covers1624 <[email protected]>
Co-authored-by: DaemonUmbra <[email protected]>
Co-authored-by: gigaherz <[email protected]>
Signed-off-by: SizableShrimp <[email protected]>
This commit is contained in:
authored and Curle committed 2021-07-22 19:57:02 +01:00
1 parent 064ae6961b
commit be5446b91c
1990 files changed
+35661 -37544

No files matched your search

@@ -17,29 +17,46 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.minecraftforge.common;
package net.minecraftforge.commontest;
import com.electronwill.nightconfig.core.file.CommentedFileConfig;
import com.electronwill.nightconfig.core.io.WritingMode;
import com.google.common.base.Stopwatch;
import com.google.common.collect.Lists;
import net.minecraftforge.common.ForgeConfigSpec;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestRule;
import java.io.File;
import java.io.IOException;
import java.lang.reflect.Field;
import java.nio.file.Files;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.TimeUnit;
import java.util.function.ToLongFunction;
public class ForgeConfigSpecTest
{
private final String TEST_CONFIG_PATH_TEMPLATE = "./tests/config/%s.toml";
private final int TEST_SIZE = 10000;
private static final Field useCachesField;
static {
try {
useCachesField = ForgeConfigSpec.ConfigValue.class.getDeclaredField("USE_CACHES");
useCachesField.setAccessible(true);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
private static void setUseCachesField(boolean value) {
try {
useCachesField.setBoolean(null, value);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
@Test
public void simpleSpeedTest() throws IOException
@@ -122,7 +139,7 @@ public class ForgeConfigSpecTest
private <T> TestResult runTestOnce(final T defaultKeyValue, final String testName, final ForgeConfigSpec.ConfigValue<T> simpleValue, final ForgeConfigSpec spec)
{
spec.afterReload();
ForgeConfigSpec.ConfigValue.USE_CACHES = false;
setUseCachesField(true);
final Stopwatch watchDisabled = Stopwatch.createStarted();
for (int i = 0; i < TEST_SIZE; i++)
{
@@ -131,7 +148,7 @@ public class ForgeConfigSpecTest
watchDisabled.stop();
spec.afterReload();
ForgeConfigSpec.ConfigValue.USE_CACHES = true;
setUseCachesField(false);
final Stopwatch watchEnabled = Stopwatch.createStarted();
for (int i = 0; i < TEST_SIZE; i++)
{
@@ -19,9 +19,9 @@
package net.minecraftforge.debug;
import net.minecraft.fluid.Fluids;
import net.minecraft.nbt.CompoundNBT;
import net.minecraft.nbt.NBTDynamicOps;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.nbt.NbtOps;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fml.common.Mod;
import org.apache.logging.log4j.LogManager;
@@ -49,13 +49,13 @@ public class CodecsTest
FluidStack withTag = new FluidStack(Fluids.LAVA, 10);
withTag.getOrCreateChildTag("test").putString("value", "This is a test");
CompoundNBT noTag_write = noTag.writeToNBT(new CompoundNBT());
CompoundNBT withTag_write = withTag.writeToNBT(new CompoundNBT());
CompoundTag noTag_write = noTag.writeToNBT(new CompoundTag());
CompoundTag withTag_write = withTag.writeToNBT(new CompoundTag());
CompoundNBT noTag_encode = (CompoundNBT)FluidStack.CODEC.encodeStart(NBTDynamicOps.INSTANCE, noTag).getOrThrow(false, error -> {
CompoundTag noTag_encode = (CompoundTag)FluidStack.CODEC.encodeStart(NbtOps.INSTANCE, noTag).getOrThrow(false, error -> {
LOGGER.error("Error encoding noTag: {}", error);
});
CompoundNBT withTag_encode = (CompoundNBT)FluidStack.CODEC.encodeStart(NBTDynamicOps.INSTANCE, withTag).getOrThrow(false, error -> {
CompoundTag withTag_encode = (CompoundTag)FluidStack.CODEC.encodeStart(NbtOps.INSTANCE, withTag).getOrThrow(false, error -> {
LOGGER.error("Error encoding withTag: {}", error);
});
@@ -64,10 +64,10 @@ public class CodecsTest
if (!withTag_write.equals(withTag_encode))
throw new IllegalStateException("Encoded withTag does not match");
FluidStack noTag_decode = FluidStack.CODEC.decode(NBTDynamicOps.INSTANCE, noTag_encode).getOrThrow(false, error -> {
FluidStack noTag_decode = FluidStack.CODEC.decode(NbtOps.INSTANCE, noTag_encode).getOrThrow(false, error -> {
LOGGER.error("Error decoding noTag: {}", error);
}).getFirst();
FluidStack withTag_decode = FluidStack.CODEC.decode(NBTDynamicOps.INSTANCE, withTag_encode).getOrThrow(false, error -> {
FluidStack withTag_decode = FluidStack.CODEC.decode(NbtOps.INSTANCE, withTag_encode).getOrThrow(false, error -> {
LOGGER.error("Error decoding withTag: {}", error);
}).getFirst();
@@ -19,18 +19,18 @@
package net.minecraftforge.debug;
import net.minecraft.block.AbstractBlock;
import net.minecraft.block.Block;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundEvent;
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.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
@@ -50,10 +50,10 @@ public class CustomSoundTypeTest
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(AbstractBlock.Properties.of(Material.WOOD).sound(TEST_SOUND_TYPE)));
() -> 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(ItemGroup.TAB_MISC)));
() -> new BlockItem(TEST_STEP_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public CustomSoundTypeTest()
{
@@ -40,8 +40,7 @@ import java.util.stream.Stream;
import com.google.gson.JsonNull;
import com.google.gson.JsonPrimitive;
import net.minecraft.block.*;
import net.minecraft.util.SoundEvents;
import net.minecraft.sounds.SoundEvents;
import net.minecraftforge.common.data.SoundDefinition;
import net.minecraftforge.common.data.SoundDefinitionsProvider;
import org.apache.commons.lang3.tuple.Triple;
@@ -63,26 +62,26 @@ import com.google.gson.JsonObject;
import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementRewards;
import net.minecraft.advancements.FrameType;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.model.ItemTransformVec3f;
import net.minecraft.client.renderer.model.Variant;
import net.minecraft.client.renderer.model.BlockModel.GuiLight;
import net.minecraft.data.BlockTagsProvider;
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.DirectoryCache;
import net.minecraft.data.IFinishedRecipe;
import net.minecraft.data.RecipeProvider;
import net.minecraft.data.ShapedRecipeBuilder;
import net.minecraft.enchantment.Enchantments;
import net.minecraft.entity.EntityType;
import net.minecraft.item.Items;
import net.minecraft.potion.Effects;
import net.minecraft.resources.IResource;
import net.minecraft.resources.ResourcePackType;
import net.minecraft.data.HashCache;
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;
import net.minecraft.world.effect.MobEffects;
import net.minecraft.server.packs.resources.Resource;
import net.minecraft.server.packs.PackType;
import net.minecraft.tags.BlockTags;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.network.chat.TextComponent;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ConfiguredModel;
import net.minecraftforge.client.model.generators.ItemModelProvider;
@@ -100,7 +99,21 @@ 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;
import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraft.world.level.block.BarrelBlock;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.DoorBlock;
import net.minecraft.world.level.block.FenceBlock;
import net.minecraft.world.level.block.FenceGateBlock;
import net.minecraft.world.level.block.FurnaceBlock;
import net.minecraft.world.level.block.IronBarsBlock;
import net.minecraft.world.level.block.RotatedPillarBlock;
import net.minecraft.world.level.block.SlabBlock;
import net.minecraft.world.level.block.StairBlock;
import net.minecraft.world.level.block.TrapDoorBlock;
import net.minecraft.world.level.block.WallBlock;
@SuppressWarnings("deprecation")
@Mod(MODID)
@@ -116,8 +129,8 @@ public class DataGeneratorTest
{
GSON = new GsonBuilder()
.registerTypeAdapter(Variant.class, new Variant.Deserializer())
.registerTypeAdapter(ItemCameraTransforms.class, new ItemCameraTransforms.Deserializer())
.registerTypeAdapter(ItemTransformVec3f.class, new ItemTransformVec3f.Deserializer())
.registerTypeAdapter(ItemTransforms.class, new ItemTransforms.Deserializer())
.registerTypeAdapter(ItemTransform.class, new ItemTransform.Deserializer())
.create();
DataGenerator gen = event.getGenerator();
@@ -145,7 +158,8 @@ public class DataGeneratorTest
super(gen);
}
protected void buildShapelessRecipes(Consumer<IFinishedRecipe> consumer)
@Override
protected void buildCraftingRecipes(Consumer<FinishedRecipe> consumer)
{
ResourceLocation ID = new ResourceLocation("data_gen_test", "conditional");
@@ -180,8 +194,8 @@ public class DataGeneratorTest
Advancement.Builder.advancement()
.parent(new ResourceLocation("minecraft", "root"))
.display(Blocks.DIAMOND_BLOCK,
new StringTextComponent("Dirt2Diamonds"),
new StringTextComponent("The BEST crafting recipe in the game!"),
new TextComponent("Dirt2Diamonds"),
new TextComponent("The BEST crafting recipe in the game!"),
null, FrameType.TASK, false, false, false
)
.rewards(AdvancementRewards.Builder.recipe(ID))
@@ -290,7 +304,7 @@ public class DataGeneratorTest
}
@Override
public void run(DirectoryCache cache) throws IOException
public void run(HashCache cache) throws IOException
{
super.run(cache);
test();
@@ -308,7 +322,7 @@ public class DataGeneratorTest
throw new RuntimeException("Unable to test for errors due to reflection error", e);
}
final JsonObject actual = GSON.fromJson(
new InputStreamReader(this.helper.getResource(new ResourceLocation("sounds.json"), ResourcePackType.CLIENT_RESOURCES).getInputStream()),
new InputStreamReader(this.helper.getResource(new ResourceLocation("sounds.json"), PackType.CLIENT_RESOURCES).getInputStream()),
JsonObject.class
);
@@ -432,7 +446,6 @@ public class DataGeneratorTest
}
}
public static class Tags extends BlockTagsProvider
{
public Tags(DataGenerator gen, ExistingFileHelper existingFileHelper)
@@ -478,7 +491,7 @@ public class DataGeneratorTest
add(Blocks.STONE, "Stone");
add(Items.DIAMOND, "Diamond");
//add(Biomes.BEACH, "Beach");
add(Effects.POISON, "Poison");
add(MobEffects.POISON, "Poison");
add(Enchantments.SHARPNESS, "Sharpness");
add(EntityType.CAT, "Cat");
add(MODID + ".test.unicode", "\u0287s\u01DD\u2534 \u01DDpo\u0254\u1D09u\u2229");
@@ -533,7 +546,7 @@ public class DataGeneratorTest
);
@Override
public void run(DirectoryCache cache) throws IOException
public void run(HashCache cache) throws IOException
{
super.run(cache);
List<String> errors = testModelResults(this.generatedModels, existingFileHelper, IGNORED_MODELS.stream().map(s -> new ResourceLocation(MODID, folder + "/" + s)).collect(Collectors.toSet()));
@@ -673,7 +686,7 @@ public class DataGeneratorTest
logBlock((RotatedPillarBlock) Blocks.ACACIA_LOG);
stairsBlock((StairsBlock) Blocks.ACACIA_STAIRS, "acacia", mcLoc("block/acacia_planks"));
stairsBlock((StairBlock) Blocks.ACACIA_STAIRS, "acacia", mcLoc("block/acacia_planks"));
slabBlock((SlabBlock) Blocks.ACACIA_SLAB, Blocks.ACACIA_PLANKS.getRegistryName(), mcLoc("block/acacia_planks"));
fenceBlock((FenceBlock) Blocks.ACACIA_FENCE, "acacia", mcLoc("block/acacia_planks"));
@@ -681,7 +694,7 @@ public class DataGeneratorTest
wallBlock((WallBlock) Blocks.COBBLESTONE_WALL, "cobblestone", mcLoc("block/cobblestone"));
paneBlock((PaneBlock) Blocks.GLASS_PANE, "glass", mcLoc("block/glass"), mcLoc("block/glass_pane_top"));
paneBlock((IronBarsBlock) Blocks.GLASS_PANE, "glass", mcLoc("block/glass"), mcLoc("block/glass_pane_top"));
doorBlock((DoorBlock) Blocks.ACACIA_DOOR, "acacia", mcLoc("block/acacia_door_bottom"), mcLoc("block/acacia_door_top"));
trapdoorBlock((TrapDoorBlock) Blocks.ACACIA_TRAPDOOR, "acacia", mcLoc("block/acacia_trapdoor"), true);
@@ -705,7 +718,7 @@ public class DataGeneratorTest
private List<String> errors = new ArrayList<>();
@Override
public void run(DirectoryCache cache) throws IOException
public void run(HashCache cache) throws IOException
{
super.run(cache);
this.errors.addAll(testModelResults(models().generatedModels, models().existingFileHelper, Sets.union(IGNORED_MODELS, CUSTOM_MODELS)));
@@ -713,7 +726,7 @@ public class DataGeneratorTest
if (IGNORED_BLOCKS.contains(block)) return;
JsonObject generated = state.toJson();
try {
IResource vanillaResource = models().existingFileHelper.getResource(block.getRegistryName(), ResourcePackType.CLIENT_RESOURCES, ".json", "blockstates");
Resource vanillaResource = models().existingFileHelper.getResource(block.getRegistryName(), PackType.CLIENT_RESOURCES, ".json", "blockstates");
JsonObject existing = GSON.fromJson(new InputStreamReader(vanillaResource.getInputStream()), JsonObject.class);
if (state instanceof VariantBlockStateBuilder) {
compareVariantBlockstates(block, generated, existing);
@@ -891,7 +904,7 @@ public class DataGeneratorTest
generated.addProperty("parent", toVanillaModel(generated.get("parent").getAsString()));
}
try {
IResource vanillaResource = existingFileHelper.getResource(new ResourceLocation(loc.getPath()), ResourcePackType.CLIENT_RESOURCES, ".json", "models");
Resource vanillaResource = existingFileHelper.getResource(new ResourceLocation(loc.getPath()), PackType.CLIENT_RESOURCES, ".json", "models");
JsonObject existing = GSON.fromJson(new InputStreamReader(vanillaResource.getInputStream()), JsonObject.class);
JsonElement generatedDisplay = generated.remove("display");
@@ -903,8 +916,8 @@ public class DataGeneratorTest
ret.add("Model " + loc + " has transforms when vanilla equivalent does not");
return;
} else if (generatedDisplay != null) { // Both must be non-null
ItemCameraTransforms generatedTransforms = GSON.fromJson(generatedDisplay, ItemCameraTransforms.class);
ItemCameraTransforms vanillaTransforms = GSON.fromJson(vanillaDisplay, ItemCameraTransforms.class);
ItemTransforms generatedTransforms = GSON.fromJson(generatedDisplay, ItemTransforms.class);
ItemTransforms vanillaTransforms = GSON.fromJson(vanillaDisplay, ItemTransforms.class);
for (Perspective type : Perspective.values()) {
if (!generatedTransforms.getTransform(type.vanillaType).equals(vanillaTransforms.getTransform(type.vanillaType))) {
ret.add("Model " + loc + " has transforms that differ from vanilla equivalent for perspective " + type.name());
@@ -24,19 +24,18 @@ import java.util.function.Supplier;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.material.Material;
import net.minecraft.data.DataGenerator;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.util.ResourceLocation;
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;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@@ -55,7 +54,7 @@ public class DeferredRegistryTest {
private static final DeferredRegister<Custom> CUSTOMS = DeferredRegister.create(Custom.class, 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(ItemGroup.TAB_BUILDING_BLOCKS)));
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<Custom> CUSTOM = CUSTOMS.register("test", () -> new Custom(){});
private static final Supplier<IForgeRegistry<Custom>> CUSTOM_REG = CUSTOMS.makeRegistry("test_registry", () ->
@@ -22,9 +22,9 @@ package net.minecraftforge.debug;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.crafting.Ingredient;
import net.minecraftforge.common.brewing.BrewingRecipeRegistry;
import net.minecraftforge.event.entity.living.PotionEvent;
import net.minecraftforge.eventbus.api.Event.Result;
@@ -19,7 +19,7 @@
package net.minecraftforge.debug.block;
import net.minecraft.entity.item.FallingBlockEntity;
import net.minecraft.world.entity.item.FallingBlockEntity;
import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -19,18 +19,18 @@
package net.minecraftforge.debug.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.FlowerBlock;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.potion.Effects;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorldReader;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.FlowerBlock;
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.effect.MobEffects;
import net.minecraft.core.Direction;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.LevelReader;
import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.PlantType;
import net.minecraftforge.event.RegistryEvent;
@@ -69,12 +69,12 @@ public class CustomPlantTypeTest
{
public CustomBlock()
{
super(Block.Properties.of(Material.STONE));
super(Properties.of(Material.STONE));
this.setRegistryName(MODID, CUSTOM_SOIL_BLOCK);
}
@Override
public boolean canSustainPlant(BlockState state, IBlockReader world, BlockPos pos, Direction facing, IPlantable plantable)
public boolean canSustainPlant(BlockState state, BlockGetter world, BlockPos pos, Direction facing, IPlantable plantable)
{
PlantType type = plantable.getPlantType(world, pos.relative(facing));
if (type != null && type == CustomPlantBlock.pt)
@@ -91,31 +91,31 @@ public class CustomPlantTypeTest
public CustomPlantBlock()
{
super(Effects.WEAKNESS, 9, Block.Properties.of(Material.PLANT).noCollission().sound(SoundType.GRASS));
super(MobEffects.WEAKNESS, 9, Properties.of(Material.PLANT).noCollission().sound(SoundType.GRASS));
this.setRegistryName(MODID, CUSTOM_PLANT_BLOCK);
}
@Override
public PlantType getPlantType(IBlockReader world, BlockPos pos)
public PlantType getPlantType(BlockGetter world, BlockPos pos)
{
return pt;
}
@Override
public BlockState getPlant(IBlockReader world, BlockPos pos)
public BlockState getPlant(BlockGetter world, BlockPos pos)
{
return defaultBlockState();
}
@Override
public boolean canSurvive(BlockState state, IWorldReader world, BlockPos pos)
public boolean canSurvive(BlockState state, LevelReader world, BlockPos pos)
{
BlockState soil = world.getBlockState(pos.below());
return soil.canSustainPlant(world, pos, Direction.UP, this);
}
@Override
public boolean mayPlaceOn(BlockState state, IBlockReader worldIn, BlockPos pos)
public boolean mayPlaceOn(BlockState state, BlockGetter worldIn, BlockPos pos)
{
Block block = state.getBlock();
return block == CUSTOM_SOIL;
@@ -19,34 +19,33 @@
package net.minecraftforge.debug.block;
import java.util.Optional;
import javax.annotation.Nullable;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.RespawnAnchorBlock;
import net.minecraft.block.material.Material;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Hand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.IWorldReader;
import net.minecraft.world.World;
import net.minecraft.core.BlockPos;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.InteractionResult;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelReader;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.RespawnAnchorBlock;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import javax.annotation.Nullable;
import java.util.Optional;
@Mod(CustomRespawnTest.MODID)
public class CustomRespawnTest
{
@@ -78,17 +77,17 @@ public class CustomRespawnTest
}
@Override
public ActionResultType use(BlockState p_225533_1_, World world, BlockPos pos, PlayerEntity p_225533_4_, Hand p_225533_5_, BlockRayTraceResult p_225533_6_)
public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult blockHitResult)
{
if (!world.isClientSide && p_225533_4_ instanceof ServerPlayerEntity)
if (!world.isClientSide && player instanceof ServerPlayer serverPlayer)
{
((ServerPlayerEntity)p_225533_4_).setRespawnPosition(world.dimension(), pos, 0, false, true);
serverPlayer.setRespawnPosition(world.dimension(), pos, 0, false, true);
}
return ActionResultType.sidedSuccess(world.isClientSide);
return InteractionResult.sidedSuccess(world.isClientSide);
}
@Override
public Optional<Vector3d> getRespawnPosition(BlockState state, EntityType<?> type, IWorldReader world, BlockPos pos, float orientation, @Nullable LivingEntity entity)
public Optional<Vec3> getRespawnPosition(BlockState state, EntityType<?> type, LevelReader world, BlockPos pos, float orientation, @Nullable LivingEntity entity)
{
return RespawnAnchorBlock.findStandUpPosition(type, world, pos);
}
@@ -19,21 +19,20 @@
package net.minecraftforge.debug.block;
import net.minecraft.block.*;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.Atlases;
import net.minecraft.client.renderer.tileentity.SignTileEntityRenderer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.SignItem;
import net.minecraft.tileentity.SignTileEntity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.IBlockReader;
import net.minecraft.client.renderer.blockentity.BlockEntityRenderers;
import net.minecraft.core.BlockPos;
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.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
@@ -41,23 +40,31 @@ import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.StandingSignBlock;
import net.minecraft.world.level.block.WallSignBlock;
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;
@Mod(CustomSignsTest.MODID)
public class CustomSignsTest
{
public static final boolean ENABLE = true;
public static final boolean ENABLE = false; // TODO fix
public static final String MODID = "custom_signs_test";
public static final WoodType TEST_WOOD_TYPE = WoodType.create(new ResourceLocation(MODID, "test").toString());
private static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
public static final RegistryObject<CustomStandingSignBlock> TEST_STANDING_SIGN = BLOCKS.register("test_sign", () -> new CustomStandingSignBlock(Block.Properties.of(Material.WOOD).noCollission().strength(1.0F).sound(SoundType.WOOD), CustomSignsTest.TEST_WOOD_TYPE));
public static final RegistryObject<CustomWallSignBlock> TEST_WALL_SIGN = BLOCKS.register("test_wall_sign", () -> new CustomWallSignBlock(Block.Properties.of(Material.WOOD).noCollission().strength(1.0F).sound(SoundType.WOOD), CustomSignsTest.TEST_WOOD_TYPE));
public static final RegistryObject<CustomStandingSignBlock> TEST_STANDING_SIGN = BLOCKS.register("test_sign", () -> new CustomStandingSignBlock(Properties.of(Material.WOOD).noCollission().strength(1.0F).sound(SoundType.WOOD), CustomSignsTest.TEST_WOOD_TYPE));
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(ItemGroup.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).tab(CreativeModeTab.TAB_DECORATIONS), TEST_STANDING_SIGN.get(), TEST_WALL_SIGN.get()));
private static final DeferredRegister<TileEntityType<?>> TILE_ENTITIES = DeferredRegister.create(ForgeRegistries.TILE_ENTITIES, MODID);
public static final RegistryObject<TileEntityType<CustomSignTileEntity>> CUSTOM_SIGN = TILE_ENTITIES.register("custom_sign", () -> TileEntityType.Builder.of(CustomSignTileEntity::new, TEST_WALL_SIGN.get(), TEST_STANDING_SIGN.get()).build(null));
private static final DeferredRegister<BlockEntityType<?>> BLOCK_ENTITIES = DeferredRegister.create(ForgeRegistries.BLOCK_ENTITIES, 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));
public CustomSignsTest()
{
@@ -66,7 +73,7 @@ public class CustomSignsTest
final IEventBus eventBus = FMLJavaModLoadingContext.get().getModEventBus();
BLOCKS.register(eventBus);
ITEMS.register(eventBus);
TILE_ENTITIES.register(eventBus);
BLOCK_ENTITIES.register(eventBus);
eventBus.addListener(this::clientSetup);
eventBus.addListener(this::commonSetup);
@@ -75,9 +82,9 @@ public class CustomSignsTest
private void clientSetup(final FMLClientSetupEvent event)
{
ClientRegistry.bindTileEntityRenderer(CUSTOM_SIGN.get(), SignTileEntityRenderer::new);
BlockEntityRenderers.register(CUSTOM_SIGN.get(), SignRenderer::new);
event.enqueueWork(() -> {
Atlases.addWoodType(TEST_WOOD_TYPE);
Sheets.addWoodType(TEST_WOOD_TYPE);
});
}
@@ -95,15 +102,9 @@ public class CustomSignsTest
}
@Override
public boolean hasTileEntity(BlockState stateIn)
public BlockEntity newBlockEntity(BlockPos pos, BlockState state)
{
return true;
}
@Override
public TileEntity newBlockEntity(IBlockReader worldIn)
{
return new CustomSignTileEntity();
return new CustomSignBlockEntity(pos, state);
}
}
@@ -116,22 +117,20 @@ public class CustomSignsTest
}
@Override
public boolean hasTileEntity(BlockState stateIn)
public BlockEntity newBlockEntity(BlockPos pos, BlockState state)
{
return true;
}
@Override
public TileEntity newBlockEntity(IBlockReader worldIn)
{
return new CustomSignTileEntity();
return new CustomSignBlockEntity(pos, state);
}
}
public static class CustomSignTileEntity extends SignTileEntity
public static class CustomSignBlockEntity extends SignBlockEntity
{
public CustomSignBlockEntity(BlockPos pos, BlockState state) {
super(pos, state);
}
@Override
public TileEntityType<CustomSignTileEntity> getType()
public BlockEntityType<CustomSignBlockEntity> getType()
{
return CUSTOM_SIGN.get();
}
@@ -19,15 +19,15 @@
package net.minecraftforge.debug.block;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.block.FlowerPotBlock;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.FlowerPotBlock;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber.Bus;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -19,9 +19,9 @@
package net.minecraftforge.debug.block;
import net.minecraft.block.BlockState;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.entity.player.Player;
import net.minecraft.network.chat.TextComponent;
import net.minecraftforge.common.ToolType;
import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -34,11 +34,11 @@ public class HarvestToolTest
@SubscribeEvent
public static void onBlockBreak(BlockEvent.BreakEvent event)
{
PlayerEntity player = event.getPlayer();
Player player = event.getPlayer();
BlockState state = event.getState();
for (ToolType toolType : player.getMainHandItem().getToolTypes()) {
if (state.isToolEffective(toolType)) {
player.sendMessage(new StringTextComponent(String.format("Tool was effective. tool type: %s | harvest level: %d", toolType.getName(), state.getHarvestLevel())), player.getUUID());
player.sendMessage(new TextComponent(String.format("Tool was effective. tool type: %s | harvest level: %d", toolType.getName(), state.getHarvestLevel())), player.getUUID());
break;
}
}
@@ -19,7 +19,7 @@
package net.minecraftforge.debug.block;
import net.minecraft.block.Blocks;
import net.minecraft.world.level.block.Blocks;
import net.minecraftforge.event.world.BlockEvent.NeighborNotifyEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -21,22 +21,22 @@ package net.minecraftforge.debug.block;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.block.PistonBlock;
import net.minecraft.block.PistonBlockStructureHelper;
import net.minecraft.block.material.Material;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.piston.PistonBaseBlock;
import net.minecraft.world.level.block.piston.PistonStructureResolver;
import net.minecraft.world.level.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.data.DataGenerator;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.util.Direction;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.world.World;
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.network.chat.TextComponent;
import net.minecraft.world.level.Level;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ModelFile;
@@ -46,9 +46,9 @@ import net.minecraftforge.event.world.PistonEvent.PistonMoveType;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@@ -70,7 +70,7 @@ public class PistonEventTest
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(ItemGroup.TAB_BUILDING_BLOCKS)));
ITEMS.register(blockName, () -> new BlockItem(shiftOnMove.get(), new Item.Properties().tab(CreativeModeTab.TAB_BUILDING_BLOCKS)));
}
public PistonEventTest()
@@ -86,18 +86,18 @@ public class PistonEventTest
{
if (event.getPistonMoveType() == PistonMoveType.EXTEND)
{
World world = (World) event.getWorld();
PistonBlockStructureHelper pistonHelper = event.getStructureHelper();
PlayerEntity player = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().player);
Level world = (Level) event.getWorld();
PistonStructureResolver pistonHelper = event.getStructureHelper();
Player player = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().player);
if (world.isClientSide && player != null)
{
if (pistonHelper.resolve())
{
player.sendMessage(new StringTextComponent(String.format("Piston will extend moving %d blocks and destroy %d blocks", pistonHelper.getToPush().size(), pistonHelper.getToDestroy().size())), player.getUUID());
player.sendMessage(new TextComponent(String.format("Piston will extend moving %d blocks and destroy %d blocks", pistonHelper.getToPush().size(), pistonHelper.getToDestroy().size())), player.getUUID());
}
else
{
player.sendMessage(new StringTextComponent("Piston won't extend"), player.getUUID());
player.sendMessage(new TextComponent("Piston won't extend"), player.getUUID());
}
}
@@ -130,19 +130,19 @@ public class PistonEventTest
{
boolean isSticky = event.getWorld().getBlockState(event.getPos()).getBlock() == Blocks.STICKY_PISTON;
PlayerEntity player = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().player);
Player player = DistExecutor.safeCallWhenOn(Dist.CLIENT, () -> () -> Minecraft.getInstance().player);
if (event.getWorld().isClientSide() && player != null)
{
if (isSticky)
{
BlockPos targetPos = event.getFaceOffsetPos().relative(event.getDirection());
boolean canPush = PistonBlock.isPushable(event.getWorld().getBlockState(targetPos), (World) event.getWorld(), event.getFaceOffsetPos(), event.getDirection().getOpposite(), false, event.getDirection());
boolean canPush = PistonBaseBlock.isPushable(event.getWorld().getBlockState(targetPos), (Level) event.getWorld(), event.getFaceOffsetPos(), event.getDirection().getOpposite(), false, event.getDirection());
boolean isAir = event.getWorld().isEmptyBlock(targetPos);
player.sendMessage(new StringTextComponent(String.format("Piston will retract moving %d blocks", !isAir && canPush ? 1 : 0)), player.getUUID());
player.sendMessage(new TextComponent(String.format("Piston will retract moving %d blocks", !isAir && canPush ? 1 : 0)), player.getUUID());
}
else
{
player.sendMessage(new StringTextComponent("Piston will retract"), player.getUUID());
player.sendMessage(new TextComponent("Piston will retract"), player.getUUID());
}
}
// Offset twice to see if retraction will pull cobblestone
@@ -19,7 +19,7 @@
package net.minecraftforge.debug.block;
import net.minecraft.block.Blocks;
import net.minecraft.world.level.block.Blocks;
import net.minecraftforge.event.world.BlockEvent.EntityPlaceEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -19,33 +19,32 @@
package net.minecraftforge.debug.block;
import net.minecraft.block.AbstractBlock;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.ScaffoldingBlock;
import net.minecraft.block.SoundType;
import net.minecraft.block.material.Material;
import net.minecraft.block.material.MaterialColor;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.ScaffoldingBlock;
import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.data.DataGenerator;
import net.minecraft.entity.LivingEntity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.tags.BlockTags;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorldReader;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.LevelReader;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ConfiguredModel;
import net.minecraftforge.client.model.generators.ModelFile;
import net.minecraftforge.common.Tags.IOptionalNamedTag;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraft.block.AbstractBlock.Properties;
import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
/**
* This test mod allows a custom scaffolding to move down
@@ -58,7 +57,7 @@ public class ScaffoldingTest
static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID);
static final IOptionalNamedTag<Block> SCAFFOLDING = BlockTags.createOptional(new ResourceLocation("forge", "scaffolding"));
static final RegistryObject<Block> SCAFFOLDING_METHOD_TEST = BLOCKS.register("scaffolding_method_test", () -> new ScaffoldingMethodTestBlock(AbstractBlock.Properties.of(Material.DECORATION, MaterialColor.SAND).noCollission().sound(SoundType.SCAFFOLDING).dynamicShape()));
static final RegistryObject<Block> SCAFFOLDING_METHOD_TEST = BLOCKS.register("scaffolding_method_test", () -> new ScaffoldingMethodTestBlock(Properties.of(Material.DECORATION, MaterialColor.SAND).noCollission().sound(SoundType.SCAFFOLDING).dynamicShape()));
public ScaffoldingTest()
{
@@ -96,7 +95,7 @@ public class ScaffoldingTest
}
@Override
public boolean isScaffolding(BlockState state, IWorldReader world, BlockPos pos, LivingEntity entity)
public boolean isScaffolding(BlockState state, LevelReader world, BlockPos pos, LivingEntity entity)
{
return true;
}
@@ -19,15 +19,15 @@
package net.minecraftforge.debug.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.BoatEntity;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IWorldReader;
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.vehicle.Boat;
import net.minecraft.world.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.LevelReader;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
@@ -50,9 +50,9 @@ public class SlipperinessTest
e.getRegistry().register((new Block(Block.Properties.of(Material.ICE_SOLID))
{
@Override
public float getSlipperiness(BlockState state, IWorldReader world, BlockPos pos, Entity entity)
public float getFriction(BlockState state, LevelReader world, BlockPos pos, Entity entity)
{
return entity instanceof BoatEntity ? 2 : super.getSlipperiness(state, world, pos, entity);
return entity instanceof Boat ? 2 : super.getFriction(state, world, pos, entity);
}
}).setRegistryName(MOD_ID, BLOCK_ID));
}
@@ -19,11 +19,11 @@
package net.minecraftforge.debug.block;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material;
import net.minecraft.item.BlockItem;
import net.minecraft.item.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.item.BlockItem;
import net.minecraft.world.item.Item;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.block;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
@@ -21,9 +21,9 @@ package net.minecraftforge.debug.chat;
import com.mojang.brigadier.CommandDispatcher;
import com.mojang.brigadier.context.ParsedCommandNode;
import net.minecraft.command.CommandException;
import net.minecraft.command.CommandSource;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.commands.CommandRuntimeException;
import net.minecraft.commands.CommandSourceStack;
import net.minecraft.network.chat.TextComponent;
import net.minecraftforge.event.CommandEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -41,9 +41,9 @@ public class CommandEventTest
@SubscribeEvent
public static void onCommand(CommandEvent event)
{
CommandDispatcher<CommandSource> dispatcher = event.getParseResults().getContext().getDispatcher();
List<ParsedCommandNode<CommandSource>> nodes = event.getParseResults().getContext().getNodes();
CommandSource source = event.getParseResults().getContext().getSource();
CommandDispatcher<CommandSourceStack> dispatcher = event.getParseResults().getContext().getDispatcher();
List<ParsedCommandNode<CommandSourceStack>> nodes = event.getParseResults().getContext().getNodes();
CommandSourceStack source = event.getParseResults().getContext().getSource();
// test: when the /time command is used with no arguments, automatically add default arguments (/time set day)
if (nodes.size() == 1 && nodes.get(0).getNode() == dispatcher.getRoot().getChild("time"))
@@ -56,17 +56,18 @@ public class CommandEventTest
if (nodes.size() > 0 && nodes.get(0).getNode() == dispatcher.getRoot().getChild("give"))
{
String msg = source.getTextName() + " used the give command: " + event.getParseResults().getReader().getString();
source.getServer().getPlayerList().getPlayers().forEach(player -> player.sendMessage(new StringTextComponent(msg), player.getUUID()));
source.getServer().getPlayerList().getPlayers().forEach(player -> player.sendMessage(new TextComponent(msg), player.getUUID()));
return;
}
// this is annoying so I disabled it
// test: when the /kill command is used with no arguments, throw a custom exception
if (nodes.size() == 1 && nodes.get(0).getNode() == dispatcher.getRoot().getChild("kill"))
{
event.setException(new CommandException(new StringTextComponent("You tried to use the /kill command with no arguments")));
event.setCanceled(true);
return;
}
// if (nodes.size() == 1 && nodes.get(0).getNode() == dispatcher.getRoot().getChild("kill"))
// {
// event.setException(new CommandRuntimeException(new TextComponent("You tried to use the /kill command with no arguments")));
// event.setCanceled(true);
// return;
// }
}
}
@@ -20,14 +20,14 @@
package net.minecraftforge.debug.chat;
import com.mojang.brigadier.exceptions.CommandSyntaxException;
import net.minecraft.advancements.criterion.MinMaxBounds;
import net.minecraft.command.arguments.EntityOptions;
import net.minecraft.command.arguments.EntitySelector;
import net.minecraft.command.arguments.EntitySelectorParser;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.advancements.critereon.MinMaxBounds;
import net.minecraft.commands.arguments.selector.options.EntitySelectorOptions;
import net.minecraft.commands.arguments.selector.EntitySelector;
import net.minecraft.commands.arguments.selector.EntitySelectorParser;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent;
import net.minecraftforge.common.command.EntitySelectorManager;
import net.minecraftforge.common.command.IEntitySelectorType;
import net.minecraftforge.fml.common.Mod;
@@ -44,7 +44,7 @@ public class EntitySelectorTest
public void setup(FMLCommonSetupEvent event)
{
EntityOptions.register("health", this::healthArgument, parser -> true, new StringTextComponent("Selects entities based on their current health."));
EntitySelectorOptions.register("health", this::healthArgument, parser -> true, new TextComponent("Selects entities based on their current health."));
EntitySelectorManager.register("er", new ExampleCustomSelector());
}
@@ -53,7 +53,7 @@ public class EntitySelectorTest
*/
private void healthArgument(EntitySelectorParser parser) throws CommandSyntaxException
{
MinMaxBounds.FloatBound bound = MinMaxBounds.FloatBound.fromReader(parser.getReader());
MinMaxBounds.Doubles bound = MinMaxBounds.Doubles.fromReader(parser.getReader());
parser.addPredicate(entity -> entity instanceof LivingEntity && bound.matches(((LivingEntity) entity).getHealth()));
}
@@ -76,7 +76,7 @@ public class EntitySelectorTest
parser.getReader().skip();
parser.setSuggestions((builder, consumer) -> {
builder.suggest(String.valueOf(']'));
EntityOptions.suggestNames(parser, builder);
EntitySelectorOptions.suggestNames(parser, builder);
return builder.buildFuture();
});
@@ -88,9 +88,9 @@ public class EntitySelectorTest
}
@Override
public ITextComponent getSuggestionTooltip()
public Component getSuggestionTooltip()
{
return new StringTextComponent("Example: Selects a random entity");
return new TextComponent("Example: Selects a random entity");
}
}
}
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.chat;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
@@ -23,35 +23,35 @@ import java.util.Random;
import javax.annotation.Nonnull;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.NativeImage;
import com.mojang.blaze3d.platform.NativeImage;
import net.minecraft.client.renderer.texture.TextureAtlas;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.Item;
import net.minecraft.resources.IResource;
import net.minecraft.resources.IResourceManager;
import net.minecraft.util.ResourceLocation;
import net.minecraft.client.renderer.texture.Tickable;
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.MinecraftForgeClient;
import net.minecraftforge.client.textures.ITextureAtlasSpriteLoader;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.loading.FMLLoader;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@Mod(CustomTASTest.MOD_ID)
public class CustomTASTest
{
private static final boolean enabled = true;
private static final boolean ENABLED = true;
static final String MOD_ID = "custom_tas_test";
private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MOD_ID);
private static final RegistryObject<Item> TEST_ITEM = ITEMS.register("test_item", () -> new Item(new Item.Properties()));
public CustomTASTest()
{
if (enabled)
if (ENABLED)
{
if (FMLLoader.getDist().isClient())
{
@@ -70,23 +70,21 @@ public class CustomTASTest
{
@Override
@Nonnull
public TextureAtlasSprite load(AtlasTexture atlas, IResourceManager resourceManager, TextureAtlasSprite.Info textureInfo, IResource resource, int atlasWidth, int atlasHeight, int spriteX, int spriteY, int mipmapLevel, NativeImage image)
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();
@Override
public boolean isAnimation()
public Tickable getAnimationTicker()
{
return true;
return this::tick;
}
@Override
public void cycleFrames()
private void tick()
{
this.mainImage[0].fillRect(0, 0, 16, 16, 0xFF000000 | random.nextInt(0xFFFFFF));
this.uploadFirstFrame();
@@ -0,0 +1,104 @@
/*
* Minecraft Forge
* Copyright (c) 2016-2021.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation version 2.1
* of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
package net.minecraftforge.debug.client;
import net.minecraft.client.Minecraft;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.InputEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.client.gui.OverlayRegistry;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.loading.FMLEnvironment;
import org.lwjgl.glfw.GLFW;
import java.util.List;
@Mod("overlay_layers_test")
public class OverlayLayersTest
{
public static final boolean ENABLE = true;
private boolean visible = false;
public OverlayLayersTest()
{
if (ENABLE && FMLEnvironment.dist == Dist.CLIENT)
{
MinecraftForge.EVENT_BUS.addListener(this::renderTextEvent);
MinecraftForge.EVENT_BUS.addListener(this::keyInputEvent);
}
}
int overlayIndex = 0;
public void renderTextEvent(RenderGameOverlayEvent.Text event)
{
if (event.getType() != RenderGameOverlayEvent.ElementType.TEXT || !visible)
return;
List<OverlayRegistry.OverlayEntry> overlays = OverlayRegistry.orderedEntries();
for(int i=0;i<overlays.size();i++)
{
OverlayRegistry.OverlayEntry entry = overlays.get(i);
event.getLeft().add(String.format(overlayIndex == i ? "> %s [%s] <" : " %s [%s] ", entry.getDisplayName(), entry.isEnabled()));
}
}
public void keyInputEvent(InputEvent.KeyInputEvent event)
{
if (event.getAction() != GLFW.GLFW_PRESS || Minecraft.getInstance().level == null || Minecraft.getInstance().screen != null)
return;
if (event.getKey() == GLFW.GLFW_KEY_H)
{
visible = !visible;
return;
}
if (!visible)
return;
if (event.getKey() == GLFW.GLFW_KEY_J)
{
List<OverlayRegistry.OverlayEntry> overlays = OverlayRegistry.orderedEntries();
if (overlayIndex >= overlays.size())
overlayIndex = 0;
else
overlayIndex = (overlayIndex + overlays.size() - 1) % overlays.size();
}
else if (event.getKey() == GLFW.GLFW_KEY_K)
{
List<OverlayRegistry.OverlayEntry> overlays = OverlayRegistry.orderedEntries();
if (overlayIndex >= overlays.size())
overlayIndex = 0;
else
overlayIndex = (overlayIndex + 1) % overlays.size();
}
else if (event.getKey() == GLFW.GLFW_KEY_I)
{
List<OverlayRegistry.OverlayEntry> overlays = OverlayRegistry.orderedEntries();
if (overlayIndex >= overlays.size())
overlayIndex = 0;
else
{
OverlayRegistry.OverlayEntry entry = overlays.get(overlayIndex);
OverlayRegistry.enableOverlay(entry.getOverlay(), !entry.isEnabled());
}
}
}
}
@@ -19,25 +19,25 @@
package net.minecraftforge.debug.client.model;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material;
import net.minecraft.entity.Entity;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.BlockItem;
import net.minecraft.item.BlockItemUseContext;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.ItemStack;
import net.minecraft.state.StateContainer;
import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.util.math.shapes.VoxelShapes;
import net.minecraft.world.IBlockReader;
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;
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.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
@@ -55,14 +55,14 @@ public class CompositeModelTest
public static RegistryObject<Block> composite_block = BLOCKS.register("composite_block", () ->
new Block(Block.Properties.of(Material.WOOD).strength(10)) {
@Override
protected void createBlockStateDefinition(StateContainer.Builder<Block, BlockState> builder)
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder)
{
builder.add(BlockStateProperties.HORIZONTAL_FACING);
}
@Nullable
@Override
public BlockState getStateForPlacement(BlockItemUseContext context)
public BlockState getStateForPlacement(BlockPlaceContext context)
{
return defaultBlockState().setValue(
BlockStateProperties.HORIZONTAL_FACING, context.getHorizontalDirection()
@@ -70,8 +70,8 @@ public class CompositeModelTest
}
@Override
public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context) {
return VoxelShapes.or(
public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context) {
return Shapes.or(
box(5.6, 5.6, 5.6, 10.4, 10.4, 10.4),
box(0, 0, 0, 4.8, 4.8, 4.8),
box(11.2, 0, 0, 16, 4.8, 4.8),
@@ -87,11 +87,11 @@ public class CompositeModelTest
);
public static RegistryObject<Item> composite_item = ITEMS.register("composite_block", () ->
new BlockItem(composite_block.get(), new Item.Properties().tab(ItemGroup.TAB_MISC)) {
new BlockItem(composite_block.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)) {
@Override
public boolean canEquip(ItemStack stack, EquipmentSlotType armorType, Entity entity)
public boolean canEquip(ItemStack stack, EquipmentSlot armorType, Entity entity)
{
return armorType == EquipmentSlotType.HEAD;
return armorType == EquipmentSlot.HEAD;
}
}
);
@@ -19,10 +19,10 @@
package net.minecraftforge.debug.client.model;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
@@ -31,15 +31,19 @@ import net.minecraftforge.registries.ForgeRegistries;
@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(ItemGroup.TAB_MISC)));
public static final RegistryObject<Item> LAVA_OBSIDIAN = ITEMS.register("lava_obsidian", () -> new Item(new Item.Properties().tab(ItemGroup.TAB_MISC)));
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 DynBucketModelTest()
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(modEventBus);
if (ENABLE)
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
ITEMS.register(modEventBus);
}
}
}
@@ -19,14 +19,14 @@
package net.minecraftforge.debug.client.model;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
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.RenderTypeLookup;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.util.ResourceLocation;
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.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -64,7 +64,7 @@ public class MultiLayerModelTest
{
if (!ENABLED)
return;
event.getRegistry().register(new BlockItem(TEST_BLOCK, new Item.Properties().tab(ItemGroup.TAB_MISC)).setRegistryName(TEST_BLOCK.getRegistryName()));
event.getRegistry().register(new BlockItem(TEST_BLOCK, new Item.Properties().tab(CreativeModeTab.TAB_MISC)).setRegistryName(TEST_BLOCK.getRegistryName()));
}
@net.minecraftforge.eventbus.api.SubscribeEvent
@@ -72,7 +72,7 @@ public class MultiLayerModelTest
{
if (!ENABLED)
return;
RenderTypeLookup.setRenderLayer(TEST_BLOCK, (layer) -> {
ItemBlockRenderTypes.setRenderLayer(TEST_BLOCK, (layer) -> {
return layer == RenderType.solid() || layer == RenderType.translucent();
});
}
@@ -23,32 +23,32 @@ import com.google.common.collect.ImmutableList;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonObject;
import com.mojang.datafixers.util.Pair;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.model.*;
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.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
import net.minecraft.client.renderer.vertex.VertexFormatElement;
import com.mojang.blaze3d.vertex.DefaultVertexFormat;
import com.mojang.blaze3d.vertex.VertexFormatElement;
import net.minecraft.data.DataGenerator;
import net.minecraft.entity.Entity;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.*;
import net.minecraft.resources.IResourceManager;
import net.minecraft.state.StateContainer;
import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.shapes.ISelectionContext;
import net.minecraft.util.math.shapes.VoxelShape;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.server.packs.resources.ResourceManager;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.core.Direction;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.core.BlockPos;
import net.minecraft.world.phys.shapes.CollisionContext;
import net.minecraft.world.phys.shapes.VoxelShape;
import net.minecraft.world.level.BlockGetter;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.client.model.IModelBuilder;
import net.minecraftforge.client.model.IModelConfiguration;
import net.minecraftforge.client.model.IModelLoader;
import net.minecraftforge.client.model.ModelLoaderRegistry;
import net.minecraftforge.client.model.generators.BlockModelBuilder;
import net.minecraftforge.client.model.generators.BlockStateProvider;
import net.minecraftforge.client.model.generators.ConfiguredModel;
import net.minecraftforge.client.model.generators.ItemModelProvider;
import net.minecraftforge.client.model.generators.loaders.ItemLayersModelBuilder;
import net.minecraftforge.client.model.generators.loaders.OBJLoaderBuilder;
@@ -57,9 +57,9 @@ import net.minecraftforge.client.model.geometry.ISimpleModelGeometry;
import net.minecraftforge.client.model.pipeline.BakedQuadBuilder;
import net.minecraftforge.common.data.ExistingFileHelper;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@@ -70,6 +70,16 @@ import java.util.Collections;
import java.util.Set;
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;
@Mod(NewModelLoaderTest.MODID)
public class NewModelLoaderTest
{
@@ -80,14 +90,14 @@ public class NewModelLoaderTest
public static RegistryObject<Block> obj_block = BLOCKS.register("obj_block", () ->
new Block(Block.Properties.of(Material.WOOD).strength(10)) {
@Override
protected void createBlockStateDefinition(StateContainer.Builder<Block, BlockState> builder)
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder)
{
builder.add(BlockStateProperties.HORIZONTAL_FACING);
}
@Nullable
@Override
public BlockState getStateForPlacement(BlockItemUseContext context)
public BlockState getStateForPlacement(BlockPlaceContext context)
{
return defaultBlockState().setValue(
BlockStateProperties.HORIZONTAL_FACING, context.getHorizontalDirection()
@@ -95,7 +105,7 @@ public class NewModelLoaderTest
}
@Override
public VoxelShape getShape(BlockState state, IBlockReader worldIn, BlockPos pos, ISelectionContext context)
public VoxelShape getShape(BlockState state, BlockGetter worldIn, BlockPos pos, CollisionContext context)
{
return Block.box(2,2,2,14,14,14);
}
@@ -103,33 +113,33 @@ public class NewModelLoaderTest
);
public static RegistryObject<Item> obj_item = ITEMS.register("obj_block", () ->
new BlockItem(obj_block.get(), new Item.Properties().tab(ItemGroup.TAB_MISC)) {
new BlockItem(obj_block.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)) {
@Override
public boolean canEquip(ItemStack stack, EquipmentSlotType armorType, Entity entity)
public boolean canEquip(ItemStack stack, EquipmentSlot armorType, Entity entity)
{
return armorType == EquipmentSlotType.HEAD;
return armorType == EquipmentSlot.HEAD;
}
}
);
public static RegistryObject<Item> custom_transforms = ITEMS.register("custom_transforms", () ->
new Item(new Item.Properties().tab(ItemGroup.TAB_MISC))
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
);
public static RegistryObject<Item> custom_vanilla_loader = ITEMS.register("custom_vanilla_loader", () ->
new Item(new Item.Properties().tab(ItemGroup.TAB_MISC))
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
);
public static RegistryObject<Item> custom_loader = ITEMS.register("custom_loader", () ->
new Item(new Item.Properties().tab(ItemGroup.TAB_MISC))
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
);
public static RegistryObject<Item> item_layers = ITEMS.register("item_layers", () ->
new Item(new Item.Properties().tab(ItemGroup.TAB_MISC))
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
);
public static RegistryObject<Item> separate_perspective = ITEMS.register("separate_perspective", () ->
new Item(new Item.Properties().tab(ItemGroup.TAB_MISC))
new Item(new Item.Properties().tab(CreativeModeTab.TAB_MISC))
);
public NewModelLoaderTest()
@@ -151,7 +161,7 @@ public class NewModelLoaderTest
static class TestLoader implements IModelLoader<TestModel>
{
@Override
public void onResourceManagerReload(IResourceManager resourceManager)
public void onResourceManagerReload(ResourceManager resourceManager)
{
}
@@ -165,7 +175,7 @@ public class NewModelLoaderTest
static class TestModel implements ISimpleModelGeometry<TestModel>
{
@Override
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function<RenderMaterial, TextureAtlasSprite> spriteGetter, IModelTransform modelTransform, ResourceLocation modelLocation)
public void addQuads(IModelConfiguration owner, IModelBuilder<?> modelBuilder, ModelBakery bakery, Function< net.minecraft.client.resources.model.Material, TextureAtlasSprite> spriteGetter, ModelState modelTransform, ResourceLocation modelLocation)
{
TextureAtlasSprite texture = spriteGetter.apply(owner.resolveTexture("particle"));
@@ -184,7 +194,7 @@ public class NewModelLoaderTest
private void putVertex(BakedQuadBuilder builder, int x, float y, float z, float u, float v, float red, float green, float blue)
{
ImmutableList<VertexFormatElement> elements = DefaultVertexFormats.BLOCK.getElements();
ImmutableList<VertexFormatElement> elements = DefaultVertexFormat.BLOCK.getElements();
for(int i=0;i<elements.size();i++)
{
switch(elements.get(i).getUsage())
@@ -209,7 +219,7 @@ public class NewModelLoaderTest
}
@Override
public Collection<RenderMaterial> getTextures(IModelConfiguration owner, Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
public Collection< net.minecraft.client.resources.model.Material> getTextures(IModelConfiguration owner, Function<ResourceLocation, UnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors)
{
return Collections.singleton(owner.resolveTexture("particle"));
}
@@ -247,8 +257,8 @@ public class NewModelLoaderTest
withExistingParent(NewModelLoaderTest.separate_perspective.getId().getPath(), "forge:item/default")
.customLoader(SeparatePerspectiveModelBuilder::begin)
.base(nested().parent(getExistingFile(mcLoc("minecraft:item/coal"))))
.perspective(ItemCameraTransforms.TransformType.GUI, nested().parent(getExistingFile(mcLoc("minecraft:item/snowball"))))
.perspective(ItemCameraTransforms.TransformType.FIRST_PERSON_LEFT_HAND, nested().parent(getExistingFile(mcLoc("minecraft:item/bone"))))
.perspective(ItemTransforms.TransformType.GUI, nested().parent(getExistingFile(mcLoc("minecraft:item/snowball"))))
.perspective(ItemTransforms.TransformType.FIRST_PERSON_LEFT_HAND, nested().parent(getExistingFile(mcLoc("minecraft:item/bone"))))
.end();
}
}
@@ -263,15 +273,28 @@ public class NewModelLoaderTest
@Override
protected void registerStatesAndModels()
{
simpleBlock(NewModelLoaderTest.obj_block.get(), models()
BlockModelBuilder model = models()
.getBuilder(NewModelLoaderTest.obj_block.getId().getPath())
.customLoader(OBJLoaderBuilder::begin)
.modelLocation(new ResourceLocation("new_model_loader_test:models/item/sugar_glider.obj"))
.flipV(true)
.end()
.texture("qr", "minecraft:block/oak_planks")
.texture("particle", "#qr")
);
.texture("particle", "#qr");
getVariantBuilder(NewModelLoaderTest.obj_block.get())
.partialState()
.with(BlockStateProperties.HORIZONTAL_FACING, Direction.EAST)
.addModels(new ConfiguredModel(model, 0, 90, false))
.partialState()
.with(BlockStateProperties.HORIZONTAL_FACING, Direction.WEST)
.addModels(new ConfiguredModel(model, 0, 270, false))
.partialState()
.with(BlockStateProperties.HORIZONTAL_FACING, Direction.NORTH)
.addModels(new ConfiguredModel(model))
.partialState()
.with(BlockStateProperties.HORIZONTAL_FACING, Direction.SOUTH)
.addModels(new ConfiguredModel(model, 0, 180, false))
.partialState();
}
}
}
@@ -26,21 +26,21 @@ import javax.annotation.Nullable;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemOverrideList;
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.client.renderer.block.model.BakedQuad;
import net.minecraft.client.resources.model.BakedModel;
import net.minecraft.client.renderer.block.model.ItemOverrides;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.util.Direction;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.vector.Quaternion;
import net.minecraft.util.math.vector.TransformationMatrix;
import net.minecraft.util.math.vector.Vector3f;
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.ModelBakeEvent;
import net.minecraftforge.client.model.data.IDynamicBakedModel;
@@ -50,7 +50,7 @@ import net.minecraftforge.client.model.pipeline.TRSRTransformer;
import net.minecraftforge.common.model.TransformationHelper;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.DistExecutor;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
@@ -64,7 +64,7 @@ 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(ItemGroup.TAB_MISC)));
private static final RegistryObject<Item> TEST_ITEM = ITEMS.register("test", () -> new BlockItem(TEST_BLOCK.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC)));
public TRSRTransformerTest() {
final IEventBus mod = FMLJavaModLoadingContext.get().getModEventBus();
@@ -82,9 +82,9 @@ public class TRSRTransformerTest {
}
public class MyBakedModel implements IDynamicBakedModel {
private final IBakedModel base;
private final BakedModel base;
public MyBakedModel(IBakedModel base) {
public MyBakedModel(BakedModel base) {
this.base = base;
}
@@ -95,7 +95,7 @@ public class TRSRTransformerTest {
Quaternion rot = TransformationHelper.quatFromXYZ(new Vector3f(0, 45, 0), true);
Vector3f translation = new Vector3f(0, 0.33f, 0);
TransformationMatrix trans = new TransformationMatrix(translation, rot, null, null).blockCenterToCorner();
Transformation trans = new Transformation(translation, rot, null, null).blockCenterToCorner();
for (BakedQuad quad : base.getQuads(state, side, rand, data)) {
@@ -143,7 +143,7 @@ public class TRSRTransformerTest {
}
@Override
public ItemOverrideList getOverrides() {
public ItemOverrides getOverrides() {
return base.getOverrides();
}
}
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.client.model;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
@@ -19,7 +19,7 @@
package net.minecraftforge.debug.client.rendering;
import net.minecraft.client.gui.screen.MainMenuScreen;
import net.minecraft.client.gui.screens.TitleScreen;
import net.minecraftforge.client.ForgeRenderTypes;
import net.minecraftforge.client.event.GuiScreenEvent.DrawScreenEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -36,7 +36,7 @@ public class LinearTextTextureFilteringTest
@SubscribeEvent
public static void onGuiRenderPre(DrawScreenEvent.Pre event)
{
if (ENABLED && event.getGui() instanceof MainMenuScreen)
if (ENABLED && event.getGui() instanceof TitleScreen)
{
ForgeRenderTypes.enableTextTextureLinearFiltering = true;
}
@@ -45,7 +45,7 @@ public class LinearTextTextureFilteringTest
@SubscribeEvent
public static void onGuiRenderPost(DrawScreenEvent.Post event)
{
if (ENABLED && event.getGui() instanceof MainMenuScreen)
if (ENABLED && event.getGui() instanceof TitleScreen)
{
ForgeRenderTypes.enableTextTextureLinearFiltering = false;
}
@@ -19,10 +19,10 @@
package net.minecraftforge.debug.client.rendering;
import net.minecraft.entity.passive.CowEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.util.text.TextFormatting;
import net.minecraft.world.entity.animal.Cow;
import net.minecraft.world.entity.player.Player;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.ChatFormatting;
import net.minecraftforge.client.event.RenderNameplateEvent;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -46,15 +46,15 @@ public class NameplateRenderingEventTest
return;
}
if(event.getEntity() instanceof CowEntity)
if(event.getEntity() instanceof Cow)
{
event.setContent(new StringTextComponent("Evil Cow").withStyle(TextFormatting.RED));
event.setContent(new TextComponent("Evil Cow").withStyle(ChatFormatting.RED));
event.setResult(Event.Result.ALLOW);
}
if(event.getEntity() instanceof PlayerEntity)
if(event.getEntity() instanceof Player)
{
event.setContent(event.getEntity().getDisplayName().copy().withStyle(TextFormatting.GOLD));
event.setContent(event.getEntity().getDisplayName().copy().withStyle(ChatFormatting.GOLD));
}
}
}
@@ -20,8 +20,8 @@
package net.minecraftforge.debug.client.rendering;
import net.minecraft.client.Minecraft;
import net.minecraft.item.Items;
import net.minecraft.util.ActionResultType;
import net.minecraft.world.item.Items;
import net.minecraft.world.InteractionResult;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -44,7 +44,7 @@ public class RenderLocalPlayerTest
{
mc.setCameraEntity(event.getTarget());
event.setCancellationResult(ActionResultType.SUCCESS);
event.setCancellationResult(InteractionResult.SUCCESS);
event.setCanceled(true);
}
}
@@ -60,7 +60,7 @@ public class RenderLocalPlayerTest
{
mc.setCameraEntity(mc.player);
event.setCancellationResult(ActionResultType.SUCCESS);
event.setCancellationResult(InteractionResult.SUCCESS);
event.setCanceled(true);
}
}
@@ -19,11 +19,11 @@
package net.minecraftforge.debug.client.rendering;
import net.minecraft.client.entity.player.ClientPlayerEntity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.client.player.LocalPlayer;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fmlclient.registry.ClientRegistry;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -34,6 +34,6 @@ public class ShaderFixTest
@SubscribeEvent
public static void clientSetup(final FMLClientSetupEvent event)
{
ClientRegistry.registerEntityShader(ClientPlayerEntity.class, new ResourceLocation("shaders/post/desaturate.json"));
ClientRegistry.registerEntityShader(LocalPlayer.class, new ResourceLocation("shaders/post/desaturate.json"));
}
}
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.client.rendering;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
@@ -19,8 +19,8 @@
package net.minecraftforge.debug.command;
import net.minecraft.command.Commands;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.commands.Commands;
import net.minecraft.network.chat.TextComponent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.RegisterCommandsEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -46,14 +46,14 @@ public class EnumArgumentTest
event.getDispatcher().register(Commands.literal("enumargumenttest")
.then(Commands.argument("string", StringArgumentType.string())
.executes(context -> {
context.getSource().sendSuccess(new StringTextComponent("string: " + StringArgumentType.getString(context, "string")), false);
context.getSource().sendSuccess(new TextComponent("string: " + StringArgumentType.getString(context, "string")), false);
return 1;
}))
.then(Commands.argument("enum", EnumArgument.enumArgument(ExampleEnum.class))
.executes(context -> {
context.getSource()
.sendSuccess(new StringTextComponent("enum: " + context.getArgument("enum", ExampleEnum.class)), false);
.sendSuccess(new TextComponent("enum: " + context.getArgument("enum", ExampleEnum.class)), false);
return 1;
})));
@@ -21,6 +21,6 @@
@MethodsReturnNonnullByDefault
package net.minecraftforge.debug.command;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
@@ -19,11 +19,11 @@
package net.minecraftforge.debug.entity;
import net.minecraft.entity.ai.attributes.Attribute;
import net.minecraft.entity.ai.attributes.RangedAttribute;
import net.minecraft.world.entity.ai.attributes.Attribute;
import net.minecraft.world.entity.ai.attributes.RangedAttribute;
import net.minecraftforge.event.entity.EntityAttributeModificationEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
@@ -19,11 +19,11 @@
package net.minecraftforge.debug.entity;
import net.minecraft.entity.EntityClassification;
import net.minecraft.world.entity.MobCategory;
import net.minecraftforge.fml.common.Mod;
@Mod("create_entity_classification_test")
public class CreateEntityClassificationTest
{
public static EntityClassification test = EntityClassification.create("TEST", "test", 1, true, true, 128);
public static MobCategory test = MobCategory.create("TEST", "test", 1, true, true, 128);
}
@@ -20,7 +20,7 @@
package net.minecraftforge.debug.entity;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.EntityTeleportEvent;
import net.minecraftforge.event.entity.EntityTeleportEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -19,12 +19,12 @@
package net.minecraftforge.debug.entity;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.projectile.FishingBobberEntity;
import net.minecraft.util.math.EntityRayTraceResult;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.projectile.FishingHook;
import net.minecraft.world.phys.EntityHitResult;
import net.minecraft.world.phys.HitResult;
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.ProjectileImpactEvent;
import net.minecraftforge.fml.common.Mod;
@@ -43,19 +43,19 @@ public class FishingBobberEventTest
}
}
public static void handleImpact(ProjectileImpactEvent.FishingBobber event)
public static void handleImpact(ProjectileImpactEvent<FishingHook> event)
{
FishingBobberEntity bob = event.getFishingBobber();
RayTraceResult trace = event.getRayTraceResult();
if (trace.getType() == RayTraceResult.Type.ENTITY)
FishingHook fishingHook = event.getProjectile();
HitResult trace = event.getRayTraceResult();
if (trace.getType() == HitResult.Type.ENTITY)
{
Vector3d vector3d = bob.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D).normalize().scale(0.6);
Vec3 vector3d = fishingHook.getDeltaMovement().multiply(1.0D, 0.0D, 1.0D).normalize().scale(0.6);
if (vector3d.lengthSqr() > 0.0D)
{
Entity entity = ((EntityRayTraceResult) trace).getEntity();
Entity entity = ((EntityHitResult) trace).getEntity();
if (entity instanceof LivingEntity)
{
((LivingEntity) entity).push(vector3d.x, 0.3D, vector3d.z);
entity.push(vector3d.x, 0.3D, vector3d.z);
}
}
}
@@ -24,27 +24,28 @@ import java.util.List;
import java.util.UUID;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import net.minecraft.entity.ai.attributes.ModifiableAttributeInstance;
import net.minecraft.world.entity.ai.attributes.AttributeInstance;
import net.minecraftforge.common.ForgeMod;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import com.google.common.collect.Multimap;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.ai.attributes.Attribute;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.ai.attributes.AttributeModifier.Operation;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.item.Rarity;
import net.minecraft.world.World;
import net.minecraft.world.biome.Biome.Category;
import net.minecraft.world.server.ServerWorld;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
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.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.world.level.biome.Biome.BiomeCategory;
import net.minecraft.server.level.ServerLevel;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.event.TickEvent;
@@ -52,7 +53,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraft.item.Item.Properties;
import net.minecraft.world.item.Item.Properties;
@Mod("gravity_attribute_test")
public class GravityAttributeTest
@@ -81,11 +82,11 @@ public class GravityAttributeTest
if (ticks++ > 60)
{
ticks = 0;
World w = event.world;
Level w = event.world;
List<LivingEntity> list;
if(w.isClientSide)
{
ClientWorld cw = (ClientWorld)w;
ClientLevel cw = (ClientLevel)w;
list = new ArrayList<>(100);
for(Entity e : cw.entitiesForRendering())
{
@@ -95,15 +96,18 @@ public class GravityAttributeTest
}
else
{
ServerWorld sw = (ServerWorld)w;
Stream<LivingEntity> s = sw.getEntities().filter(Entity::isAlive).filter(e -> e instanceof LivingEntity).map(e -> (LivingEntity)e);
ServerLevel sw = (ServerLevel)w;
Stream<LivingEntity> s = StreamSupport.stream(sw.getEntities().getAll().spliterator(), false)
.filter(Entity::isAlive)
.filter(e -> e instanceof LivingEntity)
.map(e -> (LivingEntity)e);
list = s.collect(Collectors.toList());
}
for(LivingEntity liv : list)
{
ModifiableAttributeInstance grav = liv.getAttribute(ForgeMod.ENTITY_GRAVITY.get());
boolean inPlains = liv.level.getBiome(liv.blockPosition()).getBiomeCategory() == Category.PLAINS;
AttributeInstance grav = liv.getAttribute(ForgeMod.ENTITY_GRAVITY.get());
boolean inPlains = liv.level.getBiome(liv.blockPosition()).getBiomeCategory() == BiomeCategory.PLAINS;
if (inPlains && !grav.hasModifier(REDUCED_GRAVITY))
{
logger.info("Granted low gravity to Entity: {}", liv);
@@ -123,7 +127,7 @@ public class GravityAttributeTest
@SubscribeEvent
public void registerItems(RegistryEvent.Register<Item> event)
{
event.getRegistry().register(new ItemGravityStick(new Item.Properties().tab(ItemGroup.TAB_TOOLS).rarity(Rarity.RARE)).setRegistryName("gravity_attribute_test:gravity_stick"));
event.getRegistry().register(new ItemGravityStick(new Properties().tab(CreativeModeTab.TAB_TOOLS).rarity(Rarity.RARE)).setRegistryName("gravity_attribute_test:gravity_stick"));
}
public static class ItemGravityStick extends Item
@@ -136,11 +140,11 @@ public class GravityAttributeTest
}
@Override
public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlotType slot)
public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlot slot)
{
@SuppressWarnings("deprecation")
Multimap<Attribute, AttributeModifier> multimap = super.getDefaultAttributeModifiers(slot);
if (slot == EquipmentSlotType.MAINHAND)
if (slot == EquipmentSlot.MAINHAND)
multimap.put(ForgeMod.ENTITY_GRAVITY.get(), new AttributeModifier(GRAVITY_MODIFIER, "More Gravity", 1.0D, Operation.ADDITION));
return multimap;
@@ -19,10 +19,10 @@
package net.minecraftforge.debug.entity.living;
import net.minecraft.entity.merchant.villager.VillagerEntity;
import net.minecraft.entity.monster.piglin.PiglinEntity;
import net.minecraft.potion.EffectInstance;
import net.minecraft.potion.Effects;
import net.minecraft.world.entity.npc.Villager;
import net.minecraft.world.entity.monster.piglin.Piglin;
import net.minecraft.world.effect.MobEffectInstance;
import net.minecraft.world.effect.MobEffects;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.living.LivingConversionEvent;
import net.minecraftforge.fml.common.Mod;
@@ -38,7 +38,7 @@ public class LivingConversionEventTest
public void canLivingConversion(LivingConversionEvent.Pre event)
{
if (event.getEntityLiving() instanceof PiglinEntity)
if (event.getEntityLiving() instanceof Piglin)
{
event.setCanceled(true);
event.setConversionTimer(0);
@@ -47,7 +47,7 @@ public class LivingConversionEventTest
public void onLivingConversion(LivingConversionEvent.Post event)
{
if (event.getEntityLiving() instanceof VillagerEntity)
event.getEntityLiving().addEffect(new EffectInstance(Effects.LUCK, 20));
if (event.getEntityLiving() instanceof Villager)
event.getEntityLiving().addEffect(new MobEffectInstance(MobEffects.LUCK, 20));
}
}
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.entity;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
@@ -21,15 +21,19 @@ package net.minecraftforge.debug.entity.player;
import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Multimap;
import net.minecraft.entity.ai.attributes.Attribute;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.ai.attributes.Attributes;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.*;
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.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@@ -51,7 +55,7 @@ public class PlayerAttackKnockbackTest {
static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
static RegistryObject<Item> KNOCKBACK_SWORD = ITEMS.register("knockback_sword", () ->
new KnockbackSwordItem(ItemTier.IRON, 3, -2.4F, ATTACK_KNOCKBACK_VALUE, (new Item.Properties()).tab(ItemGroup.TAB_COMBAT))
new KnockbackSwordItem(Tiers.IRON, 3, -2.4F, ATTACK_KNOCKBACK_VALUE, (new Item.Properties()).tab(CreativeModeTab.TAB_COMBAT))
);
public PlayerAttackKnockbackTest()
@@ -60,19 +64,19 @@ public class PlayerAttackKnockbackTest {
ITEMS.register(modEventBus);
}
static class KnockbackSwordItem extends SwordItem{
static class KnockbackSwordItem extends SwordItem {
private final float attackKnockback;
private final Multimap<Attribute, AttributeModifier> defaultModifiers = ArrayListMultimap.create(); // initialize as empty
protected static final UUID BASE_ATTACK_KNOCKBACK_UUID = UUID.fromString("01efce91-ab3a-4163-b464-5c7bd1ae5496");
KnockbackSwordItem(IItemTier itemTier, int attackDamageIn, float attackSpeedIn, float attackKnockbackIn, Properties properties) {
KnockbackSwordItem(Tier itemTier, int attackDamageIn, float attackSpeedIn, float attackKnockbackIn, Properties properties) {
super(itemTier, attackDamageIn, attackSpeedIn, properties);
this.attackKnockback = attackKnockbackIn;
}
@Override
public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlotType equipmentSlotType) {
if(equipmentSlotType == EquipmentSlotType.MAINHAND){
public Multimap<Attribute, AttributeModifier> getDefaultAttributeModifiers(EquipmentSlot equipmentSlotType) {
if(equipmentSlotType == EquipmentSlot.MAINHAND){
if(this.defaultModifiers.isEmpty()){
Multimap<Attribute, AttributeModifier> oldAttributeModifiers = super.getDefaultAttributeModifiers(equipmentSlotType);
this.defaultModifiers.putAll(oldAttributeModifiers);
@@ -19,7 +19,7 @@
package net.minecraftforge.debug.entity.player;
import net.minecraft.world.GameType;
import net.minecraft.world.level.GameType;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.event.ClientPlayerChangeGameModeEvent;
import net.minecraftforge.event.entity.player.PlayerEvent;
@@ -44,7 +44,7 @@ public class PlayerGameModeEventTest
if (event.getNewGameMode() == GameType.SURVIVAL)
event.setCanceled(true);
}
@Mod.EventBusSubscriber(modid="player_game_mode_event_test", value=Dist.CLIENT, bus=Mod.EventBusSubscriber.Bus.FORGE)
public static class PlayerGameModeEventTestClientForgeEvents
{
@@ -19,7 +19,7 @@
package net.minecraftforge.debug.entity.player;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.network.chat.TextComponent;
import net.minecraftforge.event.entity.player.PlayerEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -34,6 +34,6 @@ public class PlayerNameEventTest
public static void onPlayerNameEvent(PlayerEvent.NameFormat event)
{
if (!ENABLE) return;
event.setDisplayname(new StringTextComponent("Test Name"));
event.setDisplayname(new TextComponent("Test Name"));
}
}
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.entity.player;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
@@ -19,9 +19,9 @@
package net.minecraftforge.debug.fluid;
import net.minecraft.block.BlockState;
import net.minecraft.fluid.FluidState;
import net.minecraft.fluid.Fluids;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.level.material.Fluids;
import net.minecraftforge.event.world.BlockEvent;
import net.minecraftforge.eventbus.api.Event;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -19,9 +19,9 @@
package net.minecraftforge.debug.fluid;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.network.chat.TextComponent;
import net.minecraftforge.common.ForgeMod;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
@@ -48,7 +48,7 @@ public class MilkFluidTest
ItemStack stack = event.getItemStack();
if (stack.getItem() == Items.MILK_BUCKET)
{
FluidUtil.getFluidContained(stack).ifPresent((fluid) -> event.getPlayer().displayClientMessage(new StringTextComponent("Contains ").append(fluid.getDisplayName()), true));
FluidUtil.getFluidContained(stack).ifPresent((fluid) -> event.getPlayer().displayClientMessage(new TextComponent("Contains ").append(fluid.getDisplayName()), true));
}
}
}
@@ -19,40 +19,50 @@
package net.minecraftforge.debug.fluid;
import net.minecraft.block.*;
import net.minecraft.block.material.Material;
import net.minecraft.fluid.FluidState;
import net.minecraft.item.*;
import net.minecraft.state.BooleanProperty;
import net.minecraft.state.StateContainer;
import net.minecraft.state.properties.BlockStateProperties;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorld;
import net.minecraftforge.common.util.Lazy;
import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.FluidState;
import net.minecraft.world.level.block.state.properties.BooleanProperty;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.core.BlockPos;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.LevelAccessor;
import net.minecraftforge.fluids.DispenseFluidContainer;
import org.apache.commons.lang3.Validate;
import net.minecraft.fluid.FlowingFluid;
import net.minecraft.fluid.Fluid;
import net.minecraft.fluid.Fluids;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.level.material.FlowingFluid;
import net.minecraft.world.level.material.Fluid;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fluids.FluidAttributes;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.fluids.ForgeFlowingFluid;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraft.block.AbstractBlock.Properties;
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;
import net.minecraft.world.level.block.LiquidBlock;
import net.minecraft.world.level.block.SimpleWaterloggedBlock;
import net.minecraft.world.level.block.state.BlockState;
@Mod(NewFluidTest.MODID)
public class NewFluidTest
{
public static final boolean ENABLE = false; // TODO fix
public static final String MODID = "new_fluid_test";
public static final ResourceLocation FLUID_STILL = new ResourceLocation("minecraft:block/brown_mushroom_block");
@@ -77,30 +87,33 @@ public class NewFluidTest
new ForgeFlowingFluid.Flowing(makeProperties())
);
public static RegistryObject<FlowingFluidBlock> test_fluid_block = BLOCKS.register("test_fluid_block", () ->
new FlowingFluidBlock(test_fluid, Block.Properties.of(net.minecraft.block.material.Material.WATER).noCollission().strength(100.0F).noDrops())
public static RegistryObject<LiquidBlock> test_fluid_block = BLOCKS.register("test_fluid_block", () ->
new LiquidBlock(test_fluid, Properties.of(Material.WATER).noCollission().strength(100.0F).noDrops())
);
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(ItemGroup.TAB_MISC))
new BucketItem(test_fluid, new Item.Properties().craftRemainder(Items.BUCKET).stacksTo(1).tab(CreativeModeTab.TAB_MISC))
);
// WARNING: this doesn't allow "any fluid", only the fluid from this test mod!
public static RegistryObject<Block> fluidloggable_block = BLOCKS.register("fluidloggable_block", () ->
new FluidloggableBlock(Block.Properties.of(Material.WOOD).noCollission().strength(100.0F).noDrops())
new FluidloggableBlock(Properties.of(Material.WOOD).noCollission().strength(100.0F).noDrops())
);
public static RegistryObject<Item> fluidloggable_blockitem = ITEMS.register("fluidloggable_block", () ->
new BlockItem(fluidloggable_block.get(), new Item.Properties().tab(ItemGroup.TAB_MISC))
new BlockItem(fluidloggable_block.get(), new Item.Properties().tab(CreativeModeTab.TAB_MISC))
);
public NewFluidTest()
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
if (ENABLE)
{
IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
modEventBus.addListener(this::loadComplete);
modEventBus.addListener(this::loadComplete);
BLOCKS.register(modEventBus);
ITEMS.register(modEventBus);
FLUIDS.register(modEventBus);
BLOCKS.register(modEventBus);
ITEMS.register(modEventBus);
FLUIDS.register(modEventBus);
}
}
public void loadComplete(FMLLoadCompleteEvent event)
@@ -115,7 +128,7 @@ public class NewFluidTest
}
// WARNING: this doesn't allow "any fluid", only the fluid from this test mod!
private static class FluidloggableBlock extends Block implements IWaterLoggable
private static class FluidloggableBlock extends Block implements SimpleWaterloggedBlock
{
public static final BooleanProperty FLUIDLOGGED = BooleanProperty.create("fluidlogged");
@@ -126,18 +139,18 @@ public class NewFluidTest
}
@Override
protected void createBlockStateDefinition(StateContainer.Builder<Block, BlockState> builder)
protected void createBlockStateDefinition(StateDefinition.Builder<Block, BlockState> builder)
{
builder.add(FLUIDLOGGED);
}
@Override
public boolean canPlaceLiquid(IBlockReader worldIn, BlockPos pos, BlockState state, Fluid fluidIn) {
public boolean canPlaceLiquid(BlockGetter worldIn, BlockPos pos, BlockState state, Fluid fluidIn) {
return !state.getValue(FLUIDLOGGED) && fluidIn == test_fluid.get();
}
@Override
public boolean placeLiquid(IWorld worldIn, BlockPos pos, BlockState state, FluidState fluidStateIn) {
public boolean placeLiquid(LevelAccessor worldIn, BlockPos pos, BlockState state, FluidState fluidStateIn) {
if (canPlaceLiquid(worldIn, pos, state, fluidStateIn.getType())) {
if (!worldIn.isClientSide()) {
worldIn.setBlock(pos, state.setValue(FLUIDLOGGED, true), 3);
@@ -151,12 +164,12 @@ public class NewFluidTest
}
@Override
public Fluid takeLiquid(IWorld worldIn, BlockPos pos, BlockState state) {
public ItemStack pickupBlock(LevelAccessor worldIn, BlockPos pos, BlockState state) {
if (state.getValue(FLUIDLOGGED)) {
worldIn.setBlock(pos, state.setValue(FLUIDLOGGED, false), 3);
return test_fluid.get();
return new ItemStack(test_fluid_bucket.get());
} else {
return Fluids.EMPTY;
return ItemStack.EMPTY;
}
}
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.fluid;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
@@ -21,42 +21,41 @@ package net.minecraftforge.debug.gameplay.loot;
import com.google.gson.JsonObject;
import com.google.gson.JsonParseException;
import net.minecraft.advancements.criterion.EnchantmentPredicate;
import net.minecraft.advancements.criterion.ItemPredicate;
import net.minecraft.advancements.criterion.MinMaxBounds;
import net.minecraft.block.Blocks;
import net.minecraft.advancements.critereon.EnchantmentPredicate;
import net.minecraft.advancements.critereon.ItemPredicate;
import net.minecraft.advancements.critereon.MinMaxBounds;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.data.DataGenerator;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.Enchantment.Rarity;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.enchantment.EnchantmentType;
import net.minecraft.enchantment.Enchantments;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.inventory.Inventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.item.crafting.FurnaceRecipe;
import net.minecraft.item.crafting.IRecipeType;
import net.minecraft.loot.LootContext;
import net.minecraft.loot.LootParameterSets;
import net.minecraft.loot.LootParameters;
import net.minecraft.loot.LootTable;
import net.minecraft.loot.conditions.BlockStateProperty;
import net.minecraft.loot.conditions.ILootCondition;
import net.minecraft.loot.conditions.MatchTool;
import net.minecraft.util.JSONUtils;
import net.minecraft.util.ResourceLocation;
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.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.util.GsonHelper;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.common.data.GlobalLootModifierProvider;
import net.minecraftforge.common.loot.GlobalLootModifierSerializer;
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.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.items.ItemHandlerHelper;
import net.minecraftforge.registries.DeferredRegister;
@@ -88,7 +87,7 @@ public class GlobalLootModifiersTest {
private static final RegistryObject<SmeltingEnchantmentModifier.Serializer> SMELTING = GLM.register("smelting", SmeltingEnchantmentModifier.Serializer::new);
private static final RegistryObject<WheatSeedsConverterModifier.Serializer> WHEATSEEDS = GLM.register("wheat_harvest", WheatSeedsConverterModifier.Serializer::new);
private static final RegistryObject<SilkTouchTestModifier.Serializer> SILKTOUCH = GLM.register("silk_touch_bamboo", SilkTouchTestModifier.Serializer::new);
private static final RegistryObject<Enchantment> SMELT = ENCHANTS.register("smelt", () -> new SmelterEnchantment(Rarity.UNCOMMON, EnchantmentType.DIGGER, EquipmentSlotType.MAINHAND));
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 {
@@ -111,30 +110,30 @@ public class GlobalLootModifiersTest {
protected void start()
{
add("smelting", SMELTING.get(), new SmeltingEnchantmentModifier(
new ILootCondition[]{
new LootItemCondition[]{
MatchTool.toolMatches(
ItemPredicate.Builder.item().hasEnchantment(
new EnchantmentPredicate(SMELT.get(), MinMaxBounds.IntBound.atLeast(1))))
new EnchantmentPredicate(SMELT.get(), MinMaxBounds.Ints.atLeast(1))))
.build()
})
);
add("wheat_harvest", WHEATSEEDS.get(), new WheatSeedsConverterModifier(
new ILootCondition[] {
new LootItemCondition[] {
MatchTool.toolMatches(ItemPredicate.Builder.item().of(Items.SHEARS)).build(),
BlockStateProperty.hasBlockStateProperties(Blocks.WHEAT).build()
LootItemBlockStatePropertyCondition.hasBlockStateProperties(Blocks.WHEAT).build()
},
3, Items.WHEAT_SEEDS, Items.WHEAT)
);
add("dungeon_loot", DUNGEON_LOOT.get(), new DungeonLootEnhancerModifier(
new ILootCondition[] { LootTableIdCondition.builder(new ResourceLocation("chests/simple_dungeon")).build() })
new LootItemCondition[] { LootTableIdCondition.builder(new ResourceLocation("chests/simple_dungeon")).build() })
);
}
}
private static class SmelterEnchantment extends Enchantment {
protected SmelterEnchantment(Rarity rarityIn, EnchantmentType typeIn, EquipmentSlotType... slots) {
protected SmelterEnchantment(Rarity rarityIn, EnchantmentCategory typeIn, EquipmentSlot... slots) {
super(rarityIn, typeIn, slots);
}
}
@@ -144,7 +143,7 @@ public class GlobalLootModifiersTest {
*
*/
private static class SmeltingEnchantmentModifier extends LootModifier {
public SmeltingEnchantmentModifier(ILootCondition[] conditionsIn) {
public SmeltingEnchantmentModifier(LootItemCondition[] conditionsIn) {
super(conditionsIn);
}
@@ -157,8 +156,8 @@ public class GlobalLootModifiersTest {
}
private static ItemStack smelt(ItemStack stack, LootContext context) {
return context.getLevel().getRecipeManager().getRecipeFor(IRecipeType.SMELTING, new Inventory(stack), context.getLevel())
.map(FurnaceRecipe::getResultItem)
return context.getLevel().getRecipeManager().getRecipeFor(RecipeType.SMELTING, new SimpleContainer(stack), context.getLevel())
.map(SmeltingRecipe::getResultItem)
.filter(itemStack -> !itemStack.isEmpty())
.map(itemStack -> ItemHandlerHelper.copyStackWithSize(itemStack, stack.getCount() * itemStack.getCount()))
.orElse(stack);
@@ -166,7 +165,7 @@ public class GlobalLootModifiersTest {
private static class Serializer extends GlobalLootModifierSerializer<SmeltingEnchantmentModifier> {
@Override
public SmeltingEnchantmentModifier read(ResourceLocation name, JsonObject json, ILootCondition[] conditionsIn) {
public SmeltingEnchantmentModifier read(ResourceLocation name, JsonObject json, LootItemCondition[] conditionsIn) {
return new SmeltingEnchantmentModifier(conditionsIn);
}
@@ -182,28 +181,28 @@ public class GlobalLootModifiersTest {
*
*/
private static class SilkTouchTestModifier extends LootModifier {
public SilkTouchTestModifier(ILootCondition[] conditionsIn) {
public SilkTouchTestModifier(LootItemCondition[] conditionsIn) {
super(conditionsIn);
}
@Nonnull
@Override
public List<ItemStack> doApply(List<ItemStack> generatedLoot, LootContext context) {
ItemStack ctxTool = context.getParamOrNull(LootParameters.TOOL);
ItemStack ctxTool = context.getParamOrNull(LootContextParams.TOOL);
//return early if silk-touch is already applied (otherwise we'll get stuck in an infinite loop).
if(EnchantmentHelper.getEnchantments(ctxTool).containsKey(Enchantments.SILK_TOUCH)) return generatedLoot;
ItemStack fakeTool = ctxTool.copy();
fakeTool.enchant(Enchantments.SILK_TOUCH, 1);
LootContext.Builder builder = new LootContext.Builder(context);
builder.withParameter(LootParameters.TOOL, fakeTool);
LootContext ctx = builder.create(LootParameterSets.BLOCK);
LootTable loottable = context.getLevel().getServer().getLootTables().get(context.getParamOrNull(LootParameters.BLOCK_STATE).getBlock().getLootTable());
builder.withParameter(LootContextParams.TOOL, fakeTool);
LootContext ctx = builder.create(LootContextParamSets.BLOCK);
LootTable loottable = context.getLevel().getServer().getLootTables().get(context.getParamOrNull(LootContextParams.BLOCK_STATE).getBlock().getLootTable());
return loottable.getRandomItems(ctx);
}
private static class Serializer extends GlobalLootModifierSerializer<SilkTouchTestModifier> {
@Override
public SilkTouchTestModifier read(ResourceLocation name, JsonObject json, ILootCondition[] conditionsIn) {
public SilkTouchTestModifier read(ResourceLocation name, JsonObject json, LootItemCondition[] conditionsIn) {
return new SilkTouchTestModifier(conditionsIn);
}
@@ -223,7 +222,7 @@ public class GlobalLootModifiersTest {
private final int numSeedsToConvert;
private final Item itemToCheck;
private final Item itemReward;
public WheatSeedsConverterModifier(ILootCondition[] conditionsIn, int numSeeds, Item itemCheck, Item reward) {
public WheatSeedsConverterModifier(LootItemCondition[] conditionsIn, int numSeeds, Item itemCheck, Item reward) {
super(conditionsIn);
numSeedsToConvert = numSeeds;
itemToCheck = itemCheck;
@@ -255,10 +254,10 @@ public class GlobalLootModifiersTest {
private static class Serializer extends GlobalLootModifierSerializer<WheatSeedsConverterModifier> {
@Override
public WheatSeedsConverterModifier read(ResourceLocation name, JsonObject object, ILootCondition[] conditionsIn) {
int numSeeds = JSONUtils.getAsInt(object, "numSeeds");
Item seed = ForgeRegistries.ITEMS.getValue(new ResourceLocation((JSONUtils.getAsString(object, "seedItem"))));
Item wheat = ForgeRegistries.ITEMS.getValue(new ResourceLocation(JSONUtils.getAsString(object, "replacement")));
public WheatSeedsConverterModifier read(ResourceLocation name, JsonObject object, LootItemCondition[] conditionsIn) {
int numSeeds = GsonHelper.getAsInt(object, "numSeeds");
Item seed = ForgeRegistries.ITEMS.getValue(new ResourceLocation((GsonHelper.getAsString(object, "seedItem"))));
Item wheat = ForgeRegistries.ITEMS.getValue(new ResourceLocation(GsonHelper.getAsString(object, "replacement")));
return new WheatSeedsConverterModifier(conditionsIn, numSeeds, seed, wheat);
}
@@ -276,12 +275,12 @@ public class GlobalLootModifiersTest {
private static class DungeonLootEnhancerModifier extends LootModifier {
private final int multiplicationFactor;
public DungeonLootEnhancerModifier(final ILootCondition[] conditionsIn, final int multiplicationFactor) {
public DungeonLootEnhancerModifier(final LootItemCondition[] conditionsIn, final int multiplicationFactor) {
super(conditionsIn);
this.multiplicationFactor = multiplicationFactor;
}
public DungeonLootEnhancerModifier(final ILootCondition[] conditionsIn) {
public DungeonLootEnhancerModifier(final LootItemCondition[] conditionsIn) {
this(conditionsIn, 2);
}
@@ -295,8 +294,8 @@ public class GlobalLootModifiersTest {
private static class Serializer extends GlobalLootModifierSerializer<DungeonLootEnhancerModifier> {
@Override
public DungeonLootEnhancerModifier read(ResourceLocation location, JsonObject object, ILootCondition[] conditions) {
final int multiplicationFactor = JSONUtils.getAsInt(object, "multiplication_factor", 2);
public DungeonLootEnhancerModifier read(ResourceLocation location, JsonObject object, LootItemCondition[] conditions) {
final int multiplicationFactor = GsonHelper.getAsInt(object, "multiplication_factor", 2);
if (multiplicationFactor <= 0) throw new JsonParseException("Unable to set a multiplication factor to a number lower than 1");
return new DungeonLootEnhancerModifier(conditions, multiplicationFactor);
}
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.gameplay.loot;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
@@ -19,20 +19,21 @@
package net.minecraftforge.debug.item;
import net.minecraft.block.DispenserBlock;
import net.minecraft.client.model.geom.EntityModelSet;
import net.minecraft.client.renderer.entity.LivingEntityRenderer;
import net.minecraft.world.level.block.DispenserBlock;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
import net.minecraft.client.renderer.entity.IEntityRenderer;
import net.minecraft.client.player.AbstractClientPlayer;
import net.minecraft.client.renderer.entity.RenderLayerParent;
import net.minecraft.client.renderer.entity.layers.ElytraLayer;
import net.minecraft.client.renderer.entity.model.PlayerModel;
import net.minecraft.entity.LivingEntity;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.*;
import net.minecraft.util.ResourceLocation;
import net.minecraft.client.model.PlayerModel;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -41,7 +42,12 @@ import net.minecraftforge.registries.ForgeRegistries;
import javax.annotation.Nullable;
import net.minecraft.item.Item.Properties;
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;
@Mod(CustomElytraTest.MOD_ID)
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, modid = CustomElytraTest.MOD_ID)
@@ -49,7 +55,7 @@ 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 Item.Properties().durability(100).tab(ItemGroup.TAB_MISC)));
private static final RegistryObject<Item> TEST_ELYTRA = ITEMS.register("test_elytra",() -> new CustomElytra(new Properties().durability(100).tab(CreativeModeTab.TAB_MISC)));
public CustomElytraTest()
{
@@ -63,10 +69,13 @@ public class CustomElytraTest
registerElytraLayer();
}
@SuppressWarnings({"unchecked", "rawtypes"})
@OnlyIn(Dist.CLIENT)
private void registerElytraLayer()
{
Minecraft.getInstance().getEntityRenderDispatcher().getSkinMap().values().forEach(player -> player.addLayer(new CustomElytraLayer(player)));
Minecraft mc = Minecraft.getInstance();
mc.getEntityRenderDispatcher().getSkinMap().values()
.forEach(player -> ((LivingEntityRenderer) player).addLayer(new CustomElytraLayer((LivingEntityRenderer) player, mc.getEntityModels())));
}
public static class CustomElytra extends Item
@@ -80,9 +89,9 @@ public class CustomElytraTest
@Nullable
@Override
public EquipmentSlotType getEquipmentSlot(ItemStack stack)
public EquipmentSlot getEquipmentSlot(ItemStack stack)
{
return EquipmentSlotType.CHEST; //Or you could just extend ItemArmor
return EquipmentSlot.CHEST; //Or you could just extend ItemArmor
}
@Override
@@ -97,30 +106,30 @@ public class CustomElytraTest
//Adding 1 to ticksElytraFlying prevents damage on the very first tick.
if (!entity.level.isClientSide && (flightTicks + 1) % 20 == 0)
{
stack.hurtAndBreak(1, entity, e -> e.broadcastBreakEvent(EquipmentSlotType.CHEST));
stack.hurtAndBreak(1, entity, e -> e.broadcastBreakEvent(EquipmentSlot.CHEST));
}
return true;
}
}
@OnlyIn(Dist.CLIENT)
public static class CustomElytraLayer extends ElytraLayer<AbstractClientPlayerEntity, PlayerModel<AbstractClientPlayerEntity>>
public static class CustomElytraLayer extends ElytraLayer<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>>
{
private static final ResourceLocation TEXTURE_ELYTRA = new ResourceLocation(MOD_ID, "textures/entity/custom_elytra.png");
public CustomElytraLayer(IEntityRenderer<AbstractClientPlayerEntity, PlayerModel<AbstractClientPlayerEntity>> rendererIn)
public CustomElytraLayer(RenderLayerParent<AbstractClientPlayer, PlayerModel<AbstractClientPlayer>> renderer, EntityModelSet modelSet)
{
super(rendererIn);
super(renderer, modelSet);
}
@Override
public boolean shouldRender(ItemStack stack, AbstractClientPlayerEntity entity)
public boolean shouldRender(ItemStack stack, AbstractClientPlayer entity)
{
return stack.getItem() == TEST_ELYTRA.get();
}
@Override
public ResourceLocation getElytraTexture(ItemStack stack, AbstractClientPlayerEntity entity)
public ResourceLocation getElytraTexture(ItemStack stack, AbstractClientPlayer entity)
{
return TEXTURE_ELYTRA;
}
@@ -19,17 +19,22 @@
package net.minecraftforge.debug.item;
import net.minecraft.entity.monster.EndermanEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.*;
import net.minecraft.world.entity.monster.EnderMan;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.EquipmentSlot;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
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;
@Mod(EnderMaskTest.MODID)
public class EnderMaskTest
{
@@ -37,10 +42,10 @@ 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(ArmorMaterial.LEATHER, EquipmentSlotType.HEAD, (new Item.Properties().tab(ItemGroup.TAB_MISC)))
new ArmorItem(ArmorMaterials.LEATHER, EquipmentSlot.HEAD, (new Item.Properties().tab(CreativeModeTab.TAB_MISC)))
{
@Override
public boolean isEnderMask(ItemStack stack, PlayerEntity player, EndermanEntity endermanEntity)
public boolean isEnderMask(ItemStack stack, Player player, EnderMan endermanEntity)
{
return player.experienceLevel > 10;
}
@@ -19,12 +19,12 @@
package net.minecraftforge.debug.item;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.ai.attributes.AttributeModifier.Operation;
import net.minecraft.entity.ai.attributes.Attributes;
import net.minecraft.inventory.EquipmentSlotType;
import net.minecraft.item.Item;
import net.minecraft.item.Items;
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.entity.EquipmentSlot;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.Items;
import net.minecraftforge.event.ItemAttributeModifierEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
import net.minecraftforge.fml.common.Mod;
@@ -40,7 +40,7 @@ public class ItemAttributeModifierTest
@SubscribeEvent
public static void onItemAttribute(ItemAttributeModifierEvent event)
{
if (ENABLED && event.getSlotType() == EquipmentSlotType.MAINHAND)
if (ENABLED && event.getSlotType() == EquipmentSlot.MAINHAND)
{
final Item item = event.getItemStack().getItem();
if (item == Items.APPLE)
@@ -19,13 +19,13 @@
package net.minecraftforge.debug.item;
import net.minecraft.item.Item;
import net.minecraft.item.MusicDiscItem;
import net.minecraft.item.Rarity;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundEvent;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.RecordItem;
import net.minecraft.world.item.Rarity;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.sounds.SoundEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
@@ -44,7 +44,7 @@ public class MusicDiscTest
() -> new SoundEvent(new ResourceLocation(MOD_ID, "test_sound_event")));
private static final RegistryObject<Item> TEST_MUSIC_DISC = ITEMS.register("test_music_disc",
() -> new MusicDiscItem(1, TEST_SOUND_EVENT, new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)));
() -> new RecordItem(1, TEST_SOUND_EVENT, new Item.Properties().stacksTo(1).rarity(Rarity.EPIC)));
public MusicDiscTest()
{
@@ -19,25 +19,28 @@
package net.minecraftforge.debug.item;
import net.minecraft.item.*;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
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.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@Mod(RangedMobsUseModdedWeaponsTest.MOD_ID)
public class RangedMobsUseModdedWeaponsTest {
//Testing if the new alternative for ProjectileHelper.getWeaponHoldingHand works for vanilla mobs
// as well as replacing their usages of LivingEntity#isHolding(Item) with LivingEntity#isHolding(Predicate<Item)
//Skeletons and Illusioners should be able to use the modded bow.
//Piglins and Pillagers should be able to use the modded crossbow.
// Testing if the new alternative for ProjectileHelper.getWeaponHoldingHand works for vanilla mobs
// as well as replacing their usages of LivingEntity#isHolding(Item) with LivingEntity#isHolding(Predicate<ItemStack>)
// Skeletons and Illusioners should be able to use the modded bow.
// Piglins and Pillagers should be able to use the modded crossbow.
public static final boolean ENABLE = true;
@@ -45,10 +48,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(ItemGroup.TAB_COMBAT).defaultDurability(384))
new BowItem(new Item.Properties().tab(CreativeModeTab.TAB_COMBAT).defaultDurability(384))
);
private static final RegistryObject<Item> MODDED_CROSSBOW = ITEMS.register("modded_crossbow", () ->
new CrossbowItem(new Item.Properties().tab(ItemGroup.TAB_COMBAT).defaultDurability(326))
new CrossbowItem(new Item.Properties().tab(CreativeModeTab.TAB_COMBAT).defaultDurability(326))
);
public RangedMobsUseModdedWeaponsTest()
@@ -70,7 +73,7 @@ public class RangedMobsUseModdedWeaponsTest {
{
static void initBowModelProperties()
{
ItemModelsProperties.register(MODDED_BOW.get(), new ResourceLocation("pull"), (itemStack, clientWorld, livingEntity) -> {
ItemProperties.register(MODDED_BOW.get(), new ResourceLocation("pull"), (itemStack, clientWorld, livingEntity, seed) -> {
if (livingEntity == null)
{
return 0.0F;
@@ -78,12 +81,12 @@ public class RangedMobsUseModdedWeaponsTest {
return livingEntity.getUseItem() != itemStack ? 0.0F : (float)(itemStack.getUseDuration() - livingEntity.getUseItemRemainingTicks()) / 20.0F;
}
});
ItemModelsProperties.register(MODDED_BOW.get(), new ResourceLocation("pulling"), (itemStack, clientWorld, livingEntity) -> livingEntity != null && livingEntity.isUsingItem() && livingEntity.getUseItem() == itemStack ? 1.0F : 0.0F);
ItemProperties.register(MODDED_BOW.get(), new ResourceLocation("pulling"), (itemStack, clientWorld, livingEntity, seed) -> livingEntity != null && livingEntity.isUsingItem() && livingEntity.getUseItem() == itemStack ? 1.0F : 0.0F);
}
static void initCrossbowModelProperties()
{
ItemModelsProperties.register(MODDED_CROSSBOW.get(), new ResourceLocation("pull"), (itemStack, clientWorld, livingEntity) -> {
ItemProperties.register(MODDED_CROSSBOW.get(), new ResourceLocation("pull"), (itemStack, clientWorld, livingEntity, seed) -> {
if (livingEntity == null)
{
return 0.0F;
@@ -91,9 +94,9 @@ public class RangedMobsUseModdedWeaponsTest {
return CrossbowItem.isCharged(itemStack) ? 0.0F : (float)(itemStack.getUseDuration() - livingEntity.getUseItemRemainingTicks()) / (float)CrossbowItem.getChargeDuration(itemStack);
}
});
ItemModelsProperties.register(MODDED_CROSSBOW.get(), new ResourceLocation("pulling"), (itemStack, clientWorld, livingEntity) -> livingEntity != null && livingEntity.isUsingItem() && livingEntity.getUseItem() == itemStack && !CrossbowItem.isCharged(itemStack) ? 1.0F : 0.0F);
ItemModelsProperties.register(MODDED_CROSSBOW.get(), new ResourceLocation("charged"), (itemStack, clientWorld, livingEntity) -> livingEntity != null && CrossbowItem.isCharged(itemStack) ? 1.0F : 0.0F);
ItemModelsProperties.register(MODDED_CROSSBOW.get(), new ResourceLocation("firework"), (itemStack, clientWorld, livingEntity) -> livingEntity != null && CrossbowItem.isCharged(itemStack) && CrossbowItem.containsChargedProjectile(itemStack, Items.FIREWORK_ROCKET) ? 1.0F : 0.0F);
ItemProperties.register(MODDED_CROSSBOW.get(), new ResourceLocation("pulling"), (itemStack, clientWorld, livingEntity, seed) -> livingEntity != null && livingEntity.isUsingItem() && livingEntity.getUseItem() == itemStack && !CrossbowItem.isCharged(itemStack) ? 1.0F : 0.0F);
ItemProperties.register(MODDED_CROSSBOW.get(), new ResourceLocation("charged"), (itemStack, clientWorld, livingEntity, seed) -> livingEntity != null && CrossbowItem.isCharged(itemStack) ? 1.0F : 0.0F);
ItemProperties.register(MODDED_CROSSBOW.get(), new ResourceLocation("firework"), (itemStack, clientWorld, livingEntity, seed) -> livingEntity != null && CrossbowItem.isCharged(itemStack) && CrossbowItem.containsChargedProjectile(itemStack, Items.FIREWORK_ROCKET) ? 1.0F : 0.0F);
}
}
}
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.item;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
@@ -19,24 +19,24 @@
package net.minecraftforge.debug.misc;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.block.Blocks;
import net.minecraft.client.gui.ScreenManager;
import net.minecraft.client.gui.screen.inventory.ContainerScreen;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerInventory;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.inventory.Inventory;
import net.minecraft.inventory.container.Container;
import net.minecraft.inventory.container.ContainerType;
import net.minecraft.inventory.container.INamedContainerProvider;
import net.minecraft.inventory.container.Slot;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.network.PacketBuffer;
import net.minecraft.util.Hand;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.text.StringTextComponent;
import com.mojang.blaze3d.vertex.PoseStack;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.client.gui.screens.MenuScreens;
import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.entity.player.Inventory;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.SimpleContainer;
import net.minecraft.world.inventory.AbstractContainerMenu;
import net.minecraft.world.inventory.MenuType;
import net.minecraft.world.MenuProvider;
import net.minecraft.world.inventory.Slot;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.network.FriendlyByteBuf;
import net.minecraft.world.InteractionHand;
import net.minecraft.network.chat.Component;
import net.minecraft.network.chat.TextComponent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.extensions.IForgeContainerType;
import net.minecraftforge.event.RegistryEvent;
@@ -44,24 +44,24 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.fml.network.NetworkHooks;
import net.minecraftforge.fmllegacy.network.NetworkHooks;
import net.minecraftforge.registries.ObjectHolder;
@Mod("containertypetest")
public class ContainerTypeTest
{
@ObjectHolder("containertypetest:container")
public static final ContainerType<TestContainer> TYPE = null;
public class TestContainer extends Container
public static final MenuType<TestContainer> TYPE = null;
public class TestContainer extends AbstractContainerMenu
{
private final String text;
protected TestContainer(int windowId, PlayerInventory playerInv, PacketBuffer extraData)
protected TestContainer(int windowId, Inventory playerInv, FriendlyByteBuf extraData)
{
this(windowId, new Inventory(9), extraData.readUtf(128));
this(windowId, new SimpleContainer(9), extraData.readUtf(128));
}
public TestContainer(int windowId, Inventory inv, String text)
public TestContainer(int windowId, SimpleContainer inv, String text)
{
super(TYPE, windowId);
this.text = text;
@@ -72,21 +72,21 @@ public class ContainerTypeTest
}
@Override
public boolean stillValid(PlayerEntity playerIn)
public boolean stillValid(Player playerIn)
{
return true;
}
}
public class TestGui extends ContainerScreen<TestContainer>
public class TestGui extends AbstractContainerScreen<TestContainer>
{
public TestGui(TestContainer container, PlayerInventory inv, ITextComponent name)
public TestGui(TestContainer container, Inventory inv, Component name)
{
super(container, inv, name);
}
@Override
protected void renderBg(MatrixStack mStack, float partialTicks, int mouseX, int mouseY)
protected void renderBg(PoseStack mStack, float partialTicks, int mouseX, int mouseY)
{
drawString(mStack, this.font, getMenu().text, mouseX, mouseY, -1);
}
@@ -94,34 +94,34 @@ public class ContainerTypeTest
public ContainerTypeTest()
{
FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(ContainerType.class, this::registerContainers);
FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(MenuType.class, this::registerContainers);
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
MinecraftForge.EVENT_BUS.addListener(this::onRightClick);
}
private void registerContainers(final RegistryEvent.Register<ContainerType<?>> event)
private void registerContainers(final RegistryEvent.Register<MenuType<?>> event)
{
event.getRegistry().register(IForgeContainerType.create(TestContainer::new).setRegistryName("container"));
}
private void setup(FMLClientSetupEvent event)
{
ScreenManager.register(TYPE, TestGui::new);
MenuScreens.register(TYPE, TestGui::new);
}
private void onRightClick(PlayerInteractEvent.RightClickBlock event)
{
if (!event.getWorld().isClientSide && event.getHand() == Hand.MAIN_HAND)
if (!event.getWorld().isClientSide && event.getHand() == InteractionHand.MAIN_HAND)
{
if (event.getWorld().getBlockState(event.getPos()).getBlock() == Blocks.SPONGE)
{
String text = "Hello World!";
NetworkHooks.openGui((ServerPlayerEntity) event.getPlayer(), new INamedContainerProvider()
NetworkHooks.openGui((ServerPlayer) event.getPlayer(), new MenuProvider()
{
@Override
public Container createMenu(int p_createMenu_1_, PlayerInventory p_createMenu_2_, PlayerEntity p_createMenu_3_)
public AbstractContainerMenu createMenu(int p_createMenu_1_, Inventory p_createMenu_2_, Player p_createMenu_3_)
{
Inventory inv = new Inventory(9);
SimpleContainer inv = new SimpleContainer(9);
for (int i = 0; i < inv.getContainerSize(); i++)
{
inv.setItem(i, new ItemStack(Items.DIAMOND));
@@ -130,9 +130,9 @@ public class ContainerTypeTest
}
@Override
public ITextComponent getDisplayName()
public Component getDisplayName()
{
return new StringTextComponent("Test");
return new TextComponent("Test");
}
}, extraData -> {
extraData.writeUtf(text);
@@ -23,23 +23,24 @@ import com.google.common.collect.Sets;
import java.util.Set;
import java.util.function.Supplier;
import javax.annotation.Nullable;
import net.minecraft.core.Registry;
import net.minecraft.data.DataGenerator;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.enchantment.Enchantments;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.item.PotionItem;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionUtils;
import net.minecraft.potion.Potions;
import net.minecraft.tags.ITag;
import net.minecraft.world.item.enchantment.Enchantment;
import net.minecraft.world.item.enchantment.EnchantmentHelper;
import net.minecraft.world.item.enchantment.Enchantments;
import net.minecraft.world.item.Item;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraft.world.item.PotionItem;
import net.minecraft.world.item.alchemy.Potion;
import net.minecraft.world.item.alchemy.PotionUtils;
import net.minecraft.world.item.alchemy.Potions;
import net.minecraft.tags.Tag;
import net.minecraft.tags.ItemTags;
import net.minecraft.tags.TagCollectionManager;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.ResourceLocation;
import net.minecraft.tags.SerializationTags;
import net.minecraft.world.level.block.entity.BlockEntity;
import net.minecraft.world.level.block.entity.BlockEntityType;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.common.ForgeTagHandler;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.data.ExistingFileHelper;
@@ -47,9 +48,9 @@ import net.minecraftforge.common.data.ForgeRegistryTagsProvider;
import net.minecraftforge.common.util.ReverseTagWrapper;
import net.minecraftforge.event.entity.player.PlayerInteractEvent;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.GatherDataEvent;
import net.minecraftforge.forge.event.lifecycle.GatherDataEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
@@ -69,11 +70,11 @@ public class CustomTagTypesTest
private static final RegistryObject<Custom> CUSTOM = CUSTOMS.register("custom", Custom::new);
private static final Supplier<IForgeRegistry<Custom>> CUSTOM_REG = CUSTOMS.makeRegistry(customRegistryName.getPath(),
() -> new RegistryBuilder<Custom>().tagFolder(MODID + "/custom_types"));
private static final ITag.INamedTag<Custom> TESTS = ForgeTagHandler.createOptionalTag(customRegistryName, new ResourceLocation(MODID, "tests"), Sets.newHashSet(CUSTOM));
private static final ITag.INamedTag<Item> OPTIONAL_TEST = ItemTags.createOptional(new ResourceLocation(MODID, "optional_test"), Sets.newHashSet(() -> Items.BONE));
private static final ITag.INamedTag<Enchantment> FIRE = ForgeTagHandler.createOptionalTag(ForgeRegistries.ENCHANTMENTS, new ResourceLocation(MODID, "fire"));
private static final ITag.INamedTag<Potion> DAMAGE = ForgeTagHandler.createOptionalTag(ForgeRegistries.POTION_TYPES, new ResourceLocation(MODID, "damage"));
private static final ITag.INamedTag<TileEntityType<?>> STORAGE = ForgeTagHandler.createOptionalTag(ForgeRegistries.TILE_ENTITIES, new ResourceLocation(MODID, "storage"));
private static final Tag.Named<Custom> TESTS = ForgeTagHandler.createOptionalTag(customRegistryName, new ResourceLocation(MODID, "tests"), Sets.newHashSet(CUSTOM));
private static final Tag.Named<Item> OPTIONAL_TEST = ItemTags.createOptional(new ResourceLocation(MODID, "optional_test"), Sets.newHashSet(() -> Items.BONE));
private static final Tag.Named<Enchantment> FIRE = ForgeTagHandler.createOptionalTag(ForgeRegistries.ENCHANTMENTS, new ResourceLocation(MODID, "fire"));
private static final Tag.Named<Potion> DAMAGE = ForgeTagHandler.createOptionalTag(ForgeRegistries.POTION_TYPES, new ResourceLocation(MODID, "damage"));
private static final Tag.Named<BlockEntityType<?>> STORAGE = ForgeTagHandler.createOptionalTag(ForgeRegistries.BLOCK_ENTITIES, new ResourceLocation(MODID, "storage"));
public CustomTagTypesTest()
{
@@ -92,7 +93,7 @@ public class CustomTagTypesTest
gen.addProvider(new CustomRegistryTags(gen, existingFileHelper));
gen.addProvider(new EnchantmentTags(gen, existingFileHelper));
gen.addProvider(new PotionTags(gen, existingFileHelper));
gen.addProvider(new TileEntityTypeTags(gen, existingFileHelper));
gen.addProvider(new BlockEntityTypeTags(gen, existingFileHelper));
}
}
@@ -101,11 +102,11 @@ public class CustomTagTypesTest
ItemStack itemStack = event.getItemStack();
if (!itemStack.isEmpty())
{
LOGGER.info("{} {} {}", Items.BONE.getTags(), OPTIONAL_TEST.getValues().size(), TagCollectionManager.getInstance().getItems().getTag(new ResourceLocation(MODID, "optional_test")));
LOGGER.info("{} {} {}", Items.BONE.getTags(), OPTIONAL_TEST.getValues().size(), SerializationTags.getInstance().getOrEmpty(Registry.ITEM_REGISTRY).getTag(new ResourceLocation(MODID, "optional_test")));
EnchantmentHelper.getEnchantments(itemStack).forEach((enchantment, level) -> logTagsIfPresent(enchantment.getTags()));
if (itemStack.getItem() instanceof PotionItem) logTagsIfPresent(PotionUtils.getPotion(itemStack).getTags());
TileEntity tileEntity = event.getWorld().getBlockEntity(event.getPos());
if (tileEntity != null) logTagsIfPresent(tileEntity.getType().getTags());
BlockEntity blockEntity = event.getWorld().getBlockEntity(event.getPos());
if (blockEntity != null) logTagsIfPresent(blockEntity.getType().getTags());
}
}
@@ -119,14 +120,14 @@ public class CustomTagTypesTest
public static class Custom extends ForgeRegistryEntry<Custom>
{
private final ReverseTagWrapper<Custom> reverseTags = new ReverseTagWrapper<>(this, () -> TagCollectionManager.getInstance().getCustomTypeCollection(CUSTOM_REG.get()));
private final ReverseTagWrapper<Custom> reverseTags = new ReverseTagWrapper<>(this, () -> SerializationTags.getInstance().getCustomTypeCollection(CUSTOM_REG.get()));
public Set<ResourceLocation> getTags()
{
return reverseTags.getTagNames();
}
public boolean isIn(ITag<Custom> tag)
public boolean isIn(Tag<Custom> tag)
{
return tag.contains(this);
}
@@ -192,17 +193,17 @@ public class CustomTagTypesTest
}
}
public static class TileEntityTypeTags extends ForgeRegistryTagsProvider<TileEntityType<?>>
public static class BlockEntityTypeTags extends ForgeRegistryTagsProvider<BlockEntityType<?>>
{
public TileEntityTypeTags(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper)
public BlockEntityTypeTags(DataGenerator gen, @Nullable ExistingFileHelper existingFileHelper)
{
super(gen, ForgeRegistries.TILE_ENTITIES, MODID, existingFileHelper);
super(gen, ForgeRegistries.BLOCK_ENTITIES, MODID, existingFileHelper);
}
@Override
protected void addTags()
{
tag(STORAGE).add(TileEntityType.BARREL, TileEntityType.CHEST, TileEntityType.ENDER_CHEST);
tag(STORAGE).add(BlockEntityType.BARREL, BlockEntityType.CHEST, BlockEntityType.ENDER_CHEST);
}
@Override
@@ -19,12 +19,12 @@
package net.minecraftforge.debug.misc;
import net.minecraft.command.Commands;
import net.minecraft.command.arguments.EntityArgument;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.util.Hand;
import net.minecraft.commands.Commands;
import net.minecraft.commands.arguments.EntityArgument;
import net.minecraft.server.level.ServerPlayer;
import net.minecraft.world.InteractionHand;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.util.FakePlayerFactory;
import net.minecraftforge.event.RegisterCommandsEvent;
@@ -57,8 +57,8 @@ public class FakePlayerTest
//Makes sure fake player does not crash when its `connection` is accessed [#7604]
.then(Commands.literal("opencontainer")
.executes(context -> {
ServerPlayerEntity fakePlayer = FakePlayerFactory.getMinecraft(context.getSource().getLevel());
Hand hand = Hand.MAIN_HAND;
ServerPlayer fakePlayer = FakePlayerFactory.getMinecraft(context.getSource().getLevel());
InteractionHand hand = InteractionHand.MAIN_HAND;
ItemStack stack = Items.WRITABLE_BOOK.getDefaultInstance();
fakePlayer.setItemInHand(hand, stack);
fakePlayer.openItemGui(stack, hand);
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.misc;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
@@ -21,6 +21,5 @@
@MethodsReturnNonnullByDefault
package net.minecraftforge.debug;
import mcp.MethodsReturnNonnullByDefault;
import javax.annotation.ParametersAreNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;
@@ -19,7 +19,7 @@
package net.minecraftforge.debug.world;
import net.minecraft.util.ResourceLocation;
import net.minecraft.resources.ResourceLocation;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.BiomeLoadingEvent;
import net.minecraftforge.fml.common.Mod;
@@ -21,8 +21,8 @@ package net.minecraftforge.debug.world;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.Level;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.ChunkWatchEvent;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -75,7 +75,7 @@ public class ChunkWatchEventTest
}
@Nullable
private static ResourceLocation getDimensionName(World w)
private static ResourceLocation getDimensionName(Level w)
{
return w.dimension().location();
}
@@ -19,12 +19,13 @@
package net.minecraftforge.debug.world;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.registry.WorldGenRegistries;
import net.minecraft.world.gen.DimensionSettings;
import net.minecraft.world.gen.feature.structure.Structure;
import net.minecraft.world.gen.settings.DimensionStructuresSettings;
import net.minecraft.world.gen.settings.StructureSeparationSettings;
import com.sun.jna.Structure;
import net.minecraft.data.BuiltinRegistries;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
import net.minecraft.world.level.levelgen.StructureSettings;
import net.minecraft.world.level.levelgen.feature.StructureFeature;
import net.minecraft.world.level.levelgen.feature.configurations.StructureFeatureConfiguration;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.event.lifecycle.FMLLoadCompleteEvent;
@@ -68,8 +69,8 @@ public class DimensionSettingsTest {
event.enqueueWork(() ->
{
LOGGER.info("Registering custom DimensionSettings for Dimension: {}", TEST_OVERWORLD);
DimensionSettings dimensionSettings = createDimensionSettings();
WorldGenRegistries.register(WorldGenRegistries.NOISE_GENERATOR_SETTINGS, TEST_OVERWORLD, dimensionSettings);
NoiseGeneratorSettings noiseGenSettings = createNoiseGenerationSettings();
BuiltinRegistries.register(BuiltinRegistries.NOISE_GENERATOR_SETTINGS, TEST_OVERWORLD, noiseGenSettings);
});
}
@@ -80,33 +81,33 @@ public class DimensionSettingsTest {
{
event.enqueueWork(() ->
{
StructureSeparationSettings settings = new StructureSeparationSettings(2, 1, 0);
StructureFeatureConfiguration config = new StructureFeatureConfiguration(2, 1, 0);
WorldGenRegistries.NOISE_GENERATOR_SETTINGS.entrySet().forEach(entry ->
BuiltinRegistries.NOISE_GENERATOR_SETTINGS.entrySet().forEach(entry ->
{
ResourceLocation dimensionName = entry.getKey().location();
// Example: blacklisting all vanilla dimensions
if (dimensionName.getNamespace().equals("minecraft")) return;
LOGGER.info("Adding Structure: {} to Dimension: {}", Structure.RUINED_PORTAL.getFeatureName(), dimensionName);
entry.getValue().structureSettings().structureConfig().put(Structure.RUINED_PORTAL, settings);
LOGGER.info("Adding Structure: {} to Dimension: {}", StructureFeature.RUINED_PORTAL.getFeatureName(), dimensionName);
entry.getValue().structureSettings().structureConfig().put(StructureFeature.RUINED_PORTAL, config);
});
});
}
/**
* Create a DimensionSettings instance copying all but the structure settings from overworld.
* Create a NoiseGeneratorSettings instance copying all but the structure settings from overworld.
*/
private static DimensionSettings createDimensionSettings()
private static NoiseGeneratorSettings createNoiseGenerationSettings()
{
DimensionSettings overworld = WorldGenRegistries.NOISE_GENERATOR_SETTINGS.getOrThrow(DimensionSettings.OVERWORLD);
NoiseGeneratorSettings overworld = BuiltinRegistries.NOISE_GENERATOR_SETTINGS.getOrThrow(NoiseGeneratorSettings.OVERWORLD);
// Make a new DimensionStructuresSettings with no structures
DimensionStructuresSettings structures = new DimensionStructuresSettings(Optional.empty(), new HashMap<>());
// Make a new StructureSettings with no structures
StructureSettings structures = new StructureSettings(Optional.empty(), new HashMap<>());
// Build a new DimensionSettings copying all the other options from 'overworld'
return new DimensionSettings(
// Build a new NoiseGeneratorSettings copying all the other options from 'overworld'
return new NoiseGeneratorSettings(
structures,
overworld.noiseSettings(),
overworld.getDefaultBlock(),
@@ -114,6 +115,13 @@ public class DimensionSettingsTest {
overworld.getBedrockRoofPosition(),
overworld.getBedrockFloorPosition(),
overworld.seaLevel(),
overworld.disableMobGeneration());
overworld.getMinSurfaceLevel(),
overworld.disableMobGeneration(),
overworld.isAquifersEnabled(),
overworld.isNoiseCavesEnabled(),
overworld.isDeepslateEnabled(),
overworld.isOreVeinsEnabled(),
overworld.isNoodleCavesEnabled()
);
}
}
@@ -23,20 +23,20 @@ import com.mojang.datafixers.util.Pair;
import it.unimi.dsi.fastutil.longs.LongSet;
import java.util.Map;
import java.util.UUID;
import net.minecraft.block.AbstractBlock;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.block.material.Material;
import net.minecraft.item.BlockItem;
import net.minecraft.item.Item;
import net.minecraft.item.ItemGroup;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.ChunkPos;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
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.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
@@ -45,7 +45,7 @@ import net.minecraftforge.registries.ForgeRegistries;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import net.minecraft.block.AbstractBlock.Properties;
import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
@Mod(ForgeChunkManagerTest.MODID)
public class ForgeChunkManagerTest
@@ -54,8 +54,8 @@ public class ForgeChunkManagerTest
private static final Logger LOGGER = LogManager.getLogger(MODID);
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(AbstractBlock.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(ItemGroup.TAB_MISC)));
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)));
public ForgeChunkManagerTest()
{
@@ -100,24 +100,24 @@ public class ForgeChunkManagerTest
}
@Override
public void onPlace(BlockState state, World worldIn, BlockPos pos, BlockState oldState, boolean isMoving)
public void onPlace(BlockState state, Level worldIn, BlockPos pos, BlockState oldState, boolean isMoving)
{
super.onPlace(state, worldIn, pos, oldState, isMoving);
if (worldIn instanceof ServerWorld)
if (worldIn instanceof ServerLevel)
{
ChunkPos chunkPos = new ChunkPos(pos);
ForgeChunkManager.forceChunk((ServerWorld) worldIn, MODID, pos, chunkPos.x, chunkPos.z, true, false);
ForgeChunkManager.forceChunk((ServerLevel) worldIn, MODID, pos, chunkPos.x, chunkPos.z, true, false);
}
}
@Deprecated
public void onRemove(BlockState state, World worldIn, BlockPos pos, BlockState newState, boolean isMoving)
public void onRemove(BlockState state, Level worldIn, BlockPos pos, BlockState newState, boolean isMoving)
{
super.onRemove(state, worldIn, pos, newState, isMoving);
if (worldIn instanceof ServerWorld && !state.is(newState.getBlock()))
if (worldIn instanceof ServerLevel && !state.is(newState.getBlock()))
{
ChunkPos chunkPos = new ChunkPos(pos);
ForgeChunkManager.forceChunk((ServerWorld) worldIn, MODID, pos, chunkPos.x, chunkPos.z, false, false);
ForgeChunkManager.forceChunk((ServerLevel) worldIn, MODID, pos, chunkPos.x, chunkPos.z, false, false);
}
}
}
@@ -20,14 +20,14 @@
package net.minecraftforge.debug.world;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.gui.widget.button.Button;
import net.minecraft.util.registry.Registry;
import net.minecraft.util.text.StringTextComponent;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.gen.ChunkGenerator;
import net.minecraft.world.gen.DimensionSettings;
import net.minecraft.world.gen.settings.DimensionGeneratorSettings;
import net.minecraft.client.gui.components.Button;
import net.minecraft.client.gui.screens.Screen;
import net.minecraft.core.Registry;
import net.minecraft.network.chat.TextComponent;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.chunk.ChunkGenerator;
import net.minecraft.world.level.levelgen.NoiseGeneratorSettings;
import net.minecraft.world.level.levelgen.WorldGenSettings;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.client.ForgeWorldTypeScreens;
import net.minecraftforge.common.world.ForgeWorldType;
@@ -53,16 +53,16 @@ public class ForgeWorldTypeTest
private void registerWorldTypes(RegistryEvent.Register<ForgeWorldType> event)
{
event.getRegistry().registerAll(
new ForgeWorldType(DimensionGeneratorSettings::makeDefaultOverworld).setRegistryName("test_world_type")
new ForgeWorldType(WorldGenSettings::makeDefaultOverworld).setRegistryName("test_world_type")
);
event.getRegistry().registerAll(
new ForgeWorldType(this::createChunkGenerator).setRegistryName("test_world_type2")
);
}
private ChunkGenerator createChunkGenerator(Registry<Biome> biomes, Registry<DimensionSettings> dimensionSettings, long seed, String settings)
private ChunkGenerator createChunkGenerator(Registry<Biome> biomes, Registry<NoiseGeneratorSettings> dimensionSettings, long seed, String settings)
{
return DimensionGeneratorSettings.makeDefaultOverworld(biomes, dimensionSettings, seed);
return WorldGenSettings.makeDefaultOverworld(biomes, dimensionSettings, seed);
}
@Mod.EventBusSubscriber(modid="forge_world_type_test", value=Dist.CLIENT, bus=Bus.MOD)
@@ -78,7 +78,7 @@ public class ForgeWorldTypeTest
{
super.init();
addButton(new Button(0, 0, 120, 20, new StringTextComponent("close"), btn -> {
addRenderableWidget(new Button(0, 0, 120, 20, new TextComponent("close"), btn -> {
Minecraft.getInstance().setScreen(returnTo);
}));
}
@@ -19,8 +19,8 @@
package net.minecraftforge.debug.world;
import net.minecraft.entity.EntityType;
import net.minecraft.world.raid.Raid;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.entity.raid.Raid;
import net.minecraftforge.fml.common.Mod;
@Mod("raid_enum_test")
@@ -31,6 +31,6 @@ public class RaidEnumTest
public RaidEnumTest()
{
if (ENABLE)
Raid.WaveMember.create("thebluemengroup", EntityType.ILLUSIONER, new int[]{0, 5, 0, 1, 0, 1, 0, 2});
Raid.RaiderType.create("thebluemengroup", EntityType.ILLUSIONER, new int[]{0, 5, 0, 1, 0, 1, 0, 2});
}
}
@@ -19,10 +19,10 @@
package net.minecraftforge.debug.world;
import net.minecraft.entity.EntityClassification;
import net.minecraft.entity.EntityType;
import net.minecraft.world.biome.MobSpawnInfo;
import net.minecraft.world.gen.feature.structure.Structure;
import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.entity.EntityType;
import net.minecraft.world.level.biome.MobSpawnSettings;
import net.minecraft.world.level.levelgen.feature.StructureFeature;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.StructureSpawnListGatherEvent;
import net.minecraftforge.eventbus.api.EventPriority;
@@ -44,15 +44,15 @@ public class StructureSpawnListGatherEventTest
private void onStructureSpawnListGather(StructureSpawnListGatherEvent event)
{
if (event.getStructure() == Structure.STRONGHOLD)
if (event.getStructure() == StructureFeature.STRONGHOLD)
{
event.addEntitySpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.WITHER_SKELETON, 100, 5, 15));
event.addEntitySpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.WITHER_SKELETON, 100, 5, 15));
LOGGER.info("Adding wither skeleton spawns to strong holds");
}
else if (event.getStructure() == Structure.SHIPWRECK)
else if (event.getStructure() == StructureFeature.SHIPWRECK)
{
event.setInsideOnly(false);
event.addEntitySpawn(EntityClassification.MONSTER, new MobSpawnInfo.Spawners(EntityType.GUARDIAN, 100, 5, 15));
event.addEntitySpawn(MobCategory.MONSTER, new MobSpawnSettings.SpawnerData(EntityType.GUARDIAN, 100, 5, 15));
LOGGER.info("Adding guardians spawns to shipwrecks");
}
}
@@ -19,13 +19,13 @@
package net.minecraftforge.debug.world;
import net.minecraft.world.biome.Biome;
import net.minecraft.world.biome.BiomeMaker;
import net.minecraft.world.gen.feature.DungeonsFeature;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.feature.NoFeatureConfig;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.data.worldgen.biome.VanillaBiomes;
import net.minecraft.world.level.levelgen.feature.MonsterRoomFeature;
import net.minecraft.world.level.levelgen.feature.Feature;
import net.minecraft.world.level.levelgen.feature.configurations.NoneFeatureConfiguration;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.fml.RegistryObject;
import net.minecraftforge.fmllegacy.RegistryObject;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
import net.minecraftforge.registries.DeferredRegister;
@@ -36,9 +36,9 @@ import net.minecraftforge.registries.ForgeRegistries;
public class WorldgenRegistryDesyncTest {
public static final DeferredRegister<Feature<?>> FEATURES = DeferredRegister.create(ForgeRegistries.FEATURES, "worldgen_registry_desync_test");
public static final RegistryObject<Feature<NoFeatureConfig>> dungeon = FEATURES.register("dungeon", () -> new DungeonsFeature(NoFeatureConfig.CODEC));
public static final RegistryObject<Feature<NoneFeatureConfiguration>> dungeon = FEATURES.register("dungeon", () -> new MonsterRoomFeature(NoneFeatureConfiguration.CODEC));
public static final DeferredRegister<Biome> BIOMES = DeferredRegister.create(ForgeRegistries.BIOMES, "worldgen_registry_desync_test");
public static final RegistryObject<Biome> biome = BIOMES.register("biome", BiomeMaker::theVoidBiome);
public static final RegistryObject<Biome> biome = BIOMES.register("biome", VanillaBiomes::theVoidBiome);
public WorldgenRegistryDesyncTest()
{
@@ -22,4 +22,4 @@
package net.minecraftforge.debug.world;
import javax.annotation.ParametersAreNonnullByDefault;
import mcp.MethodsReturnNonnullByDefault;
import net.minecraft.MethodsReturnNonnullByDefault;